@senior-gestao-empresarial/angular-components 4.22.0 → 4.22.2-7c0b6b2c-1273-4faf-bd8a-91d677cec9bd

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, finalize, take } from 'rxjs/operators';
 import * as moment_ from 'moment';
 import { FormField, FieldType } from '@seniorsistemas/angular-components';
 import { HttpParams, HttpClient } from '@angular/common/http';
@@ -15,7 +15,6 @@ import { user } from '@seniorsistemas/senior-platform-data';
 import { FormControl, FormGroup } from '@angular/forms';
 import { get } from 'js-cookie';
 import { Stomp } from '@stomp/stompjs';
-import { CookieService } from 'ngx-cookie-service';
 import * as SockJS from 'sockjs-client';
 
 let BreadcrumbComponent = class BreadcrumbComponent {
@@ -6014,95 +6013,95 @@ NpsService = __decorate([
 
 var WebsocketService_1;
 let WebsocketService = WebsocketService_1 = class WebsocketService {
-    constructor(cookieService) {
-        this.cookieService = cookieService;
-        this.baseUrl = null;
-        this.username = null;
+    constructor() {
         this.focused = true;
+        this.wasConnected = false;
         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();
+        this.disconnect$ = new Subject();
+        this.reconnect$ = new Subject();
+        this.error$ = new Subject();
         window.onfocus = this.onFocus;
         window.onblur = this.onBlur;
         this.connect();
     }
     /**
-     * Observable resposá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.
+     * 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.
      */
     onConnect() {
         setTimeout(() => {
             if (this.isConnected()) {
-                this.publishOnConnect();
+                this.connect$.next();
             }
         }, 0);
-        return this.connect$.asObservable();
+        return this.connect$.pipe(first());
     }
     /**
-     * Observable resposá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.
+     * Observable responsável por emitir uma notificação quando a conexão é desconectada.
+     * @return Um `Observable<void>` que emite uma notificação quando a conexão é desconectada.
      */
     onDisconnect() {
-        return this.disconnectSubject.asObservable();
+        return this.disconnect$.asObservable();
+    }
+    /**
+     * Observable responsável por emitir uma notificação quando a conexão é reconectada.
+     * @return Um `Observable<void>` que emite uma notificação quando a conexão é reconectada.
+     */
+    onReconnect() {
+        return this.reconnect$.asObservable();
+    }
+    /**
+     * Observable responsável por emitir uma notificação quando ocorre algum erro.
+     * @return Um `Observable<FrameImpl>` que emite uma notificação quando ocorre algum erro.
+     */
+    onError() {
+        return this.error$.asObservable();
     }
     /**
      * Observable responsável por emitir uma notificação quando um evento é publicado.
      * @typeParam `<T>` Tipo do objeto que o retorno do `observable` vai devolver.
-     * @param domain Dominio da primitva.
+     * @param domain Dominio da primitiva.
      * @param service Service da primitiva.
      * @param primitive Primitiva que será "observada" pelo client.
-     * @param identifierPath Caminho até a propriedade considerada o indentificador do registro.
+     * @param identifierPath Caminho até a propriedade considerada o identificador do registro.
      * @return Um `observable` que emite notificações toda vez que o respectivo evento é publicado no sistema.
      */
     onEvent(domain, service, primitive, identifierPath) {
-        let primitiveManager = this.primitiveManagers.get(primitive);
-        if (primitiveManager) {
-            return primitiveManager.subject.asObservable();
+        if (this.primitiveManagers.has(primitive)) {
+            return this.primitiveManagers.get(primitive).subject.asObservable();
         }
-        primitiveManager = {
+        const primitiveManager = {
+            domain: domain,
+            service: service,
+            primitive: primitive,
+            stompSubscriptions: [],
             subject: new Subject(),
             identifierPath: identifierPath,
             publishedEvents: [],
         };
+        this.primitiveManagers.set(primitive, primitiveManager);
         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);
-            return primitiveManager.subject.asObservable();
+            this.createStompSubscriptions(primitiveManager);
+            return primitiveManager.subject.pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitive)));
         }
         else {
             if (!this.isConnecting) {
                 this.connect();
             }
-            this.onConnect()
-                .pipe(take(1))
-                .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.connect$.pipe(first()).subscribe(() => {
+                this.createStompSubscriptions(primitiveManager);
             });
-            return primitiveManager.subject.asObservable();
+            return primitiveManager.subject.pipe(finalize(() => this.disconnectPrimitiveOnFinalize(primitive)));
         }
     }
     /**
-     * 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.
+     * @param identifiers Array com os identificadores interessados.
      * @return Array contendo o último evento recebido de cada identificador fornecido.
      */
     getPublishedEvents(primitive, identifiers) {
@@ -6126,6 +6125,13 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
             primitiveManager.publishedEvents.push(event);
         }
     }
+    createStompSubscriptions(primitiveManager) {
+        const withTokenUrl = this.getSubscriptionUrlWithToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
+        const stompSubscriptionWithToken = this.createStompSubscription(withTokenUrl, primitiveManager);
+        const withoutTokenUrl = this.getSubscriptionUrlWithoutToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
+        const stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
+        primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
+    }
     getIdentifierFromEvent(identifierPath, event) {
         const properties = identifierPath.split(".");
         let identifier = event;
@@ -6137,21 +6143,24 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
     connect() {
         this.createStompClient();
         this.isConnecting = true;
+        this._stompClient.activate();
         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(true);
+            if (this.wasConnected) {
+                this.reconnectPrimitives();
+                this.reconnect$.next();
+            }
+            else {
+                this.wasConnected = true;
+                this.connect$.next();
+            }
+        }, (error) => {
             this.setConnected(false);
-            // this.reconnectWebSocket();
+            this.error$.next(error);
+            this.reconnect();
         });
     }
