@senior-gestao-empresarial/angular-components 6.9.0 → 6.9.1

package/bundles/senior-gestao-empresarial-angular-components.umd.js

@@ -7190,8 +7190,6 @@
             /** @private */
             this.isConnecting = false;
             /** @private */
-            this.isReconnecting = false;
-            /** @private */
             this.primitiveManagers = new Map();
             /** @private */
             this.connect$ = new rxjs.Subject();
@@ -7238,11 +7236,12 @@
             var domain = _a.domain, service = _a.service, primitive = _a.primitive;
             var key = this.getPrimitiveManagerKey(domain, service, primitive);
             return this.onConnect().pipe(operators.switchMap(function () {
-                return _this.primitiveManagers.has(key) && _this.primitiveManagers.get(key).isSubscribed
+                return _this.primitiveManagers.has(key) &&
+                    _this.primitiveManagers.get(key).isSubscribed
                     ? rxjs.of(void 0).pipe(operators.take(1))
                     : _this.subscribe$.pipe(operators.filter(function (primitiveManager) {
                         return _this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key;
-                    }), operators.take(1), (operators.map(function () { return void 0; })));
+                    }), operators.take(1), operators.map(function () { return void 0; }));
             }));
         };
         /**
@@ -7273,21 +7272,29 @@
                 primitive: primitive,
                 stompSubscriptions: [],
                 event$: new rxjs.Subject(),
-                isSubscribed: false,
+                isSubscribed: false
             };
             this.primitiveManagers.set(key, primitiveManager);
             if (this.isConnected) {
                 this.createStompSubscriptions(primitiveManager);
-                return primitiveManager.event$.asObservable().pipe(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+                return primitiveManager.event$
+                    .asObservable()
+                    .pipe(operators.finalize(function () {
+                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+                }));
             }
             else {
-                if (!this.isReconnecting && !this.isConnecting) {
+                if (!this.isConnecting) {
                     this.connect();
                 }
                 this.connect$.pipe(operators.first()).subscribe(function () {
                     _this.createStompSubscriptions(primitiveManager);
                 });
-                return primitiveManager.event$.asObservable().pipe(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+                return primitiveManager.event$
+                    .asObservable()
+                    .pipe(operators.finalize(function () {
+                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+                }));
             }
         };
         /** @private */
@@ -7296,7 +7303,10 @@
             var stompSubscriptionWithToken = this.createStompSubscription(withTokenUrl, primitiveManager);
             var withoutTokenUrl = this.getSubscriptionUrlWithoutToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
             var stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
-            primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
+            primitiveManager.stompSubscriptions = [
+                stompSubscriptionWithToken,
+                stompSubscriptionWithoutToken
+            ];
             primitiveManager.isSubscribed = true;
             this.subscribe$.next(primitiveManager);
         };
