wingbot 3.55.1 → 3.56.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.55.1",
+  "version": "3.56.0",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "doc": "npm run doc:gql && node ./bin/makeApiDoc.js && cpy ./CHANGELOG.md ./doc && gitbook install ./doc && gitbook build ./doc && rimraf -rf ./docs && rimraf --rf ./doc/CHANGELOG.md && move-cli ./doc/_book ./docs",
     "test": "npm run test:lint && npm run test:coverage && npm run test:coverage:threshold",
     "test:coverage": "nyc --reporter=html mocha ./test && nyc report",
-    "test:coverage:threshold": "nyc check-coverage --lines 90 --functions 89 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 89 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },
@@ -36,20 +36,20 @@
   },
   "homepage": "https://github.com/wingbot.ai/wingbot#readme",
   "devDependencies": {
-    "cpy-cli": "^4.1.0",
-    "eslint": "^8.11.0",
+    "cpy-cli": "^4.2.0",
+    "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^39.7.5",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-mocha": "^10.0.3",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsdoc": "^40.1.0",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-react": "^7.32.2",
     "graphql-markdown": "^6.0.0",
     "jsdoc-to-markdown": "^8.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.2",
-    "sinon": "^13.0.1",
+    "sinon": "^15.0.3",
     "tsd-jsdoc": "^2.5.0"
   },
   "dependencies": {
@@ -60,7 +60,7 @@
     "jsonwebtoken": "^9.0.0",
     "node-fetch": "^2.6.7",
     "path-to-regexp": "^6.2.1",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "webalize": "^0.1.0"
   },
   "optionalDependencies": {

package/src/analytics/onInteractionHandler.js

@@ -107,6 +107,8 @@ const {
  * @prop {string} [browserName]
  * @prop {string} [deviceType]
  * @prop {string} [osName]
+ * @prop {string} [skill]
+ * @prop {string} [prevSkill]
  */
 
 /**
@@ -328,6 +330,9 @@ function onInteractionHandler (
                 didHandover = true;
             }
 
+            const useSkill = (skill && webalize(skill)) || noneAction;
+            const usePrevSkill = (prevSkill && webalize(prevSkill)) || noneAction;
+
             const metadata = {
                 sessionCount,
                 lang,
@@ -344,7 +349,9 @@ function onInteractionHandler (
                 pageCategory,
                 browserName: ua.browser.name || null,
                 deviceType: ua.device.type || null,
-                osName: ua.os.name || null
+                osName: ua.os.name || null,
+                skill: useSkill,
+                prevSkill: usePrevSkill
             };
 
             let sessionPromise;
@@ -374,8 +381,6 @@ function onInteractionHandler (
                 : anonymize(
                     replaceDiacritics(req.text()).replace(/\s+/g, ' ').toLowerCase().trim()
                 );
-            const useSkill = (skill && webalize(skill)) || noneAction;
-            const usePrevSkill = (prevSkill && webalize(prevSkill)) || noneAction;
 
             let winnerAction = '';
             let winnerScore = 0;

package/src/wingbot/CustomEntityDetectionModel.js

@@ -76,6 +76,8 @@ function optionalWrap (l, r, content) {
     return `${l || ''}(${content})${r || ''}`;
 }
 
+const MULTI_ENTITY_CLEANER = /((?<!\\)\([^()]*[^()\\]\)|@[A-Z0-9-]+)\?/g;
+
 class CustomEntityDetectionModel {
 
     /**
@@ -485,11 +487,18 @@ class CustomEntityDetectionModel {
 
     /**
      *
-     * @param {RegExp} regexp
+     * @param {RegExp|string} regexp
      */
     _extractRegExpDependencies (regexp) {
-        const matches = regexp.source.match(/@[A-Z0-9-]+/g);
-        return Array.from(new Set(matches).values());
+        let str = typeof regexp === 'string' ? regexp : regexp.source;
+        const matches = str.match(/@[A-Z0-9-]+/g);
+        const known = Array.from(new Set(matches));
+        if (known.length <= 1 || !str.match(MULTI_ENTITY_CLEANER)) {
+            return known;
+        }
+        str = str.replace(MULTI_ENTITY_CLEANER, '');
+        const cleanDeps = this._extractRegExpDependencies(str);
+        return Array.from(new Set([...cleanDeps, ...matches]));
     }
 
     /**