@vielhuber/wahelper 1.6.0 → 1.6.2

package/package.json

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

package/wahelper-daemon.js

@@ -36,6 +36,7 @@ export default class wahelperDaemon {
         this.lastError = null;
         this.isFirstRun = false;
         this.reconnectDelay = 1000;
+        this.consecutiveFailures = 0;
         this.httpServer = null;
 
         if (this.args.device) {
@@ -213,7 +214,9 @@ export default class wahelperDaemon {
     async storeDataToDatabase(data) {
         this.log('storeDataToDatabase');
 
-        if (!data.messages || data.messages.length === 0) {
+        let messages = Array.isArray(data?.messages) ? data.messages : [];
+        let chats = Array.isArray(data?.chats) ? data.chats : [];
+        if (messages.length === 0 && chats.length === 0) {
             return;
         }
 
@@ -223,9 +226,8 @@ export default class wahelperDaemon {
         }
         this.dbLock = true;
 
-        //this.log(data.messages);
         let count = 0,
-            length = data.messages.length;
+            length = messages.length;
 
         // if db is closed in the meantime
         if (this.dbIsOpen === false) {
@@ -241,7 +243,7 @@ export default class wahelperDaemon {
                 VALUES (?, ?, ?, ?, ?, ?, ?)
             `);
 
-            for (let messages__value of data.messages) {
+            for (let messages__value of messages) {
                 let id = messages__value.key?.id,
                     chatId = messages__value.key?.remoteJid,
                     fromMe = messages__value.key?.fromMe ? 1 : 0,
@@ -372,6 +374,8 @@ export default class wahelperDaemon {
                 }
             }
 
+            this.applyReadFlags(messages, chats);
+
             this.db.exec('COMMIT');
             this.log('END TRANSACTION');
             if (count > 0) {
@@ -400,6 +404,43 @@ export default class wahelperDaemon {
         this.dbLock = false;
     }
 
+    // mark messages as read based on two signals that baileys ships with
+    // history-sync and chats.upsert payloads:
+    //   1. message.status === READ (=4, sometimes serialised as "READ") —
+    //      the WA server already knows this message was seen on some device
+    //   2. chat.unreadCount === 0 — the user has opened that chat on the
+    //      phone, so every incoming message there is implicitly seen
+    applyReadFlags(messages, chats) {
+        let device = this.args.device || 'me';
+        let byStatus = this.db.prepare('UPDATE messages SET `read` = 1 WHERE id = ? AND `read` = 0');
+        let byChat = this.db.prepare(
+            'UPDATE messages SET `read` = 1 WHERE `read` = 0 AND ((`from` = ? AND `to` = ?) OR (`to` = ? AND `from` != ?))'
+        );
+
+        let touchedStatus = 0;
+        for (let m of messages) {
+            let s = m?.status;
+            if (s !== 4 && s !== '4' && s !== 'READ') continue;
+            let id = m?.key?.id;
+            if (!id) continue;
+            let r = byStatus.run(id);
+            if (r?.changes) touchedStatus += r.changes;
+        }
+
+        let touchedChat = 0;
+        for (let c of chats) {
+            if (c?.unreadCount !== 0) continue;
+            let cid = (c?.id ?? '').replace(/@.*$/, '');
+            if (!cid) continue;
+            let r = byChat.run(cid, device, cid, device);
+            if (r?.changes) touchedChat += r.changes;
+        }
+
+        if (touchedStatus > 0 || touchedChat > 0) {
+            this.log('marked read: ' + touchedStatus + ' via status, ' + touchedChat + ' via chat.unreadCount=0');
+        }
+    }
+
     async markMessagesRead(updates) {
         if (!Array.isArray(updates) || updates.length === 0) {
             return;
@@ -622,11 +663,16 @@ export default class wahelperDaemon {
                                     (reason ? ' (' + reason + ')' : statusCode ? ' (statusCode=' + statusCode + ')' : ''),
                                 at: Date.now()
                             };
+                            this.consecutiveFailures++;
+                            // first 3 attempts recover network blips fast (1s/2s/4s),
+                            // after that back off to 15min so a persistent failure
+                            // (rate-overlimit, bad auth) doesn't keep hammering whatsapp
+                            let cap = this.consecutiveFailures > 3 ? 15 * 60 * 1000 : 30000;
                             let delay = this.reconnectDelay;
-                            this.log('Reconnecting in ' + delay + 'ms');
-                            console.log('Reconnecting in ' + delay + 'ms...');
+                            this.log('Reconnecting in ' + delay + 'ms (attempt ' + this.consecutiveFailures + ')');
+                            console.log('Reconnecting in ' + delay + 'ms (attempt ' + this.consecutiveFailures + ')...');
                             setTimeout(() => {
-                                this.reconnectDelay = Math.min(this.reconnectDelay * 2, 30000);
+                                this.reconnectDelay = Math.min(this.reconnectDelay * 2, cap);
                                 this.connect();
                             }, delay);
                         }
@@ -639,6 +685,7 @@ export default class wahelperDaemon {
                             this.pairingCodeRequested = false;
                             this.lastError = null;
                             this.reconnectDelay = 1000;
+                            this.consecutiveFailures = 0;
                             this.log('✅ Connected');
                             console.log('✅ Connected (device: ' + this.device + ')');
                         }
@@ -674,10 +721,6 @@ export default class wahelperDaemon {
 
                 try {
                     if (req.method === 'GET' && url === '/status') {
-                        // trigger connect on first request
-                        if (!this.connected && !this.connecting) {
-                            this.connect();
-                        }
                         this.sendJsonResponse(res, 200, {
                             success: true,
                             connected: this.connected,
@@ -821,7 +864,7 @@ export default class wahelperDaemon {
         this.initDatabase();
         this.initExitHooks();
         this.startHttpServer();
-        // connect lazily on first incoming request
+        this.connect();
     }
 }