@senior-gestao-empresarial/angular-components 6.9.3 → 6.10.1

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

@@ -7238,15 +7238,14 @@
             /** @private */
             this.primitiveManagers = new Map();
             /** @private */
-            this.connect$ = new rxjs.Subject();
+            this.connected$ = new rxjs.BehaviorSubject(false);
             /** @private */
             this.disconnect$ = new rxjs.Subject();
             /** @private */
             this.reconnect$ = new rxjs.Subject();
             /** @private */
             this.error$ = new rxjs.Subject();
-            this.subscribe$ = new rxjs.Subject();
-            this.connect();
+            this.subscribed$ = new rxjs.Subject();
         }
         WebsocketService_1 = WebsocketService;
         /**
@@ -7254,10 +7253,7 @@
          * @return Um `Observable<void>` que emite uma notificação quando a conexão websocket é estabelecida pela primeira vez.
          */
         WebsocketService.prototype.onConnect = function () {
-            if (this.isConnected || this.wasConnected) {
-                return rxjs.of(undefined).pipe(operators.take(1));
-            }
-            return this.connect$.asObservable().pipe(operators.take(1));
+            return this.connected$.asObservable().pipe(operators.filter(Boolean), operators.map(function () { return undefined; }), operators.take(1));
         };
         /**
          * Observable responsável por emitir uma notificação quando a conexão é desconectada.
@@ -7282,12 +7278,14 @@
             var domain = _a.domain, service = _a.service, primitive = _a.primitive;
             var key = this.getPrimitiveManagerKey(domain, service, primitive);
             return this.onConnect().pipe(operators.switchMap(function () {
-                return _this.primitiveManagers.has(key) &&
-                    _this.primitiveManagers.get(key).isSubscribed
-                    ? rxjs.of(void 0).pipe(operators.take(1))
-                    : _this.subscribe$.pipe(operators.filter(function (primitiveManager) {
-                        return _this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key;
-                    }), operators.take(1), operators.map(function () { return void 0; }));
+                if (_this.primitiveManagers.has(key))
+                    return _this.primitiveManagers
+                        .get(key)
+                        .subscribed$.asObservable()
+                        .pipe(operators.map(function () { return undefined; }), operators.take(1));
+                return _this.subscribed$.asObservable().pipe(operators.filter(function (primitiveManager) {
+                    return _this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive) === key;
+                }), operators.map(function () { return undefined; }), operators.take(1));
             }));
         };
         /**
@@ -7307,6 +7305,7 @@
          */
         WebsocketService.prototype.onEvent = function (options) {
             var _this = this;
+            this.connect();
             var domain = options.domain, service = options.service, primitive = options.primitive;
             var key = this.getPrimitiveManagerKey(domain, service, primitive);
             if (this.primitiveManagers.has(key)) {
@@ -7318,30 +7317,17 @@
                 primitive: primitive,
                 stompSubscriptions: [],
                 event$: new rxjs.Subject(),
-                isSubscribed: false
+                subscribed$: new rxjs.BehaviorSubject(false)
             };
             this.primitiveManagers.set(key, primitiveManager);
-            if (this.isConnected) {
-                this.createStompSubscriptions(primitiveManager);
-                return primitiveManager.event$
-                    .asObservable()
-                    .pipe(operators.finalize(function () {
-                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
-                }));
-            }
-            else {
-                if (!this.isConnecting) {
-                    this.connect();
-                }
-                this.connect$.pipe(operators.first()).subscribe(function () {
-                    _this.createStompSubscriptions(primitiveManager);
-                });
-                return primitiveManager.event$
-                    .asObservable()
-                    .pipe(operators.finalize(function () {
-                    return _this.disconnectPrimitiveOnFinalize(primitiveManager);
-                }));
-            }
+            this.onConnect()
+                .pipe(operators.take(1))
+                .subscribe(function () {
+                _this.createStompSubscriptions(primitiveManager);
+            });
+            return primitiveManager.event$
+                .asObservable()
+                .pipe(operators.finalize(function () { return _this.disconnectPrimitiveOnFinalize(primitiveManager); }));
         };
         /** @private */
         WebsocketService.prototype.createStompSubscriptions = function (primitiveManager) {
@@ -7353,12 +7339,14 @@
                 stompSubscriptionWithToken,
                 stompSubscriptionWithoutToken
             ];
-            primitiveManager.isSubscribed = true;
-            this.subscribe$.next(primitiveManager);
+            primitiveManager.subscribed$.next(true);
+            this.subscribed$.next(primitiveManager);
         };
         /** @private */
         WebsocketService.prototype.connect = function () {
             var _this = this;
+            if (this.isConnected || this.isConnecting)
+                return;
             this.createStompClient();
             this.isConnecting = true;
             this._stompClient.connect({}, function () {
@@ -7366,15 +7354,16 @@
                 _this.isConnected = true;
                 if (_this.wasConnected) {
                     _this.reconnectPrimitives();
-                    _this.connect$.next();
+                    _this.connected$.next(true);
                     _this.reconnect$.next();
                 }
                 else {
                     _this.wasConnected = true;
-                    _this.connect$.next();
+                    _this.connected$.next(true);
                 }
             }, function (error) {
                 _this.isConnected = false;
+                _this.connected$.next(false);
                 _this.error$.next(error);
                 rxjs.race(_this.disconnect$.pipe(operators.take(1), operators.map(function () { return ({ wasDisconnected: true }); })), rxjs.timer(WebsocketService_1.RECONNECT_INTERVAL).pipe(operators.take(1), operators.switchMap(function () {
                     return rxjs.iif(function () { return document.hidden; }, rxjs.fromEvent(document, 'visibilitychange').pipe(operators.first()), rxjs.of(void 0));
@@ -7393,7 +7382,7 @@
         };
         WebsocketService.prototype.disconnect = function () {
             var e_1, _a, e_2, _b, e_3, _c;
-            if (this.getObserversCount() > 0) {
+            if (!this.isConnected || this.getObserversCount() > 0) {
                 return;
             }
             try {
@@ -7440,6 +7429,7 @@
             this.isConnected = false;
             this.isConnecting = false;
             this.wasConnected = false;
+            this.connected$.next(false);
             this.disconnect$.next();
         };
         /** @private */
@@ -7529,6 +7519,7 @@
                 }
                 finally { if (e_6) throw e_6.error; }
             }
+            primitiveManager.subscribed$.complete();
             var key = this.getPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
             this.primitiveManagers.delete(key);
             this.disconnect();