@peopl-health/nexus 3.3.4 → 3.3.6

package/lib/controllers/messageController.js

@@ -3,7 +3,8 @@ const { Message } = require('../models/messageModel.js');
 const { ScheduledMessage: DefaultScheduledMessage } = require('../models/agendaMessageModel.js');
 const {
   sendMessage: defaultSendMessage,
-  sendScheduledMessage: defaultSendScheduledMessage
+  sendScheduledMessage: defaultSendScheduledMessage,
+  getDefaultInstance
 } = require('../core/NexusMessaging');
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
 const { getRecordByFilter: defaultGetRecordByFilter } = require('../services/airtableService');
@@ -31,6 +32,12 @@ const ensureDependency = (res, condition, errorMessage) => {
   return false;
 };
 
+const ensureDefaultInstance = (res) => ensureDependency(
+  res,
+  Boolean(getDefaultInstance()),
+  'NexusMessaging default instance not initialized'
+);
+
 const persistScheduledMessage = async (Model, payload) => {
   if (Model && typeof Model.create === 'function') {
     return await Model.create(payload);
@@ -80,6 +87,8 @@ const sendMessageController = async (req, res) => {
   const hasScheduler = typeof dependencies.sendScheduledMessage === 'function';
   const hasDirectSend = typeof dependencies.sendMessage === 'function';
   if (!ensureDependency(res, hasScheduler || hasDirectSend, 'No messaging provider configured. Ensure Nexus.initialize() completed before using the message controllers.')) return;
+  if ((dependencies.sendMessage === defaultSendMessage || dependencies.sendScheduledMessage === defaultSendScheduledMessage)
+    && !ensureDefaultInstance(res)) return;
 
   try {
     const payload = {
@@ -136,6 +145,8 @@ const sendBulkMessageController = async (req, res) => {
   const hasScheduler = typeof dependencies.sendScheduledMessage === 'function';
   const hasDirectSend = typeof dependencies.sendMessage === 'function';
   if (!ensureDependency(res, hasScheduler || hasDirectSend, 'No messaging provider configured. Ensure Nexus.initialize() completed before using the message controllers.')) return;
+  if ((dependencies.sendMessage === defaultSendMessage || dependencies.sendScheduledMessage === defaultSendScheduledMessage)
+    && !ensureDefaultInstance(res)) return;
 
   try {
     let numSend = 0;
@@ -216,6 +227,8 @@ const sendBulkMessageAirtableController = async (req, res) => {
   const hasScheduler = typeof dependencies.sendScheduledMessage === 'function';
   const hasDirectSend = typeof dependencies.sendMessage === 'function';
   if (!ensureDependency(res, hasScheduler || hasDirectSend, 'No messaging provider configured. Ensure Nexus.initialize() completed before using the message controllers.')) return;
+  if ((dependencies.sendMessage === defaultSendMessage || dependencies.sendScheduledMessage === defaultSendScheduledMessage)
+    && !ensureDefaultInstance(res)) return;
 
   const airtableFetcher = dependencies.getRecordByFilter;
   if (!ensureDependency(res, typeof airtableFetcher === 'function', 'Airtable getRecordByFilter not configured. Call configureMessageController() to inject it.')) return;

package/lib/core/NexusMessaging.js

@@ -45,6 +45,7 @@ class NexusMessaging {
     this.processingLocks = new Map(); // Per-chat locks to prevent parallel processing
     this.activeRequests = new Map(); // Track active AI requests per chat
     this.abandonedRuns = new Set(); // Track runs that should be ignored
+    this.typingIntervals = new Map(); // Track active typing intervals per chat
     this.batchingConfig = {
       enabled: config.messageBatching?.enabled ?? true,
       abortOnNewMessage: config.messageBatching?.abortOnNewMessage ?? true,
@@ -667,8 +668,6 @@ class NexusMessaging {
    * Handle message with check-after strategy - process immediately, check for new messages after
    */
   async _handleWithCheckAfter(chatId) {
-    const typingInterval = await this._startTypingRefresh(chatId);
-    
     if (this.processingLocks.has(chatId)) {
       logger.info(`[CheckAfter] Already processing ${chatId}, new message will be included`);
       
@@ -680,6 +679,11 @@ class NexusMessaging {
         if (this.batchingConfig.immediateRestart) {
           this.processingLocks.delete(chatId);
           this.activeRequests.delete(chatId);
+          const existingTypingInterval = this.typingIntervals.get(chatId);
+          if (existingTypingInterval) {
+            clearInterval(existingTypingInterval);
+            this.typingIntervals.delete(chatId);
+          }
           
           logger.info(`[CheckAfter] Starting immediate reprocessing for ${chatId}`);
           await this._processWithLock(chatId, null);
@@ -688,6 +692,7 @@ class NexusMessaging {
       return;
     }
 
+    const typingInterval = await this._startTypingRefresh(chatId);
     await this._processWithLock(chatId, typingInterval);
   }
 
@@ -697,13 +702,20 @@ class NexusMessaging {
   async _processWithLock(chatId, existingTypingInterval = null) {
     this.processingLocks.set(chatId, true);
     let typingInterval = existingTypingInterval;
+    if (typingInterval) {
+      this.typingIntervals.set(chatId, typingInterval);
+    }
     
     const runId = `run_${Date.now()}_${Math.random().toString(36).substring(7)}`;
     this.activeRequests.set(chatId, runId);
 
     try {
       if (!typingInterval) {
+        // Keep typing intervals scoped to the active processing run to avoid leaks on restarts.
         typingInterval = await this._startTypingRefresh(chatId);
+        if (typingInterval) {
+          this.typingIntervals.set(chatId, typingInterval);
+        }
       }
       
       const startTime = Date.now();
@@ -755,6 +767,7 @@ class NexusMessaging {
       if (typingInterval) {
         clearInterval(typingInterval);
         typingInterval = null;
+        this.typingIntervals.delete(chatId);
         await new Promise(resolve => setTimeout(resolve, 100));
       }
 
@@ -775,7 +788,10 @@ class NexusMessaging {
     } catch (error) {
       logger.error('[CheckAfter] Error processing messages:', { chatId, error: error.message });
     } finally {
-      if (typingInterval) clearInterval(typingInterval);
+      if (typingInterval) {
+        clearInterval(typingInterval);
+      }
+      this.typingIntervals.delete(chatId);
       if (this.activeRequests.get(chatId) === runId) {
         this.processingLocks.delete(chatId);
         this.activeRequests.delete(chatId);
@@ -886,12 +902,19 @@ const setDefaultInstance = (instance) => {
 
 const getDefaultInstance = () => defaultInstance;
 
+const requireDefaultInstance = () => {
+  if (!defaultInstance) {
+    throw new Error('NexusMessaging default instance not initialized');
+  }
+  return defaultInstance;
+};
+
 const sendMessage = async (messageData) => {
-  return await defaultInstance.sendMessage(messageData);
+  return await requireDefaultInstance().sendMessage(messageData);
 };
 
 const sendScheduledMessage = async (scheduledMessage) => {
-  return await defaultInstance.sendScheduledMessage(scheduledMessage);
+  return await requireDefaultInstance().sendScheduledMessage(scheduledMessage);
 };
 
 module.exports = { 

package/package.json

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