Upgrade APNS to use HTTP/2

- uses universal certificate
- removes tests logs
- standardized returned promises from APNS and GCM to something usable in _PushStatus

Author: flovilmart

package.json

@@ -18,7 +18,6 @@
   ],
   "license": "BSD-3-Clause",
   "dependencies": {
-    "apn": "^1.7.5",
     "aws-sdk": "~2.2.33",
     "babel-polyfill": "^6.5.0",
     "babel-runtime": "^6.5.0",
@@ -29,6 +28,7 @@
     "deepcopy": "^0.6.1",
     "express": "^4.13.4",
     "gcloud": "^0.28.0",
+    "http2": "^3.3.2",
     "mailgun-js": "^0.7.7",
     "mime": "^1.3.4",
     "mongodb": "~2.1.0",

spec/APNS.spec.js

@@ -1,3 +1,4 @@
+'use strict';
 var APNS = require('../src/APNS');
 
 describe('APNS', () => {
@@ -9,17 +10,13 @@ describe('APNS', () => {
       production: true,
       bundleId: 'bundleId'
     }
-    var apns = new APNS(args);
+    var apns = APNS(args);
 
-    expect(apns.conns.length).toBe(1);
-    var apnsConnection = apns.conns[0];
-    expect(apnsConnection.index).toBe(0);
-    expect(apnsConnection.bundleId).toBe(args.bundleId);
-    // TODO: Remove this checking onec we inject APNS
-    var prodApnsOptions = apnsConnection.options;
-    expect(prodApnsOptions.cert).toBe(args.cert);
-    expect(prodApnsOptions.key).toBe(args.key);
-    expect(prodApnsOptions.production).toBe(args.production);
+    var apnsConfiguration = apns.getConfiguration();
+    expect(apnsConfiguration.bundleId).toBe(args.bundleId);
+    expect(apnsConfiguration.cert).toBe(args.cert);
+    expect(apnsConfiguration.key).toBe(args.key);
+    expect(apnsConfiguration.production).toBe(args.production);
     done();
   });
 
@@ -39,24 +36,18 @@ describe('APNS', () => {
       }
     ]
 
-    var apns = new APNS(args);
-    expect(apns.conns.length).toBe(2);
-    var devApnsConnection = apns.conns[1];
-    expect(devApnsConnection.index).toBe(1);
-    var devApnsOptions = devApnsConnection.options;
-    expect(devApnsOptions.cert).toBe(args[0].cert);
-    expect(devApnsOptions.key).toBe(args[0].key);
-    expect(devApnsOptions.production).toBe(args[0].production);
-    expect(devApnsConnection.bundleId).toBe(args[0].bundleId);
-
-    var prodApnsConnection = apns.conns[0];
-    expect(prodApnsConnection.index).toBe(0);
-    // TODO: Remove this checking onec we inject APNS
-    var prodApnsOptions = prodApnsConnection.options;
-    expect(prodApnsOptions.cert).toBe(args[1].cert);
-    expect(prodApnsOptions.key).toBe(args[1].key);
-    expect(prodApnsOptions.production).toBe(args[1].production);
-    expect(prodApnsOptions.bundleId).toBe(args[1].bundleId);
+    var apns = APNS(args);
+    var devApnsConfiguration = apns.getConfiguration('bundleId');
+    expect(devApnsConfiguration.cert).toBe(args[0].cert);
+    expect(devApnsConfiguration.key).toBe(args[0].key);
+    expect(devApnsConfiguration.production).toBe(args[0].production);
+    expect(devApnsConfiguration.bundleId).toBe(args[0].bundleId);
+
+    var prodApnsConfiguration = apns.getConfiguration('bundleIdAgain');
+    expect(prodApnsConfiguration.cert).toBe(args[1].cert);
+    expect(prodApnsConfiguration.key).toBe(args[1].key);
+    expect(prodApnsConfiguration.production).toBe(args[1].production);
+    expect(prodApnsConfiguration.bundleId).toBe(args[1].bundleId);
     done();
   });
 
