Update .prettierrc and run formatting

Author: alex-friedl

.prettierrc

@@ -1,4 +1,10 @@
 {
-    "singleQuote": true,
-    "trailingComma": "es5"
+  "semi": true,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "arrowParens": "always",
+  "bracketSpacing": true,
+  "endOfLine": "lf"
 }

README.md

@@ -118,12 +118,12 @@ You can send to multiple devices, independently of platform, creating an array w
 
 ```js
 // Single destination
-const registrationIds = 'INSERT_YOUR_DEVICE_ID';
+const registrationIds = "INSERT_YOUR_DEVICE_ID";
 
 // Multiple destinations
 const registrationIds = [];
-registrationIds.push('INSERT_YOUR_DEVICE_ID');
-registrationIds.push('INSERT_OTHER_DEVICE_ID');
+registrationIds.push("INSERT_YOUR_DEVICE_ID");
+registrationIds.push("INSERT_OTHER_DEVICE_ID");
 ```
 
 The `PN.send()` method later detects device type and therefore used push method, based on the id stucture. Check out the method `PN.getPushMethodByRegId` how this detection works.
@@ -146,10 +146,10 @@ It can be of 2 types:
 Where type can be one of: 'apn', 'gcm', 'adm', 'wns', 'webPush'. The types are available as constants:
 
 ```js
-import { WEB, WNS, ADM, GCM, APN } from 'node-pushnotifications';
+import { WEB, WNS, ADM, GCM, APN } from "node-pushnotifications";
 
 const regId = {
-  id: 'INSERT_YOUR_DEVICE_ID',
+  id: "INSERT_YOUR_DEVICE_ID",
   type: APN,
 };
 ```
@@ -457,7 +457,7 @@ you can use the `phonegap` setting in order to adapt to the recommended behaviou
 ```js
 const settings = {
   gcm: {
-    id: '<yourId>',
+    id: "<yourId>",
     phonegap: true,
   },
 };
@@ -542,16 +542,14 @@ Settings:
   Note: one of `serviceAccountKey`, `credential` fcm options is required
 
 ```js
