whatsapp-store-db 1.3.44 → 1.3.46

package/dist/handlers/chat.js

@@ -72,11 +72,9 @@ function chatHandler(sessionId, event, getJid = undefined) {
         }
         logger.error({ id, sessionId }, 'Failed to persist chat record after repeated retries');
     };
-    const set = async ({ chats, isLatest }) => {
+    const set = async ({ chats }) => {
         try {
             await prisma.$transaction(async (tx) => {
-                if (isLatest)
-                    await tx.chat.deleteMany({ where: { sessionId } });
                 // Process chats in batches to avoid timeout
                 const BATCH_SIZE = 100;
                 const normalizedChats = chats.map((c) => {
@@ -165,24 +163,12 @@ function chatHandler(sessionId, event, getJid = undefined) {
             }
         }
     };
-    const del = async (ids) => {
-        try {
-            const normalizedIds = ids.map((id) => resolveChatId(id).resolvedId);
-            await prisma.chat.deleteMany({
-                where: { id: { in: normalizedIds } },
-            });
-        }
-        catch (e) {
-            logger.error(e, 'An error occured during chats delete');
-        }
-    };
     const listen = () => {
         if (listening)
             return;
         event.on('messaging-history.set', set);
         event.on('chats.upsert', upsert);
         event.on('chats.update', update);
-        // event.on('chats.delete', del);
         listening = true;
     };
     const unlisten = () => {
@@ -191,7 +177,6 @@ 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);
         listening = false;
     };
     return { listen, unlisten };

package/dist/handlers/contact.js

@@ -7,14 +7,41 @@ function contactHandler(sessionId, event, getJid = undefined) {
     const prisma = (0, shared_1.usePrisma)();
     const logger = (0, shared_1.useLogger)();
     let listening = false;
-    const resolveContactId = (id, contact) => {
+    /**
+     * Resolves a contact ID, converting LID format to phone number format when possible.
+     * Checks multiple sources: contact fields, getJid function, and Chat table lookup.
+     */
+    const resolveContactId = async (id, contact) => {
         // console.log("contactHandler:contact:", contact);
-        // Prefer primary number when we get a LID id and contact carries pn/jid
+        // Prefer primary number when we get a LID id
         if (id === null || id === void 0 ? void 0 : id.endsWith('@lid')) {
+            // First, check contact-level fields
             const candidate = ((contact === null || contact === void 0 ? void 0 : contact.senderPn) || (contact === null || contact === void 0 ? void 0 : contact.pnJid) || (contact === null || contact === void 0 ? void 0 : contact.jid));
-            if (candidate) {
+            if (candidate && candidate.includes('@s.whatsapp.net')) {
                 return (0, baileys_1.jidNormalizedUser)(candidate);
             }
+            // Second, try getJid function
+            const jidByLid = typeof getJid === 'function' ? getJid(id || '') : undefined;
+            if (jidByLid && jidByLid.includes('@s.whatsapp.net')) {
+                return (0, baileys_1.jidNormalizedUser)(jidByLid);
+            }
+            // Third, look up the Chat table for a mapping (lidJid -> id)
+            try {
+                const chatWithLid = await prisma.chat.findFirst({
+                    select: { id: true },
+                    where: {
+                        sessionId,
+                        lidJid: id,
+                        id: { endsWith: '@s.whatsapp.net' }
+                    },
+                });
+                if (chatWithLid === null || chatWithLid === void 0 ? void 0 : chatWithLid.id) {
+                    return (0, baileys_1.jidNormalizedUser)(chatWithLid.id);
+                }
+            }
+            catch (e) {
+                // Silently ignore lookup errors, fall through to default
+            }
         }
         const jidByLid = typeof getJid === 'function' ? getJid(id || '') : undefined;
         return (0, baileys_1.jidNormalizedUser)(jidByLid !== null && jidByLid !== void 0 ? jidByLid : id);
@@ -31,28 +58,18 @@ function contactHandler(sessionId, event, getJid = undefined) {
     };
     const set = async ({ contacts }) => {
         try {
-            const normalizedContacts = contacts.map((c) => {
-                const id = resolveContactId(c.id, c);
+            const normalizedContacts = await Promise.all(contacts.map(async (c) => {
+                const id = await resolveContactId(c.id, c);
                 const data = sanitizeContactData((0, utils_1.transformPrisma)(c));
                 return Object.assign(Object.assign({}, data), { id });
-            });
-            const contactIds = normalizedContacts.map((c) => c.id);
-            const deletedOldContactIds = (await prisma.contact.findMany({
-                select: { id: true },
-                where: { id: { notIn: contactIds }, sessionId },
-            })).map((c) => c.id);
-            const upsertPromises = normalizedContacts
-                .map((data) => prisma.contact.upsert({
+            }));
+            await Promise.all(normalizedContacts.map((data) => prisma.contact.upsert({
                 select: { pkId: true },
                 create: Object.assign(Object.assign({}, data), { sessionId }),
                 update: data,
                 where: { sessionId_id: { id: data.id, sessionId } },
-            }));
-            await Promise.any([
-                ...upsertPromises,
-                prisma.contact.deleteMany({ where: { id: { in: deletedOldContactIds }, sessionId } }),
-            ]);
-            logger.info({ deletedContacts: deletedOldContactIds.length, newContacts: contacts.length }, 'Synced contacts');
+            })));
+            logger.info({ contactsProcessed: contacts.length }, 'Synced contacts');
         }
         catch (e) {
             logger.error(e, 'An error occured during contacts set');
@@ -60,12 +77,12 @@ function contactHandler(sessionId, event, getJid = undefined) {
     };
     const upsert = async (contacts) => {
         try {
-            const normalizedContacts = contacts.map((c) => {
-                const id = resolveContactId(c.id, c);
+            const normalizedContacts = await Promise.all(contacts.map(async (c) => {
+                const id = await resolveContactId(c.id, c);
                 const data = sanitizeContactData((0, utils_1.transformPrisma)(c));
                 return Object.assign(Object.assign({}, data), { id });
-            });
-            await Promise.any(normalizedContacts.map((data) => prisma.contact.upsert({
+            }));
+            await Promise.all(normalizedContacts.map((data) => prisma.contact.upsert({
                 select: { pkId: true },
                 create: Object.assign(Object.assign({}, data), { sessionId }),
                 update: data,
@@ -83,7 +100,7 @@ function contactHandler(sessionId, event, getJid = undefined) {
                 continue;
             }
             try {
-                const contactId = resolveContactId(update.id, update);
+                const contactId = await resolveContactId(update.id, update);
                 const transformedData = sanitizeContactData((0, utils_1.transformPrisma)(update));
                 await prisma.contact.upsert({
                     select: { pkId: true },

package/package.json

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