@peopl-health/nexus 3.2.12 → 3.3.1-fix

package/lib/config/mongoConfig.js

@@ -0,0 +1,61 @@
+const mongoose = require('mongoose');
+const { logger } = require('../utils/logger');
+
+let connection = null;
+const databases = new Map();
+const modelDatabases = {};
+
+function setModelDatabase(modelName, dbName) {
+  modelDatabases[modelName] = dbName;
+}
+
+function setModelDatabases(mapping) {
+  Object.assign(modelDatabases, mapping);
+  logger.info('[mongoConfig] Model databases configured', { mapping });
+}
+
+function getModelDatabase(modelName) {
+  return modelDatabases[modelName] || null;
+}
+
+async function connect(uri = process.env.MONGODB_URI) {
+  if (connection || mongoose.connection.readyState === 1) {
+    connection = mongoose.connection;
+    return connection;
+  }
+  if (!uri) throw new Error('MongoDB URI required. Set MONGODB_URI or pass uri parameter.');
+  await mongoose.connect(uri);
+  connection = mongoose.connection;
+  logger.info('MongoDB connected');
+  return connection;
+}
+
+function getDb(dbName) {
+  if (!connection && mongoose.connection.readyState !== 1) throw new Error('MongoDB not connected');
+  connection = connection || mongoose.connection;
+  if (!dbName) return connection;
+  if (!databases.has(dbName)) {
+    databases.set(dbName, connection.useDb(dbName, { useCache: true }));
+  }
+  return databases.get(dbName);
+}
+
+function getConnection() {
+  return connection || mongoose.connection;
+}
+
+async function disconnect() {
+  if (mongoose.connection.readyState !== 0) await mongoose.disconnect();
+  databases.clear();
+  connection = null;
+}
+
+module.exports = { 
+  connect, 
+  disconnect, 
+  getDb, 
+  getConnection, 
+  setModelDatabase, 
+  setModelDatabases, 
+  getModelDatabase 
+};

package/lib/controllers/interactionController.js

@@ -1,4 +1,4 @@
-const { Interaction } = require('../models/interactionModel');
+const { getInteraction } = require('../models/interactionModel');
 const { Message } = require('../models/messageModel');
 const { INTERACTION_QUALITY_VALUES } = require('../config/interactionConfig');
 const { addRecord, getRecordByFilter } = require('../services/airtableService');
