@sumaris-net/ngx-components 1.8.1 → 1.8.2

package/fesm2015/sumaris-net.ngx-components.js

@@ -13561,6 +13561,7 @@ class AccountService extends BaseGraphqlService {
         this.onChange = new Subject();
         this.onAuthTokenChange = new Subject();
         this.onAuthBasicChange = new Subject();
+        this._stopWatching$ = new Subject();
         this._cache = {
             loaded: false,
             keypair: null,
@@ -13963,6 +13964,7 @@ class AccountService extends BaseGraphqlService {
             if (hadAuthBasic)
                 this.onAuthBasicChange.next(undefined);
             this.onChange.next(undefined);
+            this._stopWatching$.next();
         });
     }
     /**
@@ -14079,12 +14081,17 @@ class AccountService extends BaseGraphqlService {
             return res && res.confirmAccountEmail;
         });
     }
-    listenChanges() {
+    watch() {
         if (!this._cache.pubkey)
-            return Subscription.EMPTY;
-        const self = this;
-        console.debug('[account] [WS] Listening changes');
-        const subscription = this.graphql.subscribe({
+            throw new Error('Not logged in');
+        if (!this.started) {
+            // Wait service ready, then loop
+            return from(this.ready())
+                .pipe(switchMap(() => this.watch()));
+        }
+        this._stopWatching$.next(); // Stop previous listening
+        console.debug('[account] [WS] Watching changes');
+        return this.graphql.subscribe({
             query: AccountSubscriptions.listenChanges,
             variables: {
                 interval: 10
@@ -14093,35 +14100,39 @@ class AccountService extends BaseGraphqlService {
                 code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
                 message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
             }
-        }).subscribe({
-            next: ({ data }) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                if (!data)
-                    return;
-                const existingUpdateDate = toDateISOString((_a = self._data) === null || _a === void 0 ? void 0 : _a.updateDate);
-                if (existingUpdateDate !== data.updateDate) {
-                    console.debug(`[account] [WS] Detected update on {${data.updateDate}}`);
-                    yield self.refresh();
-                }
-            }),
-            error: (err) => __awaiter(this, void 0, void 0, function* () {
+        })
+            .pipe(
+        // Stop this pipe next time we call watch()
+        takeUntil(this._stopWatching$), map(({ data }) => {
+            var _a;
+            if (!data)
+                return;
+            const 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 Account.fromObject(data);
+        }), filter(isNotNil));
+    }
+    listenChanges() {
+        const self = this;
+        const subscription = this.watch()
+            .subscribe({
+            next: (data) => self.refresh(),
+            error: (err) => {
                 if (err && +err.code === ServerErrorCodes.NOT_FOUND) {
                     console.info('[account] Account not exists anymore: force user to logout...', err);
-                    yield self.logout();
+                    self.logout();
                 }
                 else if (err && +err.code === ServerErrorCodes.UNAUTHORIZED) {
                     console.info('[account] Account not authorized: force user to logout...', err);
-                    yield self.logout();
+                    self.logout();
                 }
                 else {
                     console.warn('[account] [WS] Received error:', err);
                 }
-            }),
-            complete: () => {
-                console.debug('[account] [WS] Completed');
             }
         });
-        // Add log when closing WS
         subscription.add(() => console.debug('[account] [WS] Stop listening changes'));
         return subscription;
     }