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

package/fesm5/senior-gestao-empresarial-angular-components.js

@@ -3,8 +3,8 @@ import { Input, Component, NgModule, Injectable, Inject, ɵɵdefineInjectable,
 import { CommonModule } from '@angular/common';
 import { BreadcrumbModule as BreadcrumbModule$1 } from 'primeng/breadcrumb';
 import { NavigationEnd, PRIMARY_OUTLET, ActivatedRoute, Router, RouterModule } from '@angular/router';
-import { Subject, throwError, interval, of, ReplaySubject } from 'rxjs';
-import { takeUntil, filter, catchError, map, takeWhile, switchMap, first, finalize, take } from 'rxjs/operators';
+import { Subject, throwError, interval, of, timer, iif, fromEvent, EMPTY, ReplaySubject } from 'rxjs';
+import { takeUntil, filter, catchError, map, takeWhile, switchMap, take, finalize, first } from 'rxjs/operators';
 import * as moment_ from 'moment';
 import { FormField, FieldType } from '@seniorsistemas/angular-components';
 import { HttpParams, HttpClient } from '@angular/common/http';
@@ -6977,15 +6977,15 @@ var NpsService = /** @class */ (function () {
 
 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 */
+        this.isReconnecting = false;
+        /** @private */
         this.primitiveManagers = new Map();
         /** @private */
         this.connect$ = new Subject();
@@ -6995,23 +6995,19 @@ var WebsocketService = /** @class */ (function () {
         this.reconnect$ = new Subject();
         /** @private */
         this.error$ = new Subject();
-        window.onfocus = this.onFocus;
-        window.onblur = this.onBlur;
+        this.subscribe$ = new 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(first());
+        if (this.isConnected || this.wasConnected) {
+            return of(undefined).pipe(take(1));
+        }
+        return this.connect$.asObservable().pipe(take(1));
     };
     /**
      * Observable responsável por emitir uma notificação quando a conexão é desconectada.
@@ -7028,16 +7024,20 @@ var WebsocketService = /** @class */ (function () {
         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(switchMap(function () {
+            return _this.primitiveManagers.has(key) && _this.primitiveManagers.get(key).isSubscribed
+                ? of(void 0).pipe(take(1))
+                : _this.subscribe$.pipe(filter(function (primitiveManager) {
+                    return _this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key;
+                }), take(1), (map(function () { return void 0; })));
+        }));
     };
     /**
      * Observable responsável por emitir uma notificação quando ocorre algum erro.
@@ -7067,25 +7067,21 @@ var WebsocketService = /** @class */ (function () {
             primitive: primitive,
             stompSubscriptions: [],
             event$: new Subject(),
-            subscribe$: new ReplaySubject(1)
+            isSubscribed: false,
         };
         this.primitiveManagers.set(key, primitiveManager);
-        if (this.isConnected()) {
+        if (this.isConnected) {
             this.createStompSubscriptions(primitiveManager);
-            return primitiveManager.event$
-                .asObservable()
-                .pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+            return primitiveManager.event$.asObservable().pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
         }
         else {
-            if (!this.isConnecting) {
+            if (!this.isReconnecting && !this.isConnecting) {
                 this.connect();
             }
             this.connect$.pipe(first()).subscribe(function () {
                 _this.createStompSubscriptions(primitiveManager);
             });
-            return primitiveManager.event$
-                .asObservable()
-                .pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+            return primitiveManager.event$.asObservable().pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
         }
     };
     /** @private */
@@ -7095,19 +7091,21 @@ var WebsocketService = /** @class */ (function () {
         var withoutTokenUrl = this.getSubscriptionUrlWithoutToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
         var stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
         primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
-        primitiveManager.subscribe$.next();
+        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.isReconnecting = false;
+            _this.isConnected = true;
             if (_this.wasConnected) {
                 _this.reconnectPrimitives();
+                _this.connect$.next();
                 _this.reconnect$.next();
             }
             else {
@@ -7115,19 +7113,16 @@ var WebsocketService = /** @class */ (function () {
                 _this.connect$.next();
             }
         }, function (error) {
-            _this.setConnected(false);
+            _this.isConnected = false;
             _this.error$.next(error);
-            _this.reconnect();
+            _this.isReconnecting = true;
+            timer(WebsocketService_1.RECONNECT_INTERVAL)
+                .pipe(switchMap(function () {
+                return iif(function () { return document.hidden; }, fromEvent(document, "visibilitychange").pipe(first()), EMPTY);
+            }))
+                .subscribe({ complete: function () { return _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();
@@ -7162,7 +7157,6 @@ var WebsocketService = /** @class */ (function () {
             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 }; }
@@ -7175,20 +7169,12 @@ var WebsocketService = /** @class */ (function () {
         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;
@@ -7210,58 +7196,28 @@ var WebsocketService = /** @class */ (function () {
     WebsocketService.prototype.createStompClient = function () {
         var ws = new SockJS(WebsocketService_1.WEBSOCKET_URL + "subscription", null, { timeout: WebsocketService_1.CONNECTION_TIMEOUT });
         this._stompClient = 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()) {
@@ -7269,36 +7225,35 @@ var WebsocketService = /** @class */ (function () {
                 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);
@@ -7310,7 +7265,7 @@ var WebsocketService = /** @class */ (function () {
     };
     var WebsocketService_1;
     /** @private */
-    WebsocketService.RECONNECT_TIMER = 3000;
+    WebsocketService.RECONNECT_INTERVAL = 3000;
     /** @private */
     WebsocketService.CONNECTION_TIMEOUT = 15000;
     /** @private */