@vielhuber/wahelper 1.8.6 → 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.6",
+    "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;
@@ -276,6 +277,11 @@ export default class wahelperDaemon {
         this.log('storeDataToDatabase');
 
         let messages = Array.isArray(data?.messages) ? data.messages : [];
+        if (Array.isArray(data?.updates)) {
+            messages = data.updates
+                .filter(({ update }) => update?.message?.editedMessage)
+                .map(({ key, update }) => ({ ...update, key }));
+        }
         let chats = Array.isArray(data) ? data : Array.isArray(data?.chats) ? data.chats : [];
         if (messages.length === 0 && chats.length === 0) {
             return;
@@ -301,14 +307,24 @@ export default class wahelperDaemon {
             let query = this.db.prepare(`
                 INSERT OR IGNORE INTO messages
                 (id, \`from\`, \`to\`, content, media_data, media_filename, timestamp)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                VALUES ($id, $from, $to, $content, $mediaData, $mediaFilename, $timestamp)
+                ON CONFLICT(id) DO UPDATE SET
+                    \`from\` = excluded.\`from\`,
+                    \`to\` = excluded.\`to\`,
+                    content = CASE WHEN $preserveContent THEN messages.content ELSE excluded.content END,
+                    media_data = COALESCE(excluded.media_data, messages.media_data),
+                    media_filename = COALESCE(excluded.media_filename, messages.media_filename),
+                    timestamp = CASE WHEN $preserveTimestamp THEN messages.timestamp ELSE excluded.timestamp END
             `);
 
             for (let messages__value of messages) {
                 let id = messages__value.key?.id,
                     chatId = messages__value.key?.remoteJid,
                     fromMe = messages__value.key?.fromMe ? 1 : 0,
-                    timestamp = messages__value.messageTimestamp;
+                    timestamp = Number(messages__value.messageTimestamp ?? NaN);
+                let isEdited = messages__value.message?.editedMessage !== undefined;
+                // Edit events carry the edit time, not the original send time.
+                let preserveTimestamp = isEdited || isNaN(timestamp);
 
                 // status posts and newsletter items are not conversations. they carry
                 // their author in remoteJidAlt, so without this they would be stored
@@ -317,12 +333,7 @@ export default class wahelperDaemon {
                     continue;
                 }
 
-                if (timestamp !== undefined && timestamp !== null) {
-                    timestamp = Number(timestamp);
-                    if (isNaN(timestamp)) {
-                        timestamp = Math.floor(Date.now() / 1000);
-                    }
-                } else {
+                if (isNaN(timestamp)) {
                     timestamp = Math.floor(Date.now() / 1000);
                 }
 
@@ -365,6 +376,7 @@ export default class wahelperDaemon {
                 }
 
                 let content = null,
+                    preserveContent = false,
                     mediaFilename = null,
                     mediaData = null,
                     mediaBufferInput = null;
@@ -484,8 +496,9 @@ export default class wahelperDaemon {
                 }
 
                 // skip media download on first run (initial history sync after fresh pairing)
-                if (this.isFirstRun) {
+                if (this.isFirstRun && !isEdited) {
                     if (content === null || content === '') {
+                        preserveContent = true;
                         content = '[Media message not downloaded on first run]';
                     }
                     mediaFilename = null;
@@ -506,12 +519,21 @@ export default class wahelperDaemon {
                         mediaData = buffer.toString('base64');
                         this.log('✅ Downloaded media ' + mediaFilename);
                     } catch (error) {
-                        mediaData = mediaBufferInput?.url || null;
-                        this.log('⚠️ Failed to download media: ' + error.message + '. Storing URL instead.');
+                        this.log('⚠️ Failed to download media: ' + error.message + '. Leaving media data empty.');
                     }
                 }
 
-                query.run(id, from, to, content, mediaData, mediaFilename, timestamp);
+                query.run({
+                    id,
+                    from,
+                    to,
+                    content,
+                    mediaData,
+                    mediaFilename,
+                    timestamp,
+                    preserveContent: Number(preserveContent),
+                    preserveTimestamp: Number(preserveTimestamp)
+                });
                 count++;
 
                 if (length < 100 || count % 100 === 0) {
@@ -526,11 +548,11 @@ export default class wahelperDaemon {
             this.db.exec('COMMIT');
             this.log('END TRANSACTION');
             if (count > 0) {
-                this.log('Stored ' + count + ' new messages to database (' + length + ' total received)');
+                this.log('Stored ' + count + ' messages to database (' + length + ' total received)');
                 process.stdout.write(
                     '\r✅ Stored ' +
                         count +
-                        ' new messages to database (' +
+                        ' messages to database (' +
                         length +
                         ' total received)' +
                         ' '.repeat(10) +
@@ -677,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) {
@@ -703,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) {
@@ -735,7 +757,7 @@ export default class wahelperDaemon {
     }
 
     connect() {
-        if (this.connecting) {
+        if (this.connecting || this.loggedOut) {
             return;
         }
         this.connecting = true;
@@ -830,6 +852,7 @@ export default class wahelperDaemon {
 
                 socket.ev.on('messages.update', async updates => {
                     try {
+                        await this.storeDataToDatabase({ updates });
                         await this.markMessagesRead(updates);
                     } catch (error) {
                         this.log('⛔ messages.update handler failed: ' + error.message);
@@ -863,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);
                                     });
@@ -895,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;
                             }
 
@@ -927,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
@@ -978,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
@@ -1003,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;
                     }
 
@@ -1173,7 +1217,12 @@ export default class wahelperDaemon {
     }
 }
 
-if (process.argv[1] && fs.realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)) {
+// Importing the class must not start the daemon or connect to WhatsApp.
+if (
+    process.argv[1] &&
+    fs.existsSync(process.argv[1]) &&
+    fs.realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)
+) {
     let daemon = new wahelperDaemon();
     daemon.init();
 }

package/wahelper.js

@@ -26,7 +26,11 @@ export default class wahelper {
             this.authFolder = 'auth_' + this.formatNumber(this.args.device);
             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';
+            if (this.args.request_id !== undefined && !/^[a-f0-9]{32}$/.test(this.args.request_id)) {
+                throw new Error('Invalid request id');
+            }
+            let requestSuffix = this.args.request_id === undefined ? '' : '_' + this.args.request_id;
+            this.dataPath = 'whatsapp_' + this.formatNumber(this.args.device) + requestSuffix + '.json';
             this.port = this.computePort(this.formatNumber(this.args.device));
             this.authToken = this.getAuthToken();
         }
@@ -49,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);
@@ -123,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(
@@ -199,6 +229,7 @@ export default class wahelper {
             };
         } catch (error) {
             this.log('⛔ Error fetching database: ' + error.message + ' (code: ' + error.code + ')');
+            this.write({ success: false, message: 'error', data: null }, true);
         }
         return null;
     }
@@ -269,6 +300,7 @@ export default class wahelper {
             };
         } catch (error) {
             this.log('⛔ Error fetching message from database: ' + error.message + ' (code: ' + error.code + ')');
+            this.write({ success: false, message: 'error', data: null }, true);
         }
         return null;
     }
@@ -310,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 };
             }
@@ -347,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' };
     }
@@ -394,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' });
@@ -576,7 +613,14 @@ export default class wahelper {
             this.writeOnEnd = msg;
             return;
         }
-        fs.writeFileSync(this.dirname + '/' + this.dataPath, JSON.stringify(msg));
+        let responsePath = this.dirname + '/' + this.dataPath;
+        let temporaryPath = responsePath + '.' + crypto.randomUUID() + '.tmp';
+        try {
+            fs.writeFileSync(temporaryPath, JSON.stringify(msg), { flag: 'wx' });
+            fs.renameSync(temporaryPath, responsePath);
+        } finally {
+            fs.rmSync(temporaryPath, { force: true });
+        }
     }
 
     initDatabase() {
@@ -621,7 +665,14 @@ export default class wahelper {
     }
 }
 
-let wa = new wahelper();
-wa.init()
-    .then(() => process.exit(0))
-    .catch(() => process.exit(1));
+// Importing the class must not start the CLI or terminate the caller.
+if (
+    process.argv[1] &&
+    fs.existsSync(process.argv[1]) &&
+    fs.realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)
+) {
+    let wa = new wahelper();
+    wa.init()
+        .then(() => process.exit(process.exitCode ?? 0))
+        .catch(() => process.exit(1));
+}