diff --git a/package-lock.json b/package-lock.json index 2248def3d8..c2375ec72e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -195,165 +195,14 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" }, "amazon-payments": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/amazon-payments/-/amazon-payments-0.0.4.tgz", - "integrity": "sha1-s1YsE/iZdcvvbKM2bvNTM62fvPA=", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/amazon-payments/-/amazon-payments-0.2.6.tgz", + "integrity": "sha1-4e34TDjOJXzApFwnPaByaHVhs20=", "requires": { - "qs": "0.6.6", - "request": "2.34.0", + "request": "2.83.0", "xml2js": "0.4.4" }, "dependencies": { - "asn1": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz", - "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=", - "optional": true - }, - "assert-plus": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=", - "optional": true - }, - "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", - "optional": true - }, - "aws-sign2": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz", - "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=", - "optional": true - }, - "boom": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz", - "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=", - "requires": { - "hoek": "0.9.1" - } - }, - "combined-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", - "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=", - "optional": true, - "requires": { - "delayed-stream": "0.0.5" - } - }, - "cryptiles": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz", - "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=", - "optional": true, - "requires": { - "boom": "0.4.2" - } - }, - "delayed-stream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz", - "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=", - "optional": true - }, - "forever-agent": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz", - "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=" - }, - "form-data": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", - "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=", - "optional": true, - "requires": { - "async": "0.9.2", - "combined-stream": "0.0.7", - "mime": "1.2.11" - } - }, - "hawk": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz", - "integrity": "sha1-uQuxaYByhUEdp//LjdJZhQLTtS0=", - "optional": true, - "requires": { - "boom": "0.4.2", - "cryptiles": "0.2.2", - "hoek": "0.9.1", - "sntp": "0.2.4" - } - }, - "hoek": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz", - "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=" - }, - "http-signature": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz", - "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=", - "optional": true, - "requires": { - "asn1": "0.1.11", - "assert-plus": "0.1.5", - "ctype": "0.5.3" - } - }, - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, - "oauth-sign": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz", - "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=", - "optional": true - }, - "qs": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz", - "integrity": "sha1-bgFQmP9RlouKPIGQAdXyyJvEsQc=" - }, - "request": { - "version": "2.34.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz", - "integrity": "sha1-tdi5UmrdSi1GKfTUFxJFc5lkRa4=", - "requires": { - "aws-sign2": "0.5.0", - "forever-agent": "0.5.2", - "form-data": "0.1.4", - "hawk": "1.0.0", - "http-signature": "0.10.1", - "json-stringify-safe": "5.0.1", - "mime": "1.2.11", - "node-uuid": "1.4.8", - "oauth-sign": "0.3.0", - "qs": "0.6.6", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.3.0" - } - }, - "sntp": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz", - "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=", - "optional": true, - "requires": { - "hoek": "0.9.1" - } - }, - "tunnel-agent": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz", - "integrity": "sha1-rWgbaPUyGtKCfEz7G31d8s/pQu4=", - "optional": true - }, "xml2js": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz", @@ -371,46 +220,11 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amplitude": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/amplitude/-/amplitude-2.0.4.tgz", - "integrity": "sha1-g6r6Ex6kvye3HS4B5F05XTYdcY0=", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/amplitude/-/amplitude-3.5.0.tgz", + "integrity": "sha1-Y+2tvZoK70lGf2bBE0D+mzcc18M=", "requires": { - "q": "1.5.1", - "superagent": "2.3.0" - }, - "dependencies": { - "form-data": { - "version": "1.0.0-rc4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", - "integrity": "sha1-BaxrwiIntD5EYfSIFhVUaZ1Pi14=", - "requires": { - "async": "1.5.2", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "superagent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-2.3.0.tgz", - "integrity": "sha1-cDUpoHFOV+EjlZ3e+84ZOy5Q0RU=", - "requires": { - "component-emitter": "1.2.1", - "cookiejar": "2.1.1", - "debug": "2.6.9", - "extend": "3.0.1", - "form-data": "1.0.0-rc4", - "formidable": "1.1.1", - "methods": "1.1.2", - "mime": "1.6.0", - "qs": "6.3.2", - "readable-stream": "2.3.3" - } - } + "superagent": "3.8.2" } }, "amqplib": { @@ -2578,6 +2392,11 @@ } } }, + "cdata": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/cdata/-/cdata-0.1.1.tgz", + "integrity": "sha512-H0gfEXypjHisCI4xkBfh6wAyzDESay6sscM5xeJMQu7zlYrq/jHzxzOfLElg/ULpkAGNomxzENi6tY6wXWNt9w==" + }, "center-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", @@ -3761,12 +3580,6 @@ "lodash.get": "4.4.2" } }, - "ctype": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz", - "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=", - "optional": true - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -3782,9 +3595,12 @@ "dev": true }, "cwait": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cwait/-/cwait-1.0.1.tgz", - "integrity": "sha1-2yWGhuRjKlMzvCMMy09ziyxBRns=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cwait/-/cwait-1.1.1.tgz", + "integrity": "sha512-VRS0E6E41fK2QDYIGsVeE6FRXoH5Vf3hGtDL/jZxh3W+KPVVoEggDem5xJveihgZrd+xmYSqGPIUi/jv5zXcxQ==", + "requires": { + "cdata": "0.1.1" + } }, "cwise": { "version": "1.0.10", @@ -12439,11 +12255,6 @@ "brorand": "1.1.0" } }, - "mime": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", - "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=" - }, "mime-db": { "version": "1.30.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", @@ -18184,25 +17995,20 @@ "integrity": "sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=" }, "stripe": { - "version": "4.25.0", - "resolved": "https://registry.npmjs.org/stripe/-/stripe-4.25.0.tgz", - "integrity": "sha512-sSRPSQ4BTSbdcevVSrtIJzlOCTIAXm8T38DE4zPL6ysYpIWGfIBdo2XnhouLK12/6cuLvaEInlfCZQgoEVzXpQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/stripe/-/stripe-5.4.0.tgz", + "integrity": "sha512-VCDFp4oQu1uOcOLHIwRIznH8ikLJcpDsHahWN48V/QuV6y2Bm281cq5wnkjqv+LPdUpqXVp9pjlb+SfN6dnyZg==", "requires": { - "bluebird": "2.11.0", + "bluebird": "3.5.1", "lodash.isplainobject": "4.0.6", - "object-assign": "4.1.1", - "qs": "6.0.4" + "qs": "6.5.1", + "safe-buffer": "5.1.1" }, "dependencies": { - "bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=" - }, "qs": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.4.tgz", - "integrity": "sha1-UQGdhHIMk5uCc36EVWp4Izjs6ns=" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" } } }, diff --git a/package.json b/package.json index 5652afa370..8e7217f978 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "dependencies": { "@slack/client": "^3.8.1", "accepts": "^1.3.2", - "amazon-payments": "0.0.4", - "amplitude": "^2.0.3", + "amazon-payments": "^0.2.6", + "amplitude": "^3.5.0", "apidoc": "^0.17.5", "apn": "^1.7.6", "autoprefixer": "^6.4.0", @@ -36,8 +36,8 @@ "coupon-code": "^0.4.5", "cross-env": "^5.1.3", "css-loader": "^0.28.0", + "cwait": "^1.1.1", "csv-stringify": "^2.0.1", - "cwait": "~1.0.1", "domain-middleware": "~0.1.0", "express": "^4.16.2", "express-basic-auth": "^1.0.1", @@ -85,8 +85,8 @@ "request": "^2.83.0", "rimraf": "^2.4.3", "sass-loader": "^6.0.2", + "stripe": "^5.4.0", "shelljs": "^0.8.1", - "stripe": "^4.2.0", "superagent": "^3.4.3", "svg-inline-loader": "^0.7.1", "svg-url-loader": "^2.0.2", diff --git a/website/server/models/challenge.js b/website/server/models/challenge.js index 93f6120897..6d748c72c5 100644 --- a/website/server/models/challenge.js +++ b/website/server/models/challenge.js @@ -12,7 +12,7 @@ import { removeFromArray } from '../libs/collectionManipulators'; import shared from '../../common'; import { sendTxn as txnEmail } from '../libs/email'; import { sendNotification as sendPushNotification } from '../libs/pushNotifications'; -import cwait from 'cwait'; +import { TaskQueue } from 'cwait'; import { syncableAttrs, setNextDue } from '../libs/taskManager'; const Schema = mongoose.Schema; @@ -211,7 +211,7 @@ schema.methods.addTasks = async function challengeAddTasks (tasks) { let challenge = this; let membersIds = await _fetchMembersIds(challenge._id); - let queue = new cwait.TaskQueue(Bluebird, 25); // process only 5 users concurrently + let queue = new TaskQueue(Bluebird, 25); // process only 5 users concurrently await Bluebird.map(membersIds, queue.wrap((memberId) => { return _addTaskFn(challenge, tasks, memberId);