@peopl-health/nexus 3.15.3 → 3.15.5

package/lib/controllers/bugReportController.js

@@ -8,11 +8,12 @@ const { getBug, VALID_SEVERITIES } = require('../models/bugModel');
 
 const { addRecord, getRecordByFilter } = require('../services/airtableService');
 
-async function logBugReportToAirtable(reporter, whatsapp_id, description, severity, messageIds = [], server) {
+async function logBugReportToAirtable(reportedBug) {
+  const { reporter, whatsapp_id, description, severity, messages, server, bugType, project } = reportedBug;
   try {
     let conversation = null;
-    if (messageIds?.length) {
-      const msgs = await Message.find({ _id: { $in: messageIds } }).sort({ createdAt: 1 });
+    if (messages?.length) {
+      const msgs = await Message.find({ _id: { $in: messages } }).sort({ createdAt: 1 });
       conversation = msgs.map(msg => {
         const timestamp = new Date(msg.timestamp).toISOString().slice(0, 16).replace('T', ' ');
         const role = msg.from_me ? 'Assistant' : 'Patient';
@@ -28,13 +29,15 @@ async function logBugReportToAirtable(reporter, whatsapp_id, description, severi
       logger.warn('Could not find patient in estado_general:', { error: err.message });
     }
 
-    await addRecord(Logging_ID, 'bug_reports', {
-      reporter, description, severity,
+    const bugRecord = await addRecord(Logging_ID, 'bug_reports', {
+      reporter, description, severity, bugType,
+      ...(project && {...project}),
       ...(patientId && { patient_id: [patientId] }),
       ...(conversation && { conversation }),
       server
     });
     logger.debug('Bug report logged to Airtable successfully');
+    reportedBug.recordId = bugRecord.id;
   } catch (error) {
     logger.error('Error logging bug report to Airtable:', { error: error.message });
   }
@@ -42,7 +45,7 @@ async function logBugReportToAirtable(reporter, whatsapp_id, description, severi
 
 const reportBugController = async (req, res) => {
   try {
-    const { reporter, whatsapp_id, description, severity, messages } = req.body;
+    const { reporter, whatsapp_id, description, severity, messages, bugType, project } = req.body;
 
     if (!reporter) return res.status(400).json({ success: false, error: 'Reporter username is required' });
     if (!whatsapp_id) return res.status(400).json({ success: false, error: 'WhatsApp ID is required' });
@@ -52,12 +55,23 @@ const reportBugController = async (req, res) => {
 
     const server = runtimeConfig.get('SERVICE_NAME');
 
-    const Bug = getBug();
-    const bug = await Bug.create({ reporter, whatsapp_id, description, severity, messages: messages || [] , server});
+    const reportedBug = {
+      reporter, whatsapp_id, description, severity,
+      messages: messages || [],
+      server,
+      recordId: null,
+      bugType: bugType || 'other',
+      ...(project && { project })
+    };
 
-    logBugReportToAirtable(reporter, whatsapp_id, description, severity, messages, server).catch(err =>
-      logger.error('Background bug report logging failed:', { error: err.message })
-    );
+    try {
+      await logBugReportToAirtable(reportedBug);
+    } catch (error) {
+      logger.error('Error logging bug report to Airtable:', { error: error.message });
+    }
+
+    const Bug = getBug();
+    const bug = await Bug.create(reportedBug);
 
     res.status(201).json({ success: true, message: 'Bug report submitted successfully', bug });
   } catch (error) {

package/lib/core/NexusMessaging.js

@@ -22,6 +22,7 @@ const { ProcessingPipeline } = require('../core/ProcessingPipeline');
 const { AssistantProcessor } = require('../core/AssistantProcessor');
 
 const { createQueueAdapter } = require('../queue');
+const { ScheduledMessageJob } = require('../jobs/ScheduledMessageJob');
 
 /**
  * Core messaging orchestrator for providers, storage, and assistant processing.
@@ -77,6 +78,11 @@ class NexusMessaging {
       sendMessage: this.sendMessage.bind(this),
       storeRunMetrics,
     });
+
+    this.scheduledMessageJob = new ScheduledMessageJob({
+      queueAdapter: this.queueAdapter,
+      sendMessage: this.sendMessage.bind(this)
+    });
   }
 
   async initialize(options = {}) {
@@ -257,10 +263,16 @@ class NexusMessaging {
   }
 
   async sendScheduledMessage(scheduledMessage) {
-    if (!this.provider) {
-      throw new Error('No provider initialized');
+    if (!scheduledMessage?._id) {
+      throw new Error('sendScheduledMessage requires a persisted ScheduledMessage with _id');
     }
-    return await this.provider.sendScheduledMessage(scheduledMessage);
+    if (!scheduledMessage?.sendTime) {
+      throw new Error('sendScheduledMessage requires sendTime');
+    }
+    return await this.scheduledMessageJob.schedule({
+      scheduledMessageId: scheduledMessage._id,
+      sendTime: scheduledMessage.sendTime
+    });
   }
 
   /*

package/lib/jobs/ScheduledMessageJob.js

@@ -1,4 +1,5 @@
 const { logger } = require('../utils/logger');
+const { ScheduledMessage } = require('../models/agendaMessageModel');
 const { BaseJob } = require('./BaseJob');
 
 const QUEUE_NAME = 'scheduled-messages';
@@ -10,9 +11,15 @@ const DEFAULT_JOB_OPTIONS = {
   removeOnFail: 50
 };
 
+const TERMINAL_STATUSES = ['sent', 'cancelled'];
+
 class ScheduledMessageJob extends BaseJob {
-  constructor({ queueAdapter } = {}) {
+  constructor({ queueAdapter, sendMessage } = {}) {
     super({ queueAdapter, queueName: QUEUE_NAME });
+    if (typeof sendMessage !== 'function') {
+      throw new Error('ScheduledMessageJob requires a sendMessage function');
+    }
+    this.sendMessage = sendMessage;
   }
 
   async schedule({ scheduledMessageId, sendTime }) {
@@ -47,9 +54,66 @@ class ScheduledMessageJob extends BaseJob {
     return `scheduled-msg-${scheduledMessageId}`;
   }
 
-  async _process(data) {
-    logger.warn('[ScheduledMessageJob] Processor stub invoked; real implementation pending', data);
-    return { success: false, reason: 'not_implemented' };
+  async _process({ scheduledMessageId }) {
+    const msg = await ScheduledMessage.findById(scheduledMessageId);
+
+    if (!msg) {
+      logger.warn('[ScheduledMessageJob] Scheduled message not found', { scheduledMessageId });
+      return { success: false, reason: 'not_found' };
+    }
+
+    if (TERMINAL_STATUSES.includes(msg.status)) {
+      logger.info('[ScheduledMessageJob] Already processed', { scheduledMessageId, status: msg.status });
+      return { success: false, reason: 'already_processed', status: msg.status };
+    }
+
+    const claim = await ScheduledMessage.updateOne(
+      { _id: scheduledMessageId, status: { $nin: TERMINAL_STATUSES.concat(['sending']) } },
+      { $set: { status: 'sending', sendingAt: new Date() } }
+    );
+    if (!claim.modifiedCount && !claim.nModified) {
+      logger.info('[ScheduledMessageJob] Send already claimed by another worker', { scheduledMessageId });
+      return { success: false, reason: 'already_claimed' };
+    }
+
+    try {
+      const result = await this.sendMessage({
+        code: msg.code,
+        body: msg.message,
+        fileUrl: msg.fileUrl,
+        fileType: msg.fileType,
+        contentSid: msg.contentSid,
+        variables: msg.variables,
+        hidePreview: msg.hidePreview
+      });
+
+      const messageId = result?.messageId || result?.sid || null;
+
+      await ScheduledMessage.updateOne(
+        { _id: scheduledMessageId },
+        { $set: { status: 'sent', sentAt: new Date(), wa_id: messageId } }
+      );
+
+      logger.info('[ScheduledMessageJob] Sent', { scheduledMessageId, messageId });
+
+      return { success: true, messageId };
+    } catch (error) {
+      await ScheduledMessage.updateOne(
+        { _id: scheduledMessageId },
+        {
+          $set: {
+            status: 'failed',
+            failedAt: new Date(),
+            errorCode: error?.code || null,
+            errorMessage: error?.message || null
+          }
+        }
+      );
+
+      logger.error('[ScheduledMessageJob] Send failed', { scheduledMessageId, error: error.message });
+
+      throw error;
+    }
   }
 }
 

package/package.json

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