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

package/fesm2015/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';
@@ -6554,15 +6554,15 @@ NpsService = __decorate([
 var WebsocketService_1;
 let WebsocketService = WebsocketService_1 = class WebsocketService {
     constructor() {
-        /** @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();
@@ -6572,21 +6572,18 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.reconnect$ = new Subject();
         /** @private */
         this.error$ = new Subject();
-        window.onfocus = this.onFocus;
-        window.onblur = this.onBlur;
+        this.subscribe$ = new Subject();
         this.connect();
     }
     /**
-     * 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.
      */
     onConnect() {
-        setTimeout(() => {
-            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.
@@ -6603,15 +6600,14 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         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.
      */
     onSubscribe({ domain, service, primitive }) {
-        const 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();
+        const key = this.getPrimitiveManagerKey(domain, service, primitive);
+        return this.onConnect().pipe(switchMap(() => this.primitiveManagers.has(key) && this.primitiveManagers.get(key).isSubscribed
+            ? of(void 0).pipe(take(1))
+            : this.subscribe$.pipe(filter(primitiveManager => this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key), take(1), (map(() => void 0)))));
     }
     /**
      * Observable responsável por emitir uma notificação quando ocorre algum erro.
@@ -6640,25 +6636,21 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             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(() => this.disconnectPrimitiveOnFinalize(primitiveManager)));
+            return primitiveManager.event$.asObservable().pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitiveManager)));
         }
         else {
-            if (!this.isConnecting) {
+            if (!this.isReconnecting && !this.isConnecting) {
                 this.connect();
             }
             this.connect$.pipe(first()).subscribe(() => {
                 this.createStompSubscriptions(primitiveManager);
             });
-            return primitiveManager.event$
-                .asObservable()
-                .pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitiveManager)));
+            return primitiveManager.event$.asObservable().pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitiveManager)));
         }
     }
     /** @private */
@@ -6668,18 +6660,20 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         const withoutTokenUrl = this.getSubscriptionUrlWithoutToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
         const stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
         primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
-        primitiveManager.subscribe$.next();
+        primitiveManager.isSubscribed = true;
+        this.subscribe$.next(primitiveManager);
     }
     /** @private */
     connect() {
         this.createStompClient();
         this.isConnecting = true;
-        this._stompClient.activate();
         this._stompClient.connect({}, () => {
             this.isConnecting = false;
-            this.setConnected(true);
+            this.isReconnecting = false;
+            this.isConnected = true;
             if (this.wasConnected) {
                 this.reconnectPrimitives();
+                this.connect$.next();
                 this.reconnect$.next();
             }
             else {
@@ -6687,19 +6681,14 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
                 this.connect$.next();
             }
         }, (error) => {
-            this.setConnected(false);
+            this.isConnected = false;
             this.error$.next(error);
-            this.reconnect();
+            this.isReconnecting = true;
+            timer(WebsocketService_1.RECONNECT_INTERVAL)
+                .pipe(switchMap(() => iif(() => document.hidden, fromEvent(document, "visibilitychange").pipe(first()), EMPTY)))
+                .subscribe({ complete: () => this.connect() });
         });
     }
-    /** @private */
-    onFocus() {
-        this.focused = true;
-    }
-    /** @private */
-    onBlur() {
-        this.focused = false;
-    }
     disconnect() {
         const observersCount = this.getObserversCount();
         if (observersCount > 0)
@@ -6711,25 +6700,16 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         }
         for (const primitiveManager of this.primitiveManagers.values()) {
             primitiveManager.event$.complete();
-            primitiveManager.subscribe$.complete();
         }
         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 */
-    isConnected() {
-        return this.connected;
-    }
-    /** @private */
-    setConnected(connected) {
-        this.connected = connected;
-    }
-    /** @private */
     getSubscriptionUrlWithToken(domain, service, primitive) {
         const tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
         const token = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.access_token : null;
@@ -6751,30 +6731,11 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
     createStompClient() {
         const 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 = () => { }; // Para remover os logs.
-    }
-    /** @private */
-    reconnect() {
-        if (this.connected)
-            this._stompClient.disconnect();
-        setTimeout(() => {
-            if (this.getObserversCount() === 0)
-                return;
-            if (this.focused) {
-                this.connect();
-            }
-            else {
-                this.reconnect();
-            }
-        }, WebsocketService_1.RECONNECT_TIMER);
+        this._stompClient.debug = () => null;
     }
     /** @private */
     reconnectPrimitives() {
         for (const primitiveManager of this.primitiveManagers.values()) {
-            for (const stompSubscription of primitiveManager.stompSubscriptions) {
-                stompSubscription.unsubscribe();
-            }
             this.createStompSubscriptions(primitiveManager);
         }
     }
@@ -6793,7 +6754,6 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         if (hasObservers)
             return;
         primitiveManager.event$.complete();
-        primitiveManager.subscribe$.complete();
         for (const stompSubscription of primitiveManager.stompSubscriptions) {
             stompSubscription.unsubscribe();
         }
@@ -6807,7 +6767,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
     }
 };
 /** @private */
-WebsocketService.RECONNECT_TIMER = 3000;
+WebsocketService.RECONNECT_INTERVAL = 3000;
 /** @private */
 WebsocketService.CONNECTION_TIMEOUT = 15000;
 /** @private */