@sumaris-net/ngx-components 1.8.1 → 1.8.2

package/bundles/sumaris-net.ngx-components.umd.js

@@ -15419,6 +15419,7 @@
             _this.onChange = new rxjs.Subject();
             _this.onAuthTokenChange = new rxjs.Subject();
             _this.onAuthBasicChange = new rxjs.Subject();
+            _this._stopWatching$ = new rxjs.Subject();
             _this._cache = {
                 loaded: false,
                 keypair: null,
@@ -15945,6 +15946,7 @@
                             if (hadAuthBasic)
                                 this.onAuthBasicChange.next(undefined);
                             this.onChange.next(undefined);
+                            this._stopWatching$.next();
                             return [2 /*return*/];
                     }
                 });
@@ -16104,13 +16106,18 @@
                 });
             });
         };
-        AccountService.prototype.listenChanges = function () {
+        AccountService.prototype.watch = function () {
             var _this = this;
             if (!this._cache.pubkey)
-                return rxjs.Subscription.EMPTY;
-            var self = this;
-            console.debug('[account] [WS] Listening changes');
-            var subscription = this.graphql.subscribe({
+                throw new Error('Not logged in');
+            if (!this.started) {
+                // Wait service ready, then loop
+                return rxjs.from(this.ready())
+                    .pipe(operators.switchMap(function () { return _this.watch(); }));
+            }
+            this._stopWatching$.next(); // Stop previous listening
+            console.debug('[account] [WS] Watching changes');
+            return this.graphql.subscribe({
                 query: AccountSubscriptions.listenChanges,
                 variables: {
                     interval: 10
@@ -16119,57 +16126,40 @@
                     code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
                     message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
                 }
-            }).subscribe({
-                next: function (_b) {
-                    var data = _b.data;
-                    return __awaiter(_this, void 0, void 0, function () {
-                        var _a, existingUpdateDate;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    if (!data)
-                                        return [2 /*return*/];
-                                    existingUpdateDate = toDateISOString((_a = self._data) === null || _a === void 0 ? void 0 : _a.updateDate);
-                                    if (!(existingUpdateDate !== data.updateDate)) return [3 /*break*/, 2];
-                                    console.debug("[account] [WS] Detected update on {" + data.updateDate + "}");
-                                    return [4 /*yield*/, self.refresh()];
-                                case 1:
-                                    _b.sent();
-                                    _b.label = 2;
-                                case 2: return [2 /*return*/];
-                            }
-                        });
-                    });
-                },
-                error: function (err) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0:
-                                if (!(err && +err.code === ServerErrorCodes.NOT_FOUND)) return [3 /*break*/, 2];
-                                console.info('[account] Account not exists anymore: force user to logout...', err);
-                                return [4 /*yield*/, self.logout()];
-                            case 1:
-                                _b.sent();
-                                return [3 /*break*/, 5];
-                            case 2:
-                                if (!(err && +err.code === ServerErrorCodes.UNAUTHORIZED)) return [3 /*break*/, 4];
-                                console.info('[account] Account not authorized: force user to logout...', err);
-                                return [4 /*yield*/, self.logout()];
-                            case 3:
-                                _b.sent();
-                                return [3 /*break*/, 5];
-                            case 4:
-                                console.warn('[account] [WS] Received error:', err);
-                                _b.label = 5;
-                            case 5: return [2 /*return*/];
-                        }
-                    });
-                }); },
-                complete: function () {
-                    console.debug('[account] [WS] Completed');
+            })
+                .pipe(
+            // Stop this pipe next time we call watch()
+            operators.takeUntil(this._stopWatching$), operators.map(function (_b) {
+                var data = _b.data;
+                var _a;
+                if (!data)
+                    return;
+                var existingUpdateDate = toDateISOString((_a = _this._data) === null || _a === void 0 ? void 0 : _a.updateDate);
+                if (existingUpdateDate === data.updateDate)
+                    return;
+                console.debug("[account] [WS] Detected update on {" + data.updateDate + "}");
+                return exports.Account.fromObject(data);
+            }), operators.filter(isNotNil));
+        };
+        AccountService.prototype.listenChanges = function () {
+            var self = this;
+            var subscription = this.watch()
+                .subscribe({
+                next: function (data) { return self.refresh(); },
+                error: function (err) {
+                    if (err && +err.code === ServerErrorCodes.NOT_FOUND) {
+                        console.info('[account] Account not exists anymore: force user to logout...', err);
+                        self.logout();
+                    }
+                    else if (err && +err.code === ServerErrorCodes.UNAUTHORIZED) {
+                        console.info('[account] Account not authorized: force user to logout...', err);
+                        self.logout();
+                    }
+                    else {
+                        console.warn('[account] [WS] Received error:', err);
+                    }
                 }
             });
-            // Add log when closing WS
             subscription.add(function () { return console.debug('[account] [WS] Stop listening changes'); });
             return subscription;
         };