@senior-gestao-empresarial/angular-components 4.22.2 → 4.23.0

package/fesm5/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, first, 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';
 
 var BreadcrumbComponent = /** @class */ (function () {
@@ -6404,17 +6403,16 @@ var NpsService = /** @class */ (function () {
 }());
 
 var WebsocketService = /** @class */ (function () {
-    function WebsocketService(cookieService) {
-        this.cookieService = cookieService;
-        this.baseUrl = null;
-        this.username = null;
+    function WebsocketService() {
         this.focused = true;
+        this.wasConnected = false;
         this.connected = false;
         this.isConnecting = false;
-        this.stompSubscriptions = new Map();
         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();
@@ -6428,22 +6426,36 @@ var WebsocketService = /** @class */ (function () {
         var _this = this;
         setTimeout(function () {
             if (_this.isConnected()) {
-                _this.publishOnConnect();
+                _this.connect$.next();
             }
         }, 0);
-        return this.connect$.asObservable();
+        return this.connect$.pipe(first());
     };
     /**
-     * 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.
+     * 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.
      */
     WebsocketService.prototype.onDisconnect = function () {
-        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.
+     */
+    WebsocketService.prototype.onReconnect = function () {
+        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.
+     */
+    WebsocketService.prototype.onError = function () {
+        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 identificador do registro.
@@ -6455,25 +6467,27 @@ var WebsocketService = /** @class */ (function () {
             return this.primitiveManagers.get(primitive).subject.asObservable();
         }
         var primitiveManager = {
+            domain: domain,
+            service: service,
+            primitive: primitive,
+            stompSubscriptions: [],
             subject: new Subject(),
             identifierPath: identifierPath,
             publishedEvents: [],
         };
         this.primitiveManagers.set(primitive, primitiveManager);
         if (this.isConnected()) {
-            this.createStompSubscriptions(domain, service, primitive, primitiveManager);
-            return primitiveManager.subject.asObservable();
+            this.createStompSubscriptions(primitiveManager);
+            return primitiveManager.subject.pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitive); }));
         }
         else {
             if (!this.isConnecting) {
                 this.connect();
             }
-            this.onConnect()
-                .pipe(first())
-                .subscribe(function () {
-                _this.createStompSubscriptions(domain, service, primitive, primitiveManager);
+            this.connect$.pipe(first()).subscribe(function () {
+                _this.createStompSubscriptions(primitiveManager);
             });
-            return primitiveManager.subject.asObservable();
+            return primitiveManager.subject.pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitive); }));
         }
     };
     /**
@@ -6520,12 +6534,12 @@ var WebsocketService = /** @class */ (function () {
             primitiveManager.publishedEvents.push(event);
         }
     };
-    WebsocketService.prototype.createStompSubscriptions = function (domain, service, primitive, primitiveManager) {
-        var withTokenUrl = this.getSubscriptionUrlWithToken(domain, service, primitive);
+    WebsocketService.prototype.createStompSubscriptions = function (primitiveManager) {
+        var withTokenUrl = this.getSubscriptionUrlWithToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
         var stompSubscriptionWithToken = this.createStompSubscription(withTokenUrl, primitiveManager);
-        var withoutTokenUrl = this.getSubscriptionUrlWithoutToken(domain, service, primitive);
+        var withoutTokenUrl = this.getSubscriptionUrlWithoutToken(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
         var stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
-        this.stompSubscriptions.set(primitive, [stompSubscriptionWithToken, stompSubscriptionWithoutToken]);
+        primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
     };
     WebsocketService.prototype.getIdentifierFromEvent = function (identifierPath, event) {
         var e_2, _a;
@@ -6550,19 +6564,24 @@ var WebsocketService = /** @class */ (function () {
         var _this = this;
         this.createStompClient();
         this.isConnecting = true;
+        this._stompClient.activate();
         this._stompClient.connect({}, function () {
-            _this.setConnected(true);
             _this.isConnecting = false;
-            _this.publishOnConnect();
-        }, function () {
+            _this.setConnected(true);
+            if (_this.wasConnected) {
+                _this.reconnectPrimitives();
+                _this.reconnect$.next();
+            }
+            else {
+                _this.wasConnected = true;
+                _this.connect$.next();
+            }
+        }, function (error) {
             _this.setConnected(false);
-            // this.reconnectWebSocket();
+            _this.error$.next(error);
+            _this.reconnect();
         });
     };
-    WebsocketService.prototype.publishOnConnect = function () {
-        this.connect$.next();
-        this.connect$.observers = [];
-    };
     WebsocketService.prototype.onFocus = function () {
         this.focused = true;
     };
@@ -6570,59 +6589,55 @@ var WebsocketService = /** @class */ (function () {
         this.focused = false;
     };
     WebsocketService.prototype.disconnect = function () {
-        var e_3, _a, e_4, _b;
-        var observersCount = 0;
+        var e_3, _a, e_4, _b, e_5, _c;
+        var observersCount = this.getObserversCount();
+        if (observersCount > 0)
+            return;
         try {
-            for (var _c = __values(this.primitiveManagers.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var primitiveManager = _d.value;
-                observersCount += primitiveManager.subject.observers.length;
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        if (observersCount === 0) {
-            this.stompSubscriptions.forEach(function (stompSubscriptions) {
-                var e_5, _a;
+            for (var _d = __values(this.primitiveManagers.values()), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var primitiveManager = _e.value;
                 try {
-                    for (var stompSubscriptions_1 = __values(stompSubscriptions), stompSubscriptions_1_1 = stompSubscriptions_1.next(); !stompSubscriptions_1_1.done; stompSubscriptions_1_1 = stompSubscriptions_1.next()) {
-                        var stompSubscription = stompSubscriptions_1_1.value;
+                    for (var _f = (e_4 = void 0, __values(primitiveManager.stompSubscriptions)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                        var stompSubscription = _g.value;
                         stompSubscription.unsubscribe();
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
-                        if (stompSubscriptions_1_1 && !stompSubscriptions_1_1.done && (_a = stompSubscriptions_1.return)) _a.call(stompSubscriptions_1);
+                        if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_4) throw e_4.error; }
                 }
-            });
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
             try {
-                for (var _e = __values(this.primitiveManagers.values()), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var primitiveManager = _f.value;
-                    primitiveManager.subject.complete();
-                }
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                }
-                finally { if (e_4) throw e_4.error; }
+            finally { if (e_3) throw e_3.error; }
+        }
+        try {
+            for (var _h = __values(this.primitiveManagers.values()), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var primitiveManager = _j.value;
+                primitiveManager.subject.complete();
             }
-            this.stompSubscriptions.clear();
-            this.primitiveManagers.clear();
-            this._stompClient.disconnect();
-            this._stompClient.deactivate();
-            this.setConnected(false);
-            this.isConnecting = false;
-            this.disconnectSubject.next();
         }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        this.primitiveManagers.clear();
+        this._stompClient.disconnect();
+        this._stompClient.deactivate();
+        this.setConnected(false);
+        this.isConnecting = false;
+        this.wasConnected = false;
+        this.disconnect$.next();
     };
     WebsocketService.prototype.isConnected = function () {
         return this.connected;
@@ -6650,46 +6665,104 @@ 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.
     };
-    WebsocketService.prototype.getBaseUrl = function () {
-        return this.cookieService.get("com.senior.base.url");
-    };
-    WebsocketService.prototype.getUserName = function () {
-        var token = this.cookieService.get("com.senior.token");
-        return token && JSON.parse(token).username;
-    };
-    WebsocketService.prototype.reconnectWebSocket = function () {
+    WebsocketService.prototype.reconnect = function () {
         var _this = this;
-        this._stompClient.disconnect();
-        var baseUrl = this.getBaseUrl();
-        if (this.baseUrl !== null && baseUrl != this.baseUrl) {
-            return;
-        }
-        var username = this.getUserName();
-        if (this.username !== null && username != this.username) {
-            return;
-        }
+        if (this.connected)
+            this._stompClient.disconnect();
         setTimeout(function () {
+            if (_this.getObserversCount() === 0)
+                return;
             if (_this.focused) {
                 _this.connect();
             }
             else {
-                _this.reconnectWebSocket();
+                _this.reconnect();
             }
         }, WebsocketService_1.RECONNECT_TIMER);
     };
+    WebsocketService.prototype.reconnectPrimitives = function () {
+        var e_6, _a, e_7, _b;
+        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_7 = void 0, __values(primitiveManager.stompSubscriptions)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        var stompSubscription = _f.value;
+                        stompSubscription.unsubscribe();
+                    }
+                }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                finally {
+                    try {
+                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                    }
+                    finally { if (e_7) throw e_7.error; }
+                }
+                this.createStompSubscriptions(primitiveManager);
+            }
+        }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_6) throw e_6.error; }
+        }
+    };
+    WebsocketService.prototype.getObserversCount = function () {
+        var e_8, _a;
+        var observersCount = 0;
+        try {
+            for (var _b = __values(this.primitiveManagers.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var primitiveManager = _c.value;
+                observersCount += primitiveManager.subject.observers.length;
+            }
+        }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_8) throw e_8.error; }
+        }
+        return observersCount;
+    };
+    WebsocketService.prototype.disconnectPrimitiveOnFinalize = function (primitive) {
+        var e_9, _a;
+        var primitiveManager = this.primitiveManagers.get(primitive);
+        if (!primitiveManager)
+            return;
+        // @IMPORTANT: Replace .observers.length with .observed in rxjs 7.0+
+        var hasObservers = !(primitiveManager.subject.observers.length === 1);
+        if (hasObservers)
+            return;
+        try {
+            for (var _b = __values(primitiveManager.stompSubscriptions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var stompSubscription = _c.value;
+                stompSubscription.unsubscribe();
+            }
+        }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_9) throw e_9.error; }
+        }
+        this.primitiveManagers.delete(primitive);
+        this.disconnect();
+    };
     var WebsocketService_1;
     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 = function () { return [
-        { 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",