@resolveio/client-lib-core 15.0.11 → 15.1.1

package/fesm2015/resolveio-client-lib-core.mjs

@@ -299,6 +299,7 @@ class SocketService {
         this.onconnecting = function () { };
         this.onmessage = function (event) { };
         this.onerror = function (event) { };
+        document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this));
     }
     openSocket(environment, protocols) {
         this.url = environment.WS_URL;
@@ -383,13 +384,16 @@ class SocketService {
     }
     startPinging() {
         this.pingInterval = setInterval(() => {
-            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+            if (this.isWebSocketActive()) {
                 this.send('ping');
                 this.pongTimeout = setTimeout(() => {
                     this.log(new Date(), 'WS', 'pong not received, closing connection');
                     this.close();
                 }, this.pongTimeoutTime);
             }
+            else {
+                this.reconnect();
+            }
         }, this.pingIntervalTime);
     }
     stopPinging() {
@@ -438,12 +442,12 @@ class SocketService {
     }
     reconnect() {
         this.log(new Date(), 'WS', 'reconnect', this.readyState);
-        if (this.readyState === WebSocket.OPEN) {
-            this.close();
-        }
-        else if (this.readyState === WebSocket.CLOSING || this.readyState === WebSocket.CLOSED) {
+        if (this.readyState === WebSocket.CLOSED) {
             this.connect();
         }
+        else if (this.readyState !== WebSocket.CONNECTING) {
+            this.close();
+        }
     }
     getBufferAmount() {
         if (this.ws) {
@@ -458,6 +462,16 @@ class SocketService {
             console.log(...args);
         }
     }
+    handleVisibilityChange() {
+        if (document.visibilityState === 'visible') {
+            if (!this.isWebSocketActive()) {
+                this.reconnect();
+            }
+        }
+    }
+    isWebSocketActive() {
+        return this.ws && this.ws.readyState === WebSocket.OPEN;
+    }
 }
 SocketService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketService, deps: [{ token: i1.LocalStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
 SocketService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketService });
@@ -1158,12 +1172,35 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1$1.ToastrService }]; } });
 
+class TokenManagerService {
+    constructor(_storage) {
+        this._storage = _storage;
+    }
+    getToken(tokenKey) {
+        return this._storage.get(tokenKey);
+    }
+    setToken(tokenKey, tokenValue) {
+        this._storage.set(tokenKey, tokenValue);
+    }
+    removeToken(tokenKey) {
+        if (this.getToken(tokenKey) !== null) {
+            this._storage.remove(tokenKey);
+        }
+    }
+}
+TokenManagerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService, deps: [{ token: i1.LocalStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
+TokenManagerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: i1.LocalStorageService }]; } });
+
 class SocketManagerService {
-    constructor(_socket, _offline, _alert, _router) {
+    constructor(_socket, _offline, _alert, _router, _token) {
         this._socket = _socket;
         this._offline = _offline;
         this._alert = _alert;
         this._router = _router;
+        this._token = _token;
         this.messageId = 0;
         this._cbArray = [];
         this._subArray = [];
@@ -1295,6 +1332,7 @@ class SocketManagerService {
         this._socket.openSocket(environment, protocols);
     }
     closeSocket() {
+        this._token.removeToken('accessToken');
         this._socket.close();
     }
     call(method, ...parameters) {
@@ -1474,31 +1512,11 @@ class SocketManagerService {
         return this._socket.readyState$;
     }
 }
-SocketManagerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketManagerService, deps: [{ token: SocketService }, { token: OfflineManagerService }, { token: AlertService }, { token: i1$2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+SocketManagerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketManagerService, deps: [{ token: SocketService }, { token: OfflineManagerService }, { token: AlertService }, { token: i1$2.Router }, { token: TokenManagerService }], target: i0.ɵɵFactoryTarget.Injectable });
 SocketManagerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketManagerService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketManagerService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: SocketService }, { type: OfflineManagerService }, { type: AlertService }, { type: i1$2.Router }]; } });
-
-class TokenManagerService {
-    constructor(_storage) {
-        this._storage = _storage;
-    }
-    getToken(tokenKey) {
-        return this._storage.get(tokenKey);
-    }
-    setToken(tokenKey, tokenValue) {
-        this._storage.set(tokenKey, tokenValue);
-    }
-    removeToken(tokenKey) {
-        this._storage.remove(tokenKey);
-    }
-}
-TokenManagerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService, deps: [{ token: i1.LocalStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
-TokenManagerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenManagerService, decorators: [{
-            type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.LocalStorageService }]; } });
+        }], ctorParameters: function () { return [{ type: SocketService }, { type: OfflineManagerService }, { type: AlertService }, { type: i1$2.Router }, { type: TokenManagerService }]; } });
 
 class AccountManagerService {
     constructor(_router, _socket, _token, _http, _alert, _offline) {
@@ -1520,6 +1538,7 @@ class AccountManagerService {
         if (token) {
             this.initLogin(token);
             setInterval(() => {
+                token = this._token.getToken('refreshToken');
                 this.initLogin(token);
             }, 3000);
         }
@@ -1623,7 +1642,6 @@ class AccountManagerService {
             setTimeout(() => {
                 this.user.next(null);
                 this._token.removeToken('refreshToken');
-                this._token.removeToken('accessToken');
                 this._offline.removeUser();
                 this.closeSocket();
                 resolve(true);