@peopl-health/nexus 4.1.4 → 4.1.6

package/lib/adapters/TwilioProvider.js

@@ -116,7 +116,7 @@ class TwilioProvider extends MessageProvider {
       throw new Error('Message must have body, media URL, or content SID');
     }
 
-    const kind = messageParams.contentSid ? 'template' : 'freeform';
+    const kind = messageData.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];

package/lib/helpers/messageStatusHelper.js

@@ -22,10 +22,7 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
     };
 
     let updated = await Message.findOneAndUpdate(
-      { $or: [
-        { message_id: messageSid, 'statusInfo.recoveryMessageId': { $exists: false } },
-        { 'statusInfo.recoveryMessageId': messageSid }
-      ]},
+      { message_id: messageSid },
       { $set: updateData },
       { new: true }
     );
@@ -114,12 +111,7 @@ async function handleStatusCallback(twilioStatusData, { eventBus } = {}) {
 
 async function getMessageStatus(messageSid) {
   try {
-    return await Message.findOne({
-      $or: [
-        { message_id: messageSid },
-        { 'statusInfo.recoveryMessageId': messageSid }
-      ]
-    })
+    return await Message.findOne({ message_id: messageSid })
       .select('statusInfo message_id numero body')
       .lean();
   } catch (error) {

package/lib/helpers/templateRecoveryHelper.js

@@ -1,6 +1,7 @@
 const { logger } = require('../utils/logger');
 const { Message } = require('../models/messageModel');
 const { Template } = require('../templates/templateStructure');
+const { recordDeliveryAttempt } = require('./deliveryAttemptHelper');
 
 const getMessaging = () => require('../core/NexusMessaging');
 
@@ -39,10 +40,29 @@ async function handle24HourWindowError(message, messageSid) {
     const templateName = `auto_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
     const template = new Template(templateName, 'UTILITY', 'es');
     template.setBody(message.body, []);
-    const twilioContent = await template.save();
 
-    const approvalName = `${templateName}_${Date.now()}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
-    await provider.submitForApproval(twilioContent.sid, approvalName, 'UTILITY');
+    let twilioContent;
+    let setupErr = null;
+    try {
+      twilioContent = await template.save();
+      const approvalName = `${templateName}_${Date.now()}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+      await provider.submitForApproval(twilioContent.sid, approvalName, 'UTILITY');
+    } catch (err) {
+      setupErr = err;
+    }
+
+    await recordDeliveryAttempt({
+      messageId: messageDocId,
+      kind: 'recovery_template_setup',
+      body: message.body,
+      twilioResult: twilioContent?.sid ? { sid: twilioContent.sid } : null,
+      ...(setupErr && { errorSource: 'server', errorMessage: setupErr.message })
+    });
+
+    if (setupErr) {
+      logger.error('[TemplateRecovery] Setup failed', { messageSid, error: setupErr.message });
+      return;
+    }
 
     await Message.updateOne(
       { _id: messageDocId },

package/lib/jobs/TemplateApprovalJob.js

@@ -1,6 +1,5 @@
 const { logger } = require('../utils/logger');
 const { Message } = require('../models/messageModel');
-const { recordDeliveryAttempt } = require('../helpers/deliveryAttemptHelper');
 const { BaseJob } = require('./BaseJob');
 
 const QUEUE_NAME = 'template-approval';
@@ -56,7 +55,7 @@ class TemplateApprovalJob extends BaseJob {
     }
 
     const recovery = message.statusInfo || {};
-    if (recovery.recoveryMessageId || recovery.recoveryRejectedAt) {
+    if (recovery.recoverySentAt || recovery.recoveryRejectedAt) {
       logger.info('[TemplateApprovalJob] Recovery already completed', { messageId, templateSid });
       return { success: false, reason: 'already_completed' };
     }
@@ -110,17 +109,17 @@ class TemplateApprovalJob extends BaseJob {
       return { success: false, reason: 'already_claimed' };
     }
 
-    let recoveryMessageId;
     let sendResult;
     try {
       sendResult = await this.sendMessage({
         code: message.numero,
         contentSid: templateSid,
         variables: {},
-        parentMessageId: message._id
+        parentMessageId: message._id,
+        kind: 'recovery_template',
+        body: message.body
       });
-      recoveryMessageId = sendResult?.messageId;
-      if (!recoveryMessageId) {
+      if (!sendResult?.messageId) {
         throw new Error('Provider did not return a messageId for the recovery send');
       }
     } catch (sendErr) {
@@ -132,31 +131,13 @@ class TemplateApprovalJob extends BaseJob {
       throw sendErr;
     }
 
-    try {
-      await Message.updateOne(
-        { _id: message._id },
-        { $set: { 'statusInfo.recoveryMessageId': recoveryMessageId } }
-      );
-      logger.info('[TemplateApprovalJob] Recovered', { originalMessageSid, recoveryMessageId, templateSid });
-    } catch (dbErr) {
-      logger.error('[TemplateApprovalJob] CRITICAL: send succeeded but DB update failed', {
-        messageId: message._id, templateSid, recoveryMessageId, error: dbErr.message
-      });
-    }
-
-    await recordDeliveryAttempt({
-      messageData: { contentSid: templateSid },
-      messageId: message._id,
-      twilioResult: { sid: recoveryMessageId, status: sendResult?.status },
-      kind: 'recovery_template',
-      body: message.body
-    });
+    logger.info('[TemplateApprovalJob] Recovered', { originalMessageSid, recoveryMessageId: sendResult.messageId, templateSid });
 
     provider.deleteTemplate(templateSid).catch((deleteErr) =>
       logger.warn('[TemplateApprovalJob] Failed to delete template after send', { templateSid, error: deleteErr.message })
     );
 
-    return { success: true, recoveryMessageId };
+    return { success: true, recoveryMessageId: sendResult.messageId };
   }
 
   async _handleRejected({ provider, message, templateSid }) {

package/lib/models/deliveryAttemptModel.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 
-const KIND_VALUES = ['freeform', 'template', 'recovery_template'];
+const KIND_VALUES = ['freeform', 'template', 'recovery_template', 'recovery_template_setup'];
 const STATUS_VALUES = [null, 'queued', 'sending', 'sent', 'delivered', 'undelivered', 'failed', 'read'];
 const ERROR_SOURCE_VALUES = [null, 'twilio_sync', 'twilio_async', 'server'];
 

package/lib/models/messageModel.js

@@ -85,7 +85,6 @@ const messageSchema = new mongoose.Schema({
     recoveryTemplateSid: { type: String, default: null },
     recoveryStartedAt: { type: Date, default: null },
     recoverySentAt: { type: Date, default: null },
-    recoveryMessageId: { type: String, default: null },
     recoveryRejectedAt: { type: Date, default: null },
     latestDeliveryStatus: {
       type: String,
@@ -111,7 +110,6 @@ 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.index({ message_id: 1 }, { name: 'message_id_idx', sparse: true });
 
 messageSchema.index({ triggeredBy: 1, createdAt: -1 }, { name: 'triggered_by_idx', sparse: true });

package/package.json

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