@esfaenza/httpservice 13.3.1 → 13.4.1

package/fesm2020/esfaenza-httpservice.mjs

@@ -2,9 +2,10 @@ import * as i2 from '@angular/common/http';
 import { HttpEventType, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, Optional, NgModule } from '@angular/core';
-import { delay, finalize, map, catchError, scan } from 'rxjs/operators';
-import { forkJoin, of, throwError, Observable } from 'rxjs';
+import { concatMap, delay, finalize, map, catchError, scan } from 'rxjs/operators';
+import { forkJoin, from, of, throwError, Observable } from 'rxjs';
 import * as i3 from '@esfaenza/preferences';
+import * as i4 from '@esfaenza/extensions';
 
 /**
  * Dizionario di invalidazioni delle chiamate HTTP
@@ -161,7 +162,7 @@ class HTTPService {
     /**
      * @ignore
      */
-    constructor(BACKEND_URL, EXTENSION_CLASS, HTTP_INVALIDATION, LOCALE, APP_NAME, CLIENT_CACHE_DURATION_S, CACHE_BY_USER, DEBUG_MODE, http, localStorage) {
+    constructor(BACKEND_URL, EXTENSION_CLASS, HTTP_INVALIDATION, LOCALE, APP_NAME, CLIENT_CACHE_DURATION_S, CACHE_BY_USER, DEBUG_MODE, http, localStorage, utisExts) {
         this.BACKEND_URL = BACKEND_URL;
         this.EXTENSION_CLASS = EXTENSION_CLASS;
         this.HTTP_INVALIDATION = HTTP_INVALIDATION;
@@ -172,6 +173,7 @@ class HTTPService {
         this.DEBUG_MODE = DEBUG_MODE;
         this.http = http;
         this.localStorage = localStorage;
+        this.utisExts = utisExts;
         /** Cache dello stato delle chiamate HTTP attualmente effettuate. Ogni chiamata è rappresentata da un GUID e lo status assume valore **false** solo sugli errori */
         this.callStatus = {};
         /** Nome della cache in cui vengono storicizzate le informazioni sulle risposte delle chiamate sotto forma di dictionary */
@@ -229,25 +231,27 @@ class HTTPService {
      * @returns {Observable<T>} Observable che contiene il risultato della chiamata
      */
     get(url, params = null, transaction = "", succesfulResultMandatory = true, errorCallback = null) {
-        let myGuid = this.defaultStartCall(url);
-        let cachedInfos = this.tryGetCacheInformations(url, params);
-        if (cachedInfos.cache && cachedInfos.cacheItem) {
-            this.log(this.loc("Result for") + " " + url + " " + this.loc("retrieved from cache"));
-            return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
-        }
-        var httpCall = this.http.get(cachedInfos.finalUrl, { headers: this.getHeaders(transaction), params: params });
-        return httpCall.pipe(map((res) => {
-            let responseItem = res;
-            if (cachedInfos.cache) {
-                this.cacheResponse(responseItem, cachedInfos);
-                this.log(this.loc("Cached result for") + " " + url);
+        // TODO provare e testare
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            let cachedInfos = this.tryGetCacheInformations(url, params);
+            if (cachedInfos.cache && cachedInfos.cacheItem) {
+                this.log(this.loc("Result for") + " " + url + " " + this.loc("retrieved from cache"));
+                return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
             }
-            return responseItem;
-        }), catchError((err, caught) => {
-            if (errorCallback)
-                errorCallback();
-            return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid, cachedInfos); }));
+            var httpCall = this.http.get(cachedInfos.finalUrl, { headers: this.getHeaders(transaction), params: params });
+            return httpCall.pipe(map((res) => {
+                let responseItem = res;
+                if (cachedInfos.cache) {
+                    this.cacheResponse(this.utisExts.deepClone(responseItem), cachedInfos);
+                    this.log(this.loc("Cached result for") + " " + url);
+                }
+                return responseItem;
+            }), catchError((err, caught) => {
+                if (errorCallback)
+                    errorCallback();
+                return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
+            }), finalize(() => { this.tryFinalizeByGuid(myGuid, cachedInfos); }));
+        }));
     }
     /**
      * Esecuzione di una GET HTTP con eventualmente la gestione della cache qualora la chiamata termini con la convenzione "#cache"
@@ -265,24 +269,25 @@ class HTTPService {
      * @returns {Observable<Blob | ArrayBuffer>} Observable che contiene il risultato della chiamata
      */
     getRaw(url, params = null, type = "arraybuffer", transaction = "", succesfulResultMandatory = true, errorCallback = null) {
-        let myGuid = this.defaultStartCall(url);
-        let cachedInfos = this.tryGetCacheInformations(url, params);
-        if (cachedInfos.cache && cachedInfos.cacheItem) {
-            this.log(this.loc("Result for") + " " + url + " " + this.loc("retrieved from cache"));
-            return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
-        }
-        var httpCall = this.http.get(cachedInfos.finalUrl, { responseType: type, headers: this.getHeaders(transaction), params: params });
-        return httpCall.pipe(map((blob) => {
-            if (cachedInfos.cache) {
-                this.cacheResponse(blob, cachedInfos);
-                this.log(this.loc("Cached result for") + " " + url);
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            let cachedInfos = this.tryGetCacheInformations(url, params);
+            if (cachedInfos.cache && cachedInfos.cacheItem) {
+                this.log(this.loc("Result for") + " " + url + " " + this.loc("retrieved from cache"));
+                return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
             }
-            return blob;
-        }), catchError((err, caught) => {
-            if (errorCallback)
-                errorCallback();
-            return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid, cachedInfos); }));
+            var httpCall = this.http.get(cachedInfos.finalUrl, { responseType: type, headers: this.getHeaders(transaction), params: params });
+            return httpCall.pipe(map((blob) => {
+                if (cachedInfos.cache) {
+                    this.cacheResponse(blob, cachedInfos);
+                    this.log(this.loc("Cached result for") + " " + url);
+                }
+                return blob;
+            }), catchError((err, caught) => {
+                if (errorCallback)
+                    errorCallback();
+                return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
+            }), finalize(() => { this.tryFinalizeByGuid(myGuid, cachedInfos); }));
+        }));
     }
     /**
     * Esecuzione di una POST HTTP
@@ -297,14 +302,12 @@ class HTTPService {
     * @returns {Observable<T>} Observable che contiene il risultato della chiamata
     */
     post(url, bodyData, params = null, transaction = "", succesfulResultMandatory = true) {
-        let myGuid = this.defaultStartCall(url);
-        var httpCall = this.http.post(url, bodyData, { headers: this.getHeaders(transaction), params: params });
-        return httpCall.pipe(map((res) => {
-            let responseItem = res;
-            return responseItem;
-        }), catchError((err, caught) => {
-            return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            var httpCall = this.http.post(url, bodyData, { headers: this.getHeaders(transaction), params: params });
+            return httpCall.pipe(catchError((err, caught) => {
+                return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
+            }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        }));
     }
     /**
     * Esecuzione di una DELETE HTTP
@@ -318,14 +321,12 @@ class HTTPService {
     * @returns {Observable<T>} Observable che contiene il risultato della chiamata
     */
     delete(url, params = null, transaction = "", succesfulResultMandatory = true) {
-        let myGuid = this.defaultStartCall(url);
-        var httpCall = this.http.delete(url, { headers: this.getHeaders(transaction), params: params });
-        return httpCall.pipe(map((res) => {
-            let responseItem = res;
-            return responseItem;
-        }), catchError((err, caught) => {
-            return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            var httpCall = this.http.delete(url, { headers: this.getHeaders(transaction), params: params });
+            return httpCall.pipe(catchError((err, caught) => {
+                return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
+            }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        }));
     }
     /**
      * Esecuzione di una PUT HTTP
@@ -340,14 +341,12 @@ class HTTPService {
      * @returns {Observable<T>} Observable che contiene il risultato della chiamata
      */
     put(url, bodyData, params = null, transaction = "", succesfulResultMandatory = true) {
-        let myGuid = this.defaultStartCall(url);
-        var httpCall = this.http.put(url, bodyData, { headers: this.getHeaders(transaction), params: params });
-        return httpCall.pipe(map((res) => {
-            let responseItem = res;
-            return responseItem;
-        }), catchError((err, caught) => {
-            return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            var httpCall = this.http.put(url, bodyData, { headers: this.getHeaders(transaction), params: params });
+            return httpCall.pipe(catchError((err, caught) => {
+                return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, myGuid);
+            }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        }));
     }
     /**
      * Esecuzione di una POST HTTP
@@ -360,12 +359,13 @@ class HTTPService {
      *
      * @returns {Observable<T>} Observable che contiene il risultato della chiamata
      */
-    postwithFiles(url, bodyData, fileArrayOrFile) {
-        let myGuid = this.defaultStartCall(url);
-        var formData = this.getFilesFormData(fileArrayOrFile);
-        formData.append("body", JSON.stringify(bodyData));
-        var httpCall = this.http.post(url, formData, { headers: this.getHeaders(null, true, null, null) });
-        return httpCall.pipe(catchError((err, caught) => { return this.registerErrorAndReturnEmptyObservable(err, myGuid); }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+    postwithFiles(url, bodyData, fileArrayOrFile, params = null) {
+        return from([this.defaultStartCall(url)]).pipe(concatMap((myGuid) => {
+            var formData = this.getFilesFormData(fileArrayOrFile);
+            formData.append("body", JSON.stringify(bodyData));
+            var httpCall = this.http.post(url, formData, { params: params, headers: this.getHeaders(null, true, null, null) });
+            return httpCall.pipe(catchError((err, caught) => { return this.registerErrorAndReturnEmptyObservable(err, myGuid); }), finalize(() => { this.tryFinalizeByGuid(myGuid); }));
+        }));
     }
     /**
      * Esecuzione di una POST HTTP
@@ -428,7 +428,12 @@ class HTTPService {
      * @param {HttpParams} params Parametri della chiamata
      */
     getFileNative(url, params = null) {
-        let finalUrl = url + (params ? "?" + params.toString() : "");
+        // Encodo tutti i parametri per evitare casi particolari
+        // var encodedParams = new HttpParams();
+        // let parKeys = params.keys();
+        // for (let i = 0; i < parKeys.length; i++)
+        //   encodedParams = encodedParams.set(parKeys[i], encodeURIComponent(params.get(parKeys[i])));
+        let finalUrl = url + (params ? "?" + params.toString().replace(/\+/g, '%2b') : "");
         window.location.href = finalUrl;
     }
     /**
@@ -526,17 +531,20 @@ class HTTPService {
      * che mi cambi sotto l'oggetto di cache mentre sto salvando le informazioni
      */
     async tryFinalizeByGuid(guid, cacheInfos) {
-        this.log(this.loc("Finalizing call") + " " + guid + " " + this.loc("with status") + ": " + (this.callStatus[guid].success ? this.loc('Success') : this.loc('Failure')));
-        // Alla prima chiamata buona, significa che almeno il login ce l'ho. Posso mettermi in modalità redirectInProgress false
-        // e riiniziare a valutare errori di javashit
-        if (this.callStatus[guid].success && this.ExtensionsImpl.readRedirectionStatus())
-            this.ExtensionsImpl.writeRedirectionStatus(false);
-        // Aggiungo la chiamata alla lista delle ultime 3 completate
-        this.LastThreeCompletedCalls.unshift(this.callStatus[guid].url);
-        if (this.LastThreeCompletedCalls.length > 3)
-            this.LastThreeCompletedCalls.pop();
-        // In ogni caso questa posso rimuoverla
-        delete this.callStatus[guid];
+        this.log(this.loc("Finalizing call") + " " + guid + " " + this.loc("with status") + ": " + (!this.callStatus[guid] ? 'Unknown' : this.callStatus[guid].success ? this.loc('Success') : this.loc('Failure')));
+        // TODO: Perdere 3-4 ore per capire perché ogni tanto arriva null in casi pesanti di Observable spammati a random
+        if (this.callStatus[guid]) {
+            // Alla prima chiamata buona, significa che almeno il login ce l'ho. Posso mettermi in modalità redirectInProgress false
+            // e riiniziare a valutare errori di javashit
+            if (this.callStatus[guid].success && this.ExtensionsImpl.readRedirectionStatus())
+                this.ExtensionsImpl.writeRedirectionStatus(false);
+            // Aggiungo la chiamata alla lista delle ultime 3 completate
+            this.LastThreeCompletedCalls.unshift(this.callStatus[guid].url);
+            if (this.LastThreeCompletedCalls.length > 3)
+                this.LastThreeCompletedCalls.pop();
+            // In ogni caso questa posso rimuoverla
+            delete this.callStatus[guid];
+        }
         // Se vengo da una chiamata che ha aggiornato la cache a timer o globale marco il fatto che quella cache dev'essere aggiornata
         if (cacheInfos && cacheInfos.cache) {
             this.PersistTimedCacheASAP = this.PersistTimedCacheASAP || !!cacheInfos.cacheTime;
@@ -751,7 +759,7 @@ class HTTPService {
      * @returns {CacheInfos} Oggetto contenente le informazioni sulla cache per l'oggetto specificato
      */
     tryGetCacheInformations(url, params) {
-        let cachingKey = null, cacheTime = null, cache = null, item = null;
+        let cachingKey = null, cacheTime = null, item = null;
         let useCaching = !!(/#cache/gi.exec(url));
         if (useCaching) {
             let tmp = /#cache(:?-(\d+))/gi.exec(url);
@@ -771,7 +779,8 @@ class HTTPService {
                 item = cache[cachingKey];
             }
         }
-        return new CacheInfos(url, useCaching, cachingKey, cacheTime, item);
+        // Per assicurarmi che il rifeirmento degli oggetti sia diverso utilizzo il deepClone
+        return new CacheInfos(url, useCaching, cachingKey, cacheTime, this.utisExts.deepClone(item));
     }
     /**
      * Inserisce un oggetto nella cache appropriata in base alle informazioni contenute nel parametro **cacheInfos**
@@ -868,9 +877,9 @@ class HTTPService {
         return Loc[message][this.LOCALE];
     }
 }
-HTTPService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HTTPService, deps: [{ token: BACKEND_URL }, { token: HttpServiceExtensions }, { token: HTTP_INVALIDATION, optional: true }, { token: HTTP_LOCALE, optional: true }, { token: APP_NAME, optional: true }, { token: CLIENT_CACHE_DURATION_S, optional: true }, { token: CACHE_BY_USER, optional: true }, { token: DEBUG_MODE, optional: true }, { token: i2.HttpClient }, { token: i3.PreferencesService }], target: i0.ɵɵFactoryTarget.Injectable });
-HTTPService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HTTPService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HTTPService, decorators: [{
+HTTPService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HTTPService, deps: [{ token: BACKEND_URL }, { token: HttpServiceExtensions }, { token: HTTP_INVALIDATION, optional: true }, { token: HTTP_LOCALE, optional: true }, { token: APP_NAME, optional: true }, { token: CLIENT_CACHE_DURATION_S, optional: true }, { token: CACHE_BY_USER, optional: true }, { token: DEBUG_MODE, optional: true }, { token: i2.HttpClient }, { token: i3.CacheService }, { token: i4.UtilityService }], target: i0.ɵɵFactoryTarget.Injectable });
+HTTPService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HTTPService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HTTPService, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -905,7 +914,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.9", ngImpor
                 }, {
                     type: Inject,
                     args: [DEBUG_MODE]
-                }] }, { type: i2.HttpClient }, { type: i3.PreferencesService }]; } });
+                }] }, { type: i2.HttpClient }, { type: i3.CacheService }, { type: i4.UtilityService }]; } });
 
 class HttpserviceModule {
     static forRoot(config) {
@@ -925,10 +934,10 @@ class HttpserviceModule {
         };
     }
 }
-HttpserviceModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HttpserviceModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-HttpserviceModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HttpserviceModule });
-HttpserviceModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HttpserviceModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: HttpserviceModule, decorators: [{
+HttpserviceModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HttpserviceModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+HttpserviceModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HttpserviceModule });
+HttpserviceModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HttpserviceModule });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: HttpserviceModule, decorators: [{
             type: NgModule
         }] });