wingbot 3.27.0-alpha.4 → 3.27.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.27.0-alpha.4",
+  "version": "3.27.2",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/BotApp.js

@@ -262,7 +262,8 @@ class BotApp {
             pageId,
             appId,
             secret,
-            fetch: this._fetch
+            fetch: this._fetch,
+            tls: this._tls
         };
 
         const sender = new BotAppSender(options, senderId, message, this._senderLogger);

package/src/wingbot/CustomEntityDetectionModel.js

@@ -58,6 +58,14 @@ const { replaceDiacritics } = require('../utils');
 
 /** @typedef {import('../Request')} Request */
 
+function optionalWrap (l, r, content) {
+    const consistent = !l === !r;
+    if (consistent) {
+        return `(${content})`;
+    }
+    return `${l || ''}(${content})${r || ''}`;
+}
+
 class CustomEntityDetectionModel {
 
     /**
@@ -165,8 +173,9 @@ class CustomEntityDetectionModel {
         ]);
 
         const cleanSubWordResults = subWordResults
-            .filter((regular) => regularResults
-                .some((e) => e.start < regular.end && e.end > regular.start));
+            .filter((regular) => !regularResults
+                .some((e) => e.start < regular.end && e.end > regular.start
+                    && e.end >= regular.end && e.start <= regular.start));
 
         subWord.push(...cleanSubWordResults);
 
@@ -507,16 +516,16 @@ class CustomEntityDetectionModel {
                 return null;
             }
 
-            let replaced = source.replace(/@[A-Z0-9-]+/g, (value) => {
+            let replaced = source.replace(/(\()?@([A-Z0-9-]+)(\))?/g, (value, l, ent, r) => {
                 const matchingEntities = entities
-                    .filter((e) => `@${e.entity.toUpperCase()}` === value)
+                    .filter((e) => e.entity.toUpperCase() === ent)
                     .map((e) => this._escapeRegex(e.text, options.replaceDiacritics));
 
                 if (matchingEntities.length === 0) {
-                    return value;
+                    return optionalWrap(l, r, `@${ent}`);
                 }
                 matchingEntities.sort((a, z) => z.length - a.length);
-                return `(${matchingEntities.join('|')})`;
+                return optionalWrap(l, r, matchingEntities.join('|'));
             });
 
             if (options.matchWholeWords && !searchWithinWords) {