@sumaris-net/ngx-components 1.9.3 → 1.9.6

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

@@ -10614,8 +10614,6 @@
         defaultLocale: 'fr',
         defaultLatLongFormat: 'DDMM',
         apolloFetchPolicy: 'cache-first',
-        // FIXME: GraphQL subscription never unsubscribe...
-        listenRemoteChanges: false,
         // FIXME: enable cache
         persistCache: false,
         // TODO: make this works
@@ -10668,6 +10666,13 @@
             // username: 'admq2', password: 'q22006'
             // Token auth (using Person.pubkey)
             username: 'admin@sumaris.net', password: 'admin',
+        },
+        account: {
+            enableListenChanges: true,
+            listenIntervalInSecond: 30
+        },
+        entityEditor: {
+            enableListenChanges: false
         }
     });
 
@@ -14913,8 +14918,6 @@
                                 }
                                 var headers = new i2$1.HttpHeaders()
                                     .append('Authorization', authorization);
-                                //.append('X-App-Name', environment.name)
-                                //.append('X-App-Version', environment.version)
                                 // Use the setContext method to set the HTTP headers.
                                 operation.setContext(Object.assign(Object.assign({}, operation.getContext()), { headers: headers }));
                                 // Call the next link in the middleware chain.
@@ -15429,7 +15432,7 @@
     };
     var AccountService = /** @class */ (function (_super) {
         __extends(AccountService, _super);
-        function AccountService(cryptoService, network, graphql, settings, storage, file, environment) {
+        function AccountService(cryptoService, network, graphql, settings, storage, file, translate, toastController, environment) {
             var _this = _super.call(this, graphql, environment) || this;
             _this.cryptoService = cryptoService;
             _this.network = network;
@@ -15437,13 +15440,15 @@
             _this.settings = settings;
             _this.storage = storage;
             _this.file = file;
+            _this.translate = translate;
+            _this.toastController = toastController;
             _this.environment = environment;
             _this.onLogin = new rxjs.Subject();
             _this.onLogout = new rxjs.Subject();
             _this.onChange = new rxjs.Subject();
             _this.onAuthTokenChange = new rxjs.Subject();
             _this.onAuthBasicChange = new rxjs.Subject();
-            _this._stopWatching$ = new rxjs.Subject();
+            _this._listenChangesSubscription = null;
             _this._cache = {
                 loaded: false,
                 keypair: null,
@@ -15456,6 +15461,7 @@
             };
             _this._$additionalFields = new rxjs.BehaviorSubject([]);
             _this._tokenType$ = new rxjs.BehaviorSubject(undefined);
+            _this._enableListenChanges = (!environment.account || environment.account.enableListenChanges !== false);
             _this._debug = !environment.production;
             if (_this._debug)
                 console.debug('[account-service] Creating service');
@@ -15699,6 +15705,9 @@
                             // Emit events
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            // Listen remote changes
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             return [2 /*return*/, this._data];
                         case 6:
                             error_1 = _b.sent();
@@ -15853,13 +15862,16 @@
                             // Emit event to observers
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             return [2 /*return*/, this._data];
                     }
                 });
             });
         };
-        AccountService.prototype.refresh = function () {
+        AccountService.prototype.reload = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var now, wasLogin, error_6;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -15867,17 +15879,34 @@
                                 throw new Error('User not logged');
                             if (this.network.offline)
                                 throw new Error('Cannot check account in offline mode');
-                            return [4 /*yield*/, this.loadData()];
+                            now = Date.now();
+                            console.debug("[account] Reloading account...");
+                            wasLogin = this.isLogin();
+                            _b.label = 1;
                         case 1:
+                            _b.trys.push([1, 4, , 8]);
+                            return [4 /*yield*/, this.loadData()];
+                        case 2:
                             _b.sent();
                             return [4 /*yield*/, this.saveLocally()];
-                        case 2:
+                        case 3:
                             _b.sent();
-                            console.debug('[account] Successfully reload account');
+                            console.debug("[account] Reloading account [OK] in " + (Date.now() - now) + "ms");
                             // Emit login event to subscribers
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
                             return [2 /*return*/, this._data];
+                        case 4:
+                            error_6 = _b.sent();
+                            if (!(wasLogin && !this.isLogin())) return [3 /*break*/, 6];
+                            console.error("[account] Reloading account failed. Will force logout...", error_6);
+                            return [4 /*yield*/, this.logout()];
+                        case 5:
+                            _b.sent();
+                            return [3 /*break*/, 7];
+                        case 6: throw error_6;
+                        case 7: return [3 /*break*/, 8];
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -15970,7 +15999,7 @@
                             if (hadAuthBasic)
                                 this.onAuthBasicChange.next(undefined);
                             this.onChange.next(undefined);
-                            this._stopWatching$.next();
+                            this.stopListenChanges();
                             return [2 /*return*/];
                     }
                 });
@@ -16130,62 +16159,10 @@
                 });
             });
         };
