@vielhuber/wahelper 1.5.7 → 1.5.9

package/README.md

@@ -55,6 +55,10 @@ npx wahelper \
     --action "fetch_messages" \
     --limit 42
 
+    # view a single message by id
+    --action "view_message" \
+    --id "ABCDEF1234567890"
+
     # send message to user
     --action "send_user" \
     --number "xxxxxxxxxxxx" \
@@ -79,6 +83,9 @@ $wahelper = new wahelper();
 // fetch messages
 $wahelper->fetchMessages(device: 'xxxxxxxxxxxx', limit: 42);
 
+// view a single message by id
+$wahelper->viewMessage(device: 'xxxxxxxxxxxx', id: 'ABCDEF1234567890');
+
 // send message to user
 $wahelper->sendUser(
     device: 'xxxxxxxxxxxx',

package/package.json

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

package/wahelper-daemon.js

@@ -129,9 +129,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 +399,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 +543,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 => {

package/wahelper.js

@@ -55,10 +55,11 @@ export default class wahelper {
             this.args.device === undefined ||
             (this.args.action === 'send_user' && (this.args.number === undefined || this.args.message === undefined)) ||
             (this.args.action === 'send_group' && (this.args.name === undefined || this.args.message === undefined)) ||
+            (this.args.action === 'view_message' && (this.args.id === undefined || this.args.id === '')) ||
             (this.args.action === 'fetch_messages' &&
                 this.args.limit !== undefined &&
                 typeof this.args.limit !== 'number') ||
-            !['fetch_messages', 'send_user', 'send_group'].includes(this.args.action)
+            !['fetch_messages', 'view_message', 'send_user', 'send_group'].includes(this.args.action)
         ) {
             console.error('input missing or unknown action!');
             this.log('⛔input missing or unknown action!');
@@ -106,6 +107,9 @@ export default class wahelper {
                 if (this.args.action === 'fetch_messages') {
                     response = await this.fetchMessages(this.args.limit);
                 }
+                if (this.args.action === 'view_message') {
+                    response = await this.viewMessage(this.args.id);
+                }
                 if (this.args.action === 'send_user') {
                     response = await this.sendMessageToUser(this.args.number, this.args.message, this.args.attachments);
                 }
@@ -129,7 +133,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 : ''}
@@ -155,6 +159,37 @@ export default class wahelper {
         return null;
     }
 
+    async viewMessage(id = null) {
+        // lookup directly from database — no connection to daemon needed
+        try {
+            let message =
+                this.db
+                    .prepare(
+                        `
+							SELECT id, \`from\`, \`to\`, content, media_filename, timestamp, \`read\`
+							FROM messages
+							WHERE id = ?
+							LIMIT 1
+						`
+                    )
+                    .get(id) || null;
+            if (message === null) {
+                console.log('Message not found: ' + id);
+                this.write({ success: false, message: 'message_not_found', data: null }, true);
+                return { content: [{ type: 'text', text: 'Message not found: ' + id }], structuredContent: null };
+            }
+            console.log('Fetched message ' + id + ' from database.');
+            this.write({ success: true, message: 'message_fetched', data: message }, true);
+            return {
+                content: [{ type: 'text', text: 'Fetched message ' + id }],
+                structuredContent: message
+            };
+        } catch (error) {
+            this.log('⛔ Error fetching message from database: ' + error.message + ' (code: ' + error.code + ')');
+        }
+        return null;
+    }
+
     async sendMessageToUser(number = null, message = null, attachments = null) {
         let jid = this.formatNumber(number) + '@s.whatsapp.net';
         this.log('begin send message to user ' + jid);
@@ -452,9 +487,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 + ')');
         }