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

package/bundles/senior-gestao-empresarial-angular-components.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('primeng/breadcrumb'), require('@angular/router'), require('rxjs'), require('rxjs/operators'), require('moment'), require('@seniorsistemas/angular-components'), require('@angular/common/http'), require('primeng/api'), require('@ngx-translate/core'), require('@seniorsistemas/platform-components'), require('@seniorsistemas/senior-platform-data'), require('@angular/forms'), require('js-cookie'), require('@stomp/stompjs'), require('ngx-cookie-service'), require('sockjs-client')) :
-    typeof define === 'function' && define.amd ? define('@senior-gestao-empresarial/angular-components', ['exports', '@angular/core', '@angular/common', 'primeng/breadcrumb', '@angular/router', 'rxjs', 'rxjs/operators', 'moment', '@seniorsistemas/angular-components', '@angular/common/http', 'primeng/api', '@ngx-translate/core', '@seniorsistemas/platform-components', '@seniorsistemas/senior-platform-data', '@angular/forms', 'js-cookie', '@stomp/stompjs', 'ngx-cookie-service', 'sockjs-client'], factory) :
-    (global = global || self, factory((global['senior-gestao-empresarial'] = global['senior-gestao-empresarial'] || {}, global['senior-gestao-empresarial']['angular-components'] = {}), global.ng.core, global.ng.common, global.breadcrumb, global.ng.router, global.rxjs, global.rxjs.operators, global.moment_, global.angularComponents, global.ng.common.http, global.api, global.core$1, global.platformComponents, global.seniorPlatformData, global.ng.forms, global.jsCookie, global.stompjs, global.ngxCookieService, global.SockJS));
-}(this, (function (exports, core, common, breadcrumb, router, rxjs, operators, moment_, angularComponents, http, api, core$1, platformComponents, seniorPlatformData, forms, jsCookie, stompjs, ngxCookieService, SockJS) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('primeng/breadcrumb'), require('@angular/router'), require('rxjs'), require('rxjs/operators'), require('moment'), require('@seniorsistemas/angular-components'), require('@angular/common/http'), require('primeng/api'), require('@ngx-translate/core'), require('@seniorsistemas/platform-components'), require('@seniorsistemas/senior-platform-data'), require('@angular/forms'), require('js-cookie'), require('@stomp/stompjs'), require('sockjs-client')) :
+    typeof define === 'function' && define.amd ? define('@senior-gestao-empresarial/angular-components', ['exports', '@angular/core', '@angular/common', 'primeng/breadcrumb', '@angular/router', 'rxjs', 'rxjs/operators', 'moment', '@seniorsistemas/angular-components', '@angular/common/http', 'primeng/api', '@ngx-translate/core', '@seniorsistemas/platform-components', '@seniorsistemas/senior-platform-data', '@angular/forms', 'js-cookie', '@stomp/stompjs', 'sockjs-client'], factory) :
+    (global = global || self, factory((global['senior-gestao-empresarial'] = global['senior-gestao-empresarial'] || {}, global['senior-gestao-empresarial']['angular-components'] = {}), global.ng.core, global.ng.common, global.breadcrumb, global.ng.router, global.rxjs, global.rxjs.operators, global.moment_, global.angularComponents, global.ng.common.http, global.api, global.core$1, global.platformComponents, global.seniorPlatformData, global.ng.forms, global.jsCookie, global.stompjs, global.SockJS));
+}(this, (function (exports, core, common, breadcrumb, router, rxjs, operators, moment_, angularComponents, http, api, core$1, platformComponents, seniorPlatformData, forms, jsCookie, stompjs, SockJS) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -6609,98 +6609,98 @@
     }());
 
     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();
-            // private primitiveSubjects: Map<string, Subject<any>> = new Map<string, Subject<any>>();
             this.primitiveManagers = new Map();
-            this.disconnectSubject = new rxjs.Subject();
             this.connect$ = new rxjs.Subject();
