@vielhuber/wahelper 1.8.7 → 1.8.8

package/README.md

@@ -53,6 +53,9 @@ npx wahelper \
     --device "xxxxxxxxxxxx" \
     ...
 
+    # check the live connection
+    --action "get_status"
+
     # fetch messages
     --action "fetch_messages" \
     --filter '{"from":"491234567890","to":"491234567890","message":"meeting","date_from":"2026-01-01","date_until":"2026-12-31"}' \
@@ -85,6 +88,9 @@ use vielhuber\wahelper\wahelper;
 
 $wahelper = new wahelper();
 
+// success is true only when connected
+$status = $wahelper->getStatus(device: 'xxxxxxxxxxxx');
+
 // fetch messages
 $wahelper->fetchMessages(
     device: 'xxxxxxxxxxxx',

package/package.json

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

package/wahelper-daemon.js

@@ -36,6 +36,7 @@ export default class wahelperDaemon {
         this.dbLock = false;
         this.connected = false;
         this.connecting = false;
+        this.loggedOut = false;
         this.qr = null;
         this.pairingCode = null;
         this.pairingCodeRequested = false;
@@ -698,8 +699,8 @@ export default class wahelperDaemon {
     }
 
     async sendMessageToUser(number = null, message = null, attachments = null) {
-        if (!this.connected || !this.sock) {
-            throw new Error('not_connected');
+        if (!this.getStatus().connected) {
+            throw new Error(this.loggedOut ? 'logged_out' : 'not_connected');
         }
         // validate all attachments exist before sending anything
         if (attachments !== null && attachments.length > 0) {
@@ -724,8 +725,8 @@ export default class wahelperDaemon {
     }
 
     async sendMessageToGroup(name = null, message = null, attachments = null) {
-        if (!this.connected || !this.sock) {
-            throw new Error('not_connected');
+        if (!this.getStatus().connected) {
+            throw new Error(this.loggedOut ? 'logged_out' : 'not_connected');
         }
         // validate all attachments exist before sending anything
         if (attachments !== null && attachments.length > 0) {
@@ -756,7 +757,7 @@ export default class wahelperDaemon {
     }
 
     connect() {
-        if (this.connecting) {
+        if (this.connecting || this.loggedOut) {
             return;
         }
         this.connecting = true;
@@ -885,10 +886,16 @@ export default class wahelperDaemon {
                                 socket
                                     .requestPairingCode(this.device)
                                     .then(code => {
+                                        if (this.sock !== socket) {
+                                            return;
+                                        }
                                         this.pairingCode = code;
                                         console.log('\nPairing code: ' + code);
                                     })
                                     .catch(err => {
+                                        if (this.sock !== socket) {
+                                            return;
+                                        }
                                         this.lastError = { source: 'pairing', message: err.message, at: Date.now() };
                                         this.log('Pairing code request failed: ' + err.message);
                                     });
@@ -917,16 +924,19 @@ export default class wahelperDaemon {
                             }
 
                             if (statusCode === DisconnectReason.loggedOut) {
-                                // logged out — delete auth and reconnect
+                                this.loggedOut = true;
+                                this.sock = null;
                                 this.qr = null;
                                 this.pairingCode = null;
                                 this.pairingCodeRequested = false;
-                                this.log('Logged out, removing auth folder');
-                                console.log('Logged out, removing auth folder...');
-                                if (fs.existsSync(this.dirname + '/' + this.authFolder)) {
-                                    fs.rmSync(this.dirname + '/' + this.authFolder, { recursive: true, force: true });
-                                }
-                                setTimeout(() => this.connect(), 1000);
+                                this.lastError = {
+                                    source: 'disconnect',
+                                    message: 'Logged out. Automatic reconnect stopped; manual device linking required.',
+                                    statusCode,
+                                    at: Date.now()
+                                };
+                                this.log(this.lastError);
+                                console.error(this.lastError.message);
                                 return;
                             }
 
@@ -949,10 +959,16 @@ export default class wahelperDaemon {
                                     source: 'disconnect',
                                     message:
                                         'connection closed' +
-                                        (reason ? ' (' + reason + ')' : statusCode ? ' (statusCode=' + statusCode + ')' : ''),
+                                        (reason
+                                            ? ' (' + reason + ')'
+                                            : statusCode
+                                              ? ' (statusCode=' + statusCode + ')'
+                                              : ''),
+                                    statusCode,
                                     at: Date.now()
                                 };
                             }
+                            this.log(this.lastError);
                             this.consecutiveFailures++;
                             // first 3 attempts recover network blips fast (1s/2s/4s),
                             // after that back off to 15min so a persistent failure
@@ -1000,6 +1016,19 @@ export default class wahelperDaemon {
             });
     }
 
+    getStatus() {
+        return {
+            success: true,
+            connected: this.connected && this.sock?.ws?.isOpen === true,
+            connecting: this.connecting,
+            loggedOut: this.loggedOut,
+            device: this.device,
+            qr: this.qr,
+            pairingCode: this.pairingCode,
+            lastError: this.lastError
+        };
+    }
+
     startHttpServer() {
         this.httpServer = http.createServer(async (req, res) => {
             // bound to 127.0.0.1 below — every request additionally has to
@@ -1025,14 +1054,7 @@ export default class wahelperDaemon {
                             this.sendJsonResponse(res, 403, { success: false, message: 'forbidden' });
                             return;
                         }
-                        this.sendJsonResponse(res, 200, {
-                            success: true,
-                            connected: this.connected,
-                            device: this.device,
-                            qr: this.qr,
-                            pairingCode: this.pairingCode,
-                            lastError: this.lastError
-                        });
+                        this.sendJsonResponse(res, 200, this.getStatus());
                         return;
                     }
 

package/wahelper.js

@@ -53,6 +53,28 @@ export default class wahelper {
     }
 
     async init() {
+        if (this.args.action === 'get_status') {
+            let status = this.args.device
+                ? await this.callDaemon('GET', '/status')
+                : { success: false, message: 'missing_device' };
+            let connected = status.connected === true;
+            let response = {
+                success: connected,
+                message: connected ? 'connected' : status.loggedOut ? 'logged_out' : status.message || 'not_connected',
+                public_message: status.lastError?.message ?? null,
+                data: {
+                    connected,
+                    connecting: status.connecting === true,
+                    loggedOut: status.loggedOut === true,
+                    pairingRequired: status.loggedOut === true || Boolean(status.pairingCode || status.qr),
+                    lastError: status.lastError ?? null
+                }
+            };
+            this.write(response, false);
+            console.log(JSON.stringify(response));
+            process.exitCode = connected ? 0 : 1;
+            return;
+        }
         await this.awaitLock('init', true);
         this.setLock('init', true);
         this.write({ success: false, message: 'loading_state', data: null }, false);
@@ -127,7 +149,11 @@ export default class wahelper {
                         console.log('\n⚠️  Pairing required. Scan the QR code with WhatsApp, then retry.\n');
                         console.log(daemonStatus.qrString);
                     }
-                    if (daemonStatus.message === 'daemon_error' || daemonStatus.message === 'daemon_timeout') {
+                    if (
+                        daemonStatus.message === 'daemon_error' ||
+                        daemonStatus.message === 'daemon_timeout' ||
+                        daemonStatus.message === 'logged_out'
+                    ) {
                         console.log('⛔ ' + (daemonStatus.public_message || daemonStatus.message));
                     }
                     this.write(
@@ -316,26 +342,25 @@ export default class wahelper {
     }
 
     async ensureDaemon() {
-        // check current status
-        let status = await this.callDaemon('GET', '/status');
-
-        // daemon not reachable — return error immediately, daemon must be started manually
-        if (status.message === 'daemon_not_reachable') {
-            return { connected: false, message: 'daemon_not_running' };
-        }
-
-        if (status.connected) {
-            return status;
-        }
-
-        // poll up to 30s — return immediately when pairing code appears
-        console.log('Waiting for daemon to connect...');
-        for (let i = 0; i < 30; i++) {
-            await new Promise(resolve => setTimeout(resolve, 1000));
-            status = await this.callDaemon('GET', '/status');
+        for (let i = 0; i <= 30; i++) {
+            let status = await this.callDaemon('GET', '/status');
+            if (status.success === false) {
+                return {
+                    connected: false,
+                    message: status.message === 'daemon_not_reachable' ? 'daemon_not_running' : status.message
+                };
+            }
             if (status.connected) {
                 return status;
             }
+            if (status.loggedOut) {
+                return {
+                    connected: false,
+                    message: 'logged_out',
+                    public_message: status.lastError?.message,
+                    data: status.lastError
+                };
+            }
             if (status.pairingCode) {
                 return { connected: false, message: 'pairing_required', pairingCode: status.pairingCode };
             }
@@ -353,6 +378,12 @@ export default class wahelper {
                     data: status.lastError
                 };
             }
+            if (i === 0) {
+                console.log('Waiting for daemon to connect...');
+            }
+            if (i < 30) {
+                await new Promise(resolve => setTimeout(resolve, 1000));
+            }
         }
         return { connected: false, message: 'daemon_timeout' };
     }
@@ -400,7 +431,7 @@ export default class wahelper {
                     }
                 });
             });
-            req.setTimeout(30000, () => {
+            req.setTimeout(path === '/status' ? 5000 : 30000, () => {
                 req.destroy();
                 this.log('⛔ Daemon request timeout');
                 resolve({ success: false, message: 'daemon_timeout' });
@@ -642,6 +673,6 @@ if (
 ) {
     let wa = new wahelper();
     wa.init()
-        .then(() => process.exit(0))
+        .then(() => process.exit(process.exitCode ?? 0))
         .catch(() => process.exit(1));
 }