@prototypevip/baileys 0.1.1 → 0.1.2

package/lib/Socket/messages-send.js

@@ -466,6 +466,7 @@ export const makeMessagesSocket = (config) => {
             content: undefined,
           },
         ],
+        skipStoreEmit: true,
       },
     );
   };
@@ -540,6 +541,7 @@ export const makeMessagesSocket = (config) => {
     const msgId = await relayMessage(meJid, message, {
       additionalAttributes: { category: "peer", push_priority: "high_force" },
       additionalNodes: [{ tag: "meta", attrs: { appdata: "default" } }],
+      skipStoreEmit: true,
     });
     return msgId;
   };
@@ -647,6 +649,7 @@ export const makeMessagesSocket = (config) => {
       useCachedGroupMetadata,
       addBizAttributes,
       statusJidList,
+      skipStoreEmit,
     },
   ) => {
     // --- PN-First API Resolver: Resolve Mentions ---
@@ -1297,6 +1300,34 @@ export const makeMessagesSocket = (config) => {
         messageRetryManager.addRecentMessage(destinationJid, msgId, message);
       }
     }, meId);
+
+    // Ensure ANY call to relayMessage -- not just ones routed through
+    // sendMessage's own wrapper -- respects emitOwnEvents and reaches
+    // the store via messages.upsert. Callers that already build and
+    // upsert a richer fullMsg themselves (sendMessage's internal call
+    // sites) pass skipStoreEmit: true to avoid a duplicate upsert.
+    if (config.emitOwnEvents && !skipStoreEmit && msgId && message) {
+      const relayedKey = {
+        remoteJid: destinationJid,
+        fromMe: true,
+        id: msgId,
+      };
+      if (isGroup) {
+        relayedKey.participant = jidNormalizedUser(meId);
+      } else if (participant?.jid) {
+        relayedKey.participant = jidNormalizedUser(participant.jid);
+      }
+      const relayedMsg = {
+        key: relayedKey,
+        message: message,
+        messageTimestamp: unixTimestampSeconds(),
+        status: 1,
+      };
+      process.nextTick(async () => {
+        await messageMutex.mutex(() => upsertMessage(relayedMsg, "append"));
+      });
+    }
+
     return msgId;
   };
   const getMessageType = (message) => {
@@ -1529,6 +1560,14 @@ export const makeMessagesSocket = (config) => {
 
       const userJid = authState.creds.me.id;
 
+      const emitUpsert = (msg, type = "append") => {
+        if (config.emitOwnEvents && msg && msg.key) {
+          process.nextTick(async () => {
+            await messageMutex.mutex(() => upsertMessage(msg, type));
+          });
+        }
+      };
+
       if (Array.isArray(jid)) {
         const { delayMs = 1500 } = options;
         const allUsers = new Set();
@@ -1565,6 +1604,7 @@ export const makeMessagesSocket = (config) => {
         await relayMessage("status@broadcast", fullMsg.message, {
           messageId: fullMsg.key.id,
           statusJidList: Array.from(allUsers),
+          skipStoreEmit: true,
           additionalNodes: [
             {
               tag: "meta",
@@ -1604,6 +1644,8 @@ export const makeMessagesSocket = (config) => {
             { userJid: userJid },
           );
           await relayMessage(id, mentionMsg.message, {
+            messageId: mentionMsg.key.id,
+            skipStoreEmit: true,
             additionalNodes: [
               {
                 tag: "meta",
@@ -1634,29 +1676,39 @@ export const makeMessagesSocket = (config) => {
             : disappearingMessagesInChat;
         await groupToggleEphemeral(jid, value);
       } else {
-        const interactiveHandler = new InteractiveMessageHandler(Utils_1, waUploadToServer, relayMessage);
+        const interactiveHandler = new InteractiveMessageHandler(Utils_1, waUploadToServer, relayMessage, emitUpsert);
         const messageType = interactiveHandler.detectType(content);
         if (messageType) {
             switch (messageType) {
                 case 'PAYMENT': {
                     const paymentContent = await interactiveHandler.handlePayment(content, options.quoted);
-                    return await relayMessage(jid, paymentContent, {
-                        messageId: generateMessageID()
+                    const paymentMsg = generateWAMessageFromContent(jid, paymentContent, { userJid: userJid });
+                    await relayMessage(jid, paymentMsg.message, {
+                        messageId: paymentMsg.key.id,
+                        skipStoreEmit: true
                     });
+                    emitUpsert(paymentMsg);
+                    return paymentMsg;
                 }
                 case 'PRODUCT': {
                     const productContent = await interactiveHandler.handleProduct(content, jid, options.quoted);
                     const productMsg = await generateWAMessageFromContent(jid, productContent, { quoted: options.quoted });
-                    return await relayMessage(jid, productMsg.message, {
-                        messageId: productMsg.key.id
+                    await relayMessage(jid, productMsg.message, {
+                        messageId: productMsg.key.id,
+                        skipStoreEmit: true
                     });
+                    emitUpsert(productMsg);
+                    return productMsg;
                 }
                 case 'INTERACTIVE': {
                     const interactiveContent = await interactiveHandler.handleInteractive(content, jid, options.quoted);
                     const interactiveMsg = await generateWAMessageFromContent(jid, interactiveContent, { quoted: options.quoted });
-                    return await relayMessage(jid, interactiveMsg.message, {
-                        messageId: interactiveMsg.key.id
+                    await relayMessage(jid, interactiveMsg.message, {
+                        messageId: interactiveMsg.key.id,
+                        skipStoreEmit: true
                     });
+                    emitUpsert(interactiveMsg);
+                    return interactiveMsg;
                 }
                 case 'ALBUM':
                     return await interactiveHandler.handleAlbum(content, jid, options.quoted);
@@ -1784,6 +1836,7 @@ export const makeMessagesSocket = (config) => {
           statusJidList: options.statusJidList,
           additionalAttributes: additionalAttributes,
           additionalNodes: additionalNodes,
+          skipStoreEmit: true,
         });
         if (config.emitOwnEvents) {
           process.nextTick(async () => {
@@ -1825,6 +1878,7 @@ export const makeMessagesSocket = (config) => {
               statusJidList: options.statusJidList,
               additionalAttributes: additionalAttributes,
               additionalNodes: additionalNodes,
+              skipStoreEmit: true,
             });
             if (config.emitOwnEvents) {
               process.nextTick(async () => {

package/lib/Store/prototype-store.js

@@ -736,30 +736,42 @@ export const makePrototypeStore = (config = {}) => {
 
       listen("messages.upsert", async ({ messages }) => {
         for (let msg of messages) {
-          const rawChatId = msg?.key?.remoteJid;
-          if (!rawChatId) continue;
-          const chatId = await resolveJIDAsync(
-            rawChatId,
-            store.signalRepository?.lidMapping,
-          );
-          if (!chatId) continue;
-          const chat = store.chats[chatId];
-          if (!chat) continue;
-          if (!chat.messages || typeof chat.messages.upsert !== "function") {
-            chat.messages = makeMessagesStore();
-          }
-          chat.messages.upsert(cloneM(msg));
-
-          if (db) {
-            const msgKey = getMessageKey(
-              msg,
-              {},
+          try {
+            const rawChatId = msg?.key?.remoteJid;
+            if (!rawChatId) continue;
+            const chatId = await resolveJIDAsync(
+              rawChatId,
               store.signalRepository?.lidMapping,
             );
-            pendingUpdates.set(`m:${chatId}:${msgKey}`, {
-              type: "message",
-              data: cloneM(msg),
-            });
+            if (!chatId) continue;
+            const chat = store.chats[chatId];
+            if (!chat) continue;
+            if (!chat.messages || typeof chat.messages.upsert !== "function") {
+              chat.messages = makeMessagesStore();
+            }
+            chat.messages.upsert(cloneM(msg));
+
+            if (db) {
+              const msgKey = getMessageKey(
+                msg,
+                {},
+                store.signalRepository?.lidMapping,
+              );
+              pendingUpdates.set(`m:${chatId}:${msgKey}`, {
+                type: "message",
+                data: cloneM(msg),
+              });
+            }
+          } catch (err) {
+            // مهم: من غير try/catch هنا، اي رساله واحده تفشل (JID غريب،
+            // مهله lidMapping، اي حاجه) كانت بتوقف اللوب وبتفقد كل الرسايل
+            // الباقيه في نفس الـ upsert batch من غير أي خطأ ظاهر.
+            console.error(
+              "PrototypeStore messages.upsert item error (id:",
+              msg?.key?.id,
+              "):",
+              err?.message || err,
+            );
           }
         }
       });