@senior-gestao-empresarial/angular-components 6.9.0 → 6.9.1

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

@@ -3,7 +3,7 @@ import { Input, Component, NgModule, Injectable, Inject, ɵɵdefineInjectable,
 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, timer, iif, fromEvent, EMPTY, ReplaySubject } from 'rxjs';
+import { Subject, throwError, interval, of, race, timer, iif, fromEvent, ReplaySubject } from 'rxjs';
 import { takeUntil, filter, catchError, map, takeWhile, switchMap, take, finalize, first } from 'rxjs/operators';
 import * as moment_ from 'moment';
 import { FormField, FieldType } from '@seniorsistemas/angular-components';
@@ -6984,8 +6984,6 @@ var WebsocketService = /** @class */ (function () {
         /** @private */
         this.isConnecting = false;
         /** @private */
-        this.isReconnecting = false;
-        /** @private */
         this.primitiveManagers = new Map();
         /** @private */
         this.connect$ = new Subject();
@@ -7032,11 +7030,12 @@ var WebsocketService = /** @class */ (function () {
         var domain = _a.domain, service = _a.service, primitive = _a.primitive;
         var key = this.getPrimitiveManagerKey(domain, service, primitive);
         return this.onConnect().pipe(switchMap(function () {
-            return _this.primitiveManagers.has(key) && _this.primitiveManagers.get(key).isSubscribed
+            return _this.primitiveManagers.has(key) &&
+                _this.primitiveManagers.get(key).isSubscribed
                 ? of(void 0).pipe(take(1))
                 : _this.subscribe$.pipe(filter(function (primitiveManager) {
                     return _this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key;
-                }), take(1), (map(function () { return void 0; })));
+                }), take(1), map(function () { return void 0; }));
         }));
     };
     /**
@@ -7067,21 +7066,29 @@ var WebsocketService = /** @class */ (function () {
             primitive: primitive,
             stompSubscriptions: [],
             event$: new Subject(),
-            isSubscribed: false,
+            isSubscribed: false
         };
         this.primitiveManagers.set(key, primitiveManager);
         if (this.isConnected) {
             this.createStompSubscriptions(primitiveManager);
-            return primitiveManager.event$.asObservable().pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+            return primitiveManager.event$
+                .asObservable()
+                .pipe(finalize(function () {
+                return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+            }));
         }
         else {
-            if (!this.isReconnecting && !this.isConnecting) {
+            if (!this.isConnecting) {
                 this.connect();
             }
             this.connect$.pipe(first()).subscribe(function () {
                 _this.createStompSubscriptions(primitiveManager);
             });
-            return primitiveManager.event$.asObservable().pipe(finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
+            return primitiveManager.event$
+                .asObservable()
+                .pipe(finalize(function () {
+                return _this.disconnectPrimitiveOnFinalize(primitiveManager);
+            }));
         }
     };
     /** @private */
@@ -7090,7 +7097,10 @@ var WebsocketService = /** @class */ (function () {
         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];
+        primitiveManager.stompSubscriptions = [
+            stompSubscriptionWithToken,
+            stompSubscriptionWithoutToken
+        ];
         primitiveManager.isSubscribed = true;
         this.subscribe$.next(primitiveManager);
     };
@@ -7101,7 +7111,6 @@ var WebsocketService = /** @class */ (function () {
         this.isConnecting = true;
         this._stompClient.connect({}, function () {
             _this.isConnecting = false;
-            _this.isReconnecting = false;
             _this.isConnected = true;
             if (_this.wasConnected) {
                 _this.reconnectPrimitives();
@@ -7115,19 +7124,26 @@ var WebsocketService = /** @class */ (function () {
         }, function (error) {
             _this.isConnected = false;
             _this.error$.next(error);
-            _this.isReconnecting = true;
-            timer(WebsocketService_1.RECONNECT_INTERVAL)
-                .pipe(switchMap(function () {
-                return iif(function () { return document.hidden; }, fromEvent(document, "visibilitychange").pipe(first()), EMPTY);
-            }))
-                .subscribe({ complete: function () { return _this.connect(); } });
+            race(_this.disconnect$.pipe(take(1), map(function () { return ({ wasDisconnected: true }); })), timer(WebsocketService_1.RECONNECT_INTERVAL).pipe(take(1), switchMap(function () {
+                return iif(function () { return document.hidden; }, fromEvent(document, 'visibilitychange').pipe(first()), of(void 0));
+            }), map(function () { return ({ wasDisconnected: false }); })))
+                .pipe(take(1))
+                .subscribe({
+                next: function (_a) {
+                    var wasDisconnected = _a.wasDisconnected;
+                    if (!wasDisconnected &&
+                        !(_this.isConnected || _this.isConnecting)) {
+                        _this.connect();
+                    }
+                }
+            });
         });
     };
     WebsocketService.prototype.disconnect = function () {
         var e_1, _a, e_2, _b, e_3, _c;
-        var observersCount = this.getObserversCount();
-        if (observersCount > 0)
+        if (this.getObserversCount() > 0) {
             return;
+        }
         try {
             for (var _d = __values(this.primitiveManagers.values()), _e = _d.next(); !_e.done; _e = _d.next()) {
                 var primitiveManager = _e.value;
@@ -7176,19 +7192,25 @@ var WebsocketService = /** @class */ (function () {
     };
     /** @private */
     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;
+        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;
     };
     /** @private */
     WebsocketService.prototype.getSubscriptionUrlWithoutToken = function (domain, service, primitive) {
-        var tenant = WebsocketService_1.TOKEN ? WebsocketService_1.TOKEN.username.split("@")[1] : null;
+        var tenant = WebsocketService_1.TOKEN
+            ? WebsocketService_1.TOKEN.username.split('@')[1]
+            : null;
         return "/topic/" + tenant + "/" + domain + "/" + service + "/" + primitive;
     };
     /** @private */
     WebsocketService.prototype.createStompSubscription = function (destination, primitiveManager) {
         return this._stompClient.subscribe(destination, function (message) {
-            var event = JSON.parse(message.body || "{}");
+            var event = JSON.parse(message.body || '{}');
             primitiveManager.event$.next(event);
         });
     };
@@ -7264,22 +7286,20 @@ var WebsocketService = /** @class */ (function () {
         return domain + "/" + service + "/" + primitive;
     };
     var WebsocketService_1;
-    /** @private */
     WebsocketService.RECONNECT_INTERVAL = 3000;
-    /** @private */
     WebsocketService.CONNECTION_TIMEOUT = 15000;
     /** @private */
-    WebsocketService.BASE_URL_COOKIE = "com.senior.base.url";
+    WebsocketService.BASE_URL_COOKIE = 'com.senior.base.url';
     /** @private */
-    WebsocketService.TOKEN_COOKIE = "com.senior.token";
+    WebsocketService.TOKEN_COOKIE = 'com.senior.token';
     /** @private */
-    WebsocketService.TOKEN = JSON.parse(get(WebsocketService_1.TOKEN_COOKIE) || "{}");
+    WebsocketService.TOKEN = JSON.parse(get(WebsocketService_1.TOKEN_COOKIE) || '{}');
     /** @private */
-    WebsocketService.WEBSOCKET_URL = get(WebsocketService_1.BASE_URL_COOKIE) + "/websocket/";
+    WebsocketService.WEBSOCKET_URL = get(WebsocketService_1.BASE_URL_COOKIE) + '/websocket/';
     WebsocketService.ɵprov = ɵɵdefineInjectable({ factory: function WebsocketService_Factory() { return new WebsocketService(); }, token: WebsocketService, providedIn: "root" });
     WebsocketService = WebsocketService_1 = __decorate([
         Injectable({
-            providedIn: "root",
+            providedIn: 'root'
         })
     ], WebsocketService);
     return WebsocketService;