@vielhuber/wahelper 1.5.1 → 1.5.3

package/README.MD

@@ -106,24 +106,28 @@ $wahelper->sendGroup(
 # install pm2
 npm install -g pm2
 
-# start daemon
+# start daemon (linux)
 pm2 start npx --name wahelper-xxxxxxxxxxxx --cwd /var/www/wahelper -- wahelper-daemon --device xxxxxxxxxxxx
 
-# optional: autostart
-## save config
+# start daemon (windows)
+pm2 start node --name wahelper-xxxxxxxxxxxx --cwd "C:\path\to\project" -- node_modules/@vielhuber/wahelper/wahelper-daemon.js --device xxxxxxxxxxxx
+
+## autostart (linux)
 pm2 save
-## linux
 pm2 startup
-## windows
-Windows Task Scheduler > Trigger Bei Systemstart → Aktion "pm2 resurrect"
+
+## autostart (windows)
+pm2 save
+Windows Task Scheduler > Create Task > Triggers: At startup → Actions: Start a program → Program: `C:\Users\<user>\AppData\Roaming\npm\pm2.cmd`, Arguments: `resurrect`
 
 # more commands
-pm2 resurrect
-pm2 unstartup
-pm2 status
-pm2 start wahelper-xxxxxxxxxxxx
-pm2 stop wahelper-xxxxxxxxxxxx
-pm2 restart wahelper-xxxxxxxxxxxx
-pm2 logs wahelper-xxxxxxxxxxxx
-pm2 delete wahelper-xxxxxxxxxxxx
+pm2 unstartup                      # remove autostart
+pm2 status                         # show status of all processes
+pm2 resurrect                      # restore saved process list
+pm2 save                           # save current process list for resurrect
+pm2 start wahelper-xxxxxxxxxxxx    # start a stopped process
+pm2 stop wahelper-xxxxxxxxxxxx     # stop a running process
+pm2 restart wahelper-xxxxxxxxxxxx  # restart a process
+pm2 logs wahelper-xxxxxxxxxxxx     # tail live logs
+pm2 delete wahelper-xxxxxxxxxxxx   # remove process
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vielhuber/wahelper",
-    "version": "1.5.1",
+    "version": "1.5.3",
     "description": "Lightweight whatsapp integration layer.",
     "main": "wahelper.js",
     "files": [

package/wahelper-daemon.js

@@ -37,7 +37,7 @@ export default class wahelperDaemon {
             this.authFolder = 'auth_' + this.device;
             this.dbPath = 'whatsapp_' + this.device + '.sqlite';
             this.logPath = 'whatsapp_' + this.device + '.log';
-            this.socketPath = 'whatsapp_' + this.device + '.sock';
+            this.port = this.computePort(this.device);
         }
     }
 
@@ -88,6 +88,11 @@ export default class wahelperDaemon {
         return args;
     }
 
+    computePort(device) {
+        // range 29000-31999: below linux ephemeral (32768+) and windows ephemeral (49152+)
+        return 29000 + (parseInt(device.slice(-5)) % 3000);
+    }
+
     formatNumber(number) {
         // replace leading zero with 49
         number = number.replace(/^0+/, '49');
@@ -627,13 +632,8 @@ export default class wahelperDaemon {
             });
         });
 
-        let socketPath = this.dirname + '/' + this.socketPath;
-        // remove stale socket file from a previous run
-        if (fs.existsSync(socketPath)) {
-            fs.rmSync(socketPath, { force: true });
-        }
-        this.httpServer.listen(socketPath, () => {
-            this.log('HTTP server listening on ' + socketPath);
+        this.httpServer.listen(this.port, '127.0.0.1', () => {
+            this.log('HTTP server listening on 127.0.0.1:' + this.port);
         });
 
         this.httpServer.on('error', error => {
@@ -686,22 +686,12 @@ export default class wahelperDaemon {
             this.db.close();
             this.dbIsOpen = false;
         }
-        // clean up socket file
-        let socketPath = this.dirname + '/' + this.socketPath;
-        if (fs.existsSync(socketPath)) {
-            fs.rmSync(socketPath, { force: true });
-        }
         this.log('Daemon stopped');
     }
 
     isAlreadyRunning() {
         return new Promise(resolve => {
-            let socketPath = this.dirname + '/' + this.socketPath;
-            if (!fs.existsSync(socketPath)) {
-                resolve(false);
-                return;
-            }
-            let req = http.request({ socketPath, path: '/status', method: 'GET' }, res => {
+            let req = http.request({ host: '127.0.0.1', port: this.port, path: '/status', method: 'GET' }, res => {
                 resolve(res.statusCode === 200);
             });
             req.on('error', () => resolve(false));
@@ -732,12 +722,8 @@ export default class wahelperDaemon {
             process.exit(1);
         }
 
-        this.log(
-            'Daemon starting.. (device: ' + this.device + ', socket: ' + this.dirname + '/' + this.socketPath + ')'
-        );
-        console.log(
-            'Daemon starting... (device: ' + this.device + ', socket: ' + this.dirname + '/' + this.socketPath + ')'
-        );
+        this.log('Daemon starting.. (device: ' + this.device + ', port: 127.0.0.1:' + this.port + ')');
+        console.log('Daemon starting... (device: ' + this.device + ', port: 127.0.0.1:' + this.port + ')');
 
         this.initDatabase();
         this.initExitHooks();

package/wahelper.js

@@ -24,7 +24,7 @@ export default class wahelper {
             this.dbPath = 'whatsapp_' + this.formatNumber(this.args.device) + '.sqlite';
             this.logPath = 'whatsapp_' + this.formatNumber(this.args.device) + '.log';
             this.dataPath = 'whatsapp_' + this.formatNumber(this.args.device) + '.json';
-            this.socketPath = 'whatsapp_' + this.formatNumber(this.args.device) + '.sock';
+            this.port = this.computePort(this.formatNumber(this.args.device));
         }
     }
 
@@ -220,18 +220,19 @@ export default class wahelper {
         return { connected: false, message: 'daemon_timeout' };
     }
 
+    computePort(device) {
+        // range 29000-31999: below linux ephemeral (32768+) and windows ephemeral (49152+)
+        return 29000 + (parseInt(device.slice(-5)) % 3000);
+    }
+
     async callDaemon(method, path, body = null) {
         return new Promise(resolve => {
             let postData = body !== null ? JSON.stringify(body) : '';
-            let options = {
-                socketPath: this.dirname + '/' + this.socketPath,
-                path,
-                method,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Content-Length': Buffer.byteLength(postData)
-                }
+            let headers = {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(postData)
             };
+            let options = { host: '127.0.0.1', port: this.port, path, method, headers };
             let req = http.request(options, res => {
                 let data = '';
                 res.on('data', chunk => {