@peopl-health/nexus 4.1.2 → 4.1.4

package/lib/adapters/TwilioProvider.js

@@ -121,13 +121,14 @@ class TwilioProvider extends MessageProvider {
       ? 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({
+    let parentId = messageData.parentMessageId || null;
+    if (!parentId && this.messageStorage?.savePendingMessage) {
+      const pending = await this.messageStorage.savePendingMessage({
         ...messageData, code: formattedCode, from: formattedFrom,
         provider: 'twilio', timestamp: new Date(), fromMe: true,
         processed: messageData.processed ?? false
       });
+      parentId = pending?._id || null;
     }
 
     let result;
@@ -136,18 +137,18 @@ class TwilioProvider extends MessageProvider {
         result = await this.twilioClient.messages.create(sends[i]);
       } catch (twilioErr) {
         await recordDeliveryAttempt({
-          messageData, messageId: pending?._id, kind, body: sends[i].body || null,
+          messageData, messageId: parentId, 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 });
+      await recordDeliveryAttempt({ messageData, messageId: parentId, 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, chunks ? null : result.sid, {
+    if (parentId && this.messageStorage?.finalizePendingMessage) {
+      await this.messageStorage.finalizePendingMessage(parentId, chunks ? null : result.sid, {
         status: result.status?.toLowerCase() || null,
         updatedAt: new Date()
       });

package/lib/core/NexusMessaging.js

@@ -82,7 +82,8 @@ class NexusMessaging {
 
     this.scheduledMessageJob = new ScheduledMessageJob({
       queueAdapter: this.queueAdapter,
-      sendMessage: this.sendMessage.bind(this)
+      sendMessage: this.sendMessage.bind(this),
+      requireMessageStorage: () => this.messageStorage
     });
 
     this.templateApprovalJob = new TemplateApprovalJob({

package/lib/helpers/deliveryAttemptHelper.js

@@ -12,7 +12,6 @@ async function recordDeliveryAttempt({
 
   let targetId = messageId;
   if (!targetId) {
-    if (messageData?._skipStorage) return null;
     if (!sid) return null;
     const msgDoc = await Message.findOne({ message_id: sid }, '_id').lean();
     if (!msgDoc) {

package/lib/jobs/ScheduledMessageJob.js

@@ -1,4 +1,5 @@
 const { logger } = require('../utils/logger');
+const { isRetryableError } = require('../utils/retryUtils');
 const { ScheduledMessage } = require('../models/agendaMessageModel');
 const { BaseJob } = require('./BaseJob');
 
@@ -15,12 +16,13 @@ const TERMINAL_STATUSES = ['sent', 'cancelled'];
 const STALE_SENDING_MS = 5 * 60 * 1000;
 
 class ScheduledMessageJob extends BaseJob {
-  constructor({ queueAdapter, sendMessage } = {}) {
+  constructor({ queueAdapter, sendMessage, requireMessageStorage = null } = {}) {
     super({ queueAdapter, queueName: QUEUE_NAME });
     if (typeof sendMessage !== 'function') {
       throw new Error('ScheduledMessageJob requires a sendMessage function');
     }
     this.sendMessage = sendMessage;
+    this.requireMessageStorage = requireMessageStorage;
   }
 
   async schedule({ scheduledMessageId, sendTime }) {
@@ -90,6 +92,23 @@ class ScheduledMessageJob extends BaseJob {
       });
     }
 
+    let parentMessageId = msg.parentMessageId || null;
+    if (!parentMessageId) {
+      const storage = this.requireMessageStorage?.();
+      if (storage?.savePendingMessage) {
+        const parent = await storage.savePendingMessage({
+          code: msg.code, body: msg.message, fileUrl: msg.fileUrl, fileType: msg.fileType,
+          contentSid: msg.contentSid, variables: msg.variables,
+          fromMe: true, processed: true,
+          frontendId: msg.frontendId, triggeredBy: msg.triggeredBy
+        });
+        parentMessageId = parent?._id || null;
+        if (parentMessageId) {
+          await ScheduledMessage.updateOne({ _id: scheduledMessageId }, { $set: { parentMessageId } });
+        }
+      }
+    }
+
     try {
       const result = await this.sendMessage({
         code: msg.code,
@@ -98,7 +117,8 @@ class ScheduledMessageJob extends BaseJob {
         fileType: msg.fileType,
         contentSid: msg.contentSid,
         variables: msg.variables,
-        hidePreview: msg.hidePreview
+        hidePreview: msg.hidePreview,
+        parentMessageId
       });
 
       const messageId = result?.messageId || result?.sid || null;
@@ -112,21 +132,23 @@ class ScheduledMessageJob extends BaseJob {
 
       return { success: true, messageId };
     } catch (error) {
+      const retryable = isRetryableError(error);
       await ScheduledMessage.updateOne(
         { _id: scheduledMessageId },
         {
           $set: {
-            status: 'failed',
-            failedAt: new Date(),
+            status: retryable ? 'pending' : 'failed',
+            failedAt: retryable ? null : new Date(),
             errorCode: error?.code || null,
             errorMessage: error?.message || null
           }
         }
       );
 
-      logger.error('[ScheduledMessageJob] Send failed', { scheduledMessageId, error: error.message });
+      logger.error('[ScheduledMessageJob] Send failed', { scheduledMessageId, retryable, error: error.message });
 
-      throw error;
+      if (retryable) throw error;
+      return { success: false, reason: 'non_retryable', error: error.message };
     }
   }
 }

package/lib/jobs/TemplateApprovalJob.js

@@ -117,7 +117,7 @@ class TemplateApprovalJob extends BaseJob {
         code: message.numero,
         contentSid: templateSid,
         variables: {},
-        _skipStorage: true
+        parentMessageId: message._id
       });
       recoveryMessageId = sendResult?.messageId;
       if (!recoveryMessageId) {

package/lib/models/agendaMessageModel.js

@@ -17,6 +17,7 @@ const scheduledMessageSchema = new mongoose.Schema({
   frontendId: { type: String, default: null },
   flowActionPayload: { type: mongoose.Schema.Types.Mixed, default: null },
   triggeredBy: { type: String, default: null },
+  parentMessageId: { type: mongoose.Schema.Types.ObjectId, ref: 'Message', default: null },
   createdAt: { type: Date, default: Date.now }
 });
 

package/lib/storage/MongoStorage.js

@@ -55,9 +55,18 @@ class MongoStorage {
   }
 
   async finalizePendingMessage(docId, sid, statusInfo = null) {
-    const update = { ...(sid && { message_id: sid }), ...(statusInfo && { statusInfo }) };
-    if (Object.keys(update).length) {
-      await Message.updateOne({ _id: docId }, { $set: update });
+    const set = {};
+    if (statusInfo) {
+      for (const [k, v] of Object.entries(statusInfo)) set[`statusInfo.${k}`] = v;
+    }
+    if (Object.keys(set).length) {
+      await Message.updateOne({ _id: docId }, { $set: set });
+    }
+    if (sid) {
+      await Message.updateOne(
+        { _id: docId, message_id: null },
+        { $set: { message_id: sid } }
+      );
     }
     safeEmit(getStatusEventBus(), 'message:status', createEvent('message:status', {
       messageId: String(docId),

package/package.json

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