add option fcmResolveUnhandledClientError

Author: mtrezza

spec/.eslintrc.json

@@ -0,0 +1,12 @@
+{
+    "env": {
+        "jasmine": true
+    },
+    "globals": {
+      "Parse": true
+    },
+    "rules": {
+      "no-console": [0],
+      "no-var": "error"
+    }
+}

spec/FCM.spec.js

@@ -2,20 +2,23 @@ import path from 'path';
 import log from 'npmlog';
 import FCM from '../src/FCM.js';
 import { getApps, deleteApp } from 'firebase-admin/app';
+import Parse from 'parse/node.js';
 
-const testArgs = {
-  firebaseServiceAccount: path.join(
-    __dirname,
-    '..',
-    'spec',
-    'support',
-    'fakeServiceAccount.json',
-  ),
-};
+let testArgs;
 
 describe('FCM', () => {
   beforeEach(async () => {
     getApps().forEach(app => deleteApp(app));
+
+    testArgs = {
+      firebaseServiceAccount: path.join(
+        __dirname,
+        '..',
+        'spec',
+        'support',
+        'fakeServiceAccount.json',
+      ),
+    };
   });
 
   it('can initialize', () => {
@@ -221,9 +224,29 @@ describe('FCM', () => {
     expect(spyError).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'error sending push: testing error abort');
   });
 
-  it('can handle exceptions that are unhandled by the FCM client', async () => {
+  it('rejects exceptions that are unhandled by FCM client', async () => {
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const spyError = spyOn(log, 'error').and.callFake(() => {});
+    testArgs.fcmResolveUnhandledClientError = false;
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      throw new Error('test error');
+    });
+    fcm.pushType = 'android';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token' }];
+    await expectAsync(fcm.send(data, devices)).toBeRejectedWith(new Parse.Error(Parse.Error.OTHER_CAUSE, 'Error: test error'));
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(spyError).toHaveBeenCalledTimes(2);
+    expect(spyError.calls.all()[0].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: firebase client exception: Error: test error']);
+    expect(spyError.calls.all()[1].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: ParseError: -1 Error: test error']);
+  });
+
+  it('resolves exceptions that are unhandled by FCM client', async () => {
     const spyInfo = spyOn(log, 'info').and.callFake(() => {});
     const spyError = spyOn(log, 'error').and.callFake(() => {});
+    testArgs.fcmResolveUnhandledClientError = true;
     const fcm = new FCM(testArgs);
     spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
       throw new Error('test error');
@@ -235,8 +258,8 @@ describe('FCM', () => {
     expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
     expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
     expect(spyError).toHaveBeenCalledTimes(2);
-    expect(spyError.calls.all()[0].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: firebase client did not handle exception: Error: test error']);
-    expect(spyError.calls.all()[1].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: Error: test error']);
+    expect(spyError.calls.all()[0].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: firebase client exception: Error: test error']);
+    expect(spyError.calls.all()[1].args).toEqual(['parse-server-push-adapter FCM', 'error sending push: ParseError: -1 Error: test error']);
   });
 
   it('FCM request invalid push type', async () => {

src/FCM.js

@@ -28,6 +28,9 @@ export default function FCM(args, pushType) {
   const fcmEnableLegacyHttpTransport = typeof args.fcmEnableLegacyHttpTransport === 'boolean'
     ? args.fcmEnableLegacyHttpTransport
     : false;
+  this.fcmResolveUnhandledClientError = typeof args.fcmResolveUnhandledClientError === 'boolean'
+    ? args.fcmResolveUnhandledClientError
+    : false;
 
   let app;
   if (getApps().length === 0) {
@@ -94,8 +97,8 @@ FCM.prototype.send = function (data, devices) {
       try {
         return this.sender.sendEachForMulticast(fcmPayloadData);
       } catch (err) {
-        log.error(LOG_PREFIX, `error sending push: firebase client did not handle exception: ${err}`);
-        return Promise.reject(err);
+        log.error(LOG_PREFIX, `error sending push: firebase client exception: ${err}`);
+        return Promise.reject(new Parse.Error(Parse.Error.OTHER_CAUSE, err));
       }
     };
 
@@ -150,8 +153,11 @@ FCM.prototype.send = function (data, devices) {
 
   const allPromises = Promise.all(
     slices.map((slice) => sendToDeviceSlice(slice, this.pushType)),
-  ).catch((err) => {
-    log.error(LOG_PREFIX, `error sending push: ${err}`);
+  ).catch(e => {
+    log.error(LOG_PREFIX, `error sending push: ${e}`);
+    if (!this.fcmResolveUnhandledClientError && e instanceof Parse.Error && e.code === Parse.Error.OTHER_CAUSE) {
+      return Promise.reject(e);
+    }
   });
 
   return allPromises;