@senior-gestao-empresarial/angular-components 4.22.0 → 4.22.1-706afb94-1b58-4cb7-9006-8d9033881f51

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

@@ -6617,7 +6617,6 @@
             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();
@@ -6627,8 +6626,8 @@
         }
         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;
@@ -6640,7 +6639,7 @@
             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.
          */
         WebsocketService.prototype.onDisconnect = function () {
@@ -6652,29 +6651,22 @@
          * @param domain Dominio da primitva.
          * @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 = {
                 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);
+                this.createStompSubscriptions(domain, service, primitive, primitiveManager);
                 return primitiveManager.subject.asObservable();
             }
             else {
@@ -6682,25 +6674,18 @@
                     this.connect();
                 }
                 this.onConnect()
-                    .pipe(operators.take(1))
+                    .pipe(operators.first())
                     .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.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.
+         * @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 +6717,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 +6725,13 @@
                 primitiveManager.publishedEvents.push(event);
             }
         };
+        WebsocketService.prototype.createStompSubscriptions = function (domain, service, primitive, primitiveManager) {
+            var withTokenUrl = this.getSubscriptionUrlWithToken(domain, service, primitive);
+            var stompSubscriptionWithToken = this.createStompSubscription(withTokenUrl, primitiveManager);
+            var withoutTokenUrl = this.getSubscriptionUrlWithoutToken(domain, service, primitive);
+            var stompSubscriptionWithoutToken = this.createStompSubscription(withoutTokenUrl, primitiveManager);
+            this.stompSubscriptions.set(primitive, [stompSubscriptionWithToken, stompSubscriptionWithoutToken]);
+        };
         WebsocketService.prototype.getIdentifierFromEvent = function (identifierPath, event) {
             var e_2, _a;
             var properties = identifierPath.split(".");
@@ -6767,9 +6757,7 @@
             this.isConnecting = true;
             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(false);
@@ -6803,8 +6791,21 @@
                 finally { if (e_3) throw e_3.error; }
             }
             if (observersCount === 0) {
-                this.stompSubscriptions.forEach(function (stompSubscription) {
-                    stompSubscription.unsubscribe();
+                this.stompSubscriptions.forEach(function (stompSubscriptions) {
+                    var e_5, _a;
+                    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;
+                            stompSubscription.unsubscribe();
+                        }
+                    }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    finally {
+                        try {
+                            if (stompSubscriptions_1_1 && !stompSubscriptions_1_1.done && (_a = stompSubscriptions_1.return)) _a.call(stompSubscriptions_1);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                    }
                 });
                 try {
                     for (var _e = __values(this.primitiveManagers.values()), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -6834,11 +6835,23 @@
         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);
@@ -6856,12 +6869,10 @@
             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;
             }
             setTimeout(function () {