@xapp/chat-widget 1.60.2 → 1.60.3

package/dist/index.js

@@ -2846,19 +2846,25 @@ var StentorRouterChat = /** @class */ (function () {
                     // We are connected
                     setActStatus("online");
                     setConnStatus("online");
-                    ws.onclose = startReconnecting;
+                    ws.onclose = function () {
+                        log("Closed WS connection (onclosed was called)");
+                        startReconnecting();
+                    };
                     clearInterval(interval);
                 };
-            }, 3000);
+            }, 5000);
         }
         log("Creating WS connection");
         var ws = wsCreate();
         if (!ws) {
             return;
         }
-        this.ws.onclose = startReconnecting;
+        ws.onclose = function () {
+            log("Closed WS connection (onclosed was called)");
+            startReconnecting();
+        };
         this.ws.onopen = function () {
-            log("Opened WS connection");
+            log("Opened WS connection (onopen was called)");
             // We are connected
             _this.setAccountStatus("online");
             _this.setConnectionStatus("online");
@@ -2866,13 +2872,27 @@ var StentorRouterChat = /** @class */ (function () {
     };
     StentorRouterChat.prototype.wsCreate = function () {
         var _this = this;
+        var _a, _b;
         if (this.isDisposed) {
             log("Stopping reconnect for disposed router connector");
             return undefined;
         }
+        else {
+            log("Trying to re-connect...");
+        }
         var url = new URL(this.serverUrl);
         url.searchParams.set("userId", this._userId);
         url.searchParams.set("isAdmin", "".concat(this.isAdmin));
+        // Force close - just in case - when you create new
+        if (this.ws && ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) !== WebSocket.CLOSED) {
+            var wsState = (_b = this.ws) === null || _b === void 0 ? void 0 : _b.readyState;
+            try {
+                this.ws.close();
+            }
+            catch (err) {
+                err("Failed to close WS (ready state: ".concat(wsState, "): ").concat(err));
+            }
+        }
         this.ws = new WebSocket(url.toString());
         this.ws.onerror = function (ev) {
             var _a;
@@ -2914,7 +2934,7 @@ var StentorRouterChat = /** @class */ (function () {
                             // Fire up the WebSocket
                             this.autoReconnect(this.wsCreate.bind(this));
                         }
-                        return [4 /*yield*/, waitFor(this.checkConnection.bind(this), 500, 5000, "connection")
+                        return [4 /*yield*/, waitFor(this.checkConnection.bind(this), 1000, 10000, "connection")
                                 .then(function (t) {
                                 if (t > 0) {
                                     log("Connection is ready in ".concat(t, " ms"));
@@ -3008,16 +3028,14 @@ var StentorRouterChat = /** @class */ (function () {
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.checkConnection() && !this.checkSession())) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.postVisitorInfo()];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2:
+                        // This is rare, but is happened: no visitor info exchange, but the connection is back.
+                        // if (this.checkConnection() && !this.checkSession()) {
+                        //     await this.postVisitorInfo();
+                        // }
                         if (!this.checkSession()) {
                             this.setConnectionStatus("pending");
                         }
-                        return [4 /*yield*/, waitFor(this.checkSession.bind(this), 500, 5000, "session creation")
+                        return [4 /*yield*/, waitFor(this.checkSession.bind(this), 1000, 10000, "session creation")
                                 .then(function (t) {
                                 if (t > 0) {
                                     log("Session creation is ready in ".concat(t, " ms"));
@@ -3029,7 +3047,7 @@ var StentorRouterChat = /** @class */ (function () {
                                 _this.setConnectionStatus("online"); // stop pulsing
                                 _this.sendDisconnectMessage();
                             })];
-                    case 3:
+                    case 1:
                         _a.sent();
                         this.setConnectionStatus("online");
                         cb();
@@ -3068,20 +3086,24 @@ var StentorRouterChat = /** @class */ (function () {
     StentorRouterChat.prototype.flush = function () { };
     StentorRouterChat.prototype.dispose = function () {
         this.isDisposed = true;
-        this.ws.close();
+        if (this.ws) {
+            this.ws.close();
+        }
         log("Closed web socket (dispose)");
     };
     StentorRouterChat.prototype.sleep = function () {
         this.isDisposed = true;
-        this.ws.close();
-        log("Closed web socket (dispose)");
+        if (this.ws) {
+            this.ws.close();
+        }
+        log("Closed web socket (sleep)");
     };
     StentorRouterChat.prototype.wakeup = function () {
+        this.isDisposed = false;
         // wait for the session setup
         if (!this._userId) {
             return;
         }
-        this.isDisposed = false;
         // Fire up the WebSocket 
         this.autoReconnect(this.wsCreate.bind(this));
         log("Waking up");
@@ -3174,7 +3196,7 @@ function senderToNick(sender) {
 function waitFor(check, stepMs, timeoutMs, resource) {
     var elapsedMs = 0;
     var poll = function (resolve, reject) {
-        if (elapsedMs > timeoutMs) {
+        if (elapsedMs >= timeoutMs) {
             reject(elapsedMs);
         }
         else {
@@ -31064,7 +31086,7 @@ var ChatWidget = function (props) {
         }
     }, [chatServer, innerDispatch, isTabVisible]);
     React$1.useEffect(function () {
-        // For reopen widget after move on same windowyar
+        // For reopen widget after move on same window
         // if (get("opened")) {
         //     setVisible(true);
         // }