wexa-chat 0.2.0 → 0.2.2

package/README.md

@@ -121,7 +121,7 @@ export type InitOptions = {
   - `searchByParticipantPair({ organizationId, a, b })`
 
 - Messages
-  - `sendMessage({ organizationId, conversationId, senderModel, senderId, text, source, kind?, parentMessageId?, rootThreadId? })`
+  - `sendMessage({ organizationId, conversationId, senderModel, senderId, text, source, kind?, parentMessageId?, rootThreadId?, connectorIds? })`
   - `listMessages({ organizationId, conversationId, limit?, cursor? })`
   - `listMessagesWithSenders({ organizationId, conversationId, limit?, cursor?, populateSenders: true, populateOptions? })`
   - `markRead({ organizationId, conversationId, participantModel, participantId, messageId })`
@@ -209,9 +209,9 @@ The method returns messages sorted by creation time (newest first), making it id
 
 The type `MessageWithSender` is exported from the package for proper TypeScript support.
 
-### Message Source
+### Sending messages and connectors
 
-Messages now include a required `source` field (array) to indicate one or more origins for a message. The model enforces `source` values via an enum of strings:
+Messages include a required `source` field (array) to indicate one or more origins for a message. Valid values are enforced by an enum of strings:
 
 ```ts
 export const sourceType = {
@@ -224,8 +224,35 @@ export const sourceType = {
 export type SourceType = (typeof sourceType)[keyof typeof sourceType];
 ```
 
-When sending a message via `sendMessage`, you must provide `source: SourceType[]`.
-For internal server-generated messages, use `[sourceType.CORE]`.
+When sending a message via `sendMessage`, you must provide `source: SourceType[]`. For internal server‑generated messages, use `[sourceType.CORE]`.
+
+If you include external connectors in the `source` (e.g., `linkedin`, `whatsapp`), you can optionally pass `connectorIds` to perform the external send and to persist identifiers for quick follow‑ups:
+
+```ts
+await chat.services.messages.sendMessage({
+  organizationId: 'org-123',
+  conversationId: 'conv-456',
+  senderModel: 'User',
+  senderId: 'user-1',
+  text: 'Hello from Wexa',
+  source: [sourceType.CORE, sourceType.LINKEDIN, sourceType.WHATSAPP],
+  connectorIds: {
+    linkedin: { connectorId: 'ln-connector-1', contactId: 'https://linkedin.com/in/someone' },
+    whatsapp: { connectorId: 'wa-connector-1', contactId: '+1 234 567 8901' },
+  },
+});
+```
+
+Under the hood (`src/services/messages.service.ts`):
+
+- LinkedIn: posts to the LinkedIn connector with `{ linkedin_url, text }`.
+- WhatsApp: posts to the WhatsApp connector with `{ phone_numbers, text }` (phone is sanitized to remove spaces and a leading `+`).
+- Each external task runs concurrently. A successful task's `source` remains in the stored message. Failures are collected into a `failed_source` array attached to the returned message instance at runtime: `message.failed_source: Array<{ source: string; message: string }>`.
+- The conversation document is updated with last message metadata and, when applicable, with connector identifiers:
+  - `lastLinkedInId: string` — set from `connectorIds.linkedin.contactId` when `source` includes `linkedin`.
+  - `lastWhatsAppId: string` — set from a sanitized `connectorIds.whatsapp.contactId` when `source` includes `whatsapp`.
+
+This allows subsequent UI actions to prefill the last known contact handles for LinkedIn and WhatsApp.
 
 ## Models
 

package/dist/index.d.cts

@@ -147,7 +147,7 @@ interface IMessage extends Document {
 /**
  * Create (or retrieve) Message model safely
  */
-declare function createMessageModel(options: InitOptions, conn?: Connection): Model<IMessage>;
+declare function createMessageModel(options: InitOptions, conn: Connection): Model<IMessage>;
 
 declare const modelRegistry: Map<string, mongoose.Model<any, {}, {}, {}, any, any>>;
 /**
@@ -259,6 +259,8 @@ interface IConversation extends Document {
     lastMessagePreview?: string;
     lastMessageSenderId?: string;
     lastMessageSenderModel?: string;
+    lastLinkedInId?: string;
+    lastWhatsAppId?: string;
     metadata?: Record<string, any>;
     createdAt: Date;
     updatedAt: Date;
@@ -266,7 +268,7 @@ interface IConversation extends Document {
 /**
  * Create (or retrieve) Conversation model safely
  */
-declare function createConversationModel(options: InitOptions, conn?: Connection): Model<IConversation>;
+declare function createConversationModel(options: InitOptions, conn: Connection): Model<IConversation>;
 
 /**
  * Pagination result interface

package/dist/index.d.ts

@@ -147,7 +147,7 @@ interface IMessage extends Document {
 /**
  * Create (or retrieve) Message model safely
  */
-declare function createMessageModel(options: InitOptions, conn?: Connection): Model<IMessage>;
+declare function createMessageModel(options: InitOptions, conn: Connection): Model<IMessage>;
 
 declare const modelRegistry: Map<string, mongoose.Model<any, {}, {}, {}, any, any>>;
 /**
@@ -259,6 +259,8 @@ interface IConversation extends Document {
     lastMessagePreview?: string;
     lastMessageSenderId?: string;
     lastMessageSenderModel?: string;
+    lastLinkedInId?: string;
+    lastWhatsAppId?: string;
     metadata?: Record<string, any>;
     createdAt: Date;
     updatedAt: Date;
@@ -266,7 +268,7 @@ interface IConversation extends Document {
 /**
  * Create (or retrieve) Conversation model safely
  */
-declare function createConversationModel(options: InitOptions, conn?: Connection): Model<IConversation>;
+declare function createConversationModel(options: InitOptions, conn: Connection): Model<IConversation>;
 
 /**
  * Pagination result interface

package/dist/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var mongoose = require('mongoose');
 var axios = require('axios');
 var Redis = require('ioredis');
 var ws = require('ws');
@@ -8,13 +7,12 @@ var url = require('url');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var mongoose__default = /*#__PURE__*/_interopDefault(mongoose);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var Redis__default = /*#__PURE__*/_interopDefault(Redis);
 var url__default = /*#__PURE__*/_interopDefault(url);
 
 // src/models/Conversation.model.ts
-function createConversationModel(options, conn = mongoose__default.default.connection) {
+function createConversationModel(options, conn) {
   const connectionId = conn.id || conn.name || "default";
   const registryKey = `${connectionId}:Conversation`;
   if (modelRegistry.has(registryKey)) {
@@ -26,7 +24,8 @@ function createConversationModel(options, conn = mongoose__default.default.conne
     modelRegistry.set(registryKey, existingModel);
     return existingModel;
   }
-  const ParticipantSchema = new mongoose.Schema(
+  const Schema = conn.base.Schema;
+  const ParticipantSchema = new Schema(
     {
       entityModel: {
         type: String,
@@ -45,7 +44,7 @@ function createConversationModel(options, conn = mongoose__default.default.conne
     },
     { _id: false }
   );
-  const ConversationSchema = new mongoose.Schema(
+  const ConversationSchema = new Schema(
     {
       organizationId: {
         type: String,
@@ -71,7 +70,9 @@ function createConversationModel(options, conn = mongoose__default.default.conne
       lastMessagePreview: String,
       lastMessageSenderId: String,
       lastMessageSenderModel: String,
-      metadata: mongoose.Schema.Types.Mixed
+      lastLinkedInId: String,
+      lastWhatsAppId: String,
+      metadata: Schema.Types.Mixed
     },
     { timestamps: true }
   );
@@ -79,13 +80,15 @@ function createConversationModel(options, conn = mongoose__default.default.conne
   modelRegistry.set(registryKey, model);
   return model;
 }
+
+// src/models/Message.model.ts
 var sourceType = {
   LINKEDIN: "linkedin",
   WHATSAPP: "whatsapp",
   EMAIL: "email",
   CORE: "core"
 };
-function createMessageModel(options, conn = mongoose__default.default.connection) {
+function createMessageModel(options, conn) {
   const connectionId = conn.id || conn.name || "default";
   const registryKey = `${connectionId}:Message`;
   if (modelRegistry.has(registryKey)) {
@@ -97,7 +100,8 @@ function createMessageModel(options, conn = mongoose__default.default.connection
     modelRegistry.set(registryKey, existingModel);
     return existingModel;
   }
-  const MessageSchema = new mongoose.Schema(
+  const Schema = conn.base.Schema;
+  const MessageSchema = new Schema(
     {
       organizationId: {
         type: String,
@@ -305,13 +309,23 @@ function createConversationsService(models) {
      * Create a new conversation or find existing one between participants
      */
     async createOrFindConversation(args) {
+      console.log("Creating or finding conversation for users:", {
+        args
+      });
       const { organizationId, a, b } = args;
+      console.log("Creating or finding conversation for users:", {
+        organizationId,
+        a,
+        b
+      });
       try {
+        console.log("asdfa");
         const existingConversation = await searchByParticipantPair(Conversation, {
           organizationId,
           a,
           b
         });
+        console.log("Existing conversation:", existingConversation);
         if (existingConversation) {
           return existingConversation;
         }
@@ -334,7 +348,9 @@ function createConversationsService(models) {
           lastMessageAt: /* @__PURE__ */ new Date()
           // Set initial lastMessageAt
         });
+        console.log("New conversation:", newConversation);
         await newConversation.save();
+        console.log("Saved conversation:", newConversation);
         return newConversation;
       } catch (error) {
         console.error("Error in createOrFindConversation:", error);
@@ -535,8 +551,11 @@ function createMessagesService(models, hooks = {}) {
       const success_source = ["core"];
       const failed_source = [];
       const tasks = [];
+      let lastLinkedInId;
+      let lastWhatsAppId;
       if (Array.isArray(source) && source.includes("linkedin")) {
         const LinkedinConnector = connectorIds && connectorIds.linkedin;
+        lastLinkedInId = LinkedinConnector == null ? void 0 : LinkedinConnector.connectorId;
         if (LinkedinConnector) {
           tasks.push({
             name: "linkedin",
@@ -554,6 +573,7 @@ function createMessagesService(models, hooks = {}) {
       }
       if (Array.isArray(source) && source.includes("whatsapp")) {
         const whatsappConnector = connectorIds && connectorIds.whatsapp;
+        lastWhatsAppId = whatsappConnector == null ? void 0 : whatsappConnector.connectorId;
         if (whatsappConnector) {
           tasks.push({
             name: "whatsapp",
@@ -599,13 +619,16 @@ function createMessagesService(models, hooks = {}) {
         rootThreadId: rootThreadId || parentMessageId
       });
       await message.save();
+      const conversationUpdate = {
+        lastMessageAt: message.createdAt,
+        lastMessagePreview: text.substring(0, 100),
+        lastMessageSenderId: senderId,
+        lastMessageSenderModel: senderModel
+      };
+      if (lastLinkedInId) conversationUpdate.lastLinkedInId = lastLinkedInId;
+      if (lastWhatsAppId) conversationUpdate.lastWhatsAppId = lastWhatsAppId;
       await Conversation.findByIdAndUpdate(conversationId, {
-        $set: {
-          lastMessageAt: message.createdAt,
-          lastMessagePreview: text.substring(0, 100),
-          lastMessageSenderId: senderId,
-          lastMessageSenderModel: senderModel
-        }
+        $set: conversationUpdate
       });
       if (onMessageCreated) {
         onMessageCreated(message);
@@ -687,18 +710,18 @@ function createMessagesService(models, hooks = {}) {
         }
         sendersByModel[senderModel].add(senderId);
       });
-      const mongoose3 = Message.base;
+      const mongoose = Message.base;
       const senders = {};
       await Promise.all(
         Object.entries(sendersByModel).map(async ([senderModel, senderIdsSet]) => {
           const modelName = modelMapping[senderModel] || senderModel;
           const senderIds = Array.from(senderIdsSet);
-          if (!mongoose3.modelNames().includes(modelName)) {
+          if (!mongoose.modelNames().includes(modelName)) {
             console.warn(`Model ${modelName} not found for sender population`);
             return;
           }
           try {
-            const SenderModel = mongoose3.model(modelName);
+            const SenderModel = mongoose.model(modelName);
             const modelSenders = await SenderModel.find({ _id: { $in: senderIds } }).select(fields).lean().exec();
             senders[senderModel] = {};
             modelSenders.forEach((sender) => {