Merge branch 'master-COLLAUDO' into features-2604/tts-coll1

Author: JohnnyUB

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    // Usare IntelliSense per informazioni sui possibili attributi.
+    // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.
+    // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+    {
+        "name": "Attach",
+        "port": 9229,
+        "request": "attach",
+        "skipFiles": [
+            "<node_internals>/**"
+        ],
+        "type": "node"
+    },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Avvia programma",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/www"
+        }
+    ]
+}

CHANGELOG.md

@@ -58,7 +58,7 @@
 - Added migration script to add the contact field in request object improving the search by phone number
 
 # 2.15.2
-- Updated GitHub actions
+- Updated GitHub actionsm
 
 # 2.15.1
 - Updated whatsapp-connector to 1.0.24

Dockerfile-en

@@ -11,12 +11,14 @@ WORKDIR /usr/src/app
 ARG NPM_TOKEN
 ARG VOICE_TOKEN
 ARG VOICE_TWILIO_TOKEN
+ARG VOICE_ENGHOUSE_TOKEN
 
 COPY .npmrc_ .npmrc
 
 # Set environment variable based on build argument
 ENV VOICE_TOKEN=${VOICE_TOKEN}
 ENV VOICE_TWILIO_TOKEN=${VOICE_TWILIO_TOKEN}
+ENV VOICE_ENGHOUSE_TOKEN=${VOICE_ENGHOUSE_TOKEN}
 
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied

app.js

@@ -69,6 +69,7 @@ winston.info("DB AutoIndex: " + autoIndex);
 let useUnifiedTopology = process.env.MONGOOSE_UNIFIED_TOPOLOGY === 'true';
 winston.info("DB useUnifiedTopology: ", useUnifiedTopology, typeof useUnifiedTopology);
 
+
 var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoIndex": autoIndex, "useUnifiedTopology": useUnifiedTopology }, function(err) {
   if (err) { 
     winston.error('Failed to connect to MongoDB on ' + databaseUri + " ", err);
@@ -77,11 +78,13 @@ var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoI
   winston.info("Mongoose connection done on host: "+mongoose.connection.host + " on port: " + mongoose.connection.port + " with name: "+ mongoose.connection.name)// , mongoose.connection.db);
 });
 if (process.env.MONGOOSE_DEBUG==="true") {
+  winston.info("Mongoose log enabled");
   mongoose.set('debug', true);
 }
 mongoose.set('useFindAndModify', false); // https://mongoosejs.com/docs/deprecations.html#-findandmodify-
 mongoose.set('useCreateIndex', true);
 //mongoose.set('useUnifiedTopology', false); 
+//mongoose.set('useUnifiedTopology', useUnifiedTopology); 
 
 // CONNECT REDIS - CHECK IT
 const { TdCache } = require('./utils/TdCache');
