@xapp/chat-widget 1.46.3 → 1.47.0

package/dist/index.js

@@ -1468,33 +1468,54 @@ var RetryRequest = /** @class */ (function () {
         if (options) {
             this.options = Object.assign(new RetryOptions(), options);
         }
-        this.attempts = 0;
     }
-    RetryRequest.prototype.retry = function (executor) {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            if (_this.attempts < _this.options.retries) {
-                setTimeout(function () {
-                    _this.attempts++;
-                    executor
-                        .then(function (response) { return resolve(response); })
-                        .catch(function (error) {
-                        _this.lastError = error;
-                        _this.log("Retry: ".concat(_this.attempts, " : ").concat(JSON.stringify(error)));
-                        return _this.retry(executor).then(resolve).catch(reject);
-                    });
-                }, _this.options.timeout);
-            }
-            else {
-                reject(_this.lastError);
-            }
+    /**
+     * Fetch with retry and timeout
+     *
+     * Help from https://stackoverflow.com/a/66499718
+     * @param executor
+     * @param options
+     * @returns
+     */
+    RetryRequest.prototype.fetch = function (executor, options) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var controller_1, timeoutId, response, e_1;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!options) {
+                            options = this.options;
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 5]);
+                        controller_1 = new AbortController();
+                        timeoutId = setTimeout(function () {
+                            controller_1.abort();
+                        }, options.timeout);
+                        return [4 /*yield*/, executor(controller_1.signal)];
+                    case 2:
+                        response = _a.sent();
+                        clearTimeout(timeoutId);
+                        return [2 /*return*/, response];
+                    case 3:
+                        e_1 = _a.sent();
+                        if (options.retries === 1 || options.retries < 1) {
+                            // Failed
+                            throw (e_1);
+                        }
+                        return [4 /*yield*/, this.fetch(executor, {
+                                timeout: options.timeout,
+                                retries: options.retries - 1
+                            })];
+                    case 4: 
+                    // decrement the retries
+                    return [2 /*return*/, _a.sent()];
+                    case 5: return [2 /*return*/];
+                }
+            });
         });
     };
-    RetryRequest.prototype.log = function (message) {
-        if (this.options.log && console && console.log) {
-            console.log(message);
-        }
-    };
     return RetryRequest;
 }());
 
