wingbot 3.37.1 → 3.37.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.37.1",
+  "version": "3.37.3",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/Ai.js

@@ -49,7 +49,7 @@ let uq = 1;
  */
 class Ai {
 
-    constructor (matcher = new AiMatching()) {
+    constructor () {
         this._keyworders = new Map();
 
         /**
@@ -111,7 +111,7 @@ class Ai {
          *
          * @type {AiMatching}
          */
-        this.matcher = matcher;
+        this.matcher = new AiMatching(this);
     }
 
     /**

package/src/AiMatching.js

@@ -91,6 +91,11 @@ const COMPARE = {
  * @prop {object} [state]
  */
 
+/**
+ * @typedef {object} ConfidenceProvider
+ * @prop {number} confidence
+ */
+
 /**
  * @class {AiMatching}
  *
@@ -98,7 +103,11 @@ const COMPARE = {
  */
 class AiMatching {
 
-    constructor () {
+    /**
+     *
+     * @param {ConfidenceProvider} ai
+     */
+    constructor (ai = { confidence: 0.8 }) {
         /**
          * When the entity is optional, the final score should be little bit lower
          * (0.001 by default)
@@ -138,6 +147,8 @@ class AiMatching {
          * (1 by default)
          */
         this.stateEntityScore = 1;
+
+        this._ai = ai;
     }
 
     get redundantHandicap () {
@@ -447,11 +458,29 @@ class AiMatching {
                 ? score - noIntentHandicap
                 : (regexpScore + score) / 2;
 
+            const matchedEntitiesTextLength = matched.reduce((tot, entity) => (
+                typeof entity.end === 'number' && typeof entity.start === 'number' && tot !== null
+                    ? (tot + (entity.end - entity.start))
+                    : null
+            ), 0);
+
+            let finalScore = (baseScore - handicap)
+                * (this.multiMatchGain ** countOfAdditionalItems);
+
+            const textLength = req.text().length;
+
+            if (matchedEntitiesTextLength && textLength) {
+                const remainingScore = Math.max(0, Math.min(1, finalScore) - (
+                    this._ai.confidence + this.redundantEntityHandicap
+                ));
+
+                finalScore -= (matchedEntitiesTextLength / textLength) * remainingScore;
+            }
+
             return {
                 intent: null,
                 entities: matched,
-                score: (baseScore - handicap)
-                    * (this.multiMatchGain ** countOfAdditionalItems)
+                score: finalScore
             };
         }
 

package/src/BuildRouter.js

@@ -559,7 +559,7 @@ class BuildRouter extends Router {
      * @param {RouteConfig} routeConfig
      */
     _enabledByRouteConfig (routeConfig) {
-        return !this._context.routeConfigs || !routeConfig || routeConfig.enabled !== false;
+        return !routeConfig || routeConfig.enabled !== false;
     }
 
     _joinPaths (...args) {

package/src/Processor.js

@@ -323,12 +323,14 @@ class Processor extends EventEmitter {
             return { status: 304 };
         }
 
-        const result = await this._dispatch(message, pageId, messageSender, responderData);
+        const result = await this
+            ._dispatch(message, pageId, messageSender, responderData, preloadPromise);
+
         await preloadPromise;
         return result;
     }
 
-    async _dispatch (message, pageId, messageSender, responderData) {
+    async _dispatch (message, pageId, messageSender, responderData, preloadPromise) {
         let req;
         let res;
         let state;
@@ -338,7 +340,7 @@ class Processor extends EventEmitter {
             ({
                 req, res, data, state
             } = await this
-                ._processMessage(message, pageId, messageSender, responderData, true));
+                ._processMessage(message, pageId, messageSender, responderData, preloadPromise));
 
             await this._emitInteractionEvent(req, messageSender, state, data);
 
@@ -447,8 +449,9 @@ class Processor extends EventEmitter {
         }
     }
 
-    async _processMessage (message, pageId, messageSender, responderData, fromEvent = false) {
+    async _processMessage (message, pageId, messageSender, responderData, preloadPromise = null) {
         let senderId = message.sender && message.sender.id;
+        const fromEvent = !!preloadPromise;
 
         // prevent infinite cycles
         let { _actionCount: actionCount = 0 } = responderData;
@@ -547,7 +550,10 @@ class Processor extends EventEmitter {
                 }
             }
 
-            await Ai.ai.preloadAi(req, res);
+            await Promise.all([
+                preloadPromise,
+                Ai.ai.preloadAi(req, res)
+            ]);
 
             // @deprecated backward compatibility
             const aByAi = req.actionByAi();