@peopl-health/nexus 4.0.2 → 4.1.1

package/lib/adapters/TwilioProvider.js

@@ -116,70 +116,41 @@ class TwilioProvider extends MessageProvider {
       throw new Error('Message must have body, media URL, or content SID');
     }
 
-    const saveMessage = async (body, result) => {
-      if (messageData._skipStorage) return;
-      if (!this.messageStorage?.saveMessage) return;
-      try {
-        await this.messageStorage.saveMessage({
-          ...messageData, 
-          body, 
-          code: formattedCode, 
-          from: formattedFrom, 
-          messageId: result.sid,
-          provider: 'twilio', 
-          timestamp: new Date(), 
-          fromMe: true,
-          processed: messageData.processed ?? false,
-          statusInfo: {
-            status: result.status?.toLowerCase() || null,
-            updatedAt: new Date()
-          }
-        });
-      } catch (err) {
-        logger.error('[TwilioProvider] Storage failed:', err);
-      }
-    };
-
-    let result;
     const kind = messageParams.contentSid ? 'template' : 'freeform';
     const chunks = messageParams.body?.length > 1600 && !messageParams.mediaUrl && !messageParams.contentSid
       ? this._splitMessageAtWordBoundaries(messageParams.body) : null;
+    const sends = chunks ? chunks.map(body => ({ ...messageParams, body })) : [messageParams];
+
+    let pending = null;
+    if (!messageData._skipStorage && this.messageStorage?.savePendingMessage) {
+      pending = await this.messageStorage.savePendingMessage({
+        ...messageData, code: formattedCode, from: formattedFrom,
+        provider: 'twilio', timestamp: new Date(), fromMe: true,
+        processed: messageData.processed ?? false
+      });
+    }
 
