@parse/push-adapter 6.0.0 → 6.1.1

package/README.md

@@ -62,6 +62,9 @@ const parseServerOptions = {
       android: {
         /* Android push options */
       }
+      web: {
+        /* Web push options */
+      }
     })
   },
   /* Other Parse Server options */

package/lib/FCM.js

@@ -162,15 +162,20 @@ function _APNSToFCMPayload(requestData) {
         apnsPayload['apns']['payload']['aps'] = coreData.aps;
         break;
       case 'alert':
-        if (!apnsPayload['apns']['payload']['aps'].hasOwnProperty('alert')) {
+        if (_typeof(coreData.alert) == 'object') {
+          // When we receive a dictionary, use as is to remain
+          // compatible with how the APNS.js + node-apn work
+          apnsPayload['apns']['payload']['aps']['alert'] = coreData.alert;
+        } else {
+          // When we receive a value, prepare `alert` dictionary
+          // and set its `body` property
           apnsPayload['apns']['payload']['aps']['alert'] = {};
+          apnsPayload['apns']['payload']['aps']['alert']['body'] = coreData.alert;
         }
-        // In APNS.js we set a body with the same value as alert in requestData.
-        // See L200 in APNS.spec.js
-        apnsPayload['apns']['payload']['aps']['alert']['body'] = coreData.alert;
         break;
       case 'title':
         // Ensure the alert object exists before trying to assign the title
+        // title always goes into the nested `alert` dictionary
         if (!apnsPayload['apns']['payload']['aps'].hasOwnProperty('alert')) {
           apnsPayload['apns']['payload']['aps']['alert'] = {};
         }
@@ -217,7 +222,8 @@ function _APNSToFCMPayload(requestData) {
   return apnsPayload;
 }
 
-function _GCMToFCMPayload(requestData, timeStamp) {
+function _GCMToFCMPayload(requestData, pushId, timeStamp) {
+
   var androidPayload = {
     android: {
       priority: 'high'
@@ -257,7 +263,11 @@ function _GCMToFCMPayload(requestData, timeStamp) {
       }
     }
 
-    androidPayload.android.data = requestData.data;
+    androidPayload.android.data = {
+      push_id: pushId,
+      time: new Date(timeStamp).toISOString(),
+      data: JSON.stringify(requestData.data)
+    };
   }
 
   if (requestData['expiration_time']) {
@@ -283,10 +293,11 @@ function _GCMToFCMPayload(requestData, timeStamp) {
  * If the key rawPayload is present in the requestData, a raw payload will be used. Otherwise, conversion is done.
  * @param {Object} requestData The request body
  * @param {String} pushType Either apple or android.
- * @param {Number} timeStamp Used during GCM payload conversion for ttl
+ * @param {String} pushId Used during GCM payload conversion, required by Parse Android SDK.
+ * @param {Number} timeStamp Used during GCM payload conversion for ttl, required by Parse Android SDK.
  * @returns {Object} A FCMv1-compatible payload.
  */
-function payloadConverter(requestData, pushType, timeStamp) {
+function payloadConverter(requestData, pushType, pushId, timeStamp) {
   if (requestData.hasOwnProperty('rawPayload')) {
     return requestData.rawPayload;
   }
@@ -294,7 +305,7 @@ function payloadConverter(requestData, pushType, timeStamp) {
   if (pushType === 'apple') {
     return _APNSToFCMPayload(requestData);
   } else if (pushType === 'android') {
-    return _GCMToFCMPayload(requestData, timeStamp);
+    return _GCMToFCMPayload(requestData, pushId, timeStamp);
   } else {
     throw new _parse2.default.Error(_parse2.default.Error.PUSH_MISCONFIGURED, 'Unsupported push type, apple or android only.');
   }
@@ -313,12 +324,10 @@ function generateFCMPayload(requestData, pushId, timeStamp, deviceTokens, pushTy
   delete requestData['where'];
 
   var payloadToUse = {
-    data: {},
-    push_id: pushId,
-    time: new Date(timeStamp).toISOString()
+    data: {}
   };
 
-  var fcmPayload = payloadConverter(requestData, pushType, timeStamp);
+  var fcmPayload = payloadConverter(requestData, pushType, pushId, timeStamp);
   payloadToUse.data = _extends({}, fcmPayload, {
     tokens: deviceTokens
   });

package/lib/ParsePushAdapter.js

@@ -26,6 +26,10 @@ var _FCM = require('./FCM');
 
 var _FCM2 = _interopRequireDefault(_FCM);
 
+var _WEB = require('./WEB');
+
+var _WEB2 = _interopRequireDefault(_WEB);
+
 var _PushAdapterUtils = require('./PushAdapterUtils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -42,7 +46,7 @@ var ParsePushAdapter = function () {
 
     this.supportsPushTracking = true;
 
-    this.validPushTypes = ['ios', 'osx', 'tvos', 'android', 'fcm'];
+    this.validPushTypes = ['ios', 'osx', 'tvos', 'android', 'fcm', 'web'];
     this.senderMap = {};
     // used in PushController for Dashboard Features
     this.feature = {
@@ -72,6 +76,9 @@ var ParsePushAdapter = function () {
               this.senderMap[pushType] = new _APNS2.default(pushConfig[pushType]);
             }
             break;
+          case 'web':
+            this.senderMap[pushType] = new _WEB2.default(pushConfig[pushType]);
+            break;
           case 'android':
           case 'fcm':
             if (pushConfig[pushType].hasOwnProperty('firebaseServiceAccount')) {

package/lib/WEB.js

@@ -0,0 +1,204 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WEB = undefined;
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _parse = require('parse');
+
+var _parse2 = _interopRequireDefault(_parse);
+
+var _npmlog = require('npmlog');
+
+var _npmlog2 = _interopRequireDefault(_npmlog);
+
+var _webPush = require('web-push');
+
+var _webPush2 = _interopRequireDefault(_webPush);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var LOG_PREFIX = 'parse-server-push-adapter WEB';
+
+var WEB = exports.WEB = function () {
+  /**
+   * Create a new WEB push adapter.
+   * 
+   * @param {Object} args https://github.com/web-push-libs/web-push#api-reference
+   */
+  function WEB(args) {
+    _classCallCheck(this, WEB);
+
+    if ((typeof args === 'undefined' ? 'undefined' : _typeof(args)) !== 'object' || !args.vapidDetails) {
+      throw new _parse2.default.Error(_parse2.default.Error.PUSH_MISCONFIGURED, 'WEB Push Configuration is invalid');
+    }
+    this.options = args;
+  }
+
+  /**
+   * Send web push notification request.
+   *
+   * @param {Object} data The data we need to send, the format is the same with api request body
+   * @param {Array} devices An array of devices
+   * @returns {Object} A promise which is resolved immediately
+   */
+
+
+  _createClass(WEB, [{
+    key: 'send',
+    value: function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(data, devices) {
+        var coreData, devicesMap, deviceTokens, resolvers, promises, length, response, results, sent, failed;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                coreData = data && data.data;
+
+                if (!(!coreData || !devices || !Array.isArray(devices))) {
+                  _context.next = 4;
+                  break;
+                }
+
+                _npmlog2.default.warn(LOG_PREFIX, 'invalid push payload');
+                return _context.abrupt('return');
+
+              case 4:
+                devicesMap = devices.reduce(function (memo, device) {
+                  memo[device.deviceToken] = device;
+                  return memo;
+                }, {});
+                deviceTokens = Object.keys(devicesMap);
+                resolvers = [];
+                promises = deviceTokens.map(function () {
+                  return new Promise(function (resolve) {
+                    return resolvers.push(resolve);
+                  });
+                });
+                length = deviceTokens.length;
+
+                _npmlog2.default.verbose(LOG_PREFIX, 'sending to ' + length + ' ' + (length > 1 ? 'devices' : 'device'));
+
+                _context.next = 12;
+                return WEB.sendNotifications(coreData, deviceTokens, this.options);
+
+              case 12:
+                response = _context.sent;
+                results = response.results, sent = response.sent, failed = response.failed;
+
+                if (sent) {
+                  _npmlog2.default.verbose(LOG_PREFIX, 'WEB Response: %d out of %d sent successfully', sent, results.length);
+                }
+                if (failed) {
+                  _npmlog2.default.error(LOG_PREFIX, 'send errored: %d out of %d failed with error %s', failed, results.length, 'push subscription has unsubscribed or expired.');
+                }
+                deviceTokens.forEach(function (token, index) {
+                  var resolve = resolvers[index];
+                  var _results$index = results[index],
+                      result = _results$index.result,
+                      error = _results$index.error;
+
+                  var device = devicesMap[token];
+                  device.deviceType = 'web';
+                  var resolution = {
+                    device: device,
+                    response: error || result,
+                    transmitted: !error
+                  };
+                  resolve(resolution);
+                });
+                return _context.abrupt('return', Promise.all(promises));
+
+              case 18:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function send(_x, _x2) {
+        return _ref.apply(this, arguments);
+      }
+
+      return send;
+    }()
+
+    /**
+     * Send multiple web push notification request.
+     *
+     * @param {Object} payload The data we need to send, the format is the same with api request body
+     * @param {Array} deviceTokens An array of devicesTokens
+     * @param {Object} options The options for the request
+     * @returns {Object} A promise which is resolved immediately
+     */
+
+  }], [{
+    key: 'sendNotifications',
+    value: function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(payload, deviceTokens, options) {
+        var promises, allResults, response;
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                promises = deviceTokens.map(function (deviceToken) {
+                  if (typeof deviceToken === 'string') {
+                    deviceToken = JSON.parse(deviceToken);
+                  }
+                  if ((typeof payload === 'undefined' ? 'undefined' : _typeof(payload)) === 'object') {
+                    payload = JSON.stringify(payload);
+                  }
+                  return _webPush2.default.sendNotification(deviceToken, payload, options);
+                });
+                _context2.next = 3;
+                return Promise.allSettled(promises);
+
+              case 3:
+                allResults = _context2.sent;
+                response = {
+                  sent: 0,
+                  failed: 0,
+                  results: []
+                };
+
+                allResults.forEach(function (result) {
+                  if (result.status === 'fulfilled') {
+                    response.sent += 1;
+                    response.results.push({ result: result.value.statusCode });
+                  } else {
+                    response.failed += 1;
+                    response.results.push({ error: result.reason.body });
+                  }
+                });
+                return _context2.abrupt('return', response);
+
+              case 7:
+              case 'end':
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function sendNotifications(_x3, _x4, _x5) {
+        return _ref2.apply(this, arguments);
+      }
+
+      return sendNotifications;
+    }()
+  }]);
+
+  return WEB;
+}();
+
+exports.default = WEB;

package/lib/index.js

@@ -1,12 +1,12 @@
 "use strict";
 // ParsePushAdapter is the default implementation of
-// PushAdapter, it uses GCM for android push and APNS
-// for ios push.
+// PushAdapter, it uses GCM for android push, APNS for ios push.
+// WEB for web push.
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.utils = exports.GCM = exports.APNS = exports.ParsePushAdapter = undefined;
+exports.utils = exports.WEB = exports.GCM = exports.APNS = exports.ParsePushAdapter = undefined;
 
 var _npmlog = require('npmlog');
 
@@ -24,6 +24,10 @@ var _APNS = require('./APNS');
 
 var _APNS2 = _interopRequireDefault(_APNS);
 
+var _WEB = require('./WEB');
+
+var _WEB2 = _interopRequireDefault(_WEB);
+
 var _PushAdapterUtils = require('./PushAdapterUtils');
 
 var utils = _interopRequireWildcard(_PushAdapterUtils);
@@ -39,4 +43,5 @@ if (process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER_PUSH_ADAPTER) {
 exports.ParsePushAdapter = _ParsePushAdapter2.default;
 exports.APNS = _APNS2.default;
 exports.GCM = _GCM2.default;
+exports.WEB = _WEB2.default;
 exports.utils = utils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parse/push-adapter",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "description": "Base parse-server-push-adapter",
   "main": "lib/index.js",
   "files": [
@@ -25,9 +25,10 @@
   "dependencies": {
     "@parse/node-apn": "6.0.1",
     "@parse/node-gcm": "1.0.2",
-    "firebase-admin": "12.0.0",
+    "firebase-admin": "12.1.0",
     "npmlog": "7.0.1",
-    "parse": "5.0.0"
+    "parse": "5.0.0",
+    "web-push": "3.6.7"
   },
   "devDependencies": {
     "@semantic-release/changelog": "5.0.1",