@sumaris-net/ngx-components 1.15.13 → 1.15.14

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

@@ -11314,18 +11314,14 @@
     var HttpUtils = /** @class */ (function () {
         function HttpUtils() {
         }
-        HttpUtils.getResource = function (http, uri, opts) {
+        HttpUtils.getText = function (http, uri, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             // Add headers
-                            opts = Object.assign({}, opts
-                            //headers: new HttpHeaders(),
-                            //.append('X-App-Name', environment.name)
-                            //.append('X-App-Version', environment.version),
-                            );
+                            opts = opts || { responseType: 'text' };
                             // Force no cache
                             if (opts.nocache === true) {
                                 opts.headers = (opts.headers instanceof i2$1.HttpHeaders ? opts.headers : new i2$1.HttpHeaders(opts.headers));
@@ -11336,10 +11332,8 @@
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, http.get(uri, opts).toPromise()];
-                        case 2: 
-                        // Using web http client
-                        return [2 /*return*/, (_a.sent())];
+                            return [4 /*yield*/, http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'text' })).toPromise()];
+                        case 2: return [2 /*return*/, (_a.sent())];
                         case 3:
                             err_1 = _a.sent();
                             if (err_1 && err_1.message) {
@@ -11354,6 +11348,40 @@
                 });
             });
         };
+        HttpUtils.getJson = function (http, uri, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var err_2;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            // Add headers
+                            opts = opts || {};
+                            // Force no cache
+                            if (opts.nocache === true) {
+                                opts.headers = (opts.headers instanceof i2$1.HttpHeaders ? opts.headers : new i2$1.HttpHeaders(opts.headers));
+                                opts.headers
+                                    .append('Cache-Control', 'no-cache')
+                                    .append('Pragma', 'no-cache');
+                            }
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'json' })).toPromise()];
+                        case 2: return [2 /*return*/, (_a.sent())];
+                        case 3:
+                            err_2 = _a.sent();
+                            if (err_2 && err_2.message) {
+                                console.error("[network] Error on get request " + uri + ": " + err_2.message, err_2);
+                            }
+                            else {
+                                console.error("[network] Error on get request " + uri + ": " + (err_2 && err_2.statusText) + " - " + JSON.stringify(err_2));
+                            }
+                            throw { code: err_2.status, message: 'ERROR.UNKNOWN_NETWORK_ERROR' };
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return HttpUtils;
     }());
 
@@ -11374,7 +11402,7 @@
                 if (peerUrl.endsWith('/')) {
                     peerUrl = peerUrl.substr(0, peerUrl.length - 1);
                 }
-                return [2 /*return*/, HttpUtils.getResource(http, peerUrl + '/api/node/info', opts)];
+                return [2 /*return*/, HttpUtils.getJson(http, peerUrl + '/api/node/info', opts)];
             });
         });
     }
@@ -12639,7 +12667,7 @@
                             if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
                                 path += '?t=' + Date.now();
                             }
-                            return [4 /*yield*/, this.get(path, opts)];
+                            return [4 /*yield*/, this.getText(path, opts)];
                         case 1:
                             appVersion = _b.sent();
                             if (isNotNilOrBlank(appVersion))
@@ -12906,31 +12934,43 @@
             });
             this._timerSubscription.add(function () { return console.debug('[network] Refresh timer stopped'); });
         };
+        NetworkService.prototype.getText = function (path, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var uri;
+                return __generator(this, function (_b) {
+                    uri = this.getUri(path);
+                    return [2 /*return*/, HttpUtils.getText(this.http, uri, opts)];
+                });
+            });
+        };
         NetworkService.prototype.get = function (path, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var uri, peerUrl;
+                var uri;
                 return __generator(this, function (_b) {
-                    uri = path;
-                    // If path is not an URI: prepend with peer URL
-                    if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
-                        peerUrl = (this.peer && this.peer.url);
-                        // Remove trailing slash
-                        if (peerUrl.endsWith('/')) {
-                            peerUrl = peerUrl.substr(0, peerUrl.length - 1);
-                        }
-                        // Add first path
-                        if (!path.startsWith('/')) {
-                            path = '/' + path;
-                        }
-                        // Create the URI: concat peer URL and path
-                        uri = peerUrl + path;
-                    }
-                    // Execute the request
-                    return [2 /*return*/, HttpUtils.getResource(this.http, uri, opts)];
+                    uri = this.getUri(path);
+                    return [2 /*return*/, HttpUtils.getJson(this.http, uri, opts)];
                 });
             });
         };
         /* -- Protected methods -- */
+        NetworkService.prototype.getUri = function (path) {
+            var uri = path;
+            // If path is not an URI: prepend with peer URL
+            if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
+                var peerUrl = (this.peer && this.peer.url);
+                // Remove trailing slash
+                if (peerUrl.endsWith('/')) {
+                    peerUrl = peerUrl.substr(0, peerUrl.length - 1);
+                }
+                // Add first path
+                if (!path.startsWith('/')) {
+                    path = '/' + path;
+                }
+                // Create the URI: concat peer URL and path
+                uri = peerUrl + path;
+            }
+            return uri;
+        };
         NetworkService.prototype.onDeviceConnectionChanged = function (connectionType) {
             connectionType = (connectionType || 'unknown').toLowerCase();
             if (connectionType.startsWith('cell'))