@@ -1508,8 +1529,9 @@ function log() {
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    // TODO: only log in debug
-    console.log.apply(console, __spreadArray$1([getCurrentDateString()], args, false));
+    if (window.xaLogLevel === "debug") {
+        console.log.apply(console, __spreadArray$1([getCurrentDateString()], args, false));
+    }
 }
 function err() {
     var args = [];
@@ -2840,7 +2862,7 @@ dist.useJsonFetch = useJsonFetch;
 var useSuggestionsFetch_1 = dist.useSuggestionsFetch = useSuggestionsFetch$1;
 var uuid_1 = dist.uuid = uuid;
 
-function postMessageToStentor(data, url, key) {
+function postMessageToStentor(data, url, key, signal) {
     return __awaiter$1(this, void 0, void 0, function () {
         var body, response;
         return __generator$1(this, function (_a) {
@@ -2857,7 +2879,8 @@ function postMessageToStentor(data, url, key) {
                                 "User-Agent": "Stentor Chat Server"
                             },
                             body: body,
-                            mode: "cors"
+                            mode: "cors",
+                            signal: signal
                         })];
                 case 1:
                     response = _a.sent();
@@ -3056,7 +3079,8 @@ function getConfigurableMessages() {
 }
 function getConfigurableMessagesConfig(messages) {
     var items = messages.items;
-    var config = [{ retry: 0, delay: 5, text: "" }];
+    // First one is silent, keeps the same message
+    var config = [{ retry: 0, delay: 10, text: "" }];
     if (Array.isArray(items) && items.length > 0) {
         for (var i = 0; i < items.length; i++) {
             config.push({ retry: i + 1, delay: items[i].delay, text: items[i].text });
@@ -3160,8 +3184,7 @@ var StentorDirectChat = /** @class */ (function () {
             }
         });
     };
-    StentorDirectChat.prototype.sendFailureMessage = function (retry, delay, text, config) {
-        var _this = this;
+    StentorDirectChat.prototype.sendFailureMessage = function (retry, delay, text) {
         this.stopTyping();
         this.dispatch({
             type: "chat",
@@ -3178,11 +3201,6 @@ var StentorDirectChat = /** @class */ (function () {
                 timestamp: +new Date()
             }
         });
-        if (retry !== config.length - 1) {
-            setTimeout(function () {
-                _this.typing();
-            }, config[retry - 1].delay * 1000);
-        }
     };
     // private disconnect() {
     //     log("SERVER: disconnect");
@@ -3271,7 +3289,7 @@ var StentorDirectChat = /** @class */ (function () {
     StentorDirectChat.prototype.postMessage = function (message) {
         var _a, _b, _c, _d;
         return __awaiter$1(this, void 0, void 0, function () {
-            var request, userId, sessionId, accessToken, attributes, now, permissionRequest, expired, text, granted, userProfile, isEmail, botResponse, configurableMessages, successResult, _loop_1, this_1, i, state_1, responseMessage;
+            var request, userId, sessionId, accessToken, attributes, now, permissionRequest, expired, text, granted, userProfile, isEmail, configurableMessages, botResponse, successResult, success, fail, i, timeout, responseMessage;
             var _this = this;
             return __generator$1(this, function (_e) {
                 switch (_e.label) {
@@ -3375,56 +3393,47 @@ var StentorDirectChat = /** @class */ (function () {
                         log("Visitor says: ".concat(JSON.stringify(request, undefined, 2)));
                         configurableMessages = getConfigurableMessagesConfig(this.configurableMessages);
                         successResult = false;
-                        this.typing();
-                        _loop_1 = function (i) {
+                        success = function (result) {
+                            botResponse = result;
+                            successResult = true;
+                        };
+                        fail = function (i, error) { return __awaiter$1(_this, void 0, void 0, function () {
                             var retry, delay, text;
-                            return __generator$1(this, function (_f) {
-                                switch (_f.label) {
-                                    case 0:
-                                        retry = configurableMessages[i].retry;
-                                        delay = configurableMessages[i].delay;
-                                        text = configurableMessages[i].text;
-                                        //eslint-disable-next-line
-                                        return [4 /*yield*/, new RetryRequest({ retries: 1, timeout: (configurableMessages[i - 1].delay * 1000) + 3000 }).retry(postMessageToStentor(request, this_1.config.url, this_1.config.key)).then(function (result) {
-                                                //eslint-disable-next-line
-                                                //@ts-ignore
-                                                botResponse = result;
-                                                successResult = true;
-                                                //eslint-disable-next-line
-                                            }, function (error) {
-                                                err("POST failed: ".concat(error));
-                                                _this.sendFailureMessage(retry, delay, text, configurableMessages);
-                                                //eslint-disable-next-line
-                                                //@ts-ignore
-                                                botResponse = { errorText: "" };
-                                                //eslint-disable-next-line
-                                            }).catch(function (postError) {
-                                                err("POST failed: ".concat(postError.message));
-                                                _this.sendFailureMessage(retry, delay, text, configurableMessages);
-                                                //eslint-disable-next-line
-                                                //@ts-ignore
-                                                botResponse = { errorText: "" };
-                                            })];
-                                    case 1:
-                                        //eslint-disable-next-line
-                                        _f.sent();
-                                        if (successResult) {
-                                            return [2 /*return*/, "break"];
-                                        }
-                                        return [2 /*return*/];
-                                }
+                            return __generator$1(this, function (_a) {
+                                retry = configurableMessages[i].retry;
+                                delay = configurableMessages[i].delay;
+                                text = configurableMessages[i].text;
+                                err("POST failed: ".concat(error));
+                                this.sendFailureMessage(retry, delay, text);
+                                botResponse = { errorText: "" };
+                                // We need to delay before we actually make another fetch call again
+                                return [2 /*return*/, new Promise(function (resolve) {
+                                        // * 1000 to make it seconds
+                                        setTimeout(resolve, delay * 1000);
+                                    })];
                             });
-                        };
-                        this_1 = this;
+                        }); };
                         i = 1;
                         _e.label = 1;
                     case 1:
                         if (!(i < configurableMessages.length)) return [3 /*break*/, 4];
-                        return [5 /*yield**/, _loop_1(i)];
+                        timeout = configurableMessages[i - 1].delay * 1000;
+                        this.typing();
+                        // We don't start typing IF we have a failure message displayed and we are waiting on the timeout
+                        return [4 /*yield*/, new RetryRequest({ retries: 1, timeout: timeout })
+                                .fetch(function (signal) {
+                                return postMessageToStentor(request, _this.config.url, _this.config.key, signal);
+                            })
+                                .then(success)
+                                // bind the i, the current iteration, to the fail function for looking up the message
+                                .catch(fail.bind(this, i))];
                     case 2:
-                        state_1 = _e.sent();
-                        if (state_1 === "break")
+                        // We don't start typing IF we have a failure message displayed and we are waiting on the timeout
+                        _e.sent();
+                        // If we have what we want, break the for loop
+                        if (successResult) {
                             return [3 /*break*/, 4];
+                        }
                         _e.label = 3;
                     case 3:
                         i++;
@@ -30898,7 +30907,7 @@ var ChatWidgetWrapper = function (props) {
             bot: {
                 nick: "Bot",
                 displayName: rawConfig.botName,
-                avatarPath: rawConfig.avatarUrl
+                avatarPath: rawConfig.avatarUrl,
             },
             configurableMessages: configurableMessages
         };