@senior-gestao-empresarial/angular-components 6.12.0-bea9aaec-b4b5-4e5b-b8eb-155b7aa8d5aa → 6.12.0-cdee7359-3bca-4813-b06f-c65cc860eea4

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

@@ -7412,6 +7412,47 @@
         return NpsService;
     }());
 
+    var AsyncLock = /** @class */ (function () {
+        function AsyncLock() {
+            this.queue = [];
+            this.acquired = false;
+        }
+        AsyncLock.prototype.acquire = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    if (!this.acquired) {
+                        this.acquired = true;
+                        return [2 /*return*/, Promise.resolve()];
+                    }
+                    else {
+                        return [2 /*return*/, new Promise(function (resolve, _) {
+                                _this.queue.push(resolve);
+                            })];
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        };
+        AsyncLock.prototype.release = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var continuation;
+                return __generator(this, function (_a) {
+                    if (this.queue.length === 0 && this.acquired) {
+                        this.acquired = false;
+                        return [2 /*return*/, Promise.resolve()];
+                    }
+                    continuation = this.queue.shift();
+                    return [2 /*return*/, new Promise(function (res) {
+                            continuation();
+                            res();
+                        })];
+                });
+            });
+        };
+        return AsyncLock;
+    }());
+
     var UserInformationService = /** @class */ (function () {
         function UserInformationService() {
         }
@@ -7428,7 +7469,7 @@
         };
         UserInformationService.prototype.getWebSocketUrl = function () {
             var baseUrl = jsCookie.get(UserInformationService_1.BASE_URL_COOKIE_KEY);
-            if (!baseUrl.endsWith('/')) {
+            if (baseUrl && !baseUrl.endsWith('/')) {
                 baseUrl += '/';
             }
             return baseUrl + 'websocket';
@@ -7492,7 +7533,7 @@
         };
         PrimitiveManager.prototype.hasObservers = function () {
             // @IMPORTANT: Replace .observers.length === 1 with .observed in rxjs 7.0+
-            return this.event$.observers.length > 1;
+            return this.event$.observers.length !== 1;
         };
         PrimitiveManager.prototype.getObserversCount = function () {
             return this.event$.observers.length;
@@ -7511,6 +7552,7 @@
             this.error$ = new rxjs.Subject();
             this.subscribed$ = new rxjs.Subject();
             this.primitiveManagers = new Map();
+            this.connectionLock = new AsyncLock();
             this.debugEnable = false;
             this.lostConnection = false;
         }
@@ -7524,29 +7566,48 @@
          * Manually starts the connection
          */
         WebsocketService.prototype.connect = function () {
-            var _this = this;
-            if (this.isConnected() || this.isConnecting()) {
-                return;
-            }
-            this.lostConnection = false;
-            var stompConfig = {
-                webSocketFactory: function () {
-                    return new SockJS(_this.getSubscriptionUrl(), null, {
-                        timeout: CONNECTION_TIMEOUT_MILLISECONDS
-                    });
-                },
-                connectionTimeout: CONNECTION_TIMEOUT_MILLISECONDS,
-                reconnectDelay: RECONNECT_INTERVAL_MILLISECONDS,
-                debug: this.debug.bind(this),
-                onConnect: this.handleOnConnected.bind(this),
-                onDisconnect: this.handleOnDisconnect.bind(this),
-                onWebSocketClose: this.handleOnWebSocketClose.bind(this),
-                onStompError: this.handleOnStompError.bind(this),
-                onWebSocketError: this.handleOnWebSocketError.bind(this)
-            };
-            this.debug('Connecting the Webscoket');
-            this.stompClient = new stompjs.Client(stompConfig);
-            this.stompClient.activate();
+            return __awaiter(this, void 0, void 0, function () {
+                var stompConfig;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.connectionLock.acquire()];
+                        case 1:
+                            _a.sent();
+                            _a.label = 2;
+                        case 2:
+                            _a.trys.push([2, , 3, 5]);
+                            if (this.isConnected() || this.isConnecting()) {
+                                return [2 /*return*/];
+                            }
+                            this.lostConnection = false;
+                            stompConfig = {
+                                webSocketFactory: function () {
+                                    return new SockJS(_this.getSubscriptionUrl(), null, {
+                                        timeout: CONNECTION_TIMEOUT_MILLISECONDS
+                                    });
+                                },
+                                connectionTimeout: CONNECTION_TIMEOUT_MILLISECONDS,
+                                reconnectDelay: RECONNECT_INTERVAL_MILLISECONDS,
+                                debug: this.debug.bind(this),
+                                onConnect: this.handleOnConnected.bind(this),
+                                onDisconnect: this.handleOnDisconnect.bind(this),
+                                onWebSocketClose: this.handleOnWebSocketClose.bind(this),
+                                onStompError: this.handleOnStompError.bind(this),
+                                onWebSocketError: this.handleOnWebSocketError.bind(this)
+                            };
+                            this.debug('Connecting the Webscoket');
+                            this.stompClient = new stompjs.Client(stompConfig);
+                            this.stompClient.activate();
+                            return [3 /*break*/, 5];
+                        case 3: return [4 /*yield*/, this.connectionLock.release()];
+                        case 4:
+                            _a.sent();
+                            return [7 /*endfinally*/];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
         };
         /**
          * Manually disconnect the websocket. The reconnect loop will be stopped.
@@ -7558,6 +7619,15 @@
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
+                            if (!this.isConnected()) {
+                                return [2 /*return*/];
+                            }
+                            return [4 /*yield*/, this.connectionLock.acquire()];
+                        case 1:
+                            _d.sent();
+                            _d.label = 2;
+                        case 2:
+                            _d.trys.push([2, , 5, 7]);
                             try {
                                 for (_a = __values(this.primitiveManagers.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     primitiveManager = _b.value;
@@ -7572,15 +7642,19 @@
                                 finally { if (e_1) throw e_1.error; }
                             }
                             this.primitiveManagers.clear();
-                            if (!this.stompClient) return [3 /*break*/, 2];
+                            this.connected$.next(false);
+                            if (!this.stompClient) return [3 /*break*/, 4];
+                            this.stompClient.forceDisconnect();
                             return [4 /*yield*/, this.stompClient.deactivate()];
-                        case 1:
+                        case 3:
                             _d.sent();
-                            this.stompClient = null;
-                            _d.label = 2;
-                        case 2:
-                            this.connected$.next(false);
-                            return [2 /*return*/];
+                            _d.label = 4;
+                        case 4: return [3 /*break*/, 7];
+                        case 5: return [4 /*yield*/, this.connectionLock.release()];
+                        case 6:
+                            _d.sent();
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -7654,11 +7728,12 @@
             }
             var primitiveManager = new PrimitiveManager(domain, service, primitive);
             this.primitiveManagers.set(key, primitiveManager);
-            this.connect();
-            this.onConnect()
-                .pipe(operators.take(1))
-                .subscribe(function () {
-                _this.createStompSubscriptions(primitiveManager);
+            this.connect().then(function () {
+                _this.onConnect()
+                    .pipe(operators.take(1))
+                    .subscribe(function () {
+                    _this.createStompSubscriptions(primitiveManager);
+                });
             });
             return primitiveManager
                 .getEventObservable()
@@ -7675,7 +7750,6 @@
             var _this = this;
             var domain = options.domain, service = options.service, primitive = options.primitive;
             var key = this.buildPrimitiveManagerKey(domain, service, primitive);
-            this.connect();
             return this.onConnect().pipe(operators.take(1), operators.switchMap(function () {
                 if (_this.primitiveManagers.has(key)) {
                     return _this.primitiveManagers
@@ -7701,16 +7775,17 @@
         WebsocketService.prototype.info = function (message) {
             console.info('WS info: ' + message);
         };
-        WebsocketService.prototype.handleOnConnected = function (data) {
-            this.debug('Webscoket connected', data);
+        WebsocketService.prototype.handleOnConnected = function () {
+            this.info('Webscoket connected');
             this.connected$.next(true);
             if (this.lostConnection) {
                 this.info('Webscoket reconnected, recriating subscriptions');
                 this.handleReconnection();
             }
         };
-        WebsocketService.prototype.handleOnDisconnect = function (data) {
-            this.debug('Webscoket disconnected', data);
+        WebsocketService.prototype.handleOnDisconnect = function () {
+            this.info('Webscoket disconnected');
+            this.connected$.next(false);
             this.disconnected$.next();
         };
         WebsocketService.prototype.handleOnWebSocketClose = function (data) {
@@ -7720,7 +7795,6 @@
             this.lostConnection = true;
         };
         WebsocketService.prototype.handleOnStompError = function (data) {
-            debugger;
             this.handleError('StompError', data);
             if (this.isAuthenticationError(data)) {
                 this.info('Authentication error, recriating subscriptions');
@@ -7776,19 +7850,40 @@
             return domain + "/" + service + "/" + primitive;
         };
         WebsocketService.prototype.unsubscribePrimitiveOnFinalize = function (primitiveManager) {
-            if (primitiveManager.hasObservers()) {
-                return;
-            }
-            primitiveManager.unsubscribe();
-            var key = this.buildPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
-            this.primitiveManagers.delete(key);
-            this.disconnectIfNoMoreObservables();
+            return __awaiter(this, void 0, void 0, function () {
+                var key;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (primitiveManager.hasObservers()) {
+                                return [2 /*return*/];
+                            }
+                            primitiveManager.unsubscribe();
+                            key = this.buildPrimitiveManagerKey(primitiveManager.domain, primitiveManager.service, primitiveManager.primitive);
+                            this.primitiveManagers.delete(key);
+                            return [4 /*yield*/, this.disconnectIfNoMoreObservables()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
         };
         WebsocketService.prototype.disconnectIfNoMoreObservables = function () {
-            if (this.getObserversCount() === 0) {
-                this.debug('Manually disconnecting because there are no more observers');
-                this.disconnect();
-            }
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!(this.getObserversCount() === 0)) return [3 /*break*/, 2];
+                            this.debug('Manually disconnecting because there are no more observers');
+                            return [4 /*yield*/, this.disconnect()];
+                        case 1:
+                            _a.sent();
+                            _a.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
         };
         WebsocketService.prototype.getObserversCount = function () {
             var observersCount = 0;
@@ -8089,6 +8184,7 @@
     exports.NotaFiscalEntradaLookup = NotaFiscalEntradaLookup;
     exports.NpsService = NpsService;
     exports.ParametersLookup = ParametersLookup;
+    exports.PrimitiveManager = PrimitiveManager;
     exports.ProdutoServicoLookup = ProdutoServicoLookup;
     exports.QuantidadeDisponivelDemandaLookup = QuantidadeDisponivelDemandaLookup;
     exports.RequisicaoLookup = RequisicaoLookup;