@senior-gestao-empresarial/angular-components 4.22.0 → 4.22.1

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

@@ -4,7 +4,7 @@ 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, take } from 'rxjs/operators';
+import { takeUntil, filter, catchError, map, takeWhile, switchMap, first, take } from 'rxjs/operators';
 import * as moment_ from 'moment';
 import { FormField, FieldType } from '@seniorsistemas/angular-components';
 import { HttpParams, HttpClient } from '@angular/common/http';
@@ -6022,7 +6022,6 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.connected = false;
         this.isConnecting = false;
         this.stompSubscriptions = new Map();
-        // private primitiveSubjects: Map<string, Subject<any>> = new Map<string, Subject<any>>();
         this.primitiveManagers = new Map();
         this.disconnectSubject = new Subject();
         this.connect$ = new Subject();
@@ -6031,7 +6030,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.connect();
     }
     /**
-     * Observable resposável por emitir uma notificação quando a conexão websocket é estabelecida.
+     * 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 ou já está em andamento.
      */
     onConnect() {
@@ -6043,7 +6042,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         return this.connect$.asObservable();
     }
     /**
-     * Observable resposável por emitir uma notificação quando a conexão é finalizada.
+     * Observable responsável por emitir uma notificação quando a conexão é finalizada.
      * @return Um `Observable<void>` que emite uma notificação quando a conexão é finalizada.
      */
     onDisconnect() {
@@ -6069,14 +6068,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             publishedEvents: [],
         };
         if (this.isConnected()) {
-            const url = this.getSubscriptionUserUrl(domain, service, primitive);
-            this.primitiveManagers.set(primitive, primitiveManager);
-            const stompSubscription = this._stompClient.subscribe(url, (message) => {
-                const event = JSON.parse(message.body || "{}");
-                this.addPublishedEvent(primitiveManager, event);
-                primitiveManager.subject.next(event);
-            });
-            this.stompSubscriptions.set(primitive, stompSubscription);
+            this.createStompSubscriptions(domain, service, primitive, primitiveManager);
             return primitiveManager.subject.asObservable();
         }
         else {
@@ -6084,22 +6076,15 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
                 this.connect();
             }
             this.onConnect()
-                .pipe(take(1))
+                .pipe(first())
                 .subscribe(() => {
-                const url = this.getSubscriptionUserUrl(domain, service, primitive);
-                this.primitiveManagers.set(primitive, primitiveManager);
-                const stompSubscription = this._stompClient.subscribe(url, (message) => {
-                    const event = JSON.parse(message.body || "{}");
-                    this.addPublishedEvent(primitiveManager, event);
-                    primitiveManager.subject.next(event);
-                });
-                this.stompSubscriptions.set(primitive, stompSubscription);
+                this.createStompSubscriptions(domain, service, primitive, primitiveManager);
             });
             return primitiveManager.subject.asObservable();
         }
     }
     /**
-     * Retorna todos os eventos ouvidos para a respectiva primitiva.
+     * Retorna todos os eventos ouvidos pela primitiva com os respectivos identificadores.
      * @typeParam `<T>` Tipo do evento retornado pela primitiva.
      * @param primitive Primitiva que será "observada" pelo client.
      * @param identifiers Array com os indentificadores interessados.
@@ -6126,6 +6111,14 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             primitiveManager.publishedEvents.push(event);
         }
     }
+    createStompSubscriptions(domain, service, primitive, primitiveManager) {
+        const withTokenUrl = this.getSubscriptionUrlWithToken(domain, service, primitive);
+        this.primitiveManagers.set(primitive, primitiveManager);
+        const stompSubscriptionWithToken = this.createStompSubscription(withTokenUrl, primitiveManager);
+        const withoutTokenUrl = this.getSubscriptionUrlWithoutToken(domain, service, primitive);
+        const stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
+        this.stompSubscriptions.set(primitive, [stompSubscriptionWithToken, stompSubscriptionWithoutToken]);
+    }
     getIdentifierFromEvent(identifierPath, event) {
         const properties = identifierPath.split(".");
         let identifier = event;
@@ -6139,9 +6132,7 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.isConnecting = true;
         this._stompClient.connect({}, () => {
             this.setConnected(true);
-            // console.log('setou false isConnecting');
             this.isConnecting = false;
-            // console.log('connectou dentro do connect cb');
             this.publishOnConnect();
         }, () => {
             this.setConnected(false);
@@ -6164,8 +6155,10 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             observersCount += primitiveManager.subject.observers.length;
         }
         if (observersCount === 0) {
-            this.stompSubscriptions.forEach(stompSubscription => {
-                stompSubscription.unsubscribe();
+            this.stompSubscriptions.forEach(stompSubscriptions => {
+                for (const stompSubscription of stompSubscriptions) {
+                    stompSubscription.unsubscribe();
+                }
             });
             for (const primitiveManager of this.primitiveManagers.values()) {
                 primitiveManager.subject.complete();
@@ -6185,11 +6178,22 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
     setConnected(connected) {
         this.connected = connected;
     }
-    getSubscriptionUserUrl(domain, service, primitive) {
+    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;
         return `/topic/${tenant}/${token}/${domain}/${service}/${primitive}`;
     }
+    getSubscriptionUrlWithoutToken(domain, service, primitive) {
+        const tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
+        return `/topic/${tenant}/${domain}/${service}/${primitive}`;
+    }
+    createStompSubscription(destination, primitiveManager) {
+        return this._stompClient.subscribe(destination, (message) => {
+            const event = JSON.parse(message.body || "{}");
+            this.addPublishedEvent(primitiveManager, event);
+            primitiveManager.subject.next(event);
+        });
+    }
     createStompClient() {
         const ws = new SockJS(`${WebsocketService_1.WEBSOCKET_URL}subscription`, null, { timeout: WebsocketService_1.CONNECTION_TIMEOUT });
         this._stompClient = Stomp.over(ws);
@@ -6206,12 +6210,10 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this._stompClient.disconnect();
         const baseUrl = this.getBaseUrl();
         if (this.baseUrl !== null && baseUrl != this.baseUrl) {
-            // //console.log('ws disconnected: base url changed', this.baseUrl, ' -> ', baseUrl || 'null');
             return;
         }
         const username = this.getUserName();
         if (this.username !== null && username != this.username) {
-            // //console.log('ws disconnected: username changed', this.username, ' -> ', username || 'null');
             return;
         }
         setTimeout(() => {