@vielhuber/wahelper 1.5.8 → 1.6.0

package/package.json

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

package/wahelper-daemon.js

@@ -33,6 +33,7 @@ export default class wahelperDaemon {
         this.qr = null;
         this.pairingCode = null;
         this.pairingCodeRequested = false;
+        this.lastError = null;
         this.isFirstRun = false;
         this.reconnectDelay = 1000;
         this.httpServer = null;
@@ -129,9 +130,14 @@ export default class wahelperDaemon {
                     content TEXT,
                     media_data TEXT,
                     media_filename TEXT,
-                    timestamp INTEGER
+                    timestamp INTEGER,
+                    \`read\` INTEGER NOT NULL DEFAULT 0
                 );
             `);
+            let cols = this.db.prepare('PRAGMA table_info(messages)').all();
+            if (!cols.some(c => c.name === 'read')) {
+                this.db.exec('ALTER TABLE messages ADD COLUMN `read` INTEGER NOT NULL DEFAULT 0');
+            }
         } catch (error) {
             this.log('⛔ Error initing database: ' + error.message + ' (code: ' + error.code + ')');
         }
@@ -394,6 +400,42 @@ export default class wahelperDaemon {
         this.dbLock = false;
     }
 
+    async markMessagesRead(updates) {
+        if (!Array.isArray(updates) || updates.length === 0) {
+            return;
+        }
+        // WAMessageStatus.READ === 4
+        let ids = updates
+            .filter(u => u?.update?.status === 4)
+            .map(u => u?.key?.id)
+            .filter(id => typeof id === 'string' && id.length > 0);
+        if (ids.length === 0) {
+            return;
+        }
+        while (this.dbLock) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        this.dbLock = true;
+        try {
+            if (this.dbIsOpen === false) {
+                this.initDatabase();
+            }
+            let stmt = this.db.prepare('UPDATE messages SET `read` = 1 WHERE id = ? AND `read` = 0');
+            let touched = 0;
+            for (let id of ids) {
+                let res = stmt.run(id);
+                if (res && res.changes > 0) touched++;
+            }
+            if (touched > 0) {
+                this.log('marked ' + touched + '/' + ids.length + ' messages as read');
+            }
+        } catch (error) {
+            this.log('⛔ markMessagesRead failed: ' + error.message);
+        } finally {
+            this.dbLock = false;
+        }
+    }
+
     async sendMessageToUser(number = null, message = null, attachments = null) {
         if (!this.connected || !this.sock) {
             throw new Error('not_connected');
@@ -502,6 +544,14 @@ export default class wahelperDaemon {
                     await this.storeDataToDatabase(obj);
                 });
 
+                this.sock.ev.on('messages.update', async updates => {
+                    try {
+                        await this.markMessagesRead(updates);
+                    } catch (error) {
+                        this.log('⛔ messages.update handler failed: ' + error.message);
+                    }
+                });
+
                 this.sock.ev.on('creds.update', saveCreds);
 
                 this.sock.ev.on('connection.update', async update => {
@@ -522,6 +572,7 @@ export default class wahelperDaemon {
                                         console.log('\nPairing code: ' + code);
                                     })
                                     .catch(err => {
+                                        this.lastError = { source: 'pairing', message: err.message, at: Date.now() };
                                         this.log('Pairing code request failed: ' + err.message);
                                     });
                             }
@@ -560,6 +611,17 @@ export default class wahelperDaemon {
                             }
 
                             // reconnect on all other disconnect reasons with exponential backoff
+                            let reason =
+                                DisconnectReason && statusCode
+                                    ? Object.keys(DisconnectReason).find(k => DisconnectReason[k] === statusCode)
+                                    : null;
+                            this.lastError = {
+                                source: 'disconnect',
+                                message:
+                                    'connection closed' +
+                                    (reason ? ' (' + reason + ')' : statusCode ? ' (statusCode=' + statusCode + ')' : ''),
+                                at: Date.now()
+                            };
                             let delay = this.reconnectDelay;
                             this.log('Reconnecting in ' + delay + 'ms');
                             console.log('Reconnecting in ' + delay + 'ms...');
@@ -575,6 +637,7 @@ export default class wahelperDaemon {
                             this.qr = null;
                             this.pairingCode = null;
                             this.pairingCodeRequested = false;
+                            this.lastError = null;
                             this.reconnectDelay = 1000;
                             this.log('✅ Connected');
                             console.log('✅ Connected (device: ' + this.device + ')');
@@ -584,6 +647,7 @@ export default class wahelperDaemon {
             })
             .catch(error => {
                 this.connecting = false;
+                this.lastError = { source: 'connect', message: error.message, at: Date.now() };
                 this.log('⛔ Connect error: ' + error.message);
                 console.log('⛔ Connect error: ' + error.message);
                 setTimeout(() => this.connect(), this.reconnectDelay);
@@ -619,7 +683,8 @@ export default class wahelperDaemon {
                             connected: this.connected,
                             device: this.device,
                             qr: this.qr,
-                            pairingCode: this.pairingCode
+                            pairingCode: this.pairingCode,
+                            lastError: this.lastError
                         });
                         return;
                     }

package/wahelper.js

@@ -95,11 +95,15 @@ 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') {
+                    console.log('⛔ ' + (daemonStatus.public_message || daemonStatus.message));
+                }
                 this.write(
                     {
                         success: false,
                         message: daemonStatus.message,
-                        data: daemonStatus.pairingCode || daemonStatus.qrString || null
+                        public_message: daemonStatus.public_message || null,
+                        data: daemonStatus.data || daemonStatus.pairingCode || daemonStatus.qrString || null
                     },
                     true
                 );