-        AccountService.prototype.watch = function () {
-            var _this = this;
-            if (!this._cache.pubkey)
-                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
-                },
-                error: {
-                    code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
-                    message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
-                }
-            })
-                .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);
-                    }
-                }
-            });
-            subscription.add(function () { return console.debug('[account] [WS] Stop listening changes'); });
-            return subscription;
+        AccountService.prototype.listenChanges = function (opts) {
+            if (this._enableListenChanges)
+                return new rxjs.Subscription(); // Already started: skip
+            return this.startListenChanges(opts);
         };
         Object.defineProperty(AccountService.prototype, "additionalFields", {
             get: function () {
@@ -16215,6 +16192,7 @@
         };
         /* -- protected method -- */
         AccountService.prototype.resetData = function () {
+            this.stopListenChanges();
             this._cache.loaded = false;
             this._cache.keypair = null;
             this._cache.authToken = null;
@@ -16227,7 +16205,7 @@
         };
         AccountService.prototype.loadData = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var account, settings, error_6;
+                var account, settings, error_7;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -16264,11 +16242,11 @@
                             _b.label = 4;
                         case 4: return [2 /*return*/, this._data];
                         case 5:
-                            error_6 = _b.sent();
+                            error_7 = _b.sent();
                             this.resetData();
-                            if (error_6.code && error_6.message)
-                                throw error_6;
-                            console.error(error_6);
+                            if (error_7.code && error_7.message)
+                                throw error_7;
+                            console.error(error_7);
                             throw {
                                 code: ErrorCodes$2.LOAD_ACCOUNT_ERROR,
                                 message: 'ERROR.LOAD_ACCOUNT_ERROR'
@@ -16292,7 +16270,7 @@
         };
         AccountService.prototype.restoreLocally = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var values, pubkey, token, seckey, canRemoteAuth, error_7, jsonAccount, accountStr, account;
+                var values, pubkey, token, seckey, canRemoteAuth, error_8, jsonAccount, accountStr, account;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, Promise.all([
@@ -16330,7 +16308,7 @@
                                 throw new Error('Authentication failed');
                             return [3 /*break*/, 5];
                         case 4:
-                            error_7 = _b.sent();
+                            error_8 = _b.sent();
                             // Offline feature are enable: continue in offline mode
                             if (this.settings.hasOfflineFeature()) {
                                 console.warn('[account] Unable to authenticate on pod: forcing offline mode');
@@ -16339,7 +16317,7 @@
                             }
                             // No offline features enable (=offline mode not allowed)
                             else {
-                                console.error(error_7);
+                                console.error(error_8);
                                 this.logout();
                                 return [2 /*return*/];
                             }
@@ -16365,6 +16343,8 @@
                             // Emit event
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             if (this._debug)
                                 console.debug("[account] Account restoration [OK] {pubkey: " + pubkey.substr(0, 8) + "}, {profile: " + this._cache.mainProfile + "}");
                             return [2 /*return*/, account];
@@ -16614,6 +16594,79 @@
                 });
             });
         };
+        AccountService.prototype.startListenChanges = function (opts) {
+            var _this = this;
+            if (this._listenChangesSubscription)
+                this.stopListenChanges(); // Stop previous subscription
+            if (this.network.offline)
+                return new rxjs.Subscription(); // Offline: skip
+            var subscription = this.watchChanges(opts)
+                .subscribe({
+                next: function (data) {
+                    console.debug("[account] Remote update detected at " + data.updateDate);
+                    _this.reload();
+                },
+                error: function (err) {
+                    if (err && +err.code === ServerErrorCodes.NOT_FOUND) {
+                        console.info('[account] [WS] Account not exists anymore: force user to logout...', err);
+                        _this.logout();
+                    }
+                    else if (err && +err.code === ServerErrorCodes.UNAUTHORIZED) {
+                        console.info('[account] [WS] Account not authorized: force user to logout...', err);
+                        _this.logout();
+                    }
+                    else {
+                        console.warn('[account] [WS] Received error:', err);
+                    }
+                }
+            });
+            // Add close log
+            subscription.add(function () { return console.debug("[account] Stop watching remote changes"); });
+            this._listenChangesSubscription = subscription;
+            // Make sure to use the stop function, when unsubscribe
+            return new rxjs.Subscription(function () { return _this.stopListenChanges(); });
+        };
+        AccountService.prototype.stopListenChanges = function () {
+            if (this._listenChangesSubscription) {
+                this._listenChangesSubscription.unsubscribe();
+                this._listenChangesSubscription = null;
+            }
+        };
+        AccountService.prototype.watchChanges = function (opts) {
+            var _this = this;
+            var _a;
+            if (!this.started) {
+                // Wait service ready, then loop
+                return rxjs.from(this.ready())
+                    .pipe(operators.switchMap(function () { return _this.watchChanges(opts); }));
+            }
+            if (!this._cache.pubkey)
+                throw new Error('Not logged in');
+            if (this.network.offline)
+                throw new Error('Cannot watch account changes: network is offline.');
+            var variables = {
+                interval: Math.max(0, (opts === null || opts === void 0 ? void 0 : opts.intervalInSecond) || ((_a = this.environment.account) === null || _a === void 0 ? void 0 : _a.listenIntervalInSecond) || 0)
+            };
+            console.debug("[account] Watching remote changes, every " + variables.interval + "s");
+            return this.graphql.subscribe({
+                query: AccountSubscriptions.listenChanges,
+                variables: variables,
+                error: {
+                    code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
+                    message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
+                }
+            }).pipe(operators.map(function (_b) {
+                var data = _b.data;
+                return data;
+            }), 
+            // Keep only if newer
+            operators.filter(function (data) {
+                var _a;
+                var currentUpdateDate = fromDateISOString((_a = _this._data) === null || _a === void 0 ? void 0 : _a.updateDate);
+                var remoteUpdateDate = fromDateISOString(data === null || data === void 0 ? void 0 : data.updateDate);
+                return (remoteUpdateDate && (!currentUpdateDate || !remoteUpdateDate.isSame(currentUpdateDate, 'millisecond')));
+            }));
+        };
         AccountService.prototype.copyIdAndUpdateDate = function (source, target) {
             if (!source)
                 return;
@@ -16627,9 +16680,12 @@
             target.id = source.id || target.id;
             target.updateDate = source.updateDate || target.updateDate;
         };