@@ -93,6 +96,9 @@ let tdCache = new TdCache({
 
 tdCache.connect();
 
+var cacheManager = require('./utils/cacheManager');
+cacheManager.setClient(tdCache);
+
 // ROUTES DECLARATION
 var troubleshooting = require('./routes/troubleshooting');
 var auth = require('./routes/auth');
@@ -149,8 +155,11 @@ var property = require('./routes/property');
 var segment = require('./routes/segment');
 var webhook = require('./routes/webhook');
 var webhooks = require('./routes/webhooks');
+var roles = require('./routes/roles');
 var copilot = require('./routes/copilot');
 var mcp = require('./routes/mcp');
+var scheduler = require('./routes/scheduledJobs');
+var voice = require('./routes/voice');
 
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
@@ -265,6 +274,7 @@ app.set('chatbot_service', new ChatbotService())
 app.set('redis_client', tdCache);
 app.set('quote_manager', qm);
 app.set('rate_manager', rm);
+app.set('trust proxy', true);
 
 // TODO DELETE IT IN THE NEXT RELEASE
 if (process.env.ENABLE_ALTERNATIVE_CORS_MIDDLEWARE === "true") {  
@@ -347,32 +357,38 @@ if (process.env.DISABLE_SESSION_STRATEGY==true ||  process.env.DISABLE_SESSION_S
       // redisClient.connect().catch(console.error)
 
       let cacheClient = undefined;
-      if (pubModulesManager.cache) {
+      if (pubModulesManager.cache && pubModulesManager.cache._cache && pubModulesManager.cache._cache._cache) {
         cacheClient = pubModulesManager.cache._cache._cache;  //_cache._cache to jump directly to redis modules without cacheoose wrapper (don't support await)
       }
+
+      if (cacheClient) {
       // winston.info("Express Session cacheClient",cacheClient);
 
 
-      let redisStore = new RedisStore({
-        client: cacheClient,
-        prefix: "sessions:",
-      })
-
-      app.use(
-        session({
-          store: redisStore,
-          resave: false, // required: force lightweight session keep alive (touch)
-          saveUninitialized: false, // recommended: only save session when data exists
-          secret: sessionSecret,
-          cookie: {
-            secure: true,           // ✅ Use HTTPS
-            httpOnly: true,         // ✅ Only accessible by the server (not client-side JS)
-            sameSite: 'None'        // ✅ Allows cross-origin (e.g., Keycloak on a different domain)
-          }
+        let redisStore = new RedisStore({
+          client: cacheClient,
+          prefix: "sessions:",
         })
-      )
-      winston.info("Express Session with Redis enabled with Secret: " + sessionSecret);
 
+        app.use(
+          session({
+            store: redisStore,
+            resave: false, // required: force lightweight session keep alive (touch)
+            saveUninitialized: false, // recommended: only save session when data exists
+            secret: sessionSecret,
+            cookie: {
+              secure: true,           // ✅ Use HTTPS
+              httpOnly: true,         // ✅ Only accessible by the server (not client-side JS)
+              sameSite: 'None'        // ✅ Allows cross-origin (e.g., Keycloak on a different domain)
+            }
+          })
+        )
+        winston.info("Express Session with Redis enabled with Secret: " + sessionSecret);
+      } else {
+        winston.warn("ENABLE_REDIS_SESSION is true but Redis cache is not available (pubmodules cache not initialized). Using default in-memory session store.");
+        app.use(session({ secret: sessionSecret}));
+        winston.info("Express Session enabled with Secret: " + sessionSecret);
+      }
 
   } else {
     app.use(session({ secret: sessionSecret}));
@@ -647,7 +663,10 @@ app.use('/:projectid/kb', [passport.authenticate(['basic', 'jwt'], { session: fa
 app.use('/:projectid/logs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], logs);
 
 app.use('/:projectid/webhooks', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], webhooks);
+app.use('/:projectid/scheduler', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('admin', ['bot','subscription'])], scheduler);
 app.use('/:projectid/copilot', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], copilot);
+app.use('/:projectid/voice', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], voice);
+app.use('/:projectid/roles', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], roles);
 
 app.use('/:projectid/files', filesp);
 

channels/chat21/chat21Handler.js

@@ -527,9 +527,15 @@ class Chat21Handler {
             requestEvent.on('request.create',  function(request) {          
 
                 winston.debug("chat21Handler requestEvent request.create called" , request);
+                console.log('[WELCOME_MSG_FLOW] chat21Handler: received request.create', { request_id: request.request_id, channelOutbound: request.channelOutbound?.name, first_text: request.first_text });
                 // setImmediate(() => {
 // perche nn c'è setImmedite? per performace
-                    if (request.channelOutbound.name === ChannelConstants.CHAT21) {
+                    if (request.channelOutbound && request.channelOutbound.name === ChannelConstants.CHAT21) {
+                        console.log('[WELCOME_MSG_FLOW] chat21Handler: channelOutbound is CHAT21, creating group');
+                    } else {
+                        console.log('[WELCOME_MSG_FLOW] chat21Handler: channelOutbound is NOT CHAT21, skipping group creation', { channelOutbound: request.channelOutbound, channelOutboundName: request.channelOutbound?.name, expected: ChannelConstants.CHAT21 });
+                    }
+                    if (request.channelOutbound && request.channelOutbound.name === ChannelConstants.CHAT21) {
 
                         chat21.auth.setAdminToken(adminToken);
 
@@ -619,6 +625,7 @@ class Chat21Handler {
                                 // performance console log
                                 // console.log("************* after request.support_group.created: "+new Date().toISOString()); 
 
+                                console.log('[WELCOME_MSG_FLOW] chat21Handler: emitting request.support_group.created', { request_id: request.request_id, id_project: request.id_project });
                                 requestEvent.emit('request.support_group.created', request);
 
                                 chat21Event.emit('group.create', data);      

channels/chat21/chat21WebHook.js

@@ -18,6 +18,7 @@ var MessageConstants = require("../../models/messageConstants");
 var ProjectUserUtil = require("../../utils/project_userUtil");
 var RequestUtil = require("../../utils/requestUtil");
 const authEvent = require('../../event/authEvent');
+const requestEvent = require('../../event/requestEvent');
 
 var syncJoinAndLeaveGroupEvent =  false;
 if (process.env.SYNC_JOIN_LEAVE_GROUP_EVENT === true || process.env.SYNC_JOIN_LEAVE_GROUP_EVENT ==="true") {
@@ -74,6 +75,7 @@ router.post('/', function (req, res) {
 
     winston.debug("Chat21 message", message);
 
+      winston.info('chat21 webhook message received');
         // requestcachefarequi nocachepopulatereqired        
         let q = Request.findOne({request_id: message.recipient}) 
 
@@ -97,6 +99,15 @@ router.post('/', function (req, res) {
 
             winston.debug("request not exists with request_id: " + message.recipient);
 
+            // After close or retention delete, Chat21 may still POST new-message (e.g. system line).
+            // Sender "system" is not a project_user (no uuid_user/id_user row); creating a request here is wrong.
+            // if (message.sender === "system") {
+            //   winston.verbose("Chat21 webhook: no request for recipient, sender is system — ignore (no new request)", {
+            //     recipient: message.recipient
+            //   });
+            //   return res.status(200).send({ success: true, msg: "Ignored: system message without existing request" });
+            // }
+
             var departmentid = "default";
 
 
@@ -208,7 +219,14 @@ router.post('/', function (req, res) {
                       winston.debug("project_user_id: " + project_user_id);
                     } else {
                       // error->utente bloccato oppure non autenticator request.requester sarà nulll...⁄
-                      return winston.error("project_user not found with query: ", queryProjectUser);
+                      
+                      winston.warn("project_user not found with query: ", queryProjectUser);
+                      return res.status(404).send({
+                        success: false,
+                        msg: "Project user not found for sender; cannot create request",
+                        query: queryProjectUser
+                      });
+                      //return winston.error("project_user not found with query: ", queryProjectUser);
                     }
 
 
@@ -307,6 +325,45 @@ router.post('/', function (req, res) {
                 // TODO se stato = 50 e scrive visitatotre sposto a stato 100 poi queuue lo smista
 
                 // TOOD update also request attributes and sourcePage
+                if (message.sender !== "system") { 
+                  const rid = request.request_id; 
+                  const idProj = request.id_project; 
+                  Request.findOneAndUpdate( 
+                    { request_id: rid, id_project: idProj }, 
+                    { $set: { "attributes.last_message": savedMessage } }, 
+                    { new: true } 
+                  )
+                  .then(() => { 
+                    // ConciergeBot runs on message.create inside setImmediate and sets preflight:false (request.update). 
+                    // Emitting request.update here with findOneAndUpdate's doc can race: cache/WS may apply this emit 
+                    // AFTER Concierge's and overwrite preflight:false with a stale true. Defer + full reload matches 
+                    // changeFirstTextAndPreflightByRequestId populates and picks up the committed preflight + last_message. 
+                    
+                    setImmediate(() => { 
+                      Request.findOne({ request_id: rid, id_project: idProj }) 
+                      .populate('lead') 
+                      .populate('department') 
+                      .populate('participatingBots') 
+                      .populate('participatingAgents') 
+                      .populate({ path: 'requester', populate: { path: 'id_user' } }) 
+                      .exec((err, freshRequest) => { 
+                        if (err) { 
+                          winston.error("Create message - Error reloading request after last_message update", err); 
+                          return; 
+                        } 
+                        
+                        if (freshRequest) { 
+                          requestEvent.emit('request.update', freshRequest); 
+                        } 
+                      }); 
+                    }); 
+                  }) 
+                  .catch((err) => { 
+                    winston.error("Create message - Error updating request attributes with last_message", err); 
+                  });
+                  
+                }
+
 
                     // return requestService.incrementMessagesCountByRequestId(request.request_id, request.id_project).then(function(savedRequest) {
                       // winston.debug("savedRequest.participants.indexOf(message.sender)", savedRequest.participants.indexOf(message.sender));
@@ -315,7 +372,7 @@ router.post('/', function (req, res) {
                       // TODO it doesn't work for internal requests bacause participanets == message.sender⁄
                       if (request.participants && request.participants.indexOf(message.sender) > -1) { //update waiitng time if write an  agent (member of participants)
                         winston.debug("updateWaitingTimeByRequestId*******");
-                                                                                                                  //leave this parameter to true because it is used by websocket to notify request.update                                 
+                        //leave this parameter to true because it is used by websocket to notify request.update                                 
                         return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project, true).then(function(upRequest) {
                           return res.json(upRequest);
                         });
@@ -398,7 +455,7 @@ router.post('/', function (req, res) {
               var query = {request_id: recipient_id, id_project: projectId};
               winston.debug('query:'+ projectId);
 
-              winston.debug('conversation-archived Request.findOne(query);:');
+              winston.info('conversation-archived Request.findOne(query);:');
               let q = Request.findOne(query);
               // if (cacheEnabler.request) {
               //   q.cache(cacheUtil.defaultTTL, projectId+":requests:request_id:"+recipient_id+":simple"); //request_cache NOT IMPORTANT HERE
@@ -485,7 +542,7 @@ router.post('/', function (req, res) {
       winston.debug("id_project: " + id_project);
 
       // requestcachefarequi populaterequired
-      winston.debug('join-member Request.findOne(query);:');
+      winston.info('join-member Request.findOne(query);:');
       return Request.findOne({request_id: request_id, id_project: id_project})
           .populate('lead') //TODO posso prenderlo da snapshot senza populate cache_attention
           .exec(function(err, request) {
@@ -656,7 +713,7 @@ else if (req.body.event_type == "typing-start") {
 
 
   // requestcachefarequi nocachepopulatereqired
-  winston.debug('typing-start Request.findOne(query);:');
+  winston.info('typing-start Request.findOne(query);:');
   return Request.findOne({request_id: recipient_id})
                              //TOD  errore cache sistemare e riabbilitare->
   // .cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+recipient_id)   cache_attention

event/authEvent.js

@@ -1,4 +1,5 @@
 const EventEmitter = require('events');
+var RoleConstants = require("../models/roleConstants");
 
 class AuthEvent extends EventEmitter {
     constructor() {
@@ -9,6 +10,23 @@ class AuthEvent extends EventEmitter {
 
 const authEvent = new AuthEvent();
 
+var projectuserUpdateKey = 'project_user.update';
+if (process.env.QUEUE_ENABLED === "true") {
+  projectuserUpdateKey = 'project_user.update.queue';
+}
+
+authEvent.on(projectuserUpdateKey,  function(event) { 
+      if (event.updatedProject_userPopulated) {
+        var pu = event.updatedProject_userPopulated;
+        console.log("AuthEvent pu.roleType: ", pu.roleType)
+        if (pu.roleType === RoleConstants.TYPE_AGENTS) {          
+          console.log("Emit event!!!");
+          authEvent.emit("project_user.update.agent", event);
+        } else {
+          authEvent.emit("project_user.update.user", event);
+        }
+      }
+});
 
 //listen for sigin and signup event
 

event/botEvent.js

@@ -83,7 +83,8 @@ class BotEvent extends EventEmitter {
                 }
 
             }
-
+            // winston.info("main_flow_cache_3 botevent find faqkb"); it is cached
+            
             // qui potresti leggere anche +secret ed evitare prossima query in botNotification
             // let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
             let qbot = Faq_kb.findById(botId).select('+secret')

event/kbEvent.js

@@ -0,0 +1,12 @@
+const EventEmitter = require('events');
+
+class KbEvent extends EventEmitter {
+    constructor() {
+        super();
+        this.queueEnabled = false;
+    }
+}
+
+const kbEvent = new KbEvent();
+
+module.exports = kbEvent;