@peopl-health/nexus 4.1.0 → 4.1.2

package/lib/adapters/TwilioProvider.js

@@ -136,13 +136,13 @@ class TwilioProvider extends MessageProvider {
         result = await this.twilioClient.messages.create(sends[i]);
       } catch (twilioErr) {
         await recordDeliveryAttempt({
-          messageData, messageId: pending?._id, kind,
+          messageData, messageId: pending?._id, 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 });
+      await recordDeliveryAttempt({ messageData, messageId: pending?._id, twilioResult: result, kind, body: sends[i].body || null });
       if (i < sends.length - 1) await new Promise(r => setTimeout(r, 100));
     }
 

package/lib/helpers/deliveryAttemptHelper.js

@@ -4,7 +4,7 @@ const { Message } = require('../models/messageModel');
 const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
 
 async function recordDeliveryAttempt({
-  messageData = null, messageId = null, twilioResult = null, kind,
+  messageData = null, messageId = null, twilioResult = null, kind, body = null,
   errorSource = null, errorCode = null, errorMessage = null
 }) {
   const sid = twilioResult?.sid || null;
@@ -30,6 +30,7 @@ async function recordDeliveryAttempt({
       kind,
       twilioSid: sid,
       contentSid: messageData?.contentSid || null,
+      body,
       status,
       errorSource,
       errorCode,

package/lib/jobs/TemplateApprovalJob.js

@@ -148,7 +148,8 @@ class TemplateApprovalJob extends BaseJob {
       messageData: { contentSid: templateSid },
       messageId: message._id,
       twilioResult: { sid: recoveryMessageId, status: sendResult?.status },
-      kind: 'recovery_template'
+      kind: 'recovery_template',
+      body: message.body
     });
 
     provider.deleteTemplate(templateSid).catch((deleteErr) =>

package/lib/models/deliveryAttemptModel.js

@@ -17,6 +17,7 @@ const deliveryAttemptSchema = new mongoose.Schema({
   },
   twilioSid: { type: String, default: null },
   contentSid: { type: String, default: null },
+  body: { type: String, default: null },
   status: {
     type: String,
     enum: STATUS_VALUES,

package/lib/utils/retryUtils.js

@@ -41,25 +41,21 @@ function calculateWaitTime(config, retryCount, isRateLimit = false, error = null
   return Math.ceil(Math.random() * baseWaitTime);
 }
 
+const TWILIO_RETRYABLE_CODES = new Set([20429, 20500, 20503]);
+
 function isRetryableError(error) {
   if (!error) return false;
-  
+
   const status = error?.status;
   const code = error?.code;
-  
-  if (status === 429 || code === 'rate_limit_exceeded') {
-    return true;
-  }
-  
-  if (status >= 500 && status < 600) {
-    return true;
-  }
-  
+
+  if (status === 429 || code === 'rate_limit_exceeded') return true;
+  if (status >= 500 && status < 600) return true;
+  if (typeof code === 'number' && TWILIO_RETRYABLE_CODES.has(code)) return true;
+
   const networkErrorCodes = ['ECONNRESET', 'ETIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED', 'timeout'];
-  if (networkErrorCodes.includes(code) || error?.message?.includes('timeout')) {
-    return true;
-  }
-  
+  if (networkErrorCodes.includes(code) || error?.message?.includes('timeout')) return true;
+
   return false;
 }
 
@@ -131,7 +127,9 @@ async function retryWithBackoff(operation, options = {}) {
   }
 }
 
-module.exports = { 
-  retryWithBackoff 
+module.exports = {
+  retryWithBackoff,
+  isRetryableError,
+  TWILIO_RETRYABLE_CODES
 };
 

package/package.json

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