@xapp/chat-widget 1.37.4 → 1.39.0

package/dist/index.js

@@ -1446,6 +1446,49 @@ function useIsMounted() {
     return React$1.useCallback(function () { return ref.current; }, []);
 }
 
+var RetryOptions = /** @class */ (function () {
+    function RetryOptions() {
+        this.retries = 5;
+        this.timeout = 1000;
+        this.log = false;
+    }
+    return RetryOptions;
+}());
+var RetryRequest = /** @class */ (function () {
+    function RetryRequest(options) {
+        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);
+            }
+        });
+    };
+    RetryRequest.prototype.log = function (message) {
+        if (this.options.log && console && console.log) {
+            console.log(message);
+        }
+    };
+    return RetryRequest;
+}());
+
 var EMAIL_REGEX = "^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+$";
 // Returns current timestamp
 function getCurrentDateString() {
@@ -1666,17 +1709,18 @@ var Carousel = function (props) {
             setSetVisibleIndex(newVisibleIndex);
         }
     }
+    var hasOnlyOneItem = props.list.items.length === 1;
     var hasImage = props.list.items.some(function (item) { return item.imageUrl; });
     var listItems = props.list.items.map(function (item, itemIndex) {
         return (React__default$1["default"].createElement("div", { className: "xappw-carousel-items__item", key: "item-key-".concat(itemIndex) },
             React__default$1["default"].createElement(CarouselItem, { item: item, emptyImageVisible: hasImage, onExecute: props.onExecute, onButtonClick: props.onButtonClick, onOpenUrl: props.onOpenUrl })));
     });
     return (React__default$1["default"].createElement("div", { className: "xappw-carousel" },
-        React__default$1["default"].createElement("div", { className: "xappw-carousel__prev" },
-            React__default$1["default"].createElement(ChevronLeft, { onClick: function () { return scrollMe(-1); } })),
-        React__default$1["default"].createElement("div", { ref: listRef, className: "xappw-carousel-items" }, listItems),
-        React__default$1["default"].createElement("div", { className: "xappw-carousel__next" },
-            React__default$1["default"].createElement(ChevronRight, { onClick: function () { return scrollMe(1); } }))));
+        hasOnlyOneItem && (React__default$1["default"].createElement("div", { className: "xappw-carousel__prev" },
+            React__default$1["default"].createElement(ChevronLeft, { onClick: function () { return scrollMe(-1); } }))),
+        React__default$1["default"].createElement("div", { ref: listRef, className: "xappw-carousel-items ".concat(hasOnlyOneItem ? "xappw-carousel-items--one-item" : "") }, listItems),
+        hasOnlyOneItem && (React__default$1["default"].createElement("div", { className: "xappw-carousel__next" },
+            React__default$1["default"].createElement(ChevronRight, { onClick: function () { return scrollMe(1); } })))));
 };
 
 function useDimensions() {
@@ -1897,19 +1941,21 @@ function throwBadKind$1(x) {
 
 function execute(url, behavior) {
     var type = behavior.type;
-    if (get("opened")) {
-        set("opened", false);
-    }
     switch (type) {
         case "newWindow":
+            if (get("opened")) {
+                set("opened", false);
+            }
             window.open(url, "callout-option", "toolbar=0,status=0,width=".concat(behavior.width || 1000, ",height=").concat(behavior.height || 700));
             break;
         case "newTab":
+            if (get("opened")) {
+                set("opened", false);
+            }
             window.open(url, "_blank");
             break;
         case "sameWindow":
-            // For reopen widget after move on same window
-            if (get("visible")) {
+            if (!get("opened")) {
                 set("opened", true);
             }
             window.open(url, "_self");
@@ -1941,6 +1987,7 @@ function writeMessage(msg, user) {
 function executeAction(text, token) {
     return function (chatServer) { return function (dispatch, getState) {
         var attributes = getState().attributes;
+        attributes = __assign(__assign({}, attributes), { currentUrl: window.location.href });
         chatServer.sendChatMsg({ text: text, token: token, attributes: attributes }, function (err) {
             if (err) {
                 log("Error sending message", err);
@@ -1997,6 +2044,7 @@ function sendFile(file) {
                 user: {
                     nick: "",
                 },
+                attributes: { currentUrl: window.location.href },
                 timestamp: +Date()
             }
         });
@@ -2840,12 +2888,11 @@ function convertFromListDisplay(list) {
     };
 }
 function convertFromCardDisplay(card) {
-    var _a;
     return {
         content: card.content,
         imageUrl: card.smallImageUrl,
         title: card.title,
-        imageActionUrl: (_a = card) === null || _a === void 0 ? void 0 : _a.imageActionUrl,
+        imageActionUrl: card === null || card === void 0 ? void 0 : card.imageActionUrl,
         buttons: card.buttons ? card.buttons.map(function (button) { return ({
             actionUrl: button.openUrlAction,
             label: button.title
@@ -3131,14 +3178,14 @@ var StentorDirectChat = /** @class */ (function () {
     };
     StentorDirectChat.prototype.setVisitorInfo = function (visitorInfo, cb) {
         this.visitorInfo = visitorInfo;
-        this._attributes = this.visitorInfo.attributes;
+        this._attributes = __assign(__assign({}, this.visitorInfo.attributes), { currentUrl: window.location.href });
         this._accessToken = this.visitorInfo.accessToken;
-        this.startSession();
         // This is for the bot
         this.userJoined({
             user: this.getBot(undefined),
             token: ""
         });
+        this.startSession();
         cb();
     };
     StentorDirectChat.prototype.sendChatRating = function () {
@@ -3258,14 +3305,21 @@ var StentorDirectChat = /** @class */ (function () {
                         log("Visitor says: ".concat(JSON.stringify(request, undefined, 2)));
                         // Bot is "typing"
                         this.typing();
-                        return [4 /*yield*/, postMessageToStentor(request, this.config.url, this.config.key).catch(function (postError) {
+                        return [4 /*yield*/, new RetryRequest({ retries: 1, timeout: 5000 }).retry(postMessageToStentor(request, this.config.url, this.config.key)).then(function (result) {
+                                botResponse = result;
+                            }, function (error) {
+                                err("POST failed: ".concat(error));
+                                //eslint-disable-next-line
+                                //@ts-ignore
+                                botResponse = { errorText: "Bot doesn't respond. Reason: ".concat(error) };
+                            }).catch(function (postError) {
                                 err("POST failed: ".concat(postError.message));
-                                return {
-                                    text: "Bot doesn't respond. Reason: ".concat(postError.message)
-                                };
+                                //eslint-disable-next-line
+                                //@ts-ignore
+                                botResponse = { errorText: "Bot doesn't respond. Reason: ".concat(error) };
                             })];
                     case 1:
-                        botResponse = _e.sent();
+                        _e.sent();
                         // Bot stopped "typing"
                         this.stopTyping();
                         log("Bot says: ".concat(JSON.stringify(botResponse, undefined, 2)));
@@ -3273,7 +3327,7 @@ var StentorDirectChat = /** @class */ (function () {
                         // new session no more
                         this.isNewSession = false;
                         responseMessage = responseToMessage(botResponse);
-                        if (!responseMessage) {
+                        if (botResponse.hasOwnProperty("errorText") || !botResponse) {
                             responseMessage = {
                                 type: "userLeft",
                                 timestamp: now,
@@ -3300,7 +3354,13 @@ var StentorDirectChat = /** @class */ (function () {
         else {
             this._userId = "stentor-widget-user-".concat(uuid_1());
         }
-        this._sessionId = "stentor-widget-session-".concat(uuid_1());
+        if (get("sessionId") !== "") {
+            this._sessionId = get("sessionId");
+        }
+        else {
+            this._sessionId = "stentor-widget-session-".concat(uuid_1());
+            set("sessionId", this._sessionId);
+        }
         // This is a flag that is cleared after the first message is sent
         this.isNewSession = true;
     };
@@ -7554,7 +7614,7 @@ function useGreeting(active) {
                         visitorId: curr.visitorId,
                         userId: curr.userId,
                         accessToken: curr.accessToken,
-                        attributes: curr.attributes
+                        attributes: __assign(__assign({}, curr.attributes), { currentUrl: window.location.href })
                     }));
                     var timeoutId_1 = setTimeout(function () {
                         var greetingAction = sendGreeting();
@@ -8495,7 +8555,7 @@ var ChatWidget = function (props) {
         canCancel = !dockedMode && !staticMode;
     }
     // Our state - pull from storage
-    var _o = React$1.useState(!canMinimize || !!get("visible)") || (((_h = props.config) === null || _h === void 0 ? void 0 : _h.autoOpenOnWidth) && window.matchMedia("(min-width: ".concat((_j = props.config) === null || _j === void 0 ? void 0 : _j.autoOpenOnWidth, ")")).matches)), visible = _o[0], setVisibleState = _o[1];
+    var _o = React$1.useState((!canMinimize && !canCancel) || !!get("visible)") || (((_h = props.config) === null || _h === void 0 ? void 0 : _h.autoOpenOnWidth) && window.matchMedia("(min-width: ".concat((_j = props.config) === null || _j === void 0 ? void 0 : _j.autoOpenOnWidth, ")")).matches)), visible = _o[0], setVisibleState = _o[1];
     var _p = React$1.useState(false), typing = _p[0], setTypingState = _p[1]; // false initially
     var chatServer = React$1.useContext(ChatServerContext);
     var setVisible = React$1.useCallback(function (newVisible) {
@@ -8557,13 +8617,16 @@ var ChatWidget = function (props) {
         return visible ? "visible" : "";
     }
     function minimizeOnClick() {
+        set("opened", false);
         setVisible(false);
     }
     function cancelOnClick() {
+        set("opened", false);
         innerDispatch(reset());
         setVisible(false);
     }
     function chatButtonOnClick() {
+        set("opened", true);
         setVisible(true);
     }
     var isOffline = chatState.accountStatus === "offline" && !chatState.isChatting;
@@ -8707,6 +8770,9 @@ function joinMessages(messages, msg) {
 
 function memberJoin(state, detail) {
     var _a;
+    if (state.chats.length === 0) {
+        set("sessionId", "");
+    }
     if (isAgent(detail.user.nick)) {
         var prevAgentInfo = state.agents[detail.user.nick];
         return __assign(__assign({}, state), { isChatting: true, chats: (prevAgentInfo === null || prevAgentInfo === void 0 ? void 0 : prevAgentInfo.joined) ? state.chats : joinMessages(state.chats, detail), agents: (_a = {},