wingbot 3.25.1 → 3.26.0-alpha.4

package/package.json

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

package/src/BotApp.js

@@ -22,6 +22,7 @@ const DEFAULT_API_URL = 'https://orchestrator-api.wingbot.ai';
 /** @typedef {import('./Processor').Plugin} Plugin */
 
 /** @typedef {import('./CallbackAuditLog')} AuditLog */
+/** @typedef {import('./BotAppSender').TlsOptions} TlsOptions */
 
 /**
  * @typedef {object} BotAppOptions
@@ -32,6 +33,7 @@ const DEFAULT_API_URL = 'https://orchestrator-api.wingbot.ai';
  * @prop {ChatLogStorage} [chatLogStorage]
  * @prop {boolean} [preferSynchronousResponse]
  * @prop {AuditLog} [auditLog]
+ * @prop {TlsOptions} [tls]
  *
  * @typedef {ProcessorOptions & BotAppOptions} Options
  */
@@ -63,6 +65,7 @@ class BotApp {
             appId = null,
             preferSynchronousResponse = false,
             auditLog = null,
+            tls = null,
             ...processorOptions
         } = options;
 
@@ -70,6 +73,7 @@ class BotApp {
         this._fetch = fetch; // mock
         this._appId = appId;
         this._auditLog = auditLog;
+        this._tls = tls;
 
         let { apiUrl } = options;
 
@@ -96,6 +100,18 @@ class BotApp {
         this._preferSynchronousResponse = preferSynchronousResponse;
     }
 
+    /**
+     * Get authorization token for wingbot orchestrator
+     *
+     * @param {string} body
+     * @param {string} secret
+     * @param {string} appId
+     * @returns {Promise<string>}
+     */
+    static signBody (body, secret, appId) {
+        return BotAppSender.signBody(body, secret, appId);
+    }
+
     /**
      * Returns processor plugin, which updates thread context automatically
      *
@@ -211,7 +227,8 @@ class BotApp {
             appId,
             secret,
             mid,
-            fetch: this._fetch
+            fetch: this._fetch,
+            tls: this._tls
         };
 
         const sender = new BotAppSender(options, senderId, message, this._senderLogger);

package/src/BotAppSender.js

@@ -6,17 +6,25 @@
 const jwt = require('jsonwebtoken');
 const { default: fetch, Headers } = require('node-fetch');
 const crypto = require('crypto');
+const { Agent } = require('https');
 const { promisify } = require('util');
 const ReturnSender = require('./ReturnSender');
 
 /** @typedef {import('./ReturnSender').ReturnSenderOptions} ReturnSenderOptions */
 /** @typedef {import('./ReturnSender').ChatLogStorage} ChatLogStorage */
 
+/**
+ * @typedef {object} TlsOptions
+ * @prop {string|Promise<string>} key
+ * @prop {string|Promise<string>} cert
+ */
+
 /**
  * @typedef {object} BotAppSenderOptions
  * @prop {string} apiUrl
  * @prop {string} pageId
  * @prop {string} appId
+ * @prop {TlsOptions} [tls]
  * @prop {string} [mid]
  * @prop {Function} [fetch]
  * @prop {string|Promise<string>} secret
@@ -47,6 +55,9 @@ class BotAppSender extends ReturnSender {
 
         this._secret = Promise.resolve(options.secret);
 
+        this._tls = options.tls;
+        this._agent = null;
+
         this._fetch = options.fetch || fetch;
     }
 
@@ -65,6 +76,21 @@ class BotAppSender extends ReturnSender {
         }, goodSecret);
     }
 
+    async _getAgent () {
+        if (!this._tls) {
+            return null;
+        }
+        if (!this._agent) {
+            const [key, cert] = await Promise.all([
+                Promise.resolve(this._tls.key), Promise.resolve(this._tls.cert)
+            ]);
+
+            this._agent = new Agent({ cert, key });
+        }
+
+        return this._agent;
+    }
+
     async _send (payload) {
         // attach sender
         if (typeof payload.sender === 'undefined') {
@@ -78,14 +104,19 @@ class BotAppSender extends ReturnSender {
 
         const body = JSON.stringify(payload);
 
-        const token = await BotAppSender.signBody(body, this._secret, this._appId);
+        const [token, agent] = await Promise.all([
+            BotAppSender.signBody(body, this._secret, this._appId),
+            this._getAgent()
+        ]);
 
         const headers = new Headers();
 
         headers.set('Authorization', token);
         headers.set('Content-Type', 'application/json');
 
-        const response = await this._fetch(this._apiUrl, { headers, body, method: 'POST' })
+        const response = await this._fetch(this._apiUrl, {
+            headers, body, agent, method: 'POST'
+        })
             .then((r) => r.json());
 
         const { request, errors = null } = response;

package/src/utils/getUpdate.js

@@ -179,7 +179,7 @@ function getSetState (setState = {}, req, res = null, useState = null) {
                         const useValue = typeof value === 'string'
                             ? handlebars.compile(value)(stateData(req, res))
                                 .split(/(?<!\\),/g)
-                                .map((v) => v.trim())
+                                .map((v) => v.replace(/\\,/g, ',').trim())
                             : value;
                         values = toArray(useValue);
                     }

package/src/wingbot/CustomEntityDetectionModel.js

@@ -284,12 +284,12 @@ class CustomEntityDetectionModel {
      * @param {string} text
      * @param {string} [singleEntity]
      * @param {string[]} expectedEntities
+     * @param {DetectedEntity[]} [entities] - previously detected entities to include
      * @returns {Promise<DetectedEntity[]>}
      */
-    async resolveEntities (text, singleEntity = null, expectedEntities = []) {
+    async resolveEntities (text, singleEntity = null, expectedEntities = [], entities = []) {
         const resolved = new Set();
         let missing = Array.from(this._entityDetectors.keys());
-        const entities = [];
 
         while (missing.length !== 0) {
             let detect = [];