cleanup silent notification

README.md

@@ -91,21 +91,7 @@ client.send(sn).then(() => {
 });
 ```
 
-Send a silent notification with options:
-
-```javascript
-const SilentNotification = APNS.SilentNotification;
-
-let sn = new SilentNotification(deviceToken, {
-  badge: getUnreadNotificationCount()
-});
-
-client.send(sn).then(() => {
-  // sent successfully
-}).catch(err => {
-  console.error(err.reason);
-});
-```
+Note: [Apple recommends](https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/TheNotificationPayload.html#//apple_ref/doc/uid/TP40008194-CH107-SW1) that no options other than the `content-available` flag be sent in order for a notification to truly be silent and wake up your app in the background. Therefore this class does not accept any additional options in the constructor.
 
 #### Advanced
 

lib/notifications/notification.js

@@ -27,8 +27,7 @@ class Notification {
    * @param {String} [options.sound]
    * @param {String} [options.category]
    * @param {Object} [options.data]
-   * @param {Number} [options.content-available]
-   * @param {Boolean} [options.silent] - Identical to `content-available`: 1
+   * @param {Boolean} [options.contentAvailable]
    * @param {Number} [options.priority]
    * @param {Object} [options.aps] - override all setters
    */
@@ -76,7 +75,7 @@ class Notification {
     }
 
     // Check for "silent" notification
-    if (this._options[`content-available`] || this._options.silent) {
+    if (_.isBoolean(this._options.contentAvailable)) {
       result.aps[`content-available`] = 1;
     }
 

lib/notifications/silent-notification.js

@@ -13,11 +13,11 @@ class SilentNotification extends Notification {
    * @param {String} deviceToken
    * @param {Object} [options] - see super class
    */
-  constructor(deviceToken, options) {
-    options = options || {};
-    options.priority = priority.throttled;
-    options.silent = true;
-    super(deviceToken, options);
+  constructor(deviceToken) {
+    super(deviceToken, {
+      contentAvailable: true,
+      priority: priority.throttled
+    });
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apns2",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Node client for connecting to Apple's Push Notification Service using the new HTTP/2 protocol with JSON web tokens.",
   "author": "Andrew Barba <[email protected]>",
   "main": "lib/apns.js",

test/test.js

@@ -45,11 +45,39 @@ describe('apns', () => {
       return apns.send(basicNotification);
     });
 
+    it('should send a basic notification with options', () => {
+      let basicNotification = new APNS.BasicNotification(deviceToken, `Hello, 1`, {
+        badge: 1
+      });
+      return apns.send(basicNotification);
+    });
+
+    it('should send a basic notification with additional data', () => {
+      let basicNotification = new APNS.BasicNotification(deviceToken, `Hello, ICON`, {
+        badge: 0,
+        data: {
+          url: `venue/icon`
+        }
+      });
+      return apns.send(basicNotification);
+    });
+
     it('should send a silent notification', () => {
       let silentNotification = new APNS.SilentNotification(deviceToken);
       return apns.send(silentNotification);
     });
 
+    it('should send a notification', () => {
+      let notification = new APNS.Notification(deviceToken, {
+        aps: {
+          alert: {
+            body: `Hello, Tablelist`
+          }
+        }
+      });
+      return apns.send(notification);
+    });
+
     it('should send both notifications', () => {
       let basicNotification = new APNS.BasicNotification(deviceToken, `Hello, Multiple`);
       let silentNotification = new APNS.SilentNotification(deviceToken);