@peopl-health/nexus 4.1.5 → 4.1.7

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/deliveryAttemptHelper.js

@@ -1,7 +1,7 @@
 const { logger } = require('../utils/logger');
 
 const { Message } = require('../models/messageModel');
-const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
+const { DeliveryAttempt, DELIVERY_ATTEMPT_TERMINAL_STATUSES } = require('../models/deliveryAttemptModel');
 
 async function recordDeliveryAttempt({
   messageData = null, messageId = null, twilioResult = null, kind, body = null,
@@ -61,7 +61,7 @@ async function updateDeliveryAttemptByTwilioSid(twilioSid, { status, errorCode =
       ...(errorMessage != null && { errorMessage })
     };
     const attempt = await DeliveryAttempt.findOneAndUpdate(
-      { twilioSid },
+      { twilioSid, status: { $nin: DELIVERY_ATTEMPT_TERMINAL_STATUSES } },
       { $set: update },
       { new: true }
     );

package/lib/helpers/messageStatusHelper.js

@@ -4,7 +4,7 @@ const { logger } = require('../utils/logger');
 const { createEvent, safeEmit } = require('../utils/eventUtils');
 
 const { Message } = require('../models/messageModel');
-const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
+const { DeliveryAttempt, DELIVERY_ATTEMPT_TERMINAL_STATUSES } = require('../models/deliveryAttemptModel');
 
 const { handle24HourWindowError } = require('../helpers/templateRecoveryHelper');
 const { updateDeliveryAttemptByTwilioSid } = require('../helpers/deliveryAttemptHelper');
@@ -21,8 +21,10 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
       ...(errorMessage && { 'statusInfo.errorMessage': errorMessage })
     };
 
+    const notTerminal = { 'statusInfo.status': { $nin: DELIVERY_ATTEMPT_TERMINAL_STATUSES } };
+
     let updated = await Message.findOneAndUpdate(
-      { message_id: messageSid },
+      { message_id: messageSid, ...notTerminal },
       { $set: updateData },
       { new: true }
     );
@@ -31,7 +33,7 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
       const attempt = await DeliveryAttempt.findOne({ twilioSid: messageSid }, '_id messageId').lean();
       if (attempt?.messageId) {
         updated = await Message.findOneAndUpdate(
-          { _id: attempt.messageId },
+          { _id: attempt.messageId, ...notTerminal },
           { $set: updateData },
           { new: true }
         );

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';
@@ -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,21 +131,13 @@ class TemplateApprovalJob extends BaseJob {
       throw sendErr;
     }
 
-    logger.info('[TemplateApprovalJob] Recovered', { originalMessageSid, recoveryMessageId, templateSid });
-
-    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,7 +1,8 @@
 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 TERMINAL_STATUS_VALUES = ['delivered', 'read', 'failed', 'undelivered'];
 const ERROR_SOURCE_VALUES = [null, 'twilio_sync', 'twilio_async', 'server'];
 
 const deliveryAttemptSchema = new mongoose.Schema({
@@ -45,5 +46,6 @@ module.exports = {
   DeliveryAttempt,
   DELIVERY_ATTEMPT_KINDS: KIND_VALUES,
   DELIVERY_ATTEMPT_STATUSES: STATUS_VALUES,
+  DELIVERY_ATTEMPT_TERMINAL_STATUSES: TERMINAL_STATUS_VALUES,
   DELIVERY_ATTEMPT_ERROR_SOURCES: ERROR_SOURCE_VALUES
 };

package/package.json

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