@@ -73,64 +64,22 @@ describe('APNS', () => {
     };
     var expirationTime = 1454571491354
 
-    var notification = APNS.generateNotification(data, expirationTime);
-
-    expect(notification.alert).toEqual(data.alert);
-    expect(notification.badge).toEqual(data.badge);
-    expect(notification.sound).toEqual(data.sound);
-    expect(notification.contentAvailable).toEqual(1);
-    expect(notification.category).toEqual(data.category);
-    expect(notification.payload).toEqual({
-      'key': 'value',
-      'keyAgain': 'valueAgain'
-    });
-    expect(notification.expiry).toEqual(expirationTime);
-    done();
-  });
-
-  it('can choose conns for device without appIdentifier', (done) => {
-    // Mock conns
-    var conns = [
-      {
-        bundleId: 'bundleId'
-      },
-      {
-        bundleId: 'bundleIdAgain'
-      }
-    ];
-    // Mock device
-    var device = {};
-
-    var qualifiedConns = APNS.chooseConns(conns, device);
-    expect(qualifiedConns).toEqual([0, 1]);
-    done();
-  });
-
-  it('can choose conns for device with valid appIdentifier', (done) => {
-    // Mock conns
-    var conns = [
-      {
-        bundleId: 'bundleId'
-      },
-      {
-        bundleId: 'bundleIdAgain'
-      }
-    ];
-    // Mock device
-    var device = {
-      appIdentifier: 'bundleId'
-    };
-
-    var qualifiedConns = APNS.chooseConns(conns, device);
-    expect(qualifiedConns).toEqual([0]);
+    var notification = APNS.generateNotification(data);
+    expect(notification.aps.alert).toEqual(data.alert);
+    expect(notification.aps.badge).toEqual(data.badge);
+    expect(notification.aps.sound).toEqual(data.sound);
+    expect(notification.aps['content-available']).toEqual(1);
+    expect(notification.aps.category).toEqual(data.category);
+    expect(notification.key).toEqual('value');
+    expect(notification.keyAgain).toEqual('valueAgain');
     done();
   });
 
   it('can choose conns for device with invalid appIdentifier', (done) => {
     // Mock conns
     var conns = [
       {
-        bundleId: 'bundleId'
+        bundleId: 'bundleId',
       },
       {
         bundleId: 'bundleIdAgain'
@@ -140,143 +89,18 @@ describe('APNS', () => {
     var device = {
       appIdentifier: 'invalid'
     };
-
-    var qualifiedConns = APNS.chooseConns(conns, device);
-    expect(qualifiedConns).toEqual([]);
-    done();
-  });
-
-  it('can handle transmission error when notification is not in cache or device is missing', (done) => {
-    // Mock conns
-    var conns = [];
-    var errorCode = 1;
-    var notification = undefined;
-    var device = {};
-
-    APNS.handleTransmissionError(conns, errorCode, notification, device);
-
-    var notification = {};
-    var device = undefined;
-
-    APNS.handleTransmissionError(conns, errorCode, notification, device);
-    done();
-  });
-
-  it('can handle transmission error when there are other qualified conns', (done) => {
-    // Mock conns
-    var conns = [
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId2'
-      },
-    ];
-    var errorCode = 1;
-    var notification = {};
-    var apnDevice = {
-      connIndex: 0,
-      appIdentifier: 'bundleId1'
-    };
-
-    APNS.handleTransmissionError(conns, errorCode, notification, apnDevice);
-
-    expect(conns[0].pushNotification).not.toHaveBeenCalled();
-    expect(conns[1].pushNotification).toHaveBeenCalled();
-    expect(conns[2].pushNotification).not.toHaveBeenCalled();
-    done();
-  });
-
-  it('can handle transmission error when there is no other qualified conns', (done) => {
-    // Mock conns
-    var conns = [
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId2'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      }
-    ];
-    var errorCode = 1;
-    var notification = {};
-    var apnDevice = {
-      connIndex: 2,
-      appIdentifier: 'bundleId1'
-    };
-
-    APNS.handleTransmissionError(conns, errorCode, notification, apnDevice);
-
-    expect(conns[0].pushNotification).not.toHaveBeenCalled();
-    expect(conns[1].pushNotification).not.toHaveBeenCalled();
-    expect(conns[2].pushNotification).not.toHaveBeenCalled();
-    expect(conns[3].pushNotification).not.toHaveBeenCalled();
-    expect(conns[4].pushNotification).toHaveBeenCalled();
-    done();
-  });
-
-  it('can handle transmission error when device has no appIdentifier', (done) => {
-    // Mock conns
-    var conns = [
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId1'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId2'
-      },
-      {
-        pushNotification: jasmine.createSpy('pushNotification'),
-        bundleId: 'bundleId3'
-      },
-    ];
-    var errorCode = 1;
-    var notification = {};
-    var apnDevice = {
-      connIndex: 1,
-    };
-
-    APNS.handleTransmissionError(conns, errorCode, notification, apnDevice);
-
-    expect(conns[0].pushNotification).not.toHaveBeenCalled();
-    expect(conns[1].pushNotification).not.toHaveBeenCalled();
-    expect(conns[2].pushNotification).toHaveBeenCalled();
+    let apns = APNS(conns);
+    var config = apns.getConfiguration(device.appIdentifier);
+    expect(config).toBeUndefined();
     done();
   });
 
   it('can send APNS notification', (done) => {
     var args = {
-      cert: 'prodCert.pem',
-      key: 'prodKey.pem',
       production: true,
       bundleId: 'bundleId'
     }
-    var apns = new APNS(args);
-    var conn = {
-      pushNotification: jasmine.createSpy('send'),
-      bundleId: 'bundleId'
-    };
-    apns.conns = [ conn ];
+    var apns = APNS(args);
     // Mock data
     var expirationTime = 1454571491354
     var data = {
@@ -293,15 +117,18 @@ describe('APNS', () => {
       }
     ];
 
-    var promise = apns.send(data, devices);
-    expect(conn.pushNotification).toHaveBeenCalled();
-    var args = conn.pushNotification.calls.first().args;
-    var notification = args[0];
-    expect(notification.alert).toEqual(data.data.alert);
-    expect(notification.expiry).toEqual(data['expiration_time']);
-    var apnDevice = args[1]
-    expect(apnDevice.connIndex).toEqual(0);
-    expect(apnDevice.appIdentifier).toEqual('bundleId');
-    done();
+    apns.send(data, devices).then((results) => {
+      let isArray = Array.isArray(results);
+      expect(isArray).toBe(true);
+      expect(results.length).toBe(1);
+      // No provided certificates
+      expect(results[0].status).toBe(403);
+      expect(results[0].device).toEqual(devices[0]);
+      expect(results[0].transmitted).toBe(false);
+      done();
+    }, (err) => {
+      fail('should not fail');
+      done();
+    });
   });
 });