@peopl-health/nexus 6.3.2 → 6.3.3

package/lib/adapters/TwilioProvider.js

@@ -10,6 +10,7 @@ const {
 const { isBenchMode } = require('../utils/benchModeHelper');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
+const { templateMediaOf } = require('../helpers/mediaHelper');
 const { recordDeliveryAttempt } = require('../helpers/deliveryAttemptHelper');
 const { blockedSendResult, isOutboundAllowed, lastDigits } = require('../helpers/outboundAllowlistHelper');
 
@@ -301,6 +302,10 @@ class TwilioProvider extends MessageProvider {
   }
 
   async renderTemplate(contentSid, variables) {
+    return (await this.renderTemplateContent(contentSid, variables))?.body ?? null;
+  }
+
+  async renderTemplateContent(contentSid, variables) {
     try {
       if (!contentSid) return null;
 
@@ -311,18 +316,21 @@ class TwilioProvider extends MessageProvider {
         return null;
       }
 
+      const [mediaUrl] = template.types['twilio/media']?.media || template.types['twilio/card']?.media || [];
+      const media = mediaUrl ? templateMediaOf(this._renderTemplateWithVariables(mediaUrl, variables)) : null;
+
       let textContent = this._extractTextFromTemplate(template);
 
       if (!textContent) {
         logger.warn('[TwilioProvider] No text content found in template:', contentSid);
-        return null;
+        return { body: null, media };
       }
 
       if (variables && Object.keys(variables).length > 0) {
-        return this._renderTemplateWithVariables(textContent, variables);
+        return { body: this._renderTemplateWithVariables(textContent, variables), media };
       }
 
-      return textContent.trim();
+      return { body: textContent.trim(), media };
     } catch (error) {
       logger.error('[TwilioProvider] Error rendering template:', error.message);
       return null;
@@ -356,7 +364,11 @@ class TwilioProvider extends MessageProvider {
     }
     
     if (types['twilio/flows']) return types['twilio/flows'].body || '';
-    if (types['twilio/media']) return types['twilio/media'].caption || '';
+    if (types['twilio/media']) return types['twilio/media'].body || '';
+    if (types['twilio/card']) {
+      const card = types['twilio/card'];
+      return [card.title, card.body, card.subtitle].filter(Boolean).join('\n\n');
+    }
     
     const fallback = Object.values(types).find(t => t?.body);
     return fallback?.body || '';

package/lib/controllers/mediaController.js

@@ -2,13 +2,7 @@ const { downloadFileFromS3 } = require('../config/awsConfig');
 const runtimeConfig = require('../config/runtimeConfig');
 
 const { logger } = require('../utils/logger');
-
-const MIME_MAP = {
-  jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', webp: 'image/webp',
-  pdf: 'application/pdf',
-  mp3: 'audio/mp3', wav: 'audio/wav', ogg: 'audio/ogg', m4a: 'audio/m4a',
-  mp4: 'video/mp4', webm: 'video/webm', '3gp': 'video/3gp'
-};
+const { EXTENSION_MIME_TYPES } = require('../utils/mediaValidator');
 
 const getMediaController = async (req, res) => {
   const bucketName = runtimeConfig.get('AWS_S3_BUCKET_NAME');
@@ -48,7 +42,7 @@ const getMediaController = async (req, res) => {
     let contentType = fileData.ContentType || 'application/octet-stream';
     if (contentType === 'application/octet-stream') {
       const ext = mediaKey.split('.').pop().toLowerCase();
-      contentType = MIME_MAP[ext] || contentType;
+      contentType = EXTENSION_MIME_TYPES[ext] || contentType;
     }
         
     res.setHeader('Cache-Control', 'public, max-age=86400');

package/lib/core/NexusMessaging.js

@@ -187,8 +187,7 @@ class NexusMessaging {
 
     this.scheduledMessageJob = new ScheduledMessageJob({
       queueAdapter: this.queueAdapter,
-      sendMessage: this.sendMessage.bind(this),
-      requireProvider: () => this.getProvider()
+      sendMessage: this.sendMessage.bind(this)
     });
 
     this.templateApprovalJob = new TemplateApprovalJob({
@@ -433,9 +432,13 @@ class NexusMessaging {
 
     if (messageData.fileUrl && this._providerStores) await prepareMessageMedia(messageData);
 
-    if (messageData.contentSid && !messageData.body && this.provider.renderTemplate) {
-      const rendered = await this.provider.renderTemplate(messageData.contentSid, messageData.variables);
-      if (rendered) messageData.body = rendered;
+    const storesTemplateMedia = Boolean(messageData.contentSid && !messageData.fileUrl && !messageData.parentMessageId && this.provider.renderTemplateContent);
+    if (messageData.contentSid && (!messageData.body || storesTemplateMedia)) {
+      const content = this.provider.renderTemplateContent
+        ? await this.provider.renderTemplateContent(messageData.contentSid, messageData.variables)
+        : { body: await this.provider.renderTemplate?.(messageData.contentSid, messageData.variables) };
+      if (!messageData.body && content?.body) messageData.body = content.body;
+      if (storesTemplateMedia && content?.media) messageData.media = { ...content.media, caption: messageData.body || '' };
     }
 
     if (this._needsTemplateRoute(messageData) && !(await isWithin24HourWindow(messageData.code, { contactCode: messageData.contactCode }))) {

package/lib/helpers/mediaHelper.js

@@ -8,8 +8,9 @@ const { uploadBufferToS3, generatePresignedUrl } = require('../config/awsConfig'
 const runtimeConfig = require('../config/runtimeConfig');
 
 const { sanitizeMediaFilename } = require('../utils/sanitizerUtils.js');
-const { validateMedia, getMediaType, MEDIA_LIMITS, STICKER_DIMENSIONS } = require('../utils/mediaValidator');
+const { validateMedia, getMediaType, EXTENSION_MIME_TYPES, MEDIA_LIMITS, STICKER_DIMENSIONS } = require('../utils/mediaValidator');
 const { logger } = require('../utils/logger');
+const { ownS3Location } = require('../utils/s3Utils');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
 
@@ -177,9 +178,18 @@ function getFileExtension(contentType) {
   return mimeToExt[contentType] || 'bin';
 }
 
+function templateMediaOf(mediaUrl) {
+  const location = ownS3Location(mediaUrl);
+  if (!location?.key) return null;
+  const fileName = path.basename(location.key);
+  const contentType = EXTENSION_MIME_TYPES[path.extname(fileName).slice(1)] || 'application/octet-stream';
+  return { ...location, contentType, mediaType: getMediaType(contentType), fileName };
+}
+
 module.exports = {
   uploadMediaToS3,
   saveMediaToLocal,
   prepareMessageMedia,
-  getFileExtension
+  getFileExtension,
+  templateMediaOf
 };

package/lib/jobs/ScheduledMessageJob.js

@@ -23,13 +23,12 @@ const CANCELLED_SEND_MESSAGES = {
 };
 
 class ScheduledMessageJob extends BaseJob {
-  constructor({ queueAdapter, sendMessage, requireProvider = null } = {}) {
+  constructor({ queueAdapter, sendMessage } = {}) {
     super({ queueAdapter, queueName: QUEUE_NAME });
     if (typeof sendMessage !== 'function') {
       throw new Error('ScheduledMessageJob requires a sendMessage function');
     }
     this.sendMessage = sendMessage;
-    this.requireProvider = requireProvider;
   }
 
   async schedule({ scheduledMessageId, sendTime }) {
@@ -101,11 +100,6 @@ class ScheduledMessageJob extends BaseJob {
 
     try {
       const parentMessageId = msg.parentMessageId || null;
-      if (!parentMessageId && msg.contentSid && !msg.message) {
-        const provider = this.requireProvider?.();
-        const rendered = await provider?.renderTemplate?.(msg.contentSid, msg.variables);
-        if (rendered) msg.message = rendered;
-      }
 
       const result = await this.sendMessage({
         code: msg.code,

package/lib/services/officeAssistantService.js

@@ -1,9 +1,9 @@
 const { Estado_General_ID, Monitoreo_ID } = require('../config/airtableConfig');
-const runtimeConfig = require('../config/runtimeConfig');
 
 const { httpError, requiredText } = require('../utils/httpErrorUtils');
 const { inlineOf } = require('../utils/coercionUtils');
 const { escapeRegExp } = require('../utils/textMatchUtils');
+const { ownS3Location } = require('../utils/s3Utils');
 const { logger } = require('../utils/logger');
 const { PATIENT_CODE, redactDirectIdentifiers } = require('../utils/sanitizerUtils');
 const { OfficeReadMarker } = require('../models/officeReadMarkerModel');
@@ -194,20 +194,14 @@ async function readOfficeMessages({ requestedBy, code, limit }) {
 
 function officeDocumentUrl(fileUrl) {
   if (!fileUrl) return null;
-  const bucketName = runtimeConfig.get('AWS_S3_BUCKET_NAME');
   let url = null;
   try {
     url = new URL(String(fileUrl));
   } catch {
     url = null;
   }
-  // The approved document template pins the S3 host and takes the rest of the URL as a variable. A bucket name
-  // with dots (whatsapp.prod) is presigned path-style, so the bucket is then the first path segment.
-  const bucket = escapeRegExp(bucketName ?? '');
-  const isVirtualHosted = new RegExp(`^${bucket}\\.s3(\\.[a-z0-9-]+)?\\.amazonaws\\.com$`).test(url?.hostname ?? '');
-  const isPathStyle = /^s3(\.[a-z0-9-]+)?\.amazonaws\.com$/.test(url?.hostname ?? '')
-    && url.pathname.startsWith(`/${bucketName}/`);
-  if (!bucketName || url?.protocol !== 'https:' || !(isVirtualHosted || isPathStyle)) {
+  // The approved document template pins the S3 host and takes the rest of the URL as a variable.
+  if (!ownS3Location(url)) {
     throw httpError(400, 'The document must be uploaded before it is sent');
   }
   return url;

package/lib/utils/mediaValidator.js

@@ -57,6 +57,13 @@ function validateMediaFormat(contentType, mediaType) {
   };
 }
 
+const EXTENSION_MIME_TYPES = {
+  jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', webp: 'image/webp',
+  pdf: 'application/pdf',
+  mp3: 'audio/mp3', wav: 'audio/wav', ogg: 'audio/ogg', m4a: 'audio/m4a',
+  mp4: 'video/mp4', webm: 'video/webm', '3gp': 'video/3gp'
+};
+
 function getMediaType(contentType) {
   for (const [type, formats] of Object.entries(ALLOWED_FORMATS)) {
     if (formats.includes(contentType)) {
@@ -95,6 +102,7 @@ module.exports = {
   validateMediaSize,
   validateMediaFormat,
   getMediaType,
+  EXTENSION_MIME_TYPES,
   MEDIA_LIMITS,
   ALLOWED_FORMATS,
   STICKER_DIMENSIONS

package/lib/utils/s3Utils.js

@@ -0,0 +1,32 @@
+const runtimeConfig = require('../config/runtimeConfig');
+
+const { escapeRegExp } = require('./textMatchUtils');
+
+function decodedKey(rawKey) {
+  try {
+    return decodeURIComponent(rawKey);
+  } catch {
+    return rawKey;
+  }
+}
+
+// A dotted bucket name is presigned path-style, so the bucket is then the first path segment.
+function ownS3Location(value) {
+  let url = value;
+  try {
+    if (!(value instanceof URL)) url = new URL(String(value));
+  } catch {
+    return null;
+  }
+  const bucketName = runtimeConfig.get('AWS_S3_BUCKET_NAME');
+  if (!bucketName || url.protocol !== 'https:') return null;
+  if (new RegExp(`^${escapeRegExp(bucketName)}\\.s3(\\.[a-z0-9-]+)?\\.amazonaws\\.com$`).test(url.hostname)) {
+    return { bucketName, key: decodedKey(url.pathname.slice(1)) };
+  }
+  if (/^s3(\.[a-z0-9-]+)?\.amazonaws\.com$/.test(url.hostname) && url.pathname.startsWith(`/${bucketName}/`)) {
+    return { bucketName, key: decodedKey(url.pathname.slice(bucketName.length + 2)) };
+  }
+  return null;
+}
+
+module.exports = { ownS3Location };

package/package.json

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