-    if (chunks) {
-      for (let i = 0; i < chunks.length; i++) {
-        result = await this.twilioClient.messages.create({ ...messageParams, body: chunks[i] });
-        await saveMessage(chunks[i], result);
-        await recordDeliveryAttempt({ messageData, twilioResult: result, kind });
-        if (i < chunks.length - 1) await new Promise(r => setTimeout(r, 100));
-      }
-    } else {
-      let pending = null;
-      if (!messageData._skipStorage && this.messageStorage?.savePendingMessage) {
-        pending = await this.messageStorage.savePendingMessage({
-          ...messageData, code: formattedCode, from: formattedFrom,
-          provider: 'twilio', timestamp: new Date(), fromMe: true,
-          processed: messageData.processed ?? false
-        });
-      }
-
+    let result;
+    for (let i = 0; i < sends.length; i++) {
       try {
-        result = await this.twilioClient.messages.create(messageParams);
+        result = await this.twilioClient.messages.create(sends[i]);
       } catch (twilioErr) {
         await recordDeliveryAttempt({
-          messageData, messageId: pending?._id, kind,
+          messageData, messageId: pending?._id, kind, body: sends[i].body || null,
           errorSource: 'twilio_sync',
           errorCode: twilioErr.code, errorMessage: twilioErr.message
         });
         throw twilioErr;
       }
+      await recordDeliveryAttempt({ messageData, messageId: pending?._id, twilioResult: result, kind, body: sends[i].body || null });
+      if (i < sends.length - 1) await new Promise(r => setTimeout(r, 100));
+    }
 
-      if (pending) {
-        await this.messageStorage.finalizePendingMessage(pending._id, result.sid, {
-          status: result.status?.toLowerCase() || null,
-          updatedAt: new Date()
-        });
-      }
-      await recordDeliveryAttempt({ messageData, messageId: pending?._id, twilioResult: result, kind });
+    if (pending) {
+      await this.messageStorage.finalizePendingMessage(pending._id, chunks ? null : result.sid, {
+        status: result.status?.toLowerCase() || null,
+        updatedAt: new Date()
+      });
     }
     
     return {

package/lib/helpers/deliveryAttemptHelper.js

@@ -4,7 +4,7 @@ const { Message } = require('../models/messageModel');
 const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
 
 async function recordDeliveryAttempt({
-  messageData = null, messageId = null, twilioResult = null, kind,
+  messageData = null, messageId = null, twilioResult = null, kind, body = null,
   errorSource = null, errorCode = null, errorMessage = null
 }) {
   const sid = twilioResult?.sid || null;
@@ -30,6 +30,7 @@ async function recordDeliveryAttempt({
       kind,
       twilioSid: sid,
       contentSid: messageData?.contentSid || null,
+      body,
       status,
       errorSource,
       errorCode,

package/lib/helpers/messageStatusHelper.js

@@ -4,6 +4,7 @@ const { logger } = require('../utils/logger');
 const { createEvent, safeEmit } = require('../utils/eventUtils');
 
 const { Message } = require('../models/messageModel');
+const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
 
 const { handle24HourWindowError } = require('../helpers/templateRecoveryHelper');
 const { updateDeliveryAttemptByTwilioSid } = require('../helpers/deliveryAttemptHelper');
@@ -20,7 +21,7 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
       ...(errorMessage && { 'statusInfo.errorMessage': errorMessage })
     };
 
-    const updated = await Message.findOneAndUpdate(
+    let updated = await Message.findOneAndUpdate(
       { $or: [
         { message_id: messageSid, 'statusInfo.recoveryMessageId': { $exists: false } },
         { 'statusInfo.recoveryMessageId': messageSid }
@@ -29,6 +30,17 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
       { new: true }
     );
 
+    if (!updated) {
+      const attempt = await DeliveryAttempt.findOne({ twilioSid: messageSid }, '_id messageId').lean();
+      if (attempt?.messageId) {
+        updated = await Message.findOneAndUpdate(
+          { _id: attempt.messageId },
+          { $set: updateData },
+          { new: true }
+        );
+      }
+    }
+
     if (!updated) {
       logger.warn('[MessageStatus] Message not found', { messageSid });
     }

package/lib/jobs/TemplateApprovalJob.js

@@ -148,7 +148,8 @@ class TemplateApprovalJob extends BaseJob {
       messageData: { contentSid: templateSid },
       messageId: message._id,
       twilioResult: { sid: recoveryMessageId, status: sendResult?.status },
-      kind: 'recovery_template'
+      kind: 'recovery_template',
+      body: message.body
     });
 
     provider.deleteTemplate(templateSid).catch((deleteErr) =>

package/lib/models/deliveryAttemptModel.js

@@ -17,6 +17,7 @@ const deliveryAttemptSchema = new mongoose.Schema({
   },
   twilioSid: { type: String, default: null },
   contentSid: { type: String, default: null },
+  body: { type: String, default: null },
   status: {
     type: String,
     enum: STATUS_VALUES,

package/lib/models/messageModel.js

@@ -146,7 +146,7 @@ async function insertMessage(values) {
       isNew = true;
     } else {
       const result = await Message.findOneAndUpdate(
-        { message_id: values.message_id, body: values.body },
+        { message_id: values.message_id },
         { $setOnInsert: messageData },
         { upsert: true, new: true, setDefaultsOnInsert: true, includeResultMetadata: true }
       );

package/lib/storage/MongoStorage.js

@@ -55,10 +55,10 @@ class MongoStorage {
   }
 
   async finalizePendingMessage(docId, sid, statusInfo = null) {
-    await Message.updateOne(
-      { _id: docId },
-      { $set: { message_id: sid, ...(statusInfo && { statusInfo }) } }
-    );
+    const update = { ...(sid && { message_id: sid }), ...(statusInfo && { statusInfo }) };
+    if (Object.keys(update).length) {
+      await Message.updateOne({ _id: docId }, { $set: update });
+    }
     safeEmit(getStatusEventBus(), 'message:status', createEvent('message:status', {
       messageId: String(docId),
       status: statusInfo?.status || null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",