wexa-chat 0.3.3 → 0.3.4

package/dist/index.d.cts

@@ -182,6 +182,7 @@ interface IMessage extends Document {
         };
         whatsapp?: {
             senderName?: string;
+            senderPhone?: string;
         };
     };
     parentMessageId?: string;
@@ -304,6 +305,7 @@ type ReceiveWhatsappMessageArgs = {
     message: string;
     messageId?: string;
     senderName?: string;
+    senderPhone?: string;
 };
 type ReceiveLinkedinMessageArgs = {
     linkedinChatId: string;

package/dist/index.d.ts

@@ -182,6 +182,7 @@ interface IMessage extends Document {
         };
         whatsapp?: {
             senderName?: string;
+            senderPhone?: string;
         };
     };
     parentMessageId?: string;
@@ -304,6 +305,7 @@ type ReceiveWhatsappMessageArgs = {
     message: string;
     messageId?: string;
     senderName?: string;
+    senderPhone?: string;
 };
 type ReceiveLinkedinMessageArgs = {
     linkedinChatId: string;

package/dist/index.js

@@ -828,121 +828,152 @@ function createMessagesService(models, hooks = {}) {
       return message;
     },
     /**
-     * Receive a new message by whatsappChatId
+     * Receive a new message by whatsappChatId — delivers to ALL conversations
+     * that share this chatId (across organizations).
      */
     async receiveWhatsappMessage(args) {
-      const { whatsappChatId, message, messageId, senderName } = args;
-      const conversation = await Conversation.findOne({ whatsappChatId }).lean();
-      if (!conversation) {
+      const { whatsappChatId, message, messageId, senderName, senderPhone } = args;
+      const conversations = await Conversation.find({ whatsappChatId }).lean();
+      if (!conversations.length) {
         throw new Error("Conversation not found for given whatsappChatId");
       }
-      if (messageId) {
-        const existingMessage = await Message.findOne({
-          organizationId: conversation.organizationId,
-          conversationId: String(conversation._id),
-          externalMessageId: messageId
-        }).lean();
-        if (existingMessage) {
-          console.log(`Duplicate WhatsApp message detected: ${messageId}`);
-          return existingMessage;
+      let lastSavedMessage = null;
+      for (const conversation of conversations) {
+        if (messageId) {
+          const existingMessage = await Message.findOne({
+            organizationId: conversation.organizationId,
+            conversationId: String(conversation._id),
+            externalMessageId: messageId
+          }).lean();
+          if (existingMessage) {
+            console.log(`Duplicate WhatsApp message detected for conversation ${conversation._id}: ${messageId}`);
+            lastSavedMessage = existingMessage;
+            continue;
+          }
         }
-      }
-      const applicationParticipant = conversation.participants.find(
-        (p) => p.entityModel === "Application"
-      );
-      if (!applicationParticipant) {
-        throw new Error("Application participant not found in conversation");
-      }
-      const orgId = conversation.organizationId;
-      const senderModel = "Application";
-      const senderId = applicationParticipant.entityId;
-      const msgDoc = new Message({
-        organizationId: orgId,
-        conversationId: String(conversation._id),
-        senderModel,
-        senderId,
-        text: message,
-        kind: "text",
-        source: ["whatsapp"],
-        externalMessageId: messageId,
-        parentMessageId: void 0,
-        rootThreadId: void 0,
-        metadata: senderName ? {
-          whatsapp: {
-            senderName
+        const applicationParticipant = conversation.participants.find(
+          (p) => p.entityModel === "Application"
+        );
+        if (!applicationParticipant) {
+          console.log(`Application participant not found in conversation ${conversation._id}, skipping`);
+          continue;
+        }
+        const orgId = conversation.organizationId;
+        const senderModel = "Application";
+        const senderId = applicationParticipant.entityId;
+        const msgDoc = new Message({
+          organizationId: orgId,
+          conversationId: String(conversation._id),
+          senderModel,
+          senderId,
+          text: message,
+          kind: "text",
+          source: ["whatsapp"],
+          externalMessageId: messageId,
+          parentMessageId: void 0,
+          rootThreadId: void 0,
+          metadata: senderName || senderPhone ? {
+            whatsapp: {
+              senderName,
+              senderPhone
+            }
+          } : void 0
+        });
+        try {
+          await msgDoc.save();
+        } catch (saveError) {
+          if ((saveError == null ? void 0 : saveError.code) === 11e3) {
+            console.log(`Duplicate key for conversation ${conversation._id}, already saved by concurrent request`);
+            continue;
           }
-        } : void 0
-      });
-      await msgDoc.save();
-      await Conversation.findByIdAndUpdate(conversation._id, {
-        $set: {
-          lastMessageAt: msgDoc.createdAt,
-          lastMessagePreview: message.substring(0, 100),
-          lastMessageSenderId: senderId,
-          lastMessageSenderModel: senderModel
+          throw saveError;
         }
-      });
-      if (onMessageCreated) onMessageCreated(msgDoc);
-      return msgDoc;
+        await Conversation.findByIdAndUpdate(conversation._id, {
+          $set: {
+            lastMessageAt: msgDoc.createdAt,
+            lastMessagePreview: message.substring(0, 100),
+            lastMessageSenderId: senderId,
+            lastMessageSenderModel: senderModel
+          }
+        });
+        if (onMessageCreated) onMessageCreated(msgDoc);
+        lastSavedMessage = msgDoc;
+      }
+      return lastSavedMessage;
     },
     /**
-     * Receive a new message by linkedinChatId
+     * Receive a new message by linkedinChatId — delivers to ALL conversations
+     * that share this chatId (across organizations).
      */
     async receiveLinkedinMessage(args) {
       const { linkedinChatId, message, messageId, senderName, senderProfileUrl } = args;
-      const conversation = await Conversation.findOne({ linkedinChatId }).sort({ lastMessageAt: -1 }).lean();
-      if (!conversation) {
+      const conversations = await Conversation.find({ linkedinChatId }).lean();
+      if (!conversations.length) {
         throw new Error("Conversation not found for given linkedinChatId");
       }
-      if (messageId) {
-        const existingMessage = await Message.findOne({
-          organizationId: conversation.organizationId,
-          conversationId: String(conversation._id),
-          externalMessageId: messageId
-        }).lean();
-        if (existingMessage) {
-          console.log(`Duplicate LinkedIn message detected: ${messageId}`);
-          return existingMessage;
+      let lastSavedMessage = null;
+      for (const conversation of conversations) {
+        if (messageId) {
+          const existingMessage = await Message.findOne({
+            organizationId: conversation.organizationId,
+            conversationId: String(conversation._id),
+            externalMessageId: messageId
+          }).lean();
+          if (existingMessage) {
+            console.log(`Duplicate LinkedIn message detected for conversation ${conversation._id}: ${messageId}`);
+            lastSavedMessage = existingMessage;
+            continue;
+          }
         }
-      }
-      const applicationParticipant = conversation.participants.find(
-        (p) => p.entityModel === "Application"
-      );
-      if (!applicationParticipant) {
-        throw new Error("Application participant not found in conversation");
-      }
-      const orgId = conversation.organizationId;
-      const senderModel = "Application";
-      const senderId = applicationParticipant.entityId;
-      const msgDoc = new Message({
-        organizationId: orgId,
-        conversationId: String(conversation._id),
-        senderModel,
-        senderId,
-        text: message,
-        kind: "text",
-        source: ["linkedin"],
-        externalMessageId: messageId,
-        parentMessageId: void 0,
-        rootThreadId: void 0,
-        metadata: senderName || senderProfileUrl ? {
-          linkedin: {
-            senderName,
-            senderProfileUrl
+        const applicationParticipant = conversation.participants.find(
+          (p) => p.entityModel === "Application"
+        );
+        if (!applicationParticipant) {
+          console.log(`Application participant not found in conversation ${conversation._id}, skipping`);
+          continue;
+        }
+        const orgId = conversation.organizationId;
+        const senderModel = "Application";
+        const senderId = applicationParticipant.entityId;
+        const msgDoc = new Message({
+          organizationId: orgId,
+          conversationId: String(conversation._id),
+          senderModel,
+          senderId,
+          text: message,
+          kind: "text",
+          source: ["linkedin"],
+          externalMessageId: messageId,
+          parentMessageId: void 0,
+          rootThreadId: void 0,
+          metadata: senderName || senderProfileUrl ? {
+            linkedin: {
+              senderName,
+              senderProfileUrl
+            }
+          } : void 0
+        });
+        try {
+          await msgDoc.save();
+        } catch (saveError) {
+          if ((saveError == null ? void 0 : saveError.code) === 11e3) {
+            console.log(`Duplicate key for conversation ${conversation._id}, already saved by concurrent request`);
+            continue;
           }
-        } : void 0
-      });
-      await msgDoc.save();
-      await Conversation.findByIdAndUpdate(conversation._id, {
-        $set: {
-          lastMessageAt: msgDoc.createdAt,
-          lastMessagePreview: message.substring(0, 100),
-          lastMessageSenderId: senderId,
-          lastMessageSenderModel: senderModel
+          throw saveError;
         }
-      });
-      if (onMessageCreated) onMessageCreated(msgDoc);
-      return msgDoc;
+        await Conversation.findByIdAndUpdate(conversation._id, {
+          $set: {
+            lastMessageAt: msgDoc.createdAt,
+            lastMessagePreview: message.substring(0, 100),
+            lastMessageSenderId: senderId,
+            lastMessageSenderModel: senderModel
+          }
+        });
+        if (onMessageCreated) onMessageCreated(msgDoc);
+        lastSavedMessage = msgDoc;
+      }
+      return lastSavedMessage;
     },
     /**
      * Receive a new message by emailChatId with full email metadata