@peopl-health/nexus 4.2.15 → 4.3.0

package/lib/adapters/TwilioProvider.js

@@ -75,11 +75,6 @@ class TwilioProvider extends MessageProvider {
     }
 
     if (contentSid) {
-      const renderedMessage = await this.renderTemplate(contentSid, variables);
-      if (renderedMessage) {
-        messageData.body = renderedMessage;
-      }
-      
       messageParams.contentSid = contentSid;
       if (variables && Object.keys(variables).length > 0) {
         const formattedVariables = {};
@@ -144,7 +139,7 @@ class TwilioProvider extends MessageProvider {
       provider: 'twilio',
       status: result.status,
       result,
-      finalize: { sid: chunks ? null : result.sid, status: result.status?.toLowerCase() || null, body: contentSid ? messageData.body : null }
+      finalize: { sid: chunks ? null : result.sid, status: result.status?.toLowerCase() || null }
     };
   }
 

package/lib/core/NexusMessaging.js

@@ -85,7 +85,8 @@ class NexusMessaging {
     this.scheduledMessageJob = new ScheduledMessageJob({
       queueAdapter: this.queueAdapter,
       sendMessage: this.sendMessage.bind(this),
-      requireMessageStorage: () => this.messageStorage
+      requireMessageStorage: () => this.messageStorage,
+      requireProvider: () => this.getProvider()
     });
 
     this.templateApprovalJob = new TemplateApprovalJob({
@@ -237,6 +238,11 @@ class NexusMessaging {
 
     if (messageData._fromConversationReply) messageData.processed = true;
 
+    if (messageData.contentSid && !messageData.body && this.provider.renderTemplate) {
+      const rendered = await this.provider.renderTemplate(messageData.contentSid, messageData.variables);
+      if (rendered) messageData.body = rendered;
+    }
+
     if (this._needsTemplateRoute(messageData) && !(await isWithin24HourWindow(messageData.code))) {
       const parent = messageData.parentMessageId
         ? await Message.findById(messageData.parentMessageId)
@@ -267,7 +273,7 @@ class NexusMessaging {
       await this.messageStorage.finalizePendingMessage(parentId, result.finalize.sid, {
         status: result.finalize.status,
         updatedAt: new Date()
-      }, { body: result.finalize.body });
+      });
     }
 
     if (this.messageStorage && !providerStores) {

package/lib/jobs/ScheduledMessageJob.js

@@ -16,13 +16,14 @@ const TERMINAL_STATUSES = ['sent', 'cancelled'];
 const STALE_SENDING_MS = 5 * 60 * 1000;
 
 class ScheduledMessageJob extends BaseJob {
-  constructor({ queueAdapter, sendMessage, requireMessageStorage = null } = {}) {
+  constructor({ queueAdapter, sendMessage, requireMessageStorage = null, requireProvider = null } = {}) {
     super({ queueAdapter, queueName: QUEUE_NAME });
     if (typeof sendMessage !== 'function') {
       throw new Error('ScheduledMessageJob requires a sendMessage function');
     }
     this.sendMessage = sendMessage;
     this.requireMessageStorage = requireMessageStorage;
+    this.requireProvider = requireProvider;
   }
 
   async schedule({ scheduledMessageId, sendTime }) {
@@ -95,6 +96,11 @@ class ScheduledMessageJob extends BaseJob {
     try {
       let parentMessageId = msg.parentMessageId || null;
       if (!parentMessageId) {
+        if (msg.contentSid && !msg.message) {
+          const provider = this.requireProvider?.();
+          const rendered = await provider?.renderTemplate?.(msg.contentSid, msg.variables);
+          if (rendered) msg.message = rendered;
+        }
         const storage = this.requireMessageStorage?.();
         if (storage?.savePendingMessage) {
           const parent = await storage.savePendingMessage({

package/lib/storage/MongoStorage.js

@@ -57,12 +57,11 @@ class MongoStorage {
     return doc;
   }
 
-  async finalizePendingMessage(docId, sid, statusInfo = null, extras = null) {
+  async finalizePendingMessage(docId, sid, statusInfo = null) {
     const set = {};
     if (statusInfo) {
       for (const [k, v] of Object.entries(statusInfo)) set[`statusInfo.${k}`] = v;
     }
-    if (extras?.body) set.body = extras.body;
     if (Object.keys(set).length) {
       await Message.updateOne({ _id: docId }, { $set: set });
     }

package/package.json

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