whatsapp-store-db 1.3.45 → 1.3.47

package/dist/handlers/chat.js

@@ -8,6 +8,45 @@ function chatHandler(sessionId, event, getJid = undefined) {
     const prisma = (0, shared_1.usePrisma)();
     const logger = (0, shared_1.useLogger)();
     let listening = false;
+    /**
+     * Updates Contact records that have LID as their ID when we discover the phone number mapping.
+     * This handles the case where Contact events arrive before Chat events.
+     */
+    const updateContactWithLidMapping = async (lidJid, phoneNumberId) => {
+        try {
+            // Check if there's a Contact with the LID as ID
+            const contactWithLid = await prisma.contact.findFirst({
+                select: { pkId: true },
+                where: { sessionId, id: lidJid },
+            });
+            if (contactWithLid) {
+                // Check if a contact with the phone number already exists
+                const existingContact = await prisma.contact.findFirst({
+                    select: { pkId: true },
+                    where: { sessionId, id: phoneNumberId },
+                });
+                if (existingContact) {
+                    // Phone number contact exists, delete the LID contact (it's a duplicate)
+                    await prisma.contact.delete({
+                        where: { pkId: contactWithLid.pkId },
+                    });
+                    logger.info({ lidJid, phoneNumberId }, 'Removed duplicate LID contact (phone number contact exists)');
+                }
+                else {
+                    // Update the LID contact to use the phone number
+                    await prisma.contact.update({
+                        where: { pkId: contactWithLid.pkId },
+                        data: { id: phoneNumberId },
+                    });
+                    logger.info({ lidJid, phoneNumberId }, 'Updated Contact LID to phone number');
+                }
+            }
+        }
+        catch (e) {
+            // Silently ignore errors - this is a best-effort cleanup
+            logger.debug({ lidJid, phoneNumberId, error: e }, 'Failed to update Contact with LID mapping');
+        }
+    };
     /**
      * 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).
@@ -72,11 +111,10 @@ 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 }) => {
+        const lidMappings = [];
         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) => {
@@ -86,6 +124,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
                     // Set lidJid if we resolved from LID to phone number
                     if (lidJid) {
                         validatedData.lidJid = lidJid;
+                        lidMappings.push({ lidJid, phoneNumberId: resolvedId });
                     }
                     return Object.assign(Object.assign({}, validatedData), { id: resolvedId });
                 });
@@ -106,6 +145,10 @@ function chatHandler(sessionId, event, getJid = undefined) {
             }, {
                 timeout: 30000, // 30 seconds for this specific transaction
             });
+            // Update any Contact records that have LID as their ID (outside transaction)
+            for (const { lidJid, phoneNumberId } of lidMappings) {
+                await updateContactWithLidMapping(lidJid, phoneNumberId);
+            }
         }
         catch (e) {
             logger.error(e, 'An error occured during chats set');
@@ -115,6 +158,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
         try {
             // Normalize and de-duplicate by resolved id (keep the last occurrence)
             const dedupedById = new Map();
+            const lidMappings = [];
             for (const c of chats) {
                 const { resolvedId, lidJid } = resolveChatId(c.id, c);
                 const transformedData = (0, utils_1.transformPrisma)(c);
@@ -122,6 +166,7 @@ function chatHandler(sessionId, event, getJid = undefined) {
                 // Set lidJid if we resolved from LID to phone number
                 if (lidJid) {
                     validatedData.lidJid = lidJid;
+                    lidMappings.push({ lidJid, phoneNumberId: resolvedId });
                 }
                 dedupedById.set(resolvedId, Object.assign(Object.assign({}, validatedData), { id: resolvedId }));
             }
@@ -131,6 +176,10 @@ function chatHandler(sessionId, event, getJid = undefined) {
                 createData: Object.assign({}, data),
                 updateData: Object.assign(Object.assign({}, data), { id: undefined }),
             })));
+            // Update any Contact records that have LID as their ID
+            for (const { lidJid, phoneNumberId } of lidMappings) {
+                await updateContactWithLidMapping(lidJid, phoneNumberId);
+            }
         }
         catch (e) {
             logger.error(e, 'An error occured during chats upsert');
@@ -159,30 +208,22 @@ function chatHandler(sessionId, event, getJid = undefined) {
                                 : { set: validatedData.unreadCount }
                             : undefined }),
                 });
+                // Update any Contact records that have LID as their ID
+                if (lidJid) {
+                    await updateContactWithLidMapping(lidJid, chatId);
+                }
             }
             catch (e) {
                 logger.error(e, 'An error occured during chat update');
             }
         }
     };
-    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 +232,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

@@ -63,23 +63,13 @@ function contactHandler(sessionId, event, getJid = undefined) {
                 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');
@@ -92,7 +82,7 @@ function contactHandler(sessionId, event, getJid = undefined) {
                 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,

package/package.json

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