@tiledesk/tiledesk-server 2.15.4 → 2.15.5

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.15.5
+- Fixed email flooding when smart assignment is active and there are no operators available
+
 # 2.15.4
 - Updated endpoint to get project users adding the query parameter "trashed" in order to obtain also the trashed users.
 - Added endpoint /restore to restore a deleted project user

package/app.js

@@ -200,7 +200,7 @@ var faqBotHandler = require('./services/faqBotHandler');
 faqBotHandler.listen();
 
 var pubModulesManager = require('./pubmodules/pubModulesManager');
-pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, databaseUri:databaseUri, routes:{}, jobsManager:jobsManager});
+pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, databaseUri:databaseUri, routes:{}, jobsManager:jobsManager, tdCache:tdCache});
   
 jobsManager.listen(); //listen after pubmodules to enabled queued *.queueEnabled events
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.15.4",
+  "version": "2.15.5",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/emailNotification/requestNotification.js

@@ -14,6 +14,7 @@ var winston = require('../../config/winston');
 var RoleConstants = require("../../models/roleConstants");
 var ChannelConstants = require("../../models/channelConstants");
 var cacheUtil = require('../../utils/cacheUtil');
+const { TdCache } = require('../../utils/TdCache');
 
 const messageEvent = require('../../event/messageEvent');
 var mongoose = require('mongoose');
@@ -40,6 +41,23 @@ if (pKey) {
 let apiUrl = process.env.API_URL || configGlobal.apiUrl;
 winston.debug('********* RequestNotification apiUrl: ' + apiUrl);
 
+/** Redis cache for throttling pooled-request email. Injected by app (shared TdCache) or lazy-created fallback. */
+let _pooledEmailTdCache = null;
+function getPooledEmailCache() {
+  if (_pooledEmailTdCache) return _pooledEmailTdCache;
+  const fallback = new TdCache({
+    host: process.env.CACHE_REDIS_HOST,
+    port: process.env.CACHE_REDIS_PORT,
+    password: process.env.CACHE_REDIS_PASSWORD
+  });
+  fallback.connect();
+  _pooledEmailTdCache = fallback;
+  return _pooledEmailTdCache;
+}
+
+/** TTL in seconds: do not send pooled email again for the same request within this window (avoids flooding when smart assignment retries) */
+const POOLED_EMAIL_THROTTLE_TTL = Number(process.env.POOLED_EMAIL_THROTTLE_TTL) || cacheUtil.defaultTTL;
+
 class RequestNotification {
 
   constructor() {
@@ -48,7 +66,18 @@ class RequestNotification {
         this.enabled = false;
     }
     winston.debug("RequestNotification this.enabled: "+ this.enabled);
-}
+  }
+
+  /**
+   * Reuse app's TdCache instance instead of opening a new Redis connection (optional, called by PubModulesManager).
+   * @param {TdCache} tdCache - shared Redis cache from app.get('redis_client')
+   */
+  setTdCache(tdCache) {
+    if (tdCache && typeof tdCache.setNX === 'function') {
+      _pooledEmailTdCache = tdCache;
+      winston.debug("RequestNotification using shared TdCache for pooled email throttle");
+    }
+  }
 
 listen() {
 
@@ -892,6 +921,18 @@ sendAgentEmail(projectid, savedRequest) {
                     return winston.warn("RequestNotification savedRequest.snapshot is null :(. You are closing an old request?");
                   }
 
+                  // Throttle: send pooled email only once per request within TTL (avoids flooding when smart assignment keeps retrying)
+                  const requestId = (savedRequest._id || savedRequest.id).toString();
+                  const pooledEmailKey = 'pooled_request_email:' + requestId;
+                  try {
+                    const shouldSend = await getPooledEmailCache().setNX(pooledEmailKey, '1', POOLED_EMAIL_THROTTLE_TTL);
+                    if (!shouldSend) {
+                      return winston.debug("RequestNotification pooled email already sent for request " + requestId + " (Redis throttle, TTL " + POOLED_EMAIL_THROTTLE_TTL + "s)");
+                    }
+                  } catch (redisErr) {
+                    winston.warn("RequestNotification Redis setNX for pooled email throttle failed, skipping send", { error: redisErr, requestId });
+                    return;
+                  }
 
                  
                   var snapshotAgents = savedRequest; //riassegno varibile cosi nn cambio righe successive

package/pubmodules/pubModulesManager.js

@@ -175,6 +175,7 @@ class PubModulesManager {
         winston.debug("PubModulesManager init");
 
         this.jobsManager = config.jobsManager;
+        this.tdCache = config.tdCache;
 
         try {
             this.appRules = require('./rules/appRules');
@@ -631,6 +632,9 @@ class PubModulesManager {
         // job_here
         if (this.emailNotification) {
             try {
+                if (this.tdCache) {
+                    this.emailNotification.requestNotification.setTdCache(this.tdCache);
+                }
                 // this.emailNotification.requestNotification.listen();
                 this.jobsManager.listenEmailNotification(this.emailNotification);
                 winston.info("PubModulesManager emailNotification started.");   

package/utils/TdCache.js

@@ -76,7 +76,18 @@ class TdCache {
       });
     }
 
-
+    /**
+     * Set key only if it does not exist, with TTL (seconds). Returns true if key was set, false if key already existed.
+     * Uses Redis SET key value EX ttl NX to avoid email/notification flooding.
+     */
+    async setNX(key, value, ttlSeconds) {
+      return new Promise((resolve, reject) => {
+        this.client.set(key, value, 'EX', ttlSeconds, 'NX', (err, reply) => {
+          if (err) return reject(err);
+          resolve(reply === 'OK');
+        });
+      });
+    }