+            this.disconnect$ = new rxjs.Subject();
+            this.reconnect$ = new rxjs.Subject();
+            this.error$ = new rxjs.Subject();
             window.onfocus = this.onFocus;
             window.onblur = this.onBlur;
             this.connect();
         }
         WebsocketService_1 = WebsocketService;
         /**
-         * 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.
          */
         WebsocketService.prototype.onConnect = function () {
             var _this = this;
             setTimeout(function () {
                 if (_this.isConnected()) {
-                    _this.publishOnConnect();
+                    _this.connect$.next();
                 }
             }, 0);
-            return this.connect$.asObservable();
+            return this.connect$.pipe(operators.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.
          */
         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 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.
          */
         WebsocketService.prototype.onEvent = function (domain, service, primitive, identifierPath) {
             var _this = this;
-            var primitiveManager = this.primitiveManagers.get(primitive);
-            if (primitiveManager) {
-                return primitiveManager.subject.asObservable();
+            if (this.primitiveManagers.has(primitive)) {
+                return this.primitiveManagers.get(primitive).subject.asObservable();
             }
-            primitiveManager = {
+            var primitiveManager = {
+                domain: domain,
+                service: service,
+                primitive: primitive,
+                stompSubscriptions: [],
                 subject: new rxjs.Subject(),
                 identifierPath: identifierPath,
                 publishedEvents: [],
             };
+            this.primitiveManagers.set(primitive, primitiveManager);
             if (this.isConnected()) {
-                var url = this.getSubscriptionUserUrl(domain, service, primitive);
-                this.primitiveManagers.set(primitive, primitiveManager);
-                var stompSubscription = this._stompClient.subscribe(url, function (message) {
-                    var 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(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitive); }));
             }
             else {
                 if (!this.isConnecting) {
                     this.connect();
                 }
-                this.onConnect()
-                    .pipe(operators.take(1))
-                    .subscribe(function () {
-                    var url = _this.getSubscriptionUserUrl(domain, service, primitive);
-                    _this.primitiveManagers.set(primitive, primitiveManager);
-                    var stompSubscription = _this._stompClient.subscribe(url, function (message) {
-                        var event = JSON.parse(message.body || "{}");
-                        _this.addPublishedEvent(primitiveManager, event);
-                        primitiveManager.subject.next(event);
-                    });
-                    _this.stompSubscriptions.set(primitive, stompSubscription);
+                this.connect$.pipe(operators.first()).subscribe(function () {
+                    _this.createStompSubscriptions(primitiveManager);
                 });
-                return primitiveManager.subject.asObservable();
+                return primitiveManager.subject.pipe(operators.finalize(function () { return _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.
          */
         WebsocketService.prototype.getPublishedEvents = function (primitive, identifiers) {
@@ -6732,9 +6732,7 @@
         WebsocketService.prototype.addPublishedEvent = function (primitiveManager, event) {
             var _this = this;
             var identifier = this.getIdentifierFromEvent(primitiveManager.identifierPath, event);
-            var eventIndex = primitiveManager.publishedEvents.findIndex(function (x) {
-                return _this.getIdentifierFromEvent(primitiveManager.identifierPath, x) === identifier;
-            });
+            var eventIndex = primitiveManager.publishedEvents.findIndex(function (x) { return _this.getIdentifierFromEvent(primitiveManager.identifierPath, x) === identifier; });
             if (eventIndex !== -1) {
                 primitiveManager.publishedEvents[eventIndex] = __assign(__assign({}, primitiveManager.publishedEvents[eventIndex]), event);
             }
@@ -6742,6 +6740,13 @@
                 primitiveManager.publishedEvents.push(event);
             }
         };
+        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(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
+            var stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
+            primitiveManager.stompSubscriptions = [stompSubscriptionWithToken, stompSubscriptionWithoutToken];
+        };
         WebsocketService.prototype.getIdentifierFromEvent = function (identifierPath, event) {
             var e_2, _a;
             var properties = identifierPath.split(".");
@@ -6765,21 +6770,24 @@
             var _this = this;
             this.createStompClient();
             this.isConnecting = true;
+            this._stompClient.activate();
             this._stompClient.connect({}, function () {
-                _this.setConnected(true);
-                // console.log('setou false isConnecting');
                 _this.isConnecting = false;
-                // console.log('connectou dentro do connect cb');
-                _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;
         };
@@ -6787,46 +6795,55 @@
             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;
+                for (var _d = __values(this.primitiveManagers.values()), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var primitiveManager = _e.value;
+                    try {
+                        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_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
                 }
             }
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
-            if (observersCount === 0) {
-                this.stompSubscriptions.forEach(function (stompSubscription) {
-                    stompSubscription.unsubscribe();
-                });
-                try {
-                    for (var _e = __values(this.primitiveManagers.values()), _f = _e.next(); !_f.done; _f = _e.next()) {
-                        var primitiveManager = _f.value;
-                        primitiveManager.subject.complete();
-                    }
+            try {
+                for (var _h = __values(this.primitiveManagers.values()), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var primitiveManager = _j.value;
+                    primitiveManager.subject.complete();
                 }
-                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; }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
                 }
-                this.stompSubscriptions.clear();
-                this.primitiveManagers.clear();
-                this._stompClient.disconnect();
-                this._stompClient.deactivate();
-                this.setConnected(false);
-                this.isConnecting = false;
-                this.disconnectSubject.next();
+                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;
@@ -6834,56 +6851,124 @@
         WebsocketService.prototype.setConnected = function (connected) {
             this.connected = connected;
         };
-        WebsocketService.prototype.getSubscriptionUserUrl = function (domain, service, primitive) {
+        WebsocketService.prototype.getSubscriptionUrlWithToken = function (domain, service, primitive) {
             var tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
             var token = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.access_token : null;
             return "/topic/" + tenant + "/" + token + "/" + domain + "/" + service + "/" + primitive;
         };
+        WebsocketService.prototype.getSubscriptionUrlWithoutToken = function (domain, service, primitive) {
+            var tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
+            return "/topic/" + tenant + "/" + domain + "/" + service + "/" + primitive;
+        };
+        WebsocketService.prototype.createStompSubscription = function (destination, primitiveManager) {
+            var _this = this;
+            return this._stompClient.subscribe(destination, function (message) {
+                var event = JSON.parse(message.body || "{}");
+                _this.addPublishedEvent(primitiveManager, event);
+                primitiveManager.subject.next(event);
+            });
+        };
         WebsocketService.prototype.createStompClient = function () {
             var ws = new SockJS(WebsocketService_1.WEBSOCKET_URL + "subscription", null, { timeout: WebsocketService_1.CONNECTION_TIMEOUT });
             this._stompClient = stompjs.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) {
-                // //console.log('ws disconnected: base url changed', this.baseUrl, ' -> ', baseUrl || 'null');
-                return;
-            }
-            var username = this.getUserName();
-            if (this.username !== null && username != this.username) {
-                // //console.log('ws disconnected: username changed', this.username, ' -> ', username || 'null');
-                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(jsCookie.get(WebsocketService_1.TOKEN_COOKIE) || "{}");
         WebsocketService.WEBSOCKET_URL = jsCookie.get(WebsocketService_1.BASE_URL_COOKIE) + "/websocket/";
-        WebsocketService.ctorParameters = function () { return [
-            { type: ngxCookieService.CookieService }
-        ]; };
-        WebsocketService.ɵprov = core.ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(core.ɵɵinject(ngxCookieService.CookieService)); }, token: WebsocketService, providedIn: "root" });
+        WebsocketService.ɵprov = core.ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(); }, token: WebsocketService, providedIn: "root" });
         WebsocketService = WebsocketService_1 = __decorate([
             core.Injectable({
                 providedIn: "root",