Making vapid configurable via command line args

Author: Francisco Jordano

bin/web-push.js

@@ -1,10 +1,11 @@
 #! /usr/bin/env node
+const fs = require('fs');
 const webPush = require('web-push');
 webPush.setGCMAPIKey(process.env.GCM_API_KEY);
 
 const argv = require('minimist')(process.argv.slice(2));
 
-const usage = 'Use: web-push --endpoint=<url> --key=<browser key> [--auth=<auth secret>] [--ttl=<seconds>] [--payload=<message>] [--vapid]';
+const usage = 'Use: web-push --endpoint=<url> --key=<browser key> [--auth=<auth secret>] [--ttl=<seconds>] [--payload=<message>] [--vapid-audience] [--vapid-subject] [--vapid-pvtkey] [--vapid-pubkey]';
 
 if (!argv['endpoint'] || !argv['key']) {
   console.log(usage);
@@ -16,18 +17,37 @@ const key = argv['key'];
 const ttl = argv['ttl'] || 0;
 const payload = argv['payload'] || '';
 const auth = argv['auth'] || null;
-const useVAPID = argv['vapid'] || false;
+const vapidAudience = argv['vapid-audience'] || null;
+const vapidSubject = argv['vapid-subject'] || null;
+const vapidPubKey = argv['vapid-pubkey'] || null;
+const vapidPvtKey = argv['vapid-pvtkey'] || null;
+
+function getKeys() {
+  if (vapidPubKey && vapidPvtKey) {
+    const publicKey = fs.readFileSync(argv['vapid-pubkey']);
+    const privateKey = fs.readFileSync(argv['vapid-pvtkey']);
+
+    if (pubKey && pvtKey) {
+      return {
+        privateKey,
+        publicKey
+      };
+    }
+  }
+
+  return webPush.generateVAPIDKeys();
+}
 
 var params = {
   TTL: ttl,
   payload,
   userPublicKey: key
 };
-if (useVAPID) {
-  const vapidKeys = webPush.generateVAPIDKeys();
+if (vapidAudience && vapidSubject) {
+  const vapidKeys = getKeys();
   const vapid = {
-    audience: 'https://www.mozilla.org/',
-    subject: 'mailto:[email protected]',
+    audience: vapidAudience,
+    subject: `mailto:${vapidSubject}`,
     privateKey: vapidKeys.privateKey,
     publicKey: vapidKeys.publicKey,
   };

package.json

@@ -1,7 +1,6 @@
 {
   "name": "web-push",
   "version": "2.0.2",
-  "version": "1.0.3",
   "description": "Web Push library for Node.js",
   "main": "index.js",
   "scripts": {