-    publishOnConnect() {
-        this.connect$.next();
-        this.connect$.observers = [];
-    }
     onFocus() {
         this.focused = true;
     }
@@ -6159,25 +6168,24 @@ let WebsocketService = WebsocketService_1 = class WebsocketService {
         this.focused = false;
     }
     disconnect() {
-        let observersCount = 0;
+        const observersCount = this.getObserversCount();
+        if (observersCount > 0)
+            return;
         for (const primitiveManager of this.primitiveManagers.values()) {
-            observersCount += primitiveManager.subject.observers.length;
-        }
-        if (observersCount === 0) {
-            this.stompSubscriptions.forEach(stompSubscription => {
+            for (const stompSubscription of primitiveManager.stompSubscriptions) {
                 stompSubscription.unsubscribe();
-            });
-            for (const primitiveManager of this.primitiveManagers.values()) {
-                primitiveManager.subject.complete();
             }
-            this.stompSubscriptions.clear();
-            this.primitiveManagers.clear();
-            this._stompClient.disconnect();
-            this._stompClient.deactivate();
-            this.setConnected(false);
-            this.isConnecting = false;
-            this.disconnectSubject.next();
         }
+        for (const primitiveManager of this.primitiveManagers.values()) {
+            primitiveManager.subject.complete();
+        }
+        this.primitiveManagers.clear();
+        this._stompClient.disconnect();
+        this._stompClient.deactivate();
+        this.setConnected(false);
+        this.isConnecting = false;
+        this.wasConnected = false;
+        this.disconnect$.next();
     }
     isConnected() {
         return this.connected;
@@ -6185,55 +6193,79 @@ 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);
+        // this._stompClient.debug = (str) => console.log(new Date().toISOString(), str);
         this._stompClient.debug = () => { }; // Para remover os logs.
     }
-    getBaseUrl() {
-        return this.cookieService.get("com.senior.base.url");
-    }
-    getUserName() {
-        const token = this.cookieService.get("com.senior.token");
-        return token && JSON.parse(token).username;
-    }
-    reconnectWebSocket() {
-        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;
-        }
+    reconnect() {
+        if (this.connected)
+            this._stompClient.disconnect();
         setTimeout(() => {
+            if (this.getObserversCount() === 0)
+                return;
             if (this.focused) {
                 this.connect();
             }
             else {
-                this.reconnectWebSocket();
+                this.reconnect();
             }
         }, WebsocketService_1.RECONNECT_TIMER);
     }
+    reconnectPrimitives() {
+        for (const primitiveManager of this.primitiveManagers.values()) {
+            for (const stompSubscription of primitiveManager.stompSubscriptions) {
+                stompSubscription.unsubscribe();
+            }
+            this.createStompSubscriptions(primitiveManager);
+        }
+    }
+    getObserversCount() {
+        let observersCount = 0;
+        for (const primitiveManager of this.primitiveManagers.values()) {
+            observersCount += primitiveManager.subject.observers.length;
+        }
+        return observersCount;
+    }
+    disconnectPrimitiveOnFinalize(primitive) {
+        const primitiveManager = this.primitiveManagers.get(primitive);
+        if (!primitiveManager)
+            return;
+        // @IMPORTANT: Replace .observers.length with .observed in rxjs 7.0+
+        const hasObservers = !(primitiveManager.subject.observers.length === 1);
+        if (hasObservers)
+            return;
+        for (const stompSubscription of primitiveManager.stompSubscriptions) {
+            stompSubscription.unsubscribe();
+        }
+        this.primitiveManagers.delete(primitive);
+        this.disconnect();
+    }
 };
 WebsocketService.RECONNECT_TIMER = 3000;
-WebsocketService.CONNECTION_TIMEOUT = 30000;
+WebsocketService.CONNECTION_TIMEOUT = 15000;
 WebsocketService.BASE_URL_COOKIE = "com.senior.base.url";
 WebsocketService.TOKEN_COOKIE = "com.senior.token";
 WebsocketService.TOKEN = JSON.parse(get(WebsocketService_1.TOKEN_COOKIE) || "{}");
 WebsocketService.WEBSOCKET_URL = get(WebsocketService_1.BASE_URL_COOKIE) + "/websocket/";
-WebsocketService.ctorParameters = () => [
-    { type: CookieService }
-];
-WebsocketService.ɵprov = ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(ɵɵinject(CookieService)); }, token: WebsocketService, providedIn: "root" });
+WebsocketService.ɵprov = ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(); }, token: WebsocketService, providedIn: "root" });
 WebsocketService = WebsocketService_1 = __decorate([
     Injectable({
         providedIn: "root",