@sumaris-net/ngx-components 0.25.7 → 0.25.8

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

@@ -15678,7 +15678,7 @@
             this.browser = browser;
             this.downloader = downloader;
             this._started = false;
-            this._downloadingPromise = new Map();
+            this._downloadingJobs = new Map();
             this._debug = !environment.production;
             if (this._debug)
                 console.debug('[platform] Creating service');
@@ -15808,56 +15808,43 @@
                 window.open(url, target, features, replace);
             }
         };
-        PlatformService.prototype.getDownloadingPromise = function (uri) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, this._downloadingPromise.get(uri)];
-                });
-            });
+        PlatformService.prototype.getDownloadingJob = function (uri) {
+            return this._downloadingJobs.get(uri);
         };
         PlatformService.prototype.download = function (request) {
-            return __awaiter(this, void 0, void 0, function () {
-                var promise, location, err_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!request || !request.uri)
-                                throw new Error('Missing argument \'request\' or \'request.uri\'');
-                            if (!(this._android && this.downloader)) return [3 /*break*/, 6];
-                            promise = this._downloadingPromise.get(request.uri);
-                            if (promise)
-                                return [2 /*return*/, promise];
-                            request = Object.assign({ visibleInDownloadsUi: true, notificationVisibility: ngx$6.NotificationVisibility.VisibleNotifyCompleted, title: request.title || request.filename }, request);
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, 3, 4, 5]);
-                            console.debug('[platform] Downloading, using request: ' + JSON.stringify(request));
-                            // Start download
-                            promise = this.downloader.download(request);
-                            // Remember this request uri
-                            this._downloadingPromise.set(request.uri, promise);
-                            return [4 /*yield*/, promise];
-                        case 2:
-                            location = _a.sent();
-                            console.info('[platform] File successfully downloaded at:' + location);
-                            return [2 /*return*/, location];
-                        case 3:
-                            err_1 = _a.sent();
-                            console.error('[platform] Unable to download: ' + (err_1 && err_1.message || err_1));
-                            throw err_1;
-                        case 4:
-                            // Forget the request
-                            this._downloadingPromise.delete(request.uri);
-                            return [7 /*endfinally*/];
-                        case 5: return [3 /*break*/, 7];
-                        case 6:
-                            console.warn('[platform] Cannot use Android downloader: using browser open()');
-                            this.open(request.uri, '_system', 'location=no', true);
-                            return [2 /*return*/, undefined];
-                        case 7: return [2 /*return*/];
-                    }
-                });
-            });
+            var _this = this;
+            if (!request || !request.uri)
+                throw new Error('Missing argument \'request\' or \'request.uri\'');
+            if (this._android && this.downloader) {
+                // Check if not already downloading file
+                var location$ = this._downloadingJobs.get(request.uri);
+                if (location$)
+                    return location$;
+                request = Object.assign({ visibleInDownloadsUi: true, notificationVisibility: ngx$6.NotificationVisibility.VisibleNotifyCompleted, title: request.title || request.filename }, request);
+                console.debug('[platform] Downloading, using request: ' + JSON.stringify(request));
+                // Start download
+                location$ = rxjs.from(this.downloader.download(request));
+                // Remember this request uri
+                this._downloadingJobs.set(request.uri, location$);
+                return location$
+                    .pipe(operators.tap(function (location) {
+                    console.info('[platform] File successfully downloaded at:' + location);
+                    // Forget the request
+                    _this._downloadingJobs.delete(request.uri);
+                }), operators.catchError(function (err) {
+                    console.error('[platform] Unable to download: ' + (err && err.message || err));
+                    // Forget the request
+                    _this._downloadingJobs.delete(request.uri);
+                    throw err;
+                }));
+            }
+            // Fallback (if not Android and Cordova): opening the URI using the browser
+            // TODO: find a way to download under iOS (see https://www.c-sharpcorner.com/article/how-to-download-a-file-using-file-transfer-plugin-in-ionic-3/)
+            else {
+                console.warn('[platform] Cannot use Android downloader: using browser open()');
+                this.open(request.uri, '_system', 'location=no', true);
+                return rxjs.of();
+            }
         };
         /* -- protected methods -- */
         PlatformService.prototype.configureCordovaPlugins = function (mobile) {
@@ -15953,7 +15940,7 @@
         };
         PlatformService.prototype.migrateStorage = function (forage) {
             return __awaiter(this, void 0, void 0, function () {
-                var canMigrate, oldForage, keys, now, toast_1, duration, err_2;
+                var canMigrate, oldForage, keys, now, toast_1, duration, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -16006,8 +15993,8 @@
                             _a.sent();
                             return [3 /*break*/, 12];
                         case 9:
-                            err_2 = _a.sent();
-                            console.error(err_2 && err_2.message || err_2, err_2);
+                            err_1 = _a.sent();
+                            console.error(err_1 && err_1.message || err_1, err_1);
                             return [4 /*yield*/, toast_1.dismiss()];
                         case 10:
                             _a.sent();
@@ -21393,7 +21380,7 @@
                         console.error('[install-upgrade-card] Missing required argument \'link.url\'');
                         return [2 /*return*/]; // Skip
                     }
-                    return [2 /*return*/, this.listenDownloadPromise(link.url, this.platform.download({
+                    return [2 /*return*/, this.listenDownloadJob(link.url, this.platform.download({
                             uri: link.url,
                             title: link.title,
                             filename: link.filename,
@@ -21470,9 +21457,9 @@
                         case 4:
                             // Listening downloading promise, if exists
                             (this.upgradeLinks || []).forEach(function (link) {
-                                var promise = _this.platform.getDownloadingPromise(link.url);
-                                if (promise)
-                                    _this.listenDownloadPromise(link.url, promise);
+                                var job = _this.platform.getDownloadingJob(link.url);
+                                if (job)
+                                    _this.listenDownloadJob(link.url, job);
                             });
                             return [2 /*return*/];
                     }
@@ -21585,13 +21572,13 @@
                 });
             });
         };
-        AppInstallUpgradeCard.prototype.listenDownloadPromise = function (url, promise) {
+        AppInstallUpgradeCard.prototype.listenDownloadJob = function (url, job) {
             return __awaiter(this, void 0, void 0, function () {
                 var location, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!url || !promise)
+                            if (!url || !job)
                                 return [2 /*return*/]; // Skip
                             _a.label = 1;
                         case 1:
@@ -21602,10 +21589,13 @@
                                 this.downloading = true;
                                 this.markForCheck();
                             }
-                            return [4 /*yield*/, promise];
+                            return [4 /*yield*/, job.toPromise()];
                         case 2:
                             location = _a.sent();
-                            console.info('[install-upgrade-card] File downloaded at: ' + location);
+                            if (location) {
+                                console.info('[install-upgrade-card] File downloaded at: ' + location);
+                                return [2 /*return*/, this.showDownloadCompleteDialog()];
+                            }
                             return [3 /*break*/, 5];
                         case 3:
                             err_1 = _a.sent();
@@ -21615,7 +21605,7 @@
                             this.downloading = false;
                             this.markForCheck();
                             return [7 /*endfinally*/];
-                        case 5: return [2 /*return*/, this.showDownloadCompleteDialog()];
+                        case 5: return [2 /*return*/];
                     }
                 });
             });