@@ -7307,7 +7317,6 @@
             this.isConnecting = true;
             this._stompClient.connect({}, function () {
                 _this.isConnecting = false;
-                _this.isReconnecting = false;
                 _this.isConnected = true;
                 if (_this.wasConnected) {
                     _this.reconnectPrimitives();
@@ -7321,19 +7330,26 @@
             }, function (error) {
                 _this.isConnected = false;
                 _this.error$.next(error);
-                _this.isReconnecting = true;
-                rxjs.timer(WebsocketService_1.RECONNECT_INTERVAL)
-                    .pipe(operators.switchMap(function () {
-                    return rxjs.iif(function () { return document.hidden; }, rxjs.fromEvent(document, "visibilitychange").pipe(operators.first()), rxjs.EMPTY);
-                }))
-                    .subscribe({ complete: function () { return _this.connect(); } });
+                rxjs.race(_this.disconnect$.pipe(operators.take(1), operators.map(function () { return ({ wasDisconnected: true }); })), rxjs.timer(WebsocketService_1.RECONNECT_INTERVAL).pipe(operators.take(1), operators.switchMap(function () {
+                    return rxjs.iif(function () { return document.hidden; }, rxjs.fromEvent(document, 'visibilitychange').pipe(operators.first()), rxjs.of(void 0));
+                }), operators.map(function () { return ({ wasDisconnected: false }); })))
+                    .pipe(operators.take(1))
+                    .subscribe({
+                    next: function (_a) {
+                        var wasDisconnected = _a.wasDisconnected;
+                        if (!wasDisconnected &&
+                            !(_this.isConnected || _this.isConnecting)) {
+                            _this.connect();
+                        }
+                    }
+                });
             });
         };
         WebsocketService.prototype.disconnect = function () {
             var e_1, _a, e_2, _b, e_3, _c;
-            var observersCount = this.getObserversCount();
-            if (observersCount > 0)
+            if (this.getObserversCount() > 0) {
                 return;
+            }
             try {
                 for (var _d = __values(this.primitiveManagers.values()), _e = _d.next(); !_e.done; _e = _d.next()) {
                     var primitiveManager = _e.value;
@@ -7382,19 +7398,25 @@
         };
         /** @private */
         WebsocketService.prototype.getSubscriptionUrlWithToken = function (domain, service, primitive) {
-            var tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
-            var token = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.access_token : null;
+            var tenant = WebsocketService_1.TOKEN
+                ? WebsocketService_1.TOKEN.username.split('@')[1]
+                : null;
+            var token = WebsocketService_1.TOKEN
+                ? WebsocketService_1.TOKEN.access_token
+                : null;
             return "/topic/" + tenant + "/" + token + "/" + domain + "/" + service + "/" + primitive;
         };
         /** @private */
         WebsocketService.prototype.getSubscriptionUrlWithoutToken = function (domain, service, primitive) {
-            var tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
+            var tenant = WebsocketService_1.TOKEN
+                ? WebsocketService_1.TOKEN.username.split('@')[1]
+                : null;
             return "/topic/" + tenant + "/" + domain + "/" + service + "/" + primitive;
         };
         /** @private */
         WebsocketService.prototype.createStompSubscription = function (destination, primitiveManager) {
             return this._stompClient.subscribe(destination, function (message) {
-                var event = JSON.parse(message.body || "{}");
+                var event = JSON.parse(message.body || '{}');
                 primitiveManager.event$.next(event);
             });
         };
@@ -7470,22 +7492,20 @@
             return domain + "/" + service + "/" + primitive;
         };
         var WebsocketService_1;
-        /** @private */
         WebsocketService.RECONNECT_INTERVAL = 3000;
-        /** @private */
         WebsocketService.CONNECTION_TIMEOUT = 15000;
         /** @private */
-        WebsocketService.BASE_URL_COOKIE = "com.senior.base.url";
+        WebsocketService.BASE_URL_COOKIE = 'com.senior.base.url';
         /** @private */
-        WebsocketService.TOKEN_COOKIE = "com.senior.token";
+        WebsocketService.TOKEN_COOKIE = 'com.senior.token';
         /** @private */
-        WebsocketService.TOKEN = JSON.parse(jsCookie.get(WebsocketService_1.TOKEN_COOKIE) || "{}");
+        WebsocketService.TOKEN = JSON.parse(jsCookie.get(WebsocketService_1.TOKEN_COOKIE) || '{}');
         /** @private */
-        WebsocketService.WEBSOCKET_URL = jsCookie.get(WebsocketService_1.BASE_URL_COOKIE) + "/websocket/";
+        WebsocketService.WEBSOCKET_URL = jsCookie.get(WebsocketService_1.BASE_URL_COOKIE) + '/websocket/';
         WebsocketService.ɵprov = core.ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(); }, token: WebsocketService, providedIn: "root" });
         WebsocketService = WebsocketService_1 = __decorate([
             core.Injectable({
-                providedIn: "root",
+                providedIn: 'root'
             })
         ], WebsocketService);
         return WebsocketService;