@esfaenza/httpservice 19.2.23 → 20.3.1

package/fesm2022/esfaenza-httpservice.mjs

@@ -2,10 +2,11 @@ import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Optional, Inject, NgModule } from '@angular/core';
 import * as i3 from '@angular/common/http';
 import { HttpEventType, HttpHeaders, HttpErrorResponse, HttpParams } from '@angular/common/http';
-import { first, concatMap, delay, tap, map, catchError, finalize, scan } from 'rxjs/operators';
+import { first, concatMap, delay, finalize, map, catchError, scan } from 'rxjs/operators';
 import { Subject, forkJoin, of, from, throwError, Observable } from 'rxjs';
 import * as i2 from '@esfaenza/localizations';
 import * as i4 from '@esfaenza/preferences';
+import * as i5 from '@esfaenza/extensions';
 
 /**
  * Dizionario di invalidazioni delle chiamate HTTP
@@ -105,10 +106,10 @@ class HttpServiceExtensions {
     handleException(status, text) {
         console.error("ESHttpError " + status + " " + text);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpServiceExtensions, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpServiceExtensions, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpServiceExtensions, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpServiceExtensions, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpServiceExtensions, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpServiceExtensions, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -132,7 +133,7 @@ class HTTPService {
     /**
      * @ignore
      */
-    constructor(EXTENSION_CLASS, HTTP_INVALIDATION, CLIENT_CACHE_DURATION_S, CACHE_BY_USER, HTTP_DEBUG_MODE, bc, http, localStorage) {
+    constructor(EXTENSION_CLASS, HTTP_INVALIDATION, CLIENT_CACHE_DURATION_S, CACHE_BY_USER, HTTP_DEBUG_MODE, bc, http, localStorage, hash, utisExts) {
         this.EXTENSION_CLASS = EXTENSION_CLASS;
         this.HTTP_INVALIDATION = HTTP_INVALIDATION;
         this.CLIENT_CACHE_DURATION_S = CLIENT_CACHE_DURATION_S;
@@ -141,6 +142,8 @@ class HTTPService {
         this.bc = bc;
         this.http = http;
         this.localStorage = localStorage;
+        this.hash = hash;
+        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 */
@@ -166,17 +169,6 @@ class HTTPService {
         this.GET_Trans_BeginTrans = "/api/Trans/BeginTrans";
         this.GET_Trans_CheckExecution = "/api/Trans/CheckExecution";
         this.GET_Trans_EndTrans = "/api/Trans/EndTrans";
-        /*****************************************************************************************************************************************
-         ***************************************************** ROBA PER HASHING ******************************************************************
-         *****************************************************************************************************************************************/
-        /**
-         * Blacklist dei tipi da ignorare quando si effettua l'hashing degli oggetti
-         */
-        this.objBlacklist = {
-            "NgForm": true, "ElementRef": true, "ExtensionsService": true, "ToastrService": true, "LocaleService": true, "AppState": true, "Router": true,
-            "ActivatedRoute": true, "HTTPService": true, "Location": true, "CanvasComponent": true, "ModalDirective": true, "ChangeDetectorRef": true,
-            "DateService": true, "EventEmitter": true, "ViewRef_": true, "Subscriber": true, "ItemLocalization": true
-        };
         this.ExtensionsImpl = this.EXTENSION_CLASS || new HttpServiceExtensions();
     }
     setAppConfig(myconfig) {
@@ -229,13 +221,13 @@ class HTTPService {
             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), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString(), JSON.stringify(res)); }));
