Skip to content

Commit f04276c

Browse files
authored
Update parse (#146)
* Update parse * Improve with map
1 parent 1f8f9ff commit f04276c

File tree

3 files changed

+73
-31
lines changed

3 files changed

+73
-31
lines changed

package-lock.json

+64-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@parse/node-apn": "^3.1.0",
3737
"@parse/node-gcm": "^1.0.0",
3838
"npmlog": "^4.0.2",
39-
"parse": "^1.11.1"
39+
"parse": "^2.7.1"
4040
},
4141
"engines": {
4242
"node": ">= 8.9.1"

src/GCM.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ GCM.prototype.send = function(data, devices) {
4141
memo.push(promise);
4242
return memo;
4343
}, [])
44-
return Parse.Promise.when(promises).then((results) => {
44+
return Promise.all(promises).then((results) => {
4545
let allResults = results.reduce((memo, result) => {
4646
return memo.concat(result);
4747
}, []);
48-
return Parse.Promise.as(allResults);
48+
return Promise.resolve(allResults);
4949
});
5050
}
5151
// get the devices back...
@@ -70,8 +70,9 @@ GCM.prototype.send = function(data, devices) {
7070
}, {});
7171

7272
let deviceTokens = Object.keys(devicesMap);
73-
74-
let promises = deviceTokens.map(() => new Parse.Promise());
73+
74+
const resolvers = [];
75+
const promises = deviceTokens.map(() => new Promise(resolve => resolvers.push(resolve)));
7576
let registrationTokens = deviceTokens;
7677
let length = registrationTokens.length;
7778
log.verbose(LOG_PREFIX, `sending to ${length} ${length > 1 ? 'devices' : 'device'}`);
@@ -94,7 +95,7 @@ GCM.prototype.send = function(data, devices) {
9495
}
9596
let { results, multicast_id } = response || {};
9697
registrationTokens.forEach((token, index) => {
97-
let promise = promises[index];
98+
let resolve = resolvers[index];
9899
let result = results ? results[index] : undefined;
99100
let device = devicesMap[token];
100101
device.deviceType = 'android';
@@ -108,10 +109,10 @@ GCM.prototype.send = function(data, devices) {
108109
} else {
109110
resolution.transmitted = true;
110111
}
111-
promise.resolve(resolution);
112+
resolve(resolution);
112113
});
113114
});
114-
return Parse.Promise.when(promises);
115+
return Promise.all(promises);
115116
}
116117

117118
/**

0 commit comments

Comments
 (0)