@peopl-health/nexus 3.9.6 → 3.9.7

package/lib/adapters/TwilioProvider.js

@@ -113,6 +113,7 @@ class TwilioProvider extends MessageProvider {
     }
 
     const saveMessage = async (body, result) => {
+      if (messageData._skipStorage) return;
       if (!this.messageStorage?.saveMessage) return;
       try {
         await this.messageStorage.saveMessage({

package/lib/controllers/messageController.js

@@ -82,19 +82,21 @@ const sendMessageController = async (req, res) => {
     timeZone = 'Etc/GMT',
     hidePreview = false,
     contentSid = null,
-    variables = null
+    variables = null,
+    frontendId = null
   } = req.body || {};
 
   try {
     const finalVariables = contentSid ? await ensureFlowTokenInVariables(contentSid, variables) : variables;
-    
+
     const payload = {
       fileUrl, message, fileType, contentSid, hidePreview, variables: finalVariables,
       timeZone: timeZone || null,
       sendTime: sendTime ? moment.tz(sendTime, timeZone) + 2500 : new Date(),
       code: ensureWhatsAppFormat(code),
       author: runtimeConfig.get('USER_DB_MONGO'),
-      extraDelay: 0
+      extraDelay: 0,
+      frontendId
     };
 
     const { result, saved } = await _sendAndPersist(payload);

package/lib/helpers/messageStatusHelper.js

@@ -25,7 +25,10 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
     };
 
     const updated = await Message.findOneAndUpdate(
-      { message_id: messageSid },
+      { $or: [
+        { message_id: messageSid, 'statusInfo.recoveryMessageId': { $exists: false } },
+        { 'statusInfo.recoveryMessageId': messageSid }
+      ]},
       { $set: updateData },
       { new: true }
     );
@@ -81,7 +84,7 @@ async function handleStatusCallback(twilioStatusData) {
 
   if (updated && _eventBus) {
     safeEmit(_eventBus, 'message:status', createEvent('message:status', {
-      messageId: MessageSid,
+      messageId: updated.message_id,
       to: updated.numero,
       status: MessageStatus.toLowerCase(),
       errorCode: ErrorCode || null,
@@ -100,7 +103,12 @@ async function handleStatusCallback(twilioStatusData) {
 
 async function getMessageStatus(messageSid) {
   try {
-    return await Message.findOne({ message_id: messageSid })
+    return await Message.findOne({
+      $or: [
+        { message_id: messageSid },
+        { 'statusInfo.recoveryMessageId': messageSid }
+      ]
+    })
       .select('statusInfo message_id numero body')
       .lean();
   } catch (error) {

package/lib/helpers/templateRecoveryHelper.js

@@ -65,37 +65,40 @@ async function handle24HourWindowError(message, messageSid) {
           return;
         }
 
+        let newMessageId;
         try {
-          const sendResult = await provider.sendMessage({ code: message.numero, contentSid: twilioContent.sid, variables: {} });
-          const newMessageId = sendResult?.messageId;
+          const sendResult = await provider.sendMessage({
+            code: message.numero,
+            contentSid: twilioContent.sid,
+            variables: {},
+            _skipStorage: true
+          });
+          newMessageId = sendResult?.messageId;
           if (!newMessageId) throw new Error('Provider did not return a messageId for the recovery send');
-
+        } catch (sendErr) {
           await Message.updateOne(
             { _id: messageDocId },
-            { $set: {
-              message_id: newMessageId,
-              content_sid: twilioContent.sid,
-              'statusInfo.previousMessageId': messageSid
-            }}
+            { $unset: { 'statusInfo.recoverySentAt': '' } }
           );
+          logger.error('[TemplateRecovery] Error sending approved template', { messageSid, templateSid: twilioContent.sid, error: sendErr.message });
+          return;
+        }
 
-          const dupCleanup = await Message.deleteMany({ message_id: newMessageId, _id: { $ne: messageDocId } });
-          if (dupCleanup?.deletedCount) {
-            logger.info('[TemplateRecovery] Removed provider-created duplicate(s)', { newMessageId, deletedCount: dupCleanup.deletedCount });
-          }
-
-          logger.info('[TemplateRecovery] Recovered', { previousMessageId: messageSid, newMessageId, templateSid: twilioContent.sid });
-
-          prov.deleteTemplate(twilioContent.sid).catch(deleteErr =>
-            logger.warn('[TemplateRecovery] Failed to delete template after send', { newMessageId, templateSid: twilioContent.sid, error: deleteErr.message })
-          );
-        } catch (sendErr) {
+        try {
           await Message.updateOne(
             { _id: messageDocId },
-            { $unset: { 'statusInfo.recoverySentAt': '' } }
+            { $set: { 'statusInfo.recoveryMessageId': newMessageId } }
           );
-          logger.error('[TemplateRecovery] Error sending approved template', { messageSid, templateSid: twilioContent.sid, error: sendErr.message });
+          logger.info('[TemplateRecovery] Recovered', { originalMessageId: messageSid, recoveryMessageId: newMessageId, templateSid: twilioContent.sid });
+        } catch (dbErr) {
+          logger.error('[TemplateRecovery] CRITICAL: send succeeded but DB update failed — status tracking lost for recovery delivery', {
+            messageSid, newMessageId, templateSid: twilioContent.sid, error: dbErr.message
+          });
         }
+
+        prov.deleteTemplate(twilioContent.sid).catch(deleteErr =>
+          logger.warn('[TemplateRecovery] Failed to delete template after send', { newMessageId, templateSid: twilioContent.sid, error: deleteErr.message })
+        );
       },
       onRejected: async (prov) => {
         logger.warn('[TemplateRecovery] Template rejected', { messageSid, templateSid: twilioContent.sid });

package/lib/models/agendaMessageModel.js

@@ -15,6 +15,7 @@ const scheduledMessageSchema = new mongoose.Schema({
   timeZone: { type: String, default: 'Etc/GMT' },
   status: { type: String, default: 'pending' },
   wa_id: { type: String, default: null },
+  frontendId: { type: String, default: null },
   flowActionPayload: { type: mongoose.Schema.Types.Mixed, default: null },
   createdAt: { type: Date, default: Date.now }
 });

package/lib/models/messageModel.js

@@ -79,7 +79,8 @@ const messageSchema = new mongoose.Schema({
     updatedAt: { type: Date, default: null },
     recoveryTemplateSid: { type: String, default: null },
     recoveryStartedAt: { type: Date, default: null },
-    recoverySentAt: { type: Date, default: null }
+    recoverySentAt: { type: Date, default: null },
+    recoveryMessageId: { type: String, default: null }
   },
   prompt: { type: Object, default: null },
   response_id: { type: String, default: null }
@@ -97,6 +98,8 @@ messageSchema.index({ nombre_whatsapp: 1, createdAt: -1 }, { name: 'nombre_whats
 
 messageSchema.index({ createdAt: -1 }, { name: 'global_sort_idx' });
 
+messageSchema.index({ 'statusInfo.recoveryMessageId': 1 }, { name: 'recovery_message_id_idx', sparse: true });
+
 messageSchema.pre('save', function (next) {
   if (this.timestamp) {
     this.timestamp = moment.tz(this.timestamp, 'America/Mexico_City').toDate();

package/lib/storage/MongoStorage.js

@@ -57,7 +57,8 @@ class MongoStorage {
           origin: values.origin,
           body: values.body,
           media: values.media,
-          type: values.interactive_type ? 'interactive' : values.media ? 'media' : 'message'
+          type: values.interactive_type ? 'interactive' : values.media ? 'media' : 'message',
+          ...(messageData.frontendId && { frontendId: messageData.frontendId })
         }));
       } else {
         logger.warn('[processIncomingMessage] Skipping event emission: missing chatId or messageId', { chatId, messageId });

package/package.json

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