wingbot 3.73.14-alpha.0 → 3.73.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.73.14-alpha.0",
+  "version": "3.73.15",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/BotAppSender.js

@@ -181,10 +181,17 @@ class BotAppSender extends ReturnSender {
 
         headers.set('Authorization', token);
 
-        const response = await this._fetch(`${this._apiUrl}/${this._pageId}`, {
+        const res = await this._fetch(`${this._apiUrl}/${this._pageId}`, {
             headers, body: formData, agent, method: 'POST'
-        })
-            .then((r) => r.json());
+        });
+
+        const responseText = await res.text();
+        let response;
+        try {
+            response = JSON.parse(responseText);
+        } catch (e) {
+            throw new Error(`[${res.status}] Invalid JSON response: ${responseText}`);
+        }
 
         return response;
     }
@@ -212,10 +219,17 @@ class BotAppSender extends ReturnSender {
         headers.set('Authorization', token);
         headers.set('Content-Type', 'application/json');
 
-        const response = await this._fetch(this._apiUrl, {
+        const res = await this._fetch(this._apiUrl, {
             headers, body, agent, method: 'POST'
-        })
-            .then((r) => r.json());
+        });
+
+        const responseText = await res.text();
+        let response;
+        try {
+            response = JSON.parse(responseText);
+        } catch (e) {
+            throw new Error(`[${res.status}] Invalid JSON response: ${responseText}`);
+        }
 
         const { request, errors = null } = response;
 

package/src/BuildRouter.js

@@ -395,12 +395,7 @@ class BuildRouter extends Router {
                 if (!snapshot) {
                     snapshot = await this.loadBot();
                 }
-                this.buildWithSnapshot(
-                    snapshot.blocks,
-                    undefined,
-                    undefined,
-                    snapshot.deployedConfiguration
-                );
+                this.buildWithSnapshot(snapshot.blocks);
             } catch (e) {
                 if (this._configTs > 0 && !snapshot) {
                     // mute
@@ -442,12 +437,7 @@ class BuildRouter extends Router {
             // wait for running request
             await Promise.all(this._runningReqs);
 
-            this.buildWithSnapshot(
-                snapshot.blocks,
-                snapshot.timestamp,
-                snapshot.lastmod,
-                snapshot.deployedConfiguration
-            );
+            this.buildWithSnapshot(snapshot.blocks, snapshot.timestamp, snapshot.lastmod);
         } catch (e) {
             await configStorage.invalidateConfig();
             throw e;
@@ -538,20 +528,9 @@ class BuildRouter extends Router {
         blocks.forEach((b) => this._validateBlock(b, action));
     }
 
-    buildWithSnapshot (blocks, setConfigTimestamp = Number.MAX_SAFE_INTEGER, lastmod = '-', deployedConfiguration = null) {
+    buildWithSnapshot (blocks, setConfigTimestamp = Number.MAX_SAFE_INTEGER, lastmod = '-') {
         this._validateBlocks(blocks);
 
-        if (deployedConfiguration && typeof deployedConfiguration === 'object') {
-            if (this._configuration instanceof Promise) {
-                this._configuration = this._configuration
-                    .then((c) => Object.assign(c || /** @type {C} */ ({}), deployedConfiguration));
-            } else {
-                const cfg = this._configuration || /** @type {C} */ ({});
-                Object.assign(cfg, deployedConfiguration);
-                this._configuration = cfg;
-            }
-        }
-
         Object.assign(this._resolvedContext, {
             blocks,
             nestedBlocksByStaticId: null

package/src/OrchestratorClient.js

@@ -272,7 +272,14 @@ class OrchestratorClient {
 
         const response = await this._fetch(this._apiUrl, { headers, body, method: 'POST' });
 
-        const responseJson = response.json();
+        const responseText = await response.text();
+        let responseJson;
+        try {
+            responseJson = JSON.parse(responseText);
+        } catch (e) {
+            throw new Error(`[${response.status}] Invalid JSON response: ${responseText}`);
+        }
+
         const { errors = null } = responseJson;
 
         if (errors) {

package/src/graphApi/validateBotApi.js

@@ -21,12 +21,7 @@ const apiAuthorizer = require('./apiAuthorizer');
  */
 async function validate (bot, validationRequestBody, postBackTest = null, textTest = null) {
     try {
-        bot.buildWithSnapshot(
-            validationRequestBody.blocks,
-            Number.MAX_SAFE_INTEGER,
-            undefined,
-            validationRequestBody.deployedConfiguration
-        );
+        bot.buildWithSnapshot(validationRequestBody.blocks, Number.MAX_SAFE_INTEGER);
     } catch (e) {
         const error = `Bot build failed: ${e.message}`;
         // eslint-disable-next-line no-console