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

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

@@ -7183,12 +7183,10 @@
 
     var WebsocketService = /** @class */ (function () {
         function WebsocketService() {
-            /** @private */
-            this.focused = true;
             /** @private */
             this.wasConnected = false;
             /** @private */
-            this.connected = false;
+            this.isConnected = false;
             /** @private */
             this.isConnecting = false;
             /** @private */
@@ -7201,23 +7199,19 @@
             this.reconnect$ = new rxjs.Subject();
             /** @private */
             this.error$ = new rxjs.Subject();
-            window.onfocus = this.onFocus;
-            window.onblur = this.onBlur;
+            this.subscribe$ = new rxjs.Subject();
             this.connect();
         }
         WebsocketService_1 = WebsocketService;
         /**
-         * Observable responsável por emitir uma notificação quando a conexão websocket é estabelecida.
-         * @return Um `Observable<void>` que emite uma notificação quando a conexão websocket é estabelecida.
+         * Observable responsável por emitir uma notificação quando a conexão websocket é estabelecida pela primeira vez.
+         * @return Um `Observable<void>` que emite uma notificação quando a conexão websocket é estabelecida pela primeira vez.
          */
         WebsocketService.prototype.onConnect = function () {
-            var _this = this;
-            setTimeout(function () {
-                if (_this.isConnected()) {
-                    _this.connect$.next();
-                }
-            }, 0);
-            return this.connect$.pipe(operators.first());
+            if (this.isConnected || this.wasConnected) {
+                return rxjs.of(undefined).pipe(operators.take(1));
+            }
+            return this.connect$.asObservable().pipe(operators.take(1));
         };
         /**
          * Observable responsável por emitir uma notificação quando a conexão é desconectada.
@@ -7234,16 +7228,21 @@
             return this.reconnect$.asObservable();
         };
         /**
-         * Observable responsável por emitir uma notificação após o subscribe do evento.
-         * @return Um `Observable<void>` que emite uma notificação após o subscribe do evento.
+         * Observable responsável por emitir uma notificação após o subscribe do evento pela primeira vez.
+         * @return Um `Observable<void>` que emite uma notificação após o subscribe do evento pela primeira vez.
          */
         WebsocketService.prototype.onSubscribe = function (_a) {
+            var _this = this;
             var domain = _a.domain, service = _a.service, primitive = _a.primitive;
-            var primitiveManager = this.primitiveManagers.get(this.getPrimitiveManagerKey(domain, service, primitive));
-            if (!primitiveManager) {
-                throw new Error("No subscription found for " + this.getPrimitiveManagerKey(domain, service, primitive));
-            }
-            return primitiveManager.subscribe$.asObservable();
+            var key = this.getPrimitiveManagerKey(domain, service, primitive);
+            return this.onConnect().pipe(operators.switchMap(function () {
+                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; }));
+            }));
         };
         /**
          * Observable responsável por emitir uma notificação quando ocorre algum erro.
@@ -7273,14 +7272,16 @@
                 primitive: primitive,
                 stompSubscriptions: [],
                 event$: new rxjs.Subject(),
-                subscribe$: new rxjs.ReplaySubject(1)
+                isSubscribed: false
             };
             this.primitiveManagers.set(key, primitiveManager);
-            if (this.isConnected()) {
+            if (this.isConnected) {
                 this.createStompSubscriptions(primitiveManager);
                 return primitiveManager.event$
                     .asObservable()
-                    .pipe(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+                    .pipe(operators.finalize(function () {
+                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+                }));
             }
             else {
                 if (!this.isConnecting) {
@@ -7291,7 +7292,9 @@
                 });
                 return primitiveManager.event$
                     .asObservable()
-                    .pipe(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+                    .pipe(operators.finalize(function () {
+                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+                }));
             }
         };
         /** @private */
@@ -7300,20 +7303,24 @@
             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.subscribe$.next();
+            primitiveManager.stompSubscriptions = [
+                stompSubscriptionWithToken,
+                stompSubscriptionWithoutToken
+            ];
+            primitiveManager.isSubscribed = true;
+            this.subscribe$.next(primitiveManager);
         };
         /** @private */
         WebsocketService.prototype.connect = function () {
             var _this = this;
             this.createStompClient();
             this.isConnecting = true;
-            this._stompClient.activate();
             this._stompClient.connect({}, function () {
                 _this.isConnecting = false;
-                _this.setConnected(true);
+                _this.isConnected = true;
                 if (_this.wasConnected) {
                     _this.reconnectPrimitives();
+                    _this.connect$.next();
                     _this.reconnect$.next();
                 }
                 else {
@@ -7321,24 +7328,28 @@
                     _this.connect$.next();
                 }
             }, function (error) {
-                _this.setConnected(false);
+                _this.isConnected = false;
                 _this.error$.next(error);
-                _this.reconnect();
+                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();
+                        }
+                    }
+                });
             });
         };
