@peopl-health/nexus 3.4.1 → 3.5.0

package/lib/core/AssistantProcessor.js

@@ -14,8 +14,12 @@ class AssistantProcessor {
 
   async process({ code, body = null, runOptions = {} }) {
     if (!code) throw new Error('code is required for assistant processing');
-    if (this.mode === 'queue') return await this._processViaQueue({ code, body, runOptions });
-    return await this._processLocal({ code, body, runOptions });
+
+    const result = (this.mode === 'queue')
+      ? await this._processViaQueue({ code, body, runOptions })
+      : await this._processLocal({ code, body, runOptions });
+
+    return result;
   }
 
   async _processLocal({ code, body = null, runOptions = {} }) {

package/lib/core/NexusMessaging.js

@@ -5,10 +5,12 @@ const llmConfigModule = require('../config/llmConfig');
 const { connect } = require('../config/mongoConfig');
 
 const { logger } = require('../utils/logger');
+const { createEvent, safeEmit } = require('../utils/eventUtils');
 
 const { Message, getMessageValues, insertMessage } = require('../models/messageModel');
 const { Thread } = require('../models/threadModel');
 
+const { setEventBus: setStatusEventBus } = require('../helpers/messageStatusHelper');
 const { ensureThreadExists } = require('../helpers/threadHelper');
 const { enrichMessageWithTwilioMedia } = require('../helpers/twilioMediaHelper');
 const { convertTwilioToInternalFormat } = require('../helpers/twilioHelper');
@@ -43,6 +45,7 @@ class NexusMessaging {
       onFlow: null
     };
     this.events = new EventEmitter();
+    setStatusEventBus(this.events);
     this.middleware = {
       any: [],
       message: [],
@@ -192,7 +195,6 @@ class NexusMessaging {
   }
 
   async _handleWithPipeline(type, handlerKey, messageData, fallback) {
-    this.events.emit(`${type}:received`, messageData);
     const result = await this._runPipeline(type, messageData, async (ctx) => {
       const handler = this.handlers[handlerKey];
       if (handler) {
@@ -202,7 +204,6 @@ class NexusMessaging {
         return await fallback(ctx);
       }
     });
-    this.events.emit(`${type}:handled`, messageData);
     return result;
   }
 
@@ -274,6 +275,19 @@ class NexusMessaging {
     }
 
     const chatId = messageData.from || messageData.From;
+    const messageId = messageData.id || messageData.message_id;
+
+    if (chatId && messageId) {
+      safeEmit(this.events, 'message:new', createEvent('message:new', {
+        messageId,
+        from: chatId,
+        body: messageData.body || messageData.message || '',
+        media: messageData.media || null,
+        type: messageData.interactive ? 'interactive' : messageData.media ? 'media' : 'message'
+      }));
+    } else {
+      logger.warn('[processIncomingMessage] Skipping event emission: missing chatId or messageId', { chatId, messageId });
+    }
 
     if (chatId) {
       ensureThreadExists(chatId);
@@ -423,6 +437,8 @@ class NexusMessaging {
   async disconnect() {
     if (this.provider) await this.provider.disconnect();
     if (this.queueAdapter) await this.queueAdapter.shutdown();
+    this.events.removeAllListeners();
+    setStatusEventBus(null);
   }
 }
 

package/lib/helpers/messageStatusHelper.js

@@ -1,9 +1,16 @@
 const { logger } = require('../utils/logger');
+const { createEvent, safeEmit } = require('../utils/eventUtils');
 
 const { Message } = require('../models/messageModel');
 
 const { handle24HourWindowError } = require('../helpers/templateRecoveryHelper');
 
+let _eventBus = null;
+
+function setEventBus(eventBus) {
+  _eventBus = eventBus;
+}
+
 async function updateMessageStatus(messageSid, status, errorCode = null, errorMessage = null) {
   try {
     const updateData = {
@@ -40,6 +47,16 @@ async function handleStatusCallback(twilioStatusData) {
 
   const updated = await updateMessageStatus(MessageSid, MessageStatus.toLowerCase(), ErrorCode, ErrorMessage);
 
+  if (updated && _eventBus) {
+    safeEmit(_eventBus, 'message:status', createEvent('message:status', {
+      messageId: MessageSid,
+      to: updated.numero,
+      status: MessageStatus.toLowerCase(),
+      errorCode: ErrorCode || null,
+      errorMessage: ErrorMessage || null
+    }));
+  }
+
   if ((ErrorCode === 63016 || ErrorCode === '63016') && updated) {
     handle24HourWindowError(updated, MessageSid).catch(err => 
       logger.error('[MessageStatus] Recovery error', { messageSid: MessageSid, error: err.message })
@@ -63,5 +80,6 @@ async function getMessageStatus(messageSid) {
 module.exports = {
   updateMessageStatus,
   handleStatusCallback,
-  getMessageStatus
+  getMessageStatus,
+  setEventBus
 };

package/lib/helpers/templateRecoveryHelper.js

@@ -66,6 +66,12 @@ async function handle24HourWindowError(message, messageSid) {
             try {
               await sendMessage({ code: message.numero, contentSid: twilioContent.sid, variables: {} });
               logger.info('[TemplateRecovery] Template sent', { messageSid, templateSid: twilioContent.sid });
+              try {
+                await provider.deleteTemplate(twilioContent.sid);
+                logger.info('[TemplateRecovery] Template deleted', { messageSid, templateSid: twilioContent.sid });
+              } catch (deleteErr) {
+                logger.warn('[TemplateRecovery] Failed to delete template after send', { messageSid, templateSid: twilioContent.sid, error: deleteErr.message });
+              }
             } catch (sendErr) {
               await Message.updateOne(
                 { message_id: messageSid },
@@ -75,6 +81,12 @@ async function handle24HourWindowError(message, messageSid) {
             }
           } else if (approvalStatus === 'REJECTED') {
             logger.warn('[TemplateRecovery] Template rejected', { messageSid, templateSid: twilioContent.sid });
+            try {
+              await provider.deleteTemplate(twilioContent.sid);
+              logger.info('[TemplateRecovery] Rejected template deleted', { messageSid, templateSid: twilioContent.sid });
+            } catch (deleteErr) {
+              logger.warn('[TemplateRecovery] Failed to delete rejected template', { messageSid, templateSid: twilioContent.sid, error: deleteErr.message });
+            }
           } else {
             checkApproval(attempt + 1);
           }

package/lib/index.d.ts

@@ -161,6 +161,36 @@ declare module '@peopl-health/nexus' {
     setReplies(replies: any): void;
   }
 
+  // Event Types
+  export interface NexusEventEnvelope<T = any> {
+    event: string;
+    timestamp: number;
+    data: T;
+  }
+
+  export interface MessageNewEventData {
+    messageId: string;
+    from: string;
+    body: string;
+    media: any | null;
+    type: 'message' | 'interactive' | 'media';
+  }
+
+  export interface MessageStatusEventData {
+    messageId: string;
+    to: string;
+    status: 'queued' | 'sending' | 'sent' | 'delivered' | 'undelivered' | 'failed' | 'read';
+    errorCode: string | null;
+    errorMessage: string | null;
+  }
+
+  export interface NexusEventMap {
+    'message:new': NexusEventEnvelope<MessageNewEventData>;
+    'message:status': NexusEventEnvelope<MessageStatusEventData>;
+  }
+
+  export type NexusEventName = keyof NexusEventMap;
+
   // Core Classes
   export abstract class MessageProvider {
     constructor(config: any);
@@ -212,6 +242,9 @@ declare module '@peopl-health/nexus' {
     sendMessage(messageData: MessageData): Promise<any>;
     sendScheduledMessage(scheduledMessage: ScheduledMessage): Promise<void>;
     processIncomingMessage(messageData: MessageData): Promise<any>;
+    getEventBus(): import('events').EventEmitter;
+    getBatchingManager(): BatchingManager;
+    getAssistantProcessor(): AssistantProcessor;
     isConnected(): boolean;
     disconnect(): Promise<void>;
   }

package/lib/utils/eventUtils.js

@@ -0,0 +1,15 @@
+const { logger } = require('./logger');
+
+function createEvent(event, data) {
+  return { event, timestamp: Date.now(), data };
+}
+
+function safeEmit(emitter, event, payload) {
+  try {
+    emitter.emit(event, payload);
+  } catch (err) {
+    logger.error('[EventBus] Listener error', { event, error: err.message });
+  }
+}
+
+module.exports = { createEvent, safeEmit };

package/package.json

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