wingbot 3.76.13 → 3.76.15

package/index.js

@@ -25,6 +25,7 @@ const Plugins = require('./src/Plugins');
 const NotificationsStorage = require('./src/notifications/NotificationsStorage');
 const Notifications = require('./src/notifications/Notifications');
 const MemoryBotConfigStorage = require('./src/tools/MemoryBotConfigStorage');
+const MemoryChatLogStorage = require('./src/tools/MemoryChatLogStorage');
 const routeToEvents = require('./src/tools/routeToEvents');
 const GraphApi = require('./src/graphApi/GraphApi');
 const validateBotApi = require('./src/graphApi/validateBotApi');
@@ -91,6 +92,7 @@ module.exports = {
     bufferloader,
     asserts,
     MemoryStateStorage,
+    MemoryChatLogStorage,
     CallbackAuditLog,
     MemoryBotConfigStorage,
     CachedModel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.76.13",
+  "version": "3.76.15",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",
@@ -43,7 +43,8 @@
     "cpy-cli": "^5.0.0",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-import-resolver-node": "^0.4.0",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^48.0.2",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-mocha": "^10.2.0",
@@ -69,11 +70,15 @@
     "jsonwebtoken": "^9.0.2",
     "node-fetch": "^2.6.7",
     "path-to-regexp": "^6.3.0",
-    "uuid": "^9.0.1",
+    "uuid": "^14.0.2",
     "webalize": "^0.1.0"
   },
   "optionalDependencies": {
     "axios": "^1.6.4",
     "handlebars": "^4.0.0"
+  },
+  "allowScripts": {
+    "fsevents@2.3.2": true,
+    "mongodb-memory-server@11.0.1": true
   }
-}
+}

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,

package/src/notifications/NotificationsStorage.js

@@ -3,8 +3,6 @@
  */
 'use strict';
 
-const uuid = require('uuid');
-
 /**
  * @typedef {object} Tag
  * @prop {string} tag
@@ -120,7 +118,7 @@ class NotificationsStorage {
      * @param {object} tasks
      * @returns {Promise<Task[]>}
      */
-    pushTasks (tasks) {
+    async pushTasks (tasks) {
 
         // upsert through unique KEY (only single sliding campaign in queue)
         // [campaignId,senderId,pageId,sent]
@@ -152,6 +150,9 @@ class NotificationsStorage {
                 return override;
             });
 
+        // eslint-disable-next-line import/no-unresolved
+        const uuid = await import('uuid');
+
         const insert = tasks.map((t) => ({
             ...t,
             id: uuid.v4(),
@@ -162,7 +163,7 @@ class NotificationsStorage {
         this._tasks.push(...insert);
 
         this._tasks.sort((a, b) => a.enqueue - b.enqueue);
-        return Promise.resolve(ret);
+        return ret;
     }
 
     popTasks (limit, until = Date.now()) {
@@ -306,6 +307,8 @@ class NotificationsStorage {
     async upsertCampaign (campaign, updateCampaign = null) {
         let insert = campaign;
         if (!insert.id) {
+            // eslint-disable-next-line import/no-unresolved
+            const uuid = await import('uuid');
             insert = { ...insert, id: uuid.v4() };
         }
         if (!this._campaigns.has(insert.id)) {

package/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx mocha:*)",
-      "Bash(npx tsc *)",
-      "Bash(npm test *)",
-      "Bash(node -e \"const p = require\\('./bot/plugins/BTMLLM'\\); console.log\\('factory type:', typeof p\\); console.log\\('factory name:', p.name\\);\")",
-      "Bash(grep -n \"prompt\\\\`\\\\|tagged\\\\|render\\\\|compile\\\\|hbs\" /Users/ondrejveres/Wingbot/wingbot-llm/src/prompt.js)"
-    ]
-  }
-}