@senior-gestao-empresarial/angular-components 6.9.3 → 6.10.0

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

@@ -3,7 +3,7 @@ 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, race, timer, iif, fromEvent, ReplaySubject } from 'rxjs';
+import { Subject, throwError, interval, of, BehaviorSubject, race, timer, iif, fromEvent, 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';
@@ -6606,25 +6606,21 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         /** @private */
         this.primitiveManagers = new Map();
         /** @private */
-        this.connect$ = new Subject();
+        this.connected$ = new BehaviorSubject(false);
         /** @private */
         this.disconnect$ = new Subject();
         /** @private */
         this.reconnect$ = new Subject();
         /** @private */
         this.error$ = new Subject();
-        this.subscribe$ = new Subject();
-        this.connect();
+        this.subscribed$ = new Subject();
     }
     /**
      * 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() {
-        if (this.isConnected || this.wasConnected) {
-            return of(undefined).pipe(take(1));
-        }
-        return this.connect$.asObservable().pipe(take(1));
+        return this.connected$.asObservable().pipe(filter(Boolean), map(() => undefined), take(1));
     }
     /**
      * Observable responsável por emitir uma notificação quando a conexão é desconectada.
@@ -6646,10 +6642,14 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
      */
     onSubscribe({ domain, service, primitive }) {
         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))));
+        return this.onConnect().pipe(switchMap(() => {
+            if (this.primitiveManagers.has(key))
+                return this.primitiveManagers
+                    .get(key)
+                    .subscribed$.asObservable()
+                    .pipe(map(() => undefined), take(1));
+            return this.subscribed$.asObservable().pipe(filter((primitiveManager) => this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key), map(() => undefined), take(1));
+        }));
     }
     /**
      * Observable responsável por emitir uma notificação quando ocorre algum erro.
@@ -6667,6 +6667,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
      * @return Um Observable<T> que emite notificações toda vez que o respectivo evento é publicado.
      */
     onEvent(options) {
+        this.connect();
         const { domain, service, primitive } = options;
         const key = this.getPrimitiveManagerKey(domain, service, primitive);
         if (this.primitiveManagers.has(key)) {
@@ -6678,26 +6679,17 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             primitive: primitive,
             stompSubscriptions: [],
             event$: new Subject(),
-            isSubscribed: false
+            subscribed$: new BehaviorSubject(false)
         };
         this.primitiveManagers.set(key, primitiveManager);
-        if (this.isConnected) {
+        this.onConnect()
+            .pipe(take(1))
+            .subscribe(() => {
             this.createStompSubscriptions(primitiveManager);
-            return primitiveManager.event$
-                .asObservable()
-                .pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitiveManager)));
-        }
-        else {
-            if (!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 */
     createStompSubscriptions(primitiveManager) {
@@ -6709,11 +6701,13 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             stompSubscriptionWithToken,
             stompSubscriptionWithoutToken
         ];
-        primitiveManager.isSubscribed = true;
-        this.subscribe$.next(primitiveManager);
+        primitiveManager.subscribed$.next(true);
+        this.subscribed$.next(primitiveManager);
     }
     /** @private */
     connect() {
+        if (this.isConnected || this.isConnecting)
+            return;
         this.createStompClient();
         this.isConnecting = true;
         this._stompClient.connect({}, () => {
@@ -6721,15 +6715,16 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             this.isConnected = true;
             if (this.wasConnected) {
                 this.reconnectPrimitives();
-                this.connect$.next();
+                this.connected$.next(true);
                 this.reconnect$.next();
             }
             else {
                 this.wasConnected = true;
-                this.connect$.next();
+                this.connected$.next(true);
             }
         }, (error) => {
             this.isConnected = false;
+            this.connected$.next(false);
             this.error$.next(error);
             race(this.disconnect$.pipe(take(1), map(() => ({ wasDisconnected: true }))), timer(WebsocketService_1.RECONNECT_INTERVAL).pipe(take(1), switchMap(() => iif(() => document.hidden, fromEvent(document, 'visibilitychange').pipe(first()), of(void 0))), map(() => ({ wasDisconnected: false }))))
                 .pipe(take(1))
@@ -6761,6 +6756,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.isConnected = false;
         this.isConnecting = false;
         this.wasConnected = false;
+        this.connected$.next(false);
         this.disconnect$.next();
     }
     /** @private */
@@ -6817,6 +6813,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         for (const stompSubscription of primitiveManager.stompSubscriptions) {
             stompSubscription.unsubscribe();
         }
+        primitiveManager.subscribed$.complete();
         const key = this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
         this.primitiveManagers.delete(key);
         this.disconnect();