whatsapp-store-db 1.3.43 → 1.3.44

package/dist/handlers/chat.js

@@ -8,17 +8,41 @@ function chatHandler(sessionId, event, getJid = undefined) {
     const prisma = (0, shared_1.usePrisma)();
     const logger = (0, shared_1.useLogger)();
     let listening = false;
+    /**
+     * Resolves a chat ID, converting LID format to phone number format when possible.
+     * Returns an object with both the resolved ID and the original LID (if conversion happened).
+     */
     const resolveChatId = (id, chatOrUpdate) => {
+        var _a;
+        // Convert null to undefined for consistent typing
+        const originalLid = id !== null && id !== void 0 ? id : undefined;
         // console.log("chatHandler:chatOrUpdate:", chatOrUpdate);
         // Prefer primary number JID when id is a LID
         if (id === null || id === void 0 ? void 0 : id.endsWith('@lid')) {
+            // First, check chat-level fields
             const candidate = (chatOrUpdate === null || chatOrUpdate === void 0 ? void 0 : chatOrUpdate.pnJid) || (chatOrUpdate === null || chatOrUpdate === void 0 ? void 0 : chatOrUpdate.senderPn) || (chatOrUpdate === null || chatOrUpdate === void 0 ? void 0 : chatOrUpdate.jid);
-            if (candidate) {
-                return (0, baileys_1.jidNormalizedUser)(candidate);
+            if (candidate && candidate.includes('@s.whatsapp.net')) {
+                return { resolvedId: (0, baileys_1.jidNormalizedUser)(candidate), lidJid: originalLid };
+            }
+            // Second, try to extract from messages array (remoteJidAlt in message key)
+            const messages = chatOrUpdate === null || chatOrUpdate === void 0 ? void 0 : chatOrUpdate.messages;
+            if (Array.isArray(messages) && messages.length > 0) {
+                for (const msg of messages) {
+                    const msgObj = (msg === null || msg === void 0 ? void 0 : msg.message) || msg;
+                    const key = msgObj === null || msgObj === void 0 ? void 0 : msgObj.key;
+                    if ((_a = key === null || key === void 0 ? void 0 : key.remoteJidAlt) === null || _a === void 0 ? void 0 : _a.includes('@s.whatsapp.net')) {
+                        return { resolvedId: (0, baileys_1.jidNormalizedUser)(key.remoteJidAlt), lidJid: originalLid };
+                    }
+                }
+            }
+            // Try getJid function as fallback
+            const jidByLid = typeof getJid === 'function' ? getJid(id || '') : undefined;
+            if (jidByLid && jidByLid.includes('@s.whatsapp.net')) {
+                return { resolvedId: (0, baileys_1.jidNormalizedUser)(jidByLid), lidJid: originalLid };
             }
         }
         const jidByLid = typeof getJid === 'function' ? getJid(id || '') : undefined;
-        return (0, baileys_1.jidNormalizedUser)(jidByLid !== null && jidByLid !== void 0 ? jidByLid : id);
+        return { resolvedId: (0, baileys_1.jidNormalizedUser)(jidByLid !== null && jidByLid !== void 0 ? jidByLid : id) };
     };
     const persistChatRecord = async ({ id, createData, updateData, }) => {
         const where = { sessionId, id };
@@ -56,10 +80,14 @@ function chatHandler(sessionId, event, getJid = undefined) {
                 // Process chats in batches to avoid timeout
                 const BATCH_SIZE = 100;
                 const normalizedChats = chats.map((c) => {
-                    const id = resolveChatId(c.id, c);
+                    const { resolvedId, lidJid } = resolveChatId(c.id, c);
                     const transformedData = (0, utils_1.transformPrisma)(c);
                     const validatedData = (0, utils_1.validateChatData)(transformedData);
-                    return Object.assign(Object.assign({}, validatedData), { id });
+                    // Set lidJid if we resolved from LID to phone number
+                    if (lidJid) {
+                        validatedData.lidJid = lidJid;
+                    }
+                    return Object.assign(Object.assign({}, validatedData), { id: resolvedId });
                 });
                 const existingIds = (await tx.chat.findMany({
                     select: { id: true },
@@ -88,10 +116,14 @@ function chatHandler(sessionId, event, getJid = undefined) {
             // Normalize and de-duplicate by resolved id (keep the last occurrence)
             const dedupedById = new Map();
             for (const c of chats) {
-                const id = resolveChatId(c.id, c);
+                const { resolvedId, lidJid } = resolveChatId(c.id, c);
                 const transformedData = (0, utils_1.transformPrisma)(c);
                 const validatedData = (0, utils_1.validateChatData)(transformedData);
-                dedupedById.set(id, Object.assign(Object.assign({}, validatedData), { id }));
+                // Set lidJid if we resolved from LID to phone number
+                if (lidJid) {
+                    validatedData.lidJid = lidJid;
+                }
+                dedupedById.set(resolvedId, Object.assign(Object.assign({}, validatedData), { id: resolvedId }));
             }
             const normalizedChats = Array.from(dedupedById.values());
             await Promise.all(normalizedChats.map((data) => persistChatRecord({
@@ -111,9 +143,13 @@ function chatHandler(sessionId, event, getJid = undefined) {
                 continue;
             }
             try {
-                const chatId = resolveChatId(update.id, update);
+                const { resolvedId: chatId, lidJid } = resolveChatId(update.id, update);
                 const transformedData = (0, utils_1.transformPrisma)(update);
                 const validatedData = (0, utils_1.validateChatData)(transformedData);
+                // Set lidJid if we resolved from LID to phone number
+                if (lidJid) {
+                    validatedData.lidJid = lidJid;
+                }
                 await persistChatRecord({
                     id: chatId,
                     createData: Object.assign(Object.assign({}, validatedData), { id: chatId }),
@@ -131,7 +167,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
     };
     const del = async (ids) => {
         try {
-            const normalizedIds = ids.map((id) => resolveChatId(id));
+            const normalizedIds = ids.map((id) => resolveChatId(id).resolvedId);
             await prisma.chat.deleteMany({
                 where: { id: { in: normalizedIds } },
             });
@@ -146,7 +182,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
         event.on('messaging-history.set', set);
         event.on('chats.upsert', upsert);
         event.on('chats.update', update);
-        event.on('chats.delete', del);
+        // event.on('chats.delete', del);
         listening = true;
     };
     const unlisten = () => {
@@ -155,7 +191,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
         event.off('messaging-history.set', set);
         event.off('chats.upsert', upsert);
         event.off('chats.update', update);
-        event.off('chats.delete', del);
+        // event.off('chats.delete', del);
         listening = false;
     };
     return { listen, unlisten };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-store-db",
-  "version": "1.3.43",
+  "version": "1.3.44",
   "description": "Minimal Baileys data storage for your favorite DBMS built with Prisma",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",