http-request-manager 18.13.32 → 18.13.36

package/fesm2022/http-request-manager.mjs

@@ -5141,12 +5141,12 @@ class LocalStorageManagerService extends ComponentStore {
         this.storeExists$ = (store) => this.select(this.data$, (data) => data.settings.find(item => item.name === store) ? true : false);
         this.store$ = (store) => this.select(this.data$, (data) => {
             store = store.toLowerCase();
-            const foundStore = data.settings.find(item => item.name === store);
+            const foundStore = [...data.settings].reverse().find(item => item.name === store);
             if (foundStore) {
                 const options = SettingOptions.adapt(foundStore.options);
                 const found = foundStore.options?.storage === StorageType.GLOBAL
-                    ? data.localStores.find(item => item.id === foundStore.id)
-                    : data.sessionStores.find(item => item.id === foundStore.id);
+                    ? [...data.localStores].reverse().find(item => item.id === foundStore.id)
+                    : [...data.sessionStores].reverse().find(item => item.id === foundStore.id);
                 if (!found) {
                     console.warn('[CacheDebug] store$: settings entry found but no data entry in localStores/sessionStores', { store, foundStoreId: foundStore.id, storageType: foundStore.options?.storage });
                     this.deleteStore({ name: store });
@@ -5181,7 +5181,7 @@ class LocalStorageManagerService extends ComponentStore {
         });
         this.settings$ = this.select(state => (state) ? state.settings : storage.settings);
         this.setting$ = (store) => this.select(this.data$, (state) => {
-            const foundSetting = state.settings.find(item => item.name === store);
+            const foundSetting = [...state.settings].reverse().find(item => item.name === store);
             return (foundSetting) ? foundSetting : null;
         });
         this.persistence$ = this.data$
@@ -5208,11 +5208,14 @@ class LocalStorageManagerService extends ComponentStore {
                 const dataStr = (this.isObjectOrArray(str)) ? (store.options.encrypted) ? this.encryption.encrypt(str, this.app.appID) : store.data : store.data;
                 const localData = (dataStr && settings.options?.storage === StorageType.GLOBAL) ? [{ data: dataStr, id: settings.id }] : [];
                 const sessionData = (dataStr && settings.options?.storage === StorageType.SESSION) ? [{ data: dataStr, id: settings.id }] : [];
+                const localStores = state.localStores.filter(item => item.id !== settings.id);
+                const sessionStores = state.sessionStores.filter(item => item.id !== settings.id);
+                const stateSettings = state.settings.filter(item => item.id !== settings.id);
                 return {
                     ...state,
-                    localStores: [...state.localStores, ...localData],
-                    sessionStores: [...state.sessionStores, ...sessionData],
-                    settings: [...state.settings, ...[settings]],
+                    localStores: [...localStores, ...localData],
+                    sessionStores: [...sessionStores, ...sessionData],
+                    settings: [...stateSettings, ...[settings]],
                 };
             }
         });
@@ -5249,7 +5252,7 @@ class LocalStorageManagerService extends ComponentStore {
         this.updateStore = this.updater((state, store) => {
             store.name = store.name.toLowerCase();
             store.name = this.validStoreName(store.name);
-            const settings = state.settings.find(item => item.name === store.name);
+            const settings = [...state.settings].reverse().find(item => item.name === store.name);
             if (settings) {
                 const type = settings.options?.storage;
                 const hasStore = this.hasGlobalStorage(type, settings.id || '');
@@ -5371,7 +5374,24 @@ class LocalStorageManagerService extends ComponentStore {
             }
             else {
                 console.warn('Failed to decrypt settings data');
-                settings = [];
+                try {
+                    const fallbackSettings = JSON.parse(str);
+                    if (Array.isArray(fallbackSettings)) {
+                        settings = fallbackSettings;
+                        const migratedSettings = this.encryption.encrypt(settings, this.app.appID);
+                        if (migratedSettings) {
+                            localStorage.setItem(this.storageSettingsName, migratedSettings);
+                        }
+                        console.warn('Recovered settings from plaintext storage and migrated to encrypted format');
+                    }
+                    else {
+                        settings = [];
+                    }
+                }
+                catch (error) {
+                    console.warn('Failed to parse settings fallback data:', error);
+                    settings = [];
+                }
             }
         }
         settings.forEach(store => {
@@ -7068,12 +7088,29 @@ class HTTPManagerStateService extends ComponentStore {
                             }
                             const trackerAllowsRequest = this.checkTrackerAllowsRequest(this.databaseOptions.table, this.resolvePath(effectiveParams), options, storeData);
                             if (trackerAllowsRequest) {
+                                const normalizedPath = this.trackerNormalizePath(this.resolvePath(effectiveParams));
+                                // Defensive fallback: if localStorage metadata was lost/corrupted, prefer DB cache
+                                // for non-query requests and re-hydrate requestCache metadata.
+                                if (!normalizedPath.hasQuery) {
+                                    return this.dbManagerService.getTableRecords(this.databaseOptions.table).pipe(switchMap((dbData) => {
+                                        if (Array.isArray(dbData) && dbData.length > 0) {
+                                            this.setData$(dbData);
+                                            this.saveRequestCacheMetadata(this.databaseOptions.table, 'GET', requestSignature, storedSchemaSignature ?? expectedSchemaSignature ?? undefined, options);
+                                            return of(dbData);
+                                        }
+                                        return fetchFromAPI();
+                                    }), catchError((error) => {
+                                        const tableName = this.databaseOptions.table;
+                                        console.warn('[DB STORAGE] fallback cache read failed, falling back to API:', { table: tableName, error });
+                                        return fetchFromAPI();
+                                    }));
+                                }
                                 return fetchFromAPI();
                             }
                             return this.dbManagerService.getTableRecords(this.databaseOptions.table).pipe(switchMap((dbData) => {
                                 if (Array.isArray(dbData) && dbData.length > 0) {
                                     this.setData$(dbData);
-                                    this.saveRequestCacheMetadata(this.databaseOptions.table, 'GET', requestSignature, storedSchemaSignature ?? undefined, options);
+                                    this.saveRequestCacheMetadata(this.databaseOptions.table, 'GET', requestSignature, storedSchemaSignature ?? expectedSchemaSignature ?? undefined, options);
                                     return of(dbData);
                                 }
                                 const currentStateData = this.get()?.data;