+                return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
             }
             var httpCall = this.http.get(cachedInfos.finalUrl, { headers: this.getHeaders(ret.locale, transaction), params: params });
             return httpCall.pipe(map((res) => {
                 let responseItem = res;
                 if (cachedInfos.cache) {
-                    let toCache = JSON.parse(JSON.stringify(responseItem));
+                    let toCache = this.utisExts ? this.utisExts.deepClone(responseItem) : JSON.parse(JSON.stringify(responseItem));
                     this.cacheResponse(toCache, cachedInfos);
                     this.log(this.loc("Cached result for") + " " + url);
                 }
@@ -244,7 +236,7 @@ class HTTPService {
                 if (errorCallback)
                     errorCallback();
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString(), JSON.stringify(res), cachedInfos); }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid, cachedInfos); }));
         }));
     }
     /**
@@ -270,7 +262,7 @@ class HTTPService {
             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), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString(), JSON.stringify(res)); }));
+                return of(cachedInfos.cacheItem).pipe(delay(0), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
             }
             var httpCall = this.http.get(cachedInfos.finalUrl, { responseType: type, headers: this.getHeaders(ret.locale, transaction), params: params });
             return httpCall.pipe(map((blob) => {
@@ -283,7 +275,7 @@ class HTTPService {
                 if (errorCallback)
                     errorCallback();
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString(), JSON.stringify(res), cachedInfos); }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid, cachedInfos); }));
         }));
     }
     /**
@@ -311,17 +303,7 @@ class HTTPService {
             var httpCall = this.http.post(url, bodyData, { headers: this.getHeaders(ret.locale, transaction), params: params });
             return httpCall.pipe(catchError((err, _) => {
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => {
-                // Secco gli items dalle ricerche paginate lato richiesta
-                let request = JSON.parse(JSON.stringify(bodyData));
-                if (request.items && request.itemsperpageoverride)
-                    delete request.items;
-                // Secco gli items dalle ricerche paginate lato risposta
-                let response = JSON.parse(JSON.stringify(res));
-                if (response.items && response.itemsperpageoverride)
-                    delete response.items;
-                this.tryFinalizeByGuid(ret.myGuid, params?.toString() + (params?.toString() ? " § " : "") + JSON.stringify(request), JSON.stringify(response));
-            }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
         }));
     }
     /**
@@ -341,9 +323,9 @@ class HTTPService {
             locale: this.getlocaleObservable()
         }).pipe(concatMap((ret) => {
             var httpCall = this.http.delete(url, { headers: this.getHeaders(ret.locale, transaction), params: params });
-            return httpCall.pipe(catchError((err, _) => {
+            return httpCall.pipe(catchError((err, caught) => {
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString(), JSON.stringify(res)); }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
         }));
     }
     /**
@@ -364,9 +346,9 @@ class HTTPService {
             locale: this.getlocaleObservable()
         }).pipe(concatMap((ret) => {
             var httpCall = this.http.put(url, bodyData, { headers: this.getHeaders(ret.locale, transaction), params: params });
-            return httpCall.pipe(catchError((err, _) => {
+            return httpCall.pipe(catchError((err, caught) => {
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString() + (params?.toString() ? " § " : "") + JSON.stringify(bodyData), JSON.stringify(res)); }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
         }));
     }
     /**
@@ -391,7 +373,7 @@ class HTTPService {
             return httpCall.pipe(catchError((err, caught) => {
                 onError?.();
                 return !succesfulResultMandatory ? throwError(err) : this.registerErrorAndReturnEmptyObservable(err, ret.myGuid);
-            }), tap((res) => { this.tryFinalizeByGuid(ret.myGuid, params?.toString() + (params?.toString() ? " § " : "") + JSON.stringify(bodyData), JSON.stringify(res)); }));
+            }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
         }));
     }
     /**
@@ -410,11 +392,11 @@ class HTTPService {
     async postGetFile(url, bodyData, filename, getFileCallback, afterGetFile = null, handleError = true, pars) {
         let myGuid = this.defaultStartCall(url);
         let locale = await this.getlocaleObservable().toPromise();
-        this.http.post(url, bodyData, { params: pars, headers: this.getHeaders(locale), observe: 'response', responseType: "blob" }).pipe(catchError((err, _) => {
+        this.http.post(url, bodyData, { params: pars, headers: this.getHeaders(locale), observe: 'response', responseType: "blob" }).pipe(catchError((err, caught) => {
             if (afterGetFile && !handleError)
                 afterGetFile();
             return this.registerErrorAndReturnEmptyObservable(err, myGuid, handleError);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid, JSON.stringify(bodyData)); })).subscribe((response) => {
+        }), finalize(() => { this.tryFinalizeByGuid(myGuid); })).subscribe((response) => {
             let retUrl = window.URL.createObjectURL(response.body);
             let fn = response.headers.get('content-disposition')?.split(';')[1]?.split('filename')[1]?.split('=')[1]?.trim().replace(/\"/g, '');
             getFileCallback(retUrl, filename || fn);
@@ -438,11 +420,11 @@ class HTTPService {
     async getFile(url, params = null, filename, getFileCallback, afterGetFile = null, handleError = true) {
         let myGuid = this.defaultStartCall(url);
         let locale = await this.getlocaleObservable().toPromise();
-        this.http.get(url, { params: params, headers: this.getHeaders(locale), observe: 'response', responseType: "blob" }).pipe(catchError((err, _) => {
+        this.http.get(url, { params: params, headers: this.getHeaders(locale), observe: 'response', responseType: "blob" }).pipe(catchError((err, caught) => {
             if (afterGetFile && !handleError)
                 afterGetFile();
             return this.registerErrorAndReturnEmptyObservable(err, myGuid, handleError);
-        }), finalize(() => { this.tryFinalizeByGuid(myGuid, params?.toString()); })).subscribe((response) => {
+        }), finalize(() => { this.tryFinalizeByGuid(myGuid); })).subscribe((response) => {
             let retUrl = window.URL.createObjectURL(response.body);
             let fn = response.headers.get('content-disposition')?.split(';')[1]?.split('filename')[1]?.split('=')[1]?.trim().replace(/\"/g, '');
             getFileCallback(retUrl, filename || fn);
@@ -462,7 +444,7 @@ class HTTPService {
         // 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') : "");
+        let finalUrl = url + (params ? "?" + params.toString().replace(/\+/g, '%2b') : "");
         window.location.href = finalUrl;
     }
     /**
@@ -498,7 +480,7 @@ class HTTPService {
                     return { progress: 100, state: 'DONE', content: event.body };
                 }
                 return previous;
-            }, { state: 'PENDING', progress: 0, content: null }), catchError((err, _) => { return this.registerErrorAndReturnEmptyObservable(err, ret.myGuid); }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid, params?.toString()); }));
+            }, { state: 'PENDING', progress: 0, content: null }), catchError((err, _) => { return this.registerErrorAndReturnEmptyObservable(err, ret.myGuid); }), finalize(() => { this.tryFinalizeByGuid(ret.myGuid); }));
         }));
     }
     /**
@@ -566,15 +548,16 @@ class HTTPService {
      * @param {boolean} persistCacheIfIdle Effettua il persist della cache HTTP solo se non ci sono altre chiamate in corso, per evitare
      * che mi cambi sotto l'oggetto di cache mentre sto salvando le informazioni
      */
