wingbot 3.34.0-alpha.1 → 3.35.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.34.0-alpha.1",
+  "version": "3.35.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -46,7 +46,7 @@
     "eslint-plugin-react": "^7.29.4",
     "graphql-markdown": "^6.0.0",
     "jsdoc-to-markdown": "^7.1.1",
-    "mocha": "^9.2.2",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.2",
     "sinon": "^13.0.1",

package/src/BotApp.js

@@ -46,6 +46,15 @@ const DEFAULT_API_URL = 'https://orchestrator-api.wingbot.ai';
  * @prop {object} headers
  */
 
+function defaultMsg (senderId, pageId) {
+    return {
+        sender: { id: senderId },
+        recipient: { id: pageId },
+        mid: null,
+        timestamp: Date.now()
+    };
+}
+
 /**
  * Adapter for Wingbot flight director
  *
@@ -239,32 +248,55 @@ class BotApp {
             };
         }
 
+        const sender = await this.createSender(senderId, pageId, message, secret, appId);
+        const res = await this._processor.processMessage(message, pageId, sender, { appId });
+        await this._processSenderResponses(sender, senderId, pageId, headers);
+
+        return {
+            status: res.status,
+            response_to_mid: message.mid,
+            messaging: []
+        };
+    }
+
+    /**
+     * Creates a Sender to be able, for example, to upload files
+     *
+     * @param {string} senderId
+     * @param {string} pageId
+     * @param {object} [message]
+     * @param {string|Promise<string>} [secret]
+     * @param {string} appId
+     * @returns {Promise<BotAppSender>}
+     */
+    async createSender (
+        senderId,
+        pageId,
+        message = defaultMsg(senderId, pageId),
+        secret = this._secret,
+        appId = this._appId
+    ) {
+        const useSecret = await Promise.resolve(secret);
+
+        const setResponseToMid = message.response_to_mid || message.mid;
+
         const options = {
             ...this._returnSenderOptions,
             apiUrl: this._apiUrl,
             pageId,
             appId,
-            secret,
+            secret: useSecret,
             mid: setResponseToMid,
             fetch: this._fetch,
             tls: this._tls
         };
 
-        const sender = new BotAppSender(options, senderId, message, this._senderLogger);
-        const res = await this._processor.processMessage(message, pageId, sender, { appId });
-        await this._processSenderResponses(sender, senderId, pageId, headers);
-
-        return {
-            status: res.status,
-            response_to_mid: message.mid,
-            messaging: []
-        };
+        return new BotAppSender(options, senderId, message, this._senderLogger);
     }
 
     /**
      * Compatibility method for Notification engine
      *
-     * @deprecated
      * @param {object} message - wingbot chat event
      * @param {string} senderId - chat event sender identifier
      * @param {string} pageId - channel/page identifier

package/src/templates/ButtonTemplate.js

@@ -31,19 +31,11 @@ const { makeAbsolute } = require('../utils');
  * @param {Payload} payload
  * @returns {EncodedPayload}
  */
-function encodePayload (payload) {
-    const encodedPayload = {
-        content: payload.content,
-        content_type: payload.contentType
+function encodePayload ({ content, contentType }) {
+    return {
+        content: Buffer.from(content).toString('base64'),
+        content_type: contentType
     };
-
-    switch (payload.contentType) {
-        default:
-            encodedPayload.content = Buffer.from(payload.content).toString('base64');
-            break;
-    }
-
-    return encodedPayload;
 }
 
 /**