@@ -133,7 +137,7 @@ export default class wahelper {
             let messages = this.db
                 .prepare(
                     `
-						SELECT id, \`from\`, \`to\`, content, media_filename, timestamp
+						SELECT id, \`from\`, \`to\`, content, media_filename, timestamp, \`read\`
 						FROM messages
 						ORDER BY timestamp DESC
 						${limit !== null ? 'LIMIT ' + limit : ''}
@@ -166,7 +170,7 @@ export default class wahelper {
                 this.db
                     .prepare(
                         `
-							SELECT id, \`from\`, \`to\`, content, media_filename, timestamp
+							SELECT id, \`from\`, \`to\`, content, media_filename, timestamp, \`read\`
 							FROM messages
 							WHERE id = ?
 							LIMIT 1
@@ -251,14 +255,20 @@ export default class wahelper {
                 return { connected: false, message: 'pairing_required', pairingCode: status.pairingCode };
             }
             if (status.qr) {
-                // render QR to ASCII string for display
                 let qrString = await new Promise(resolve => {
                     qrcodeTerminal.generate(status.qr, { small: true }, str => resolve('\n' + str));
                 });
                 return { connected: false, message: 'qr_required', qrString };
             }
+            if (status.lastError) {
+                return {
+                    connected: false,
+                    message: 'daemon_error',
+                    public_message: status.lastError.source + ': ' + status.lastError.message,
+                    data: status.lastError
+                };
+            }
         }
-
         return { connected: false, message: 'daemon_timeout' };
     }
 
@@ -487,9 +497,14 @@ export default class wahelper {
                     content TEXT,
                     media_data TEXT,
                     media_filename TEXT,
-                    timestamp INTEGER
+                    timestamp INTEGER,
+                    \`read\` INTEGER NOT NULL DEFAULT 0
                 );
             `);
+            let cols = this.db.prepare('PRAGMA table_info(messages)').all();
+            if (!cols.some(c => c.name === 'read')) {
+                this.db.exec('ALTER TABLE messages ADD COLUMN `read` INTEGER NOT NULL DEFAULT 0');
+            }
         } catch (error) {
             this.log('⛔ Error initing database: ' + error.message + ' (code: ' + error.code + ')');
         }