-        /** @private */
-        WebsocketService.prototype.onFocus = function () {
-            this.focused = true;
-        };
-        /** @private */
-        WebsocketService.prototype.onBlur = function () {
-            this.focused = false;
-        };
         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;
@@ -7368,7 +7379,6 @@
                 for (var _h = __values(this.primitiveManagers.values()), _j = _h.next(); !_j.done; _j = _h.next()) {
                     var primitiveManager = _j.value;
                     primitiveManager.event$.complete();
-                    primitiveManager.subscribe$.complete();
                 }
             }
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -7381,34 +7391,32 @@
             this.primitiveManagers.clear();
             this._stompClient.disconnect();
             this._stompClient.deactivate();
-            this.setConnected(false);
+            this.isConnected = false;
             this.isConnecting = false;
             this.wasConnected = false;
             this.disconnect$.next();
         };
         /** @private */
-        WebsocketService.prototype.isConnected = function () {
-            return this.connected;
-        };
-        /** @private */
-        WebsocketService.prototype.setConnected = function (connected) {
-            this.connected = connected;
-        };
-        /** @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);
             });
         };
@@ -7416,58 +7424,28 @@
         WebsocketService.prototype.createStompClient = function () {
             var ws = new SockJS(WebsocketService_1.WEBSOCKET_URL + "subscription", null, { timeout: WebsocketService_1.CONNECTION_TIMEOUT });
             this._stompClient = stompjs.Stomp.over(ws);
-            // this._stompClient.debug = (str) => console.log(new Date().toISOString(), str);
-            this._stompClient.debug = function () { }; // Para remover os logs.
-        };
-        /** @private */
-        WebsocketService.prototype.reconnect = function () {
-            var _this = this;
-            if (this.connected)
-                this._stompClient.disconnect();
-            setTimeout(function () {
-                if (_this.getObserversCount() === 0)
-                    return;
-                if (_this.focused) {
-                    _this.connect();
-                }
-                else {
-                    _this.reconnect();
-                }
-            }, WebsocketService_1.RECONNECT_TIMER);
+            this._stompClient.debug = function () { return null; };
         };
         /** @private */
         WebsocketService.prototype.reconnectPrimitives = function () {
-            var e_4, _a, e_5, _b;
+            var e_4, _a;
             try {
-                for (var _c = __values(this.primitiveManagers.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var primitiveManager = _d.value;
-                    try {
-                        for (var _e = (e_5 = void 0, __values(primitiveManager.stompSubscriptions)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                            var stompSubscription = _f.value;
-                            stompSubscription.unsubscribe();
-                        }
-                    }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                    finally {
-                        try {
-                            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                    }
+                for (var _b = __values(this.primitiveManagers.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var primitiveManager = _c.value;
                     this.createStompSubscriptions(primitiveManager);
                 }
             }
             catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
                 finally { if (e_4) throw e_4.error; }
             }
         };
         /** @private */
         WebsocketService.prototype.getObserversCount = function () {
-            var e_6, _a;
+            var e_5, _a;
             var observersCount = 0;
             try {
                 for (var _b = __values(this.primitiveManagers.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -7475,36 +7453,35 @@
                     observersCount += primitiveManager.event$.observers.length;
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_5) throw e_5.error; }
             }
             return observersCount;
         };
         /** @private */
         WebsocketService.prototype.disconnectPrimitiveOnFinalize = function (primitiveManager) {
-            var e_7, _a;
+            var e_6, _a;
             // @IMPORTANT: Replace .observers.length === 1 with .observed in rxjs 7.0+
             var hasObservers = !(primitiveManager.event$.observers.length === 1);
             if (hasObservers)
                 return;
             primitiveManager.event$.complete();
-            primitiveManager.subscribe$.complete();
             try {
                 for (var _b = __values(primitiveManager.stompSubscriptions), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var stompSubscription = _c.value;
                     stompSubscription.unsubscribe();
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             var key = this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
             this.primitiveManagers.delete(key);
@@ -7515,22 +7492,20 @@
             return domain + "/" + service + "/" + primitive;
         };
         var WebsocketService_1;
-        /** @private */
-        WebsocketService.RECONNECT_TIMER = 3000;
-        /** @private */
+        WebsocketService.RECONNECT_INTERVAL = 3000;
         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;