@peopl-health/nexus 3.15.7 → 3.16.1

package/lib/adapters/TwilioProvider.js

@@ -15,6 +15,7 @@ const { ScheduledMessage } = require('../models/agendaMessageModel');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
 const { uploadMediaToS3, getFileExtension } = require('../helpers/mediaHelper');
+const { recordDeliveryAttempt } = require('../helpers/deliveryAttemptHelper');
 
 const { MessageProvider } = require('../adapters/MessageProvider');
 const { TwilioMessageAdapter } = require('./messageAdapters/TwilioMessageAdapter');
@@ -140,18 +141,21 @@ class TwilioProvider extends MessageProvider {
     };
 
     let result;
+    const kind = messageParams.contentSid ? 'template' : 'freeform';
     const chunks = messageParams.body?.length > 1600 && !messageParams.mediaUrl && !messageParams.contentSid
       ? this._splitMessageAtWordBoundaries(messageParams.body) : null;
-    
+
     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 {
       result = await this.twilioClient.messages.create(messageParams);
       await saveMessage(messageParams.body || messageData.body, result);
+      await recordDeliveryAttempt({ messageData, twilioResult: result, kind });
     }
     
     return {

package/lib/helpers/deliveryAttemptHelper.js

@@ -0,0 +1,46 @@
+const { logger } = require('../utils/logger');
+
+const { Message } = require('../models/messageModel');
+const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
+
+async function recordDeliveryAttempt({ messageData, twilioResult, kind }) {
+  if (messageData?._skipStorage) return null;
+  if (!twilioResult?.sid) return null;
+
+  try {
+    const msgDoc = await Message.findOne({ message_id: twilioResult.sid }, '_id').lean();
+    if (!msgDoc) {
+      logger.warn('[deliveryAttemptHelper] Message not found for SID; skipping attempt record', {
+        twilioSid: twilioResult.sid
+      });
+      return null;
+    }
+
+    const status = twilioResult.status?.toLowerCase() || 'sent';
+
+    const attempt = await DeliveryAttempt.create({
+      messageId: msgDoc._id,
+      kind,
+      twilioSid: twilioResult.sid,
+      contentSid: messageData?.contentSid || null,
+      status,
+      completedAt: new Date()
+    });
+
+    await Message.updateOne(
+      { _id: msgDoc._id },
+      { $set: { 'statusInfo.latestDeliveryStatus': status } }
+    );
+
+    return attempt;
+  } catch (error) {
+    logger.error('[deliveryAttemptHelper] Failed to record delivery attempt', {
+      twilioSid: twilioResult?.sid,
+      kind,
+      error: error.message
+    });
+    return null;
+  }
+}
+
+module.exports = { recordDeliveryAttempt };

package/lib/helpers/messageStatusHelper.js

@@ -13,6 +13,7 @@ async function updateMessageStatus(messageSid, status, errorCode = null, errorMe
   try {
     const updateData = {
       'statusInfo.status': status,
+      'statusInfo.latestDeliveryStatus': status,
       'statusInfo.updatedAt': new Date(),
       ...(errorCode && { 'statusInfo.errorCode': errorCode }),
       ...(errorMessage && { 'statusInfo.errorMessage': errorMessage })

package/lib/models/deliveryAttemptModel.js

@@ -0,0 +1,41 @@
+const mongoose = require('mongoose');
+
+const KIND_VALUES = ['freeform', 'template', 'recovery_template'];
+const STATUS_VALUES = [null, 'queued', 'sending', 'sent', 'delivered', 'undelivered', 'failed', 'read'];
+
+const deliveryAttemptSchema = new mongoose.Schema({
+  messageId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Message',
+    required: true
+  },
+  kind: {
+    type: String,
+    enum: KIND_VALUES,
+    required: true
+  },
+  twilioSid: { type: String, default: null },
+  contentSid: { type: String, default: null },
+  status: {
+    type: String,
+    enum: STATUS_VALUES,
+    default: null
+  },
+  errorCode: { type: String, default: null },
+  errorMessage: { type: String, default: null },
+  attemptedAt: { type: Date, default: Date.now, required: true },
+  completedAt: { type: Date, default: null },
+  raw: { type: mongoose.Schema.Types.Mixed, default: null }
+}, { timestamps: true });
+
+deliveryAttemptSchema.index({ messageId: 1, attemptedAt: 1 }, { name: 'message_attempt_history_idx' });
+deliveryAttemptSchema.index({ kind: 1, status: 1, attemptedAt: -1 }, { name: 'analytics_idx' });
+deliveryAttemptSchema.index({ twilioSid: 1 }, { name: 'twilio_sid_idx', sparse: true });
+
+const DeliveryAttempt = mongoose.model('DeliveryAttempt', deliveryAttemptSchema);
+
+module.exports = {
+  DeliveryAttempt,
+  DELIVERY_ATTEMPT_KINDS: KIND_VALUES,
+  DELIVERY_ATTEMPT_STATUSES: STATUS_VALUES
+};

package/lib/models/messageModel.js

@@ -8,6 +8,7 @@ const { logger } = require('../utils/logger');
 const { getClinicalContext } = require('../helpers/patientInformationHelper');
 
 const { updateRecordByFilter } = require('../services/airtableService');
+const { DELIVERY_ATTEMPT_STATUSES } = require('./deliveryAttemptModel');
 
 const { Thread } = require('./threadModel');
 
@@ -75,7 +76,7 @@ const messageSchema = new mongoose.Schema({
   statusInfo: {
     status: {
       type: String,
-      enum: ['queued', 'sending', 'sent', 'delivered', 'undelivered', 'failed', 'read', null],
+      enum: DELIVERY_ATTEMPT_STATUSES,
       default: null
     },
     errorCode: { type: String, default: null },
@@ -85,7 +86,12 @@ const messageSchema = new mongoose.Schema({
     recoveryStartedAt: { type: Date, default: null },
     recoverySentAt: { type: Date, default: null },
     recoveryMessageId: { type: String, default: null },
-    recoveryRejectedAt: { type: Date, default: null }
+    recoveryRejectedAt: { type: Date, default: null },
+    latestDeliveryStatus: {
+      type: String,
+      enum: DELIVERY_ATTEMPT_STATUSES,
+      default: null
+    }
   },
   prompt: { type: Object, default: null },
   preset: { type: Object, default: null },
@@ -106,6 +112,7 @@ 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": "3.15.7",
+  "version": "3.16.1",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",