@@ -50,7 +50,7 @@ const addInteractionController = async (req, res) => {
     if (!quality || !INTERACTION_QUALITY_VALUES.includes(quality)) {
       return res.status(400).json({ success: false, error: `Quality must be one of: ${INTERACTION_QUALITY_VALUES.join(', ')}` });
     }
-    const interaction = await Interaction.create({ messages, whatsapp_id, voter_username, quality, description });
+    const interaction = await getInteraction().create({ messages, whatsapp_id, voter_username, quality, description });
     
     logInteractionToAirtable(messages, whatsapp_id, voter_username, description).catch(err => 
       logger.error('Background Airtable logging failed:', err)
@@ -66,7 +66,7 @@ const addInteractionController = async (req, res) => {
 const getInteractionsByWhatsappIdController = async (req, res) => {
   try {
     const { whatsapp_id } = req.params;
-    const interactions = await Interaction.find({ whatsapp_id }).populate('messages').sort({ createdAt: -1 });
+    const interactions = await getInteraction().find({ whatsapp_id }).populate('messages').sort({ createdAt: -1 });
     res.status(200).json({ success: true, whatsappId: whatsapp_id, count: interactions.length, interactions });
   } catch (error) {
     logger.error('Error fetching interactions:', error);

package/lib/controllers/qualityMessageController.js

@@ -1,4 +1,4 @@
-const { QualityMessage } = require('../models/qualityMessageModel');
+const { getQualityMessage } = require('../models/qualityMessageModel');
 const { Message } = require('../models/messageModel');
 const { logger } = require('../utils/logger');
 
@@ -15,7 +15,7 @@ const addQualityVoteController = async (req, res) => {
     const message = await Message.findById(message_id);
     if (!message) return res.status(404).json({ success: false, error: 'Message not found' });
 
-    const qualityVote = await QualityMessage.findOneAndUpdate(
+    const qualityVote = await getQualityMessage().findOneAndUpdate(
       { message_id, voter_username },
       { quality, notes, context },
       { upsert: true, new: true }
@@ -31,7 +31,7 @@ const addQualityVoteController = async (req, res) => {
 const getQualityVotesByMessageController = async (req, res) => {
   try {
     const { message_id } = req.params;
-    const votes = await QualityMessage.find({ message_id }).sort({ createdAt: -1 });
+    const votes = await getQualityMessage().find({ message_id }).sort({ createdAt: -1 });
     
     const summary = {
       total: votes.length,
@@ -50,7 +50,7 @@ const getQualityVotesByMessageController = async (req, res) => {
 const getQualityVotesByVoterController = async (req, res) => {
   try {
     const { voter_username } = req.params;
-    const votes = await QualityMessage.find({ voter_username }).populate('message_id').sort({ createdAt: -1 });
+    const votes = await getQualityMessage().find({ voter_username }).populate('message_id').sort({ createdAt: -1 });
     res.status(200).json({ success: true, voterUsername: voter_username, count: votes.length, votes });
   } catch (error) {
     logger.error('Error fetching voter quality votes:', error);
@@ -61,7 +61,7 @@ const getQualityVotesByVoterController = async (req, res) => {
 const getQualityVoteByMessageAndVoterController = async (req, res) => {
   try {
     const { message_id, voter_username } = req.params;
-    const vote = await QualityMessage.findOne({ message_id, voter_username }).populate('message_id');
+    const vote = await getQualityMessage().findOne({ message_id, voter_username }).populate('message_id');
     
     if (!vote) {
       return res.status(404).json({ success: false, error: 'Vote not found' });

package/lib/core/NexusMessaging.js

@@ -8,7 +8,7 @@ const { hasPreprocessingHandler, invokePreprocessingHandler } = require('../serv
 const { ensureThreadExists } = require('../helpers/threadHelper');
 const { logger } = require('../utils/logger');
 
-const mongoose = require('mongoose');
+const { connect } = require('../config/mongoConfig');
 const OpenAI = require('openai');
 const EventEmitter = require('events');
 
@@ -60,13 +60,8 @@ class NexusMessaging {
    * @param {string} mongoUri - MongoDB connection string
    */
   async initializeMongoDB(mongoUri = process.env.MONGODB_URI) {
-    if (!mongoUri) {
-      throw new Error('MongoDB URI not provided. Please set MONGODB_URI environment variable or pass mongoUri parameter.');
-    }
-
     try {
-      await mongoose.connect(mongoUri);
-      this.mongodb = mongoose.connection;
+      this.mongodb = await connect(mongoUri);
       logger.info('MongoDB connected successfully');
     } catch (error) {
       logger.error('MongoDB connection failed', { error: error.message });

package/lib/index.js

@@ -28,6 +28,7 @@ const {
   getRequestId
 } = require('./middleware/requestId');
 const { logger } = require('./utils/logger');
+const { setModelDatabases, setModelDatabase, getModelDatabase } = require('./config/mongoConfig');
 
 /**
  * Main Nexus class that orchestrates all components
@@ -347,5 +348,9 @@ module.exports = {
   // Request tracing
   requestIdMiddleware,
   getRequestId,
-  logger
+  logger,
+  // MongoDB config
+  setModelDatabases,
+  setModelDatabase,
+  getModelDatabase
 };

package/lib/models/index.js

@@ -1,13 +1,15 @@
 const { Message, getMessageValues, formatTimestamp } = require('./messageModel');
 const { Thread } = require('./threadModel');
-const { Interaction } = require('./interactionModel');
-const { QualityMessage } = require('./qualityMessageModel');
+const { getInteraction } = require('./interactionModel');
+const { getQualityMessage } = require('./qualityMessageModel');
+const { getPredictionMetrics } = require('./predictionMetricsModel');
 
 module.exports = {
   Message,
   Thread,
-  Interaction,
-  QualityMessage,
+  getInteraction,
+  getQualityMessage,
+  getPredictionMetrics,
   getMessageValues,
   formatTimestamp
 };

package/lib/models/interactionModel.js

@@ -1,5 +1,7 @@
 const mongoose = require('mongoose');
 const { INTERACTION_QUALITY_VALUES } = require('../config/interactionConfig');
+const { getDb, getModelDatabase } = require('../config/mongoConfig');
+const { logger } = require('../utils/logger');
 
 const interactionSchema = new mongoose.Schema({
   messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message', required: true }],
@@ -10,9 +12,15 @@ const interactionSchema = new mongoose.Schema({
     enum: INTERACTION_QUALITY_VALUES, 
     required: true 
   },
-  description: { type: String, default: null }
+  description: { type: String, default: null },
+  source: { type: String, default: () => process.env.USER_DB_MONGO }
 }, { timestamps: true });
 
-const Interaction = mongoose.model('Interaction', interactionSchema);
+const getInteraction = () => {
+  const dbName = getModelDatabase('Interaction');
+  const db = dbName ? getDb(dbName) : mongoose;
+  logger.debug('[Interaction] Using database', { dbName: dbName || 'default' });
+  return db.models.Interaction || db.model('Interaction', interactionSchema);
+};
 
-module.exports = { Interaction, interactionSchema };
+module.exports = { getInteraction, interactionSchema };

package/lib/models/predictionMetricsModel.js

@@ -1,4 +1,6 @@
 const mongoose = require('mongoose');
+const { getDb, getModelDatabase } = require('../config/mongoConfig');
+const { logger } = require('../utils/logger');
 
 const predictionMetricsSchema = new mongoose.Schema({
   message_id: { type: String, required: true, index: true },
@@ -9,13 +11,19 @@ const predictionMetricsSchema = new mongoose.Schema({
   retry_count: { type: Number, default: 1 },
   completed: { type: Boolean, default: true },
   error: { type: String, default: null },
-  timing_breakdown: { type: Object, default: {} }
+  timing_breakdown: { type: Object, default: {} },
+  source: { type: String, default: () => process.env.USER_DB_MONGO }
 }, { timestamps: true });
 
 predictionMetricsSchema.index({ createdAt: -1 });
 predictionMetricsSchema.index({ assistant_id: 1, createdAt: -1 });
 predictionMetricsSchema.index({ numero: 1, createdAt: -1 });
 
-const PredictionMetrics = mongoose.model('PredictionMetrics', predictionMetricsSchema);
+const getPredictionMetrics = () => {
+  const dbName = getModelDatabase('PredictionMetrics');
+  const db = dbName ? getDb(dbName) : mongoose;
+  logger.debug('[PredictionMetrics] Using database', { dbName: dbName || 'default' });
+  return db.models.PredictionMetrics || db.model('PredictionMetrics', predictionMetricsSchema);
+};
 
-module.exports = { PredictionMetrics, predictionMetricsSchema };
+module.exports = { getPredictionMetrics, predictionMetricsSchema };

package/lib/models/qualityMessageModel.js

@@ -1,4 +1,6 @@
 const mongoose = require('mongoose');
+const { getDb, getModelDatabase } = require('../config/mongoConfig');
+const { logger } = require('../utils/logger');
 
 const qualityMessageSchema = new mongoose.Schema({
   message_id: { type: mongoose.Schema.Types.ObjectId, ref: 'Message', required: true, index: true },
@@ -9,11 +11,17 @@ const qualityMessageSchema = new mongoose.Schema({
     required: true 
   },
   notes: { type: String, default: null },
-  context: { type: String, default: null }
+  context: { type: String, default: null },
+  source: { type: String, default: () => process.env.USER_DB_MONGO }
 }, { timestamps: true });
 
 qualityMessageSchema.index({ message_id: 1, voter_username: 1 }, { unique: true });
 
-const QualityMessage = mongoose.model('QualityMessage', qualityMessageSchema);
+const getQualityMessage = () => {
+  const dbName = getModelDatabase('QualityMessage');
+  const db = dbName ? getDb(dbName) : mongoose;
+  logger.debug('[QualityMessage] Using database', { dbName: dbName || 'default' });
+  return db.models.QualityMessage || db.model('QualityMessage', qualityMessageSchema);
+};
 
-module.exports = { QualityMessage, qualityMessageSchema };
+module.exports = { getQualityMessage, qualityMessageSchema };

package/lib/services/assistantServiceCore.js

@@ -3,7 +3,7 @@ const runtimeConfig = require('../config/runtimeConfig');
 const { createProvider } = require('../providers/createProvider');
 
 const { Thread } = require('../models/threadModel.js');
-const { PredictionMetrics } = require('../models/predictionMetricsModel');
+const { getPredictionMetrics } = require('../models/predictionMetricsModel');
 const { insertMessage } = require('../models/messageModel');
 const { Historial_Clinico_ID } = require('../config/airtableConfig');
 
@@ -267,7 +267,7 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
         has_breakdown: !!timings.process_messages_breakdown
       });
       
-      await PredictionMetrics.create({
+      await getPredictionMetrics().create({
         message_id: `${code}-${Date.now()}`,
         numero: code,
         assistant_id: finalThread.getAssistantId(),

package/lib/storage/MongoStorage.js

@@ -1,8 +1,7 @@
-const mongoose = require('mongoose');
+const { connect: mongoConnect, disconnect: mongoDisconnect, getDb } = require('../config/mongoConfig');
 const runtimeConfig = require('../config/runtimeConfig');
 
 const { Message, insertMessage } = require('../models/messageModel');
-const { Interaction } = require('../models/interactionModel');
 const { Thread } = require('../models/threadModel');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
@@ -18,7 +17,6 @@ class MongoStorage {
     this.dbName = config.dbName;
     this.collections = config.collections || {
       messages: 'messages',
-      interactions: 'interactions',
       threads: 'threads'
     };
     this.schemas = this.createSchemas();
@@ -27,21 +25,13 @@ class MongoStorage {
   createSchemas() {
     return {
       Message,
-      Interaction,
       Thread
     };
   }
 
   async connect() {
-    try {
-      await mongoose.connect(this.mongoUri, {
-        useNewUrlParser: true,
-        useUnifiedTopology: true
-      });
-      logger.info('MongoDB connected successfully');
-    } catch (error) {
-      throw new Error(`MongoDB connection failed: ${error.message}`);
-    }
+    await mongoConnect(this.mongoUri);
+    if (this.dbName) this.db = getDb(this.dbName);
   }
 
   async saveMessage(messageData) {
@@ -222,10 +212,7 @@ class MongoStorage {
   }
 
   async disconnect() {
-    await mongoose.disconnect();
-    if (this.client) {
-      await this.client.close();
-    }
+    await mongoDisconnect();
   }
 }
 

package/package.json

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