http-request-manager 18.13.30 → 18.13.32

package/fesm2022/http-request-manager.mjs

@@ -5148,6 +5148,7 @@ class LocalStorageManagerService extends ComponentStore {
                     ? data.localStores.find(item => item.id === foundStore.id)
                     : data.sessionStores.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 });
                     return;
                 }
@@ -6200,7 +6201,6 @@ class QueryParamsTrackerService {
     constructor() {
         this.state = { paths: {} };
         this.stateRestored = false;
-        this.restoreInProgress = false;
         this.localStorageManager = inject(LocalStorageManagerService);
     }
     clearTracking(resetSessionInit = false) {
@@ -6452,10 +6452,10 @@ class QueryParamsTrackerService {
         return this.state.paths[pathKey];
     }
     ensureStateRestored() {
-        if (this.stateRestored || this.restoreInProgress) {
+        if (this.stateRestored) {
             return;
         }
-        this.restoreInProgress = true;
+        this.stateRestored = true;
         this.restoreState();
     }
     restoreState() {
@@ -6466,17 +6466,12 @@ class QueryParamsTrackerService {
                 if (this.isTrackerState(storedState)) {
                     this.state = QueryTrackerStateModel.adapt(storedState);
                     this.cleanupExpiredEntries();
+                    return;
                 }
-                else {
-                    this.state = { paths: {} };
-                }
-                this.stateRestored = true;
-                this.restoreInProgress = false;
+                this.state = { paths: {} };
             },
             error: () => {
                 this.state = { paths: {} };
-                this.stateRestored = true;
-                this.restoreInProgress = false;
             }
         });
     }
@@ -7053,6 +7048,7 @@ class HTTPManagerStateService extends ComponentStore {
                             }));
                         }
                         return this.localStorageManagerService.store$(this.databaseOptions.table).pipe(take(1), switchMap((storeData) => {
+                            console.log('[CacheDebug] storeData for table:', this.databaseOptions.table, { storeData, requestCache: storeData?.requestCache, expires: storeData?.expires });
                             const forceRefresh = !!options?.forceRefresh;
                             const storedSchemaSignature = this.getStoredSchemaSignature(storeData);
                             const expires = storeData?.expires || 0;
@@ -7065,6 +7061,7 @@ class HTTPManagerStateService extends ComponentStore {
                             }
                             const expectedSchema = this.buildSchemaFromAdapter();
                             const expectedSchemaSignature = this.buildSchemaSignature(expectedSchema);
+                            console.log('[CacheDebug] schema check:', { tableName: this.databaseOptions.table, storedSchemaSignature, expectedSchemaSignature, mismatch: storedSchemaSignature && storedSchemaSignature !== expectedSchemaSignature });
                             if (storedSchemaSignature && storedSchemaSignature !== expectedSchemaSignature) {
                                 const tableDef = TableSchemaDef.adapt({ table: this.databaseOptions.table, schema: expectedSchema });
                                 return this.dbManagerService.clearTable(this.databaseOptions.table).pipe(switchMap(() => this.dbManagerService.createDatabaseTable(tableDef)), switchMap(() => fetchFromAPI()));
@@ -7076,6 +7073,7 @@ class HTTPManagerStateService extends ComponentStore {
                             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);
                                     return of(dbData);
                                 }
                                 const currentStateData = this.get()?.data;
@@ -7606,7 +7604,7 @@ class HTTPManagerStateService extends ComponentStore {
         const schemaKeys = Object.keys(sampleData || {}).filter(key => sampleData[key] !== undefined);
         let schema = '++id';
         if (schemaKeys.length > 0) {
-            const otherKeys = schemaKeys.filter((k) => k !== 'id');
+            const otherKeys = schemaKeys.filter((k) => k !== 'id').sort();
             if (otherKeys.length > 0) {
                 schema += ', ' + otherKeys.join(', ');
             }
@@ -8227,7 +8225,9 @@ class HTTPManagerStateService extends ComponentStore {
         const normalized = this.trackerNormalizePath(path);
         const ignoreQueryParams = Array.isArray(options?.ignoreQueryParams) ? options.ignoreQueryParams : [];
         if (!normalized.hasQuery || ignoreQueryParams.length === 0) {
-            return !this.getRequestCacheMetadata(storeData, 'GET');
+            const meta = this.getRequestCacheMetadata(storeData, 'GET');
+            console.log('[CacheDebug] checkTrackerAllowsRequest: no query params path', { tableName, requestCacheMeta: meta, allowsRequest: !meta });
+            return !meta;
         }
         const filtered = this.trackerFilterQuery(normalized.query, ignoreQueryParams);
         const keys = Object.keys(filtered);