-    async tryFinalizeByGuid(guid, requestJson, responseJson, cacheInfos) {
+    async tryFinalizeByGuid(guid, cacheInfos) {
         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({ api: this.callStatus[guid].url, requestJson: requestJson, responseJson: responseJson });
+            this.LastThreeCompletedCalls.unshift(this.callStatus[guid].url);
             if (this.LastThreeCompletedCalls.length > 3)
                 this.LastThreeCompletedCalls.pop();
             // In ogni caso questa posso rimuoverla
@@ -716,7 +699,7 @@ class HTTPService {
                         this.ExtensionsImpl.handleBlockingException(res.status, finalError);
                     return;
                 case 0:
-                    finalError = `Generic connection error while calling '[${guid}] - ${this.callStatus[guid].url}' at ${new Date().toISOString()}. Response: ${JSON.stringify(res)}`;
+                    finalError = `Generic connection error while calling '[${guid}] - ${this.callStatus[guid].url}' at ${dayjs().format()}. Response: ${JSON.stringify(res)}`;
             }
         }
         this.ExtensionsImpl.handleException(finalStatus, finalError);
@@ -810,7 +793,7 @@ class HTTPService {
             let cacheKey = cacheTime ? this.localStorageHttpTimedCacheKey : this.localStorageHttpCacheKey;
             let cacheLs = this.localStorage?.getLocalItem?.(cacheKey);
             let cache = cacheLs ? cacheLs : {};
-            if (cache && cache[cachingKey] && !this.timedCacheItemExpired(cache[cachingKey].__expire)) {
+            if (cache && cache[cachingKey] && !this.timedCacheItemExpired(cache[cachingKey])) {
                 // Se gestisco il tempo esatto della cache prima di restituire l'oggetto cachato lo ripulisco 
                 // dalle proprietà interne che gli ho aggiunto per controllarne la scadenza
                 if (cacheTime)
@@ -819,7 +802,7 @@ class HTTPService {
             }
         }
         // Per assicurarmi che il rifeirmento degli oggetti sia diverso utilizzo il deepClone
-        let toCache = JSON.parse(JSON.stringify(item));
+        let toCache = this.utisExts ? this.utisExts.deepClone(item) : JSON.parse(JSON.stringify(item));
         return new CacheInfos(url, useCaching && this.CacheInitialized, cachingKey, cacheTime, toCache);
     }
     /**
@@ -833,11 +816,8 @@ class HTTPService {
         let cacheLs = this.localStorage?.getLocalItem?.(cacheKey);
         let cache = cacheLs ? cacheLs : {};
         cache[cacheInfos.cacheKey] = item;
-        if (cacheInfos.cacheTime) {
-            let date = new Date();
-            date.setSeconds(date.getSeconds() + parseInt(cacheInfos.cacheTime));
-            cache[cacheInfos.cacheKey].__expire = date;
-        }
+        if (cacheInfos.cacheTime)
+            cache[cacheInfos.cacheKey].__expire = dayjs().add(cacheInfos.cacheTime, "seconds");
         this.localStorage?.setLocalItem?.(cacheKey, cache);
     }
     /**
@@ -847,7 +827,7 @@ class HTTPService {
      */
     untimedCacheExpired() {
         let expire = JSON.parse(localStorage.getItem(this.localStorageHttpCacheExpireKey));
-        return !expire || (expire && this.timedCacheItemExpired(expire));
+        return !expire || expire && dayjs(expire) < dayjs();
     }
     /**
      * Controlla se la cache per una chiamata che ha un tempo di vita ben definito è scaduta o meno
@@ -856,8 +836,8 @@ class HTTPService {
      *
      * @returns {boolean} **true** se la cache è scaduta e dev'essere ripulita, **false** altrimenti
      */
-    timedCacheItemExpired(dtCheck) {
-        return new Date(dtCheck) < new Date();
+    timedCacheItemExpired(item) {
+        return dayjs(item.__expire) < dayjs();
     }
     /**
      * Ripulisce la cache e imposta la prossima scadenza ad adesso + **CLIENT_CACHE_DURATION_S** (token valorizzato in fase di configurazione dalla proprietà **clientCacheDurationS** della classe **HttpServiceModuleConfig**)
@@ -866,9 +846,7 @@ class HTTPService {
         if (!this.CacheInitialized || !this.localStorage)
             return;
         await this.localStorage.setItem(this.localStorageHttpCacheKey, {}).toPromise();
-        let date = new Date();
-        date.setSeconds(date.getSeconds() + (this.CLIENT_CACHE_DURATION_S ?? 3600));
-        localStorage.setItem(this.localStorageHttpCacheExpireKey, JSON.stringify(date));
+        localStorage.setItem(this.localStorageHttpCacheExpireKey, JSON.stringify(dayjs().add(this.CLIENT_CACHE_DURATION_S ?? 3600, "second")));
     }
     /**
      * Ripulisce la cache delle chiamate con un tempo di expire definito
@@ -929,22 +907,19 @@ class HTTPService {
     getAll(view, api, pars, transaction) {
         if (!view.selection.all)
             return of(view.selection.items);
-        var jsonView = JSON.parse(JSON.stringify(view));
+        if (!this.hash)
+            throw "[@esfaenza/httpservice] to use getAll, you need a Hasing service. WTF are you doing? this should be configured by @esfaenza core";
+        var jsonView = this.utisExts ? this.utisExts.deepClone(view) : JSON.parse(JSON.stringify(view));
         jsonView.page = 1;
         jsonView.itemsperpageoverride = 999999;
         return this.post(api, jsonView, pars, transaction).pipe(map(res => {
             let items = res.items;
-            items.forEach(t => t.hash = this.hashObject(t));
+            items.forEach(t => t.hash = this.hash.hashObject(t, null, false));
             if (res.selection.exclusions?.length > 0)
-                items = items.filter((t) => !res.selection.exclusions.find((e) => this.hashObject(e) == t.hash));
+                items = items.filter((t) => !res.selection.exclusions.find((e) => this.hash.hashObject(e, null, false) == t.hash));
             return items;
         }));
     }
-    hashObject(o, level = 0) {
-        var strDef = this.stringify(o, level);
-        var hash = this.simpleHash(strDef);
-        return hash;
-    }
     beginTransaction(executionKey, secondsTimeout) {
         this.log("beginTransaction call received: " + executionKey);
         var pars = new HttpParams().set("executionKey", executionKey);
@@ -961,77 +936,10 @@ class HTTPService {
         let pars = new HttpParams().set("idtrans", transactionKey).set("success", transactionResult.toString());
         return this.get(this.GET_Trans_EndTrans, pars);
     }
-    /**
-     * Hash più semplice e più veloce dell'md5, ma meno sicuro
-     *
-     * Vedi https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
-     *
-     * @param {string} str Stringa di cui calcolare l'hash
-     */
-    simpleHash(str, seed = 0) {
-        let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
-        for (let i = 0, ch; i < str.length; i++) {
-            ch = str.charCodeAt(i);
-            h1 = Math.imul(h1 ^ ch, 2654435761);
-            h2 = Math.imul(h2 ^ ch, 1597334677);
-        }
-        h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909);
-        h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909);
-        return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString();
-    }
-    /**
-    * Genera una stringa che identifica univocamente l'oggetto in questione
-    *
-    * @param {any} o Oggetto di cui calcolare la stringa univoca
-    * @param {number} level Livello di ricorsione nel caso venga effettuato l'hash di un oggetto che contiene altri oggetti
-    * @param {boolean} navigateFullDepth Indica se navigare l'oggetto per l'intera lunghezza. In caso contrario si ferma al secondo livello
-    */
-    stringify(o, level) {
-        var i, r;
-        if (o === null)
-            return "n";
-        if (o === true)
-            return "t";
-        if (o === false)
-            return "f";
-        if (o instanceof Date)
-            return 'd:' + o.valueOf().toString();
-        i = typeof o;
-        if (i === "string")
-            return "s:" + o;
-        if (i === "number")
-            return "n:" + o;
-        if (o instanceof Function)
-            return "m:" + o.toString();
-        if (o instanceof Array) {
-            r = [];
-            for (i = 0; i < o.length; i++) {
-                let res = this.stringify(o[i], level);
-                if (res)
-                    r.push(res);
-            }
-            return r.length > 0 ? "a:" + r.join(";") : "";
-        }
-        r = [];
-        //Se è oggetto, escludo tutti quelli di sistema/inutili
-        if (o) {
-            var name = o.__proto__.constructor.name;
-            if (!this.objBlacklist[name]) {
-                for (i in o) {
-                    if (o.hasOwnProperty(i) && (level <= 2)) {
-                        let res = this.stringify(o[i], level + 1);
-                        if (res)
-                            r.push(i + ":" + res);
-                    }
-                }
-            }
-        }
-        return r.length > 0 ? "o:" + r.join(";") : "";
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HTTPService, deps: [{ token: HttpServiceExtensions }, { token: HTTP_INVALIDATION, optional: true }, { token: CLIENT_CACHE_DURATION_S, optional: true }, { token: CACHE_BY_USER, optional: true }, { token: HTTP_DEBUG_MODE, optional: true }, { token: i2.BaseLocalization, optional: true }, { token: i3.HttpClient }, { token: i4.CacheService, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HTTPService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HTTPService, deps: [{ token: HttpServiceExtensions }, { token: HTTP_INVALIDATION, optional: true }, { token: CLIENT_CACHE_DURATION_S, optional: true }, { token: CACHE_BY_USER, optional: true }, { token: HTTP_DEBUG_MODE, optional: true }, { token: i2.BaseLocalization, optional: true }, { token: i3.HttpClient }, { token: i4.CacheService, optional: true }, { token: i5.HashingService, optional: true }, { token: i5.UtilityService, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HTTPService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HTTPService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HTTPService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: HttpServiceExtensions }, { type: undefined, decorators: [{
@@ -1058,6 +966,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
                     type: Optional
                 }] }, { type: i3.HttpClient }, { type: i4.CacheService, decorators: [{
                     type: Optional
+                }] }, { type: i5.HashingService, decorators: [{
+                    type: Optional
+                }] }, { type: i5.UtilityService, decorators: [{
+                    type: Optional
                 }] }] });
 
 class HttpserviceModule {
@@ -1072,11 +984,11 @@ class HttpserviceModule {
             ]
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpserviceModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.15", ngImport: i0, type: HttpserviceModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpserviceModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpserviceModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.13", ngImport: i0, type: HttpserviceModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpserviceModule }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: HttpserviceModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.13", ngImport: i0, type: HttpserviceModule, decorators: [{
             type: NgModule
         }] });