+        AccountService.prototype.showToast = function (opts) {
+            return Toasts.show(this.toastController, this.translate, opts);
+        };
         return AccountService;
     }(BaseGraphqlService));
-    AccountService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AccountService_Factory() { return new AccountService(i0__namespace.ɵɵinject(CryptoService), i0__namespace.ɵɵinject(NetworkService), i0__namespace.ɵɵinject(GraphqlService), i0__namespace.ɵɵinject(LocalSettingsService), i0__namespace.ɵɵinject(i3__namespace$1.Storage), i0__namespace.ɵɵinject(FileService), i0__namespace.ɵɵinject(ENVIRONMENT)); }, token: AccountService, providedIn: "root" });
+    AccountService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function AccountService_Factory() { return new AccountService(i0__namespace.ɵɵinject(CryptoService), i0__namespace.ɵɵinject(NetworkService), i0__namespace.ɵɵinject(GraphqlService), i0__namespace.ɵɵinject(LocalSettingsService), i0__namespace.ɵɵinject(i3__namespace$1.Storage), i0__namespace.ɵɵinject(FileService), i0__namespace.ɵɵinject(i1__namespace$1.TranslateService, 8), i0__namespace.ɵɵinject(i1__namespace$4.ToastController, 8), i0__namespace.ɵɵinject(ENVIRONMENT)); }, token: AccountService, providedIn: "root" });
     AccountService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
@@ -16640,6 +16696,8 @@
         { type: LocalSettingsService },
         { type: i3$2.Storage },
         { type: FileService },
+        { type: i1$2.TranslateService, decorators: [{ type: i0.Optional }] },
+        { type: i1$5.ToastController, decorators: [{ type: i0.Optional }] },
         { type: undefined, decorators: [{ type: i0.Inject, args: [ENVIRONMENT,] }] }
     ]; };
     var templateObject_1$4, templateObject_2$4, templateObject_3$3, templateObject_4$3, templateObject_5$2, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10, templateObject_11, templateObject_12;
@@ -20903,7 +20961,7 @@
                         case 4:
                             confirmed = _a.sent();
                             if (!(confirmed && this.isLogin)) return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.accountService.refresh()];
+                            return [4 /*yield*/, this.accountService.reload()];
                         case 5:
                             _a.sent();
                             _a.label = 6;
@@ -21155,7 +21213,7 @@
                 return __generator(this, function (_b) {
                     this.disable();
                     this.markAsLoading();
-                    return [2 /*return*/, this.accountService.refresh()];
+                    return [2 /*return*/, this.accountService.reload()];
                 });
             });
         };
@@ -27158,7 +27216,9 @@
     var AppEntityEditor = /** @class */ (function (_super) {
         __extends(AppEntityEditor, _super);
         function AppEntityEditor(injector, dataType, dataService, options) {
-            var _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
+            var _this = this;
+            var _a;
+            _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
             _this.dataType = dataType;
             _this.dataService = dataService;
             _this.saving = false;
@@ -27166,7 +27226,7 @@
             _this.onUpdateView = new i0.EventEmitter();
             options = Object.assign({
                 // Default options
-                enableListenChanges: (injector.get(ENVIRONMENT).listenRemoteChanges === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
+                enableListenChanges: (((_a = injector.get(ENVIRONMENT).entityEditor) === null || _a === void 0 ? void 0 : _a.enableListenChanges) === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
             }, options);
             _this.settings = injector.get(LocalSettingsService);
             _this.errorTranslator = injector.get(FormErrorTranslator);