-const tokens = [
-  'e..Gwso:APA91.......7r910HljzGUVS_f...kbyIFk2sK6......D2s6XZWn2E21x',
-];
+const tokens = ["e..Gwso:APA91.......7r910HljzGUVS_f...kbyIFk2sK6......D2s6XZWn2E21x"];
 
 const notifications = {
-  collapseKey: Math.random().toString().replace('0.', ''),
-  priority: 'high',
-  sound: 'default',
-  title: 'Title 1',
-  body: 'Body 2',
+  collapseKey: Math.random().toString().replace("0.", ""),
+  priority: "high",
+  sound: "default",
+  title: "Title 1",
+  body: "Body 2",
   // titleLocKey: 'GREETING',
   // titleLocArgs: ['Smith', 'M'],
   // fcm_notification: {
@@ -566,16 +564,16 @@ const notifications = {
   // },
   custom: {
     friend_id: 54657,
-    list_id: 'N7jSif1INyZkA7r910HljzGUVS',
+    list_id: "N7jSif1INyZkA7r910HljzGUVS",
   },
 };
 
 pushNotifications.send(tokens, notifications, (error, result) => {
   if (error) {
-    console.log('[error]', error);
+    console.log("[error]", error);
     throw error;
   } else {
-    console.log('[result]', result, result.at(0));
+    console.log("[result]", result, result.at(0));
   }
 });
 ```
@@ -619,9 +617,7 @@ Fcm object that will be sent to provider ([Fcm message format](https://firebase.
       }
     }
   },
-  "tokens": [
-    "e..Gwso:APA91.......7r910HljzGUVS_f...kbyIFk2sK6......D2s6XZWn2E21x"
-  ]
+  "tokens": ["e..Gwso:APA91.......7r910HljzGUVS_f...kbyIFk2sK6......D2s6XZWn2E21x"]
 }
 ```
 
@@ -666,8 +662,7 @@ delete data.expiry;
 delete data.timeToLive;
 
 const ADMmesssage = {
-  expiresAfter:
-    expiry - Math.floor(Date.now() / 1000) || timeToLive || 28 * 86400,
+  expiresAfter: expiry - Math.floor(Date.now() / 1000) || timeToLive || 28 * 86400,
   consolidationKey,
   data,
 };
@@ -683,7 +678,7 @@ Data can be passed as a simple string payload. If you do not pass a string, the
 Settings are directly forwarded to `webPush.sendNotification`.
 
 ```js
-const payload = typeof data === 'string' ? data : JSON.stringify(data);
+const payload = typeof data === "string" ? data : JSON.stringify(data);
 webPush.sendNotification(regId, payload, settings.web);
 ```
 

index.js

@@ -1 +1 @@
-module.exports = require('./lib/push-notifications');
+module.exports = require("./lib/push-notifications");

src/constants.js

@@ -1,13 +1,13 @@
 module.exports = {
   DEFAULT_TTL: 28 * 86400,
   GCM_MAX_TTL: 2419200, // 4 weeks in seconds (https://firebase.google.com/docs/cloud-messaging/http-server-ref#downstream-http-messages-json)
-  APN_METHOD: 'apn',
-  GCM_METHOD: 'gcm',
-  FCM_METHOD: 'fcm',
-  ADM_METHOD: 'adm',
-  WNS_METHOD: 'wns',
-  WEB_METHOD: 'webPush',
-  UNKNOWN_METHOD: 'unknown',
+  APN_METHOD: "apn",
+  GCM_METHOD: "gcm",
+  FCM_METHOD: "fcm",
+  ADM_METHOD: "adm",
+  WNS_METHOD: "wns",
+  WEB_METHOD: "webPush",
+  UNKNOWN_METHOD: "unknown",
   DEFAULT_SETTINGS: {
     gcm: {
       id: null, // PUT YOUR GCM SERVER API KEY,
@@ -25,12 +25,12 @@ module.exports = {
       //     keyId: '',
       //     teamId: '',
       // },
-      cert: 'cert.pem',
-      key: 'key.pem',
+      cert: "cert.pem",
+      key: "key.pem",
       ca: null,
       pfx: null,
       passphrase: null,
-      production: process.env.NODE_ENV === 'production',
+      production: process.env.NODE_ENV === "production",
       voip: false,
       address: null,
       port: 443,
@@ -57,13 +57,13 @@ module.exports = {
       client_secret: null, // PUT YOUR WNS CLIENT SECRET,
       accessToken: null,
       headers: null,
-      notificationMethod: 'sendTileSquareBlock',
+      notificationMethod: "sendTileSquareBlock",
     },
     web: {
       vapidDetails: {
         subject: "< 'mailto' Address or URL >",
-        publicKey: '< URL Safe Base64 Encoded Public Key >',
-        privateKey: '< URL Safe Base64 Encoded Private Key >',
+        publicKey: "< URL Safe Base64 Encoded Public Key >",
+        privateKey: "< URL Safe Base64 Encoded Private Key >",
       },
       // gcmAPIKey: '< GCM API Key >',
       // TTL: 2419200

src/index.js

@@ -1 +1 @@
-module.exports = require('./push-notifications');
+module.exports = require("./push-notifications");

src/push-notifications.js

@@ -1,9 +1,9 @@
-const sendGCM = require('./sendGCM');
-const sendFCM = require('./sendFCM');
-const APN = require('./sendAPN');
-const sendADM = require('./sendADM');
-const sendWNS = require('./sendWNS');
-const sendWebPush = require('./sendWeb');
+const sendGCM = require("./sendGCM");
+const sendFCM = require("./sendFCM");
+const APN = require("./sendAPN");
+const sendADM = require("./sendADM");
+const sendWNS = require("./sendWNS");
+const sendWebPush = require("./sendWeb");
 
 const {
   DEFAULT_SETTINGS,
@@ -14,7 +14,7 @@ const {
   GCM_METHOD,
   FCM_METHOD,
   APN_METHOD,
-} = require('./constants');
+} = require("./constants");
 
 class PN {
   constructor(options) {
@@ -27,9 +27,7 @@ class PN {
       this.apn.shutdown();
     }
     this.apn = new APN(this.settings.apn);
-    this.useFcmOrGcmMethod = this.settings.isLegacyGCM
-      ? GCM_METHOD
-      : FCM_METHOD;
+    this.useFcmOrGcmMethod = this.settings.isLegacyGCM ? GCM_METHOD : FCM_METHOD;
   }
 
   sendWith(method, regIds, data, cb) {
@@ -45,16 +43,14 @@ class PN {
   }
 
   getPushMethodByRegId(regId) {
-    if (typeof regId === 'object' && (!regId.type || !regId.id)) {
+    if (typeof regId === "object" && (!regId.type || !regId.id)) {
       return { regId, pushMethod: WEB_METHOD };
     }
 
-    if (typeof regId === 'object' && regId.id && regId.type) {
+    if (typeof regId === "object" && regId.id && regId.type) {
       return {
         regId: regId.id,
-        pushMethod: this.settings.isAlwaysUseFCM
-          ? this.useFcmOrGcmMethod
-          : regId.type,
+        pushMethod: this.settings.isAlwaysUseFCM ? this.useFcmOrGcmMethod : regId.type,
       };
     }
 
@@ -64,18 +60,15 @@ class PN {
       return { regId, pushMethod: this.useFcmOrGcmMethod };
     }
 
-    if (regId.substring(0, 4) === 'http') {
+    if (regId.substring(0, 4) === "http") {
       return { regId, pushMethod: WNS_METHOD };
     }
 
     if (/^(amzn[0-9]*.adm)/i.test(regId)) {
       return { regId, pushMethod: ADM_METHOD };
     }
 
-    if (
-      (regId.length === 64 || regId.length === 160) &&
-      /^[a-fA-F0-9]+$/.test(regId)
-    ) {
+    if ((regId.length === 64 || regId.length === 160) && /^[a-fA-F0-9]+$/.test(regId)) {
       return { regId, pushMethod: APN_METHOD };
     }
 
@@ -131,9 +124,7 @@ class PN {
 
       // iOS APN
       if (regIdsAPN.length > 0) {
-        promises.push(
-          this.sendWith(this.apn.sendAPN.bind(this.apn), regIdsAPN, data)
-        );
+        promises.push(this.sendWith(this.apn.sendAPN.bind(this.apn), regIdsAPN, data));
       }
 
       // Microsoft WNS
@@ -157,15 +148,15 @@ class PN {
     // Unknown
     if (regIdsUnk.length > 0) {
       const results = {
-        method: 'unknown',
+        method: "unknown",
         success: 0,
         failure: regIdsUnk.length,
         message: [],
       };
       regIdsUnk.forEach((regId) => {
         results.message.push({
           regId,
-          error: new Error('Unknown registration id'),
+          error: new Error("Unknown registration id"),
         });
       });
       promises.push(Promise.resolve(results));
@@ -175,7 +166,7 @@ class PN {
     if (promises.length === 0) {
       promises.push(
         Promise.resolve({
-          method: 'none',
+          method: "none",
           success: 0,
           failure: 0,
           message: [],

src/sendADM.js

@@ -1,5 +1,5 @@
-const adm = require('node-adm');
-const { ADM_METHOD } = require('./constants');
+const adm = require("node-adm");
+const { ADM_METHOD } = require("./constants");
 
 const sendADM = (regIds, _data, settings) => {
   const resumed = {
@@ -13,8 +13,7 @@ const sendADM = (regIds, _data, settings) => {
   const { consolidationKey, expiry, timeToLive, custom, ...data } = _data;
 
   const message = {
-    expiresAfter:
-      expiry - Math.floor(Date.now() / 1000) || timeToLive || 28 * 86400,
+    expiresAfter: expiry - Math.floor(Date.now() / 1000) || timeToLive || 28 * 86400,
     consolidationKey,
     data: { ...data, ...custom },
   };
@@ -24,8 +23,7 @@ const sendADM = (regIds, _data, settings) => {
       new Promise((resolve) => {
         admSender.send(message, regId, (err, response) => {
           const errorMsg = err instanceof Error ? err.message : response.error;
-          const error =
-            err || (response.error ? new Error(response.error) : null);
+          const error = err || (response.error ? new Error(response.error) : null);
           resumed.success += error ? 0 : 1;
           resumed.failure += error ? 1 : 0;
           resumed.message.push({

src/sendAPN.js

@@ -1,6 +1,6 @@
-const apn = require('@parse/node-apn');
-const { APN_METHOD } = require('./constants');
-const { buildApnsMessage } = require('./utils/tools');
+const apn = require("@parse/node-apn");
+const { APN_METHOD } = require("./constants");
+const { buildApnsMessage } = require("./utils/tools");
 
 const getDeviceTokenOrSelf = (token) => token?.device ?? token;
 
@@ -25,8 +25,7 @@ class APN {
 
     if (!this.connection) {
       return Promise.reject(
-        this.connectionError ||
-          new Error('Unknown error: APN connection not configured properly')
+        this.connectionError || new Error("Unknown error: APN connection not configured properly")
       );
     }