wingbot 3.76.14 → 3.76.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.76.14",
+  "version": "3.76.15",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/BuildRouter.js

@@ -206,6 +206,19 @@ const DUMMY_ROUTE = { id: 0, path: null, resolvers: [] };
  * @prop {string|number} [resolverId] - only for text messages with random characters
  */
 
+/**
+ * @typedef {object} Logger
+ * @prop {Function} log
+ * @prop {Function} error
+ */
+
+/**
+ * @typedef {object} RunningReq
+ * @prop {unknown[]} args
+ * @prop {Promise} promise
+ * @prop {number} started
+ */
+
 /**
  * @template {BaseConfiguration} [C=object]
  * @typedef {BotContextExtention & BuildRouterContext<C>} BotContext
@@ -300,10 +313,14 @@ class BuildRouter extends Router {
             ? context.then((c) => c.configStorage)
             : context.configStorage;
 
+        /** @type {RunningReq[]} */
         this._runningReqs = [];
 
         this._configTs = 0;
 
+        /** @type {number} */
+        this.runningReqTimeout = 20000;
+
         /**
          * Timeout, when the router is not checking for new configuration
          *
@@ -325,6 +342,20 @@ class BuildRouter extends Router {
         }
     }
 
+    /**
+     * @returns {Logger}
+     */
+    get _logger () {
+        const logger = this._resolvedContext?.log
+            // @ts-ignore
+            || this._resolvedContext?.configuration?.log;
+
+        if (typeof logger?.log === 'function') {
+            return logger;
+        }
+        return console;
+    }
+
     get snapshot () {
         return this._snapshot;
     }
@@ -373,15 +404,35 @@ class BuildRouter extends Router {
         await this.preload();
 
         let runningRequest;
+        let timeout;
         try {
             const reducePromise = super.reduce(...args);
 
-            runningRequest = reducePromise
-                .catch(() => { /* mute fails */ });
+            const timeoutPromise = new Promise((resolve) => {
+                timeout = setTimeout(() => {
+                    timeout = null;
+                    this._logger.error('BuildRouter EXPIRE', { args });
+                    this._runningReqs = this._runningReqs
+                        .filter((rr) => rr !== runningRequest);
+                    resolve();
+                }, this.runningReqTimeout);
+            });
+
+            runningRequest = {
+                args,
+                promise: Promise.race([
+                    reducePromise,
+                    timeoutPromise
+                ]).catch(() => { /* mute fails */ }),
+                started: Date.now()
+            };
             this._runningReqs.push(runningRequest);
 
             return await reducePromise;
         } finally {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
             if (runningRequest) {
                 this._runningReqs = this._runningReqs
                     .filter((rr) => rr !== runningRequest);
@@ -471,7 +522,18 @@ class BuildRouter extends Router {
             }
 
             // wait for running request
-            await Promise.all(this._runningReqs);
+            const threshold = Date.now() - this.runningReqTimeout;
+            await Promise.all(
+                this._runningReqs
+                    .filter((req) => {
+                        if (req.started < threshold) {
+                            this._logger.error('BuildRouter EXPIRE filter', req);
+                            return false;
+                        }
+                        return true;
+                    })
+                    .map((req) => req.promise)
+            );
 
             this.buildWithSnapshot(
                 snapshot.blocks,