http-request-manager 18.13.1 → 18.13.2

package/fesm2022/http-request-manager.mjs

@@ -876,13 +876,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
         }], ctorParameters: () => [] });
 
 class PathTrackerStateModel {
-    constructor(baselineQuery, consumedValuesByKey = {}, watchExpiresAt) {
+    constructor(baselineQuery, consumedValuesByKey = {}, watchExpiresAt, trackedAt) {
         this.baselineQuery = baselineQuery;
         this.consumedValuesByKey = consumedValuesByKey;
         this.watchExpiresAt = watchExpiresAt;
+        this.trackedAt = trackedAt;
     }
     static adapt(item) {
-        return new PathTrackerStateModel(item?.baselineQuery, item?.consumedValuesByKey, item?.watchExpiresAt);
+        return new PathTrackerStateModel(item?.baselineQuery, item?.consumedValuesByKey, item?.watchExpiresAt, item?.trackedAt);
     }
 }
 
@@ -926,7 +927,12 @@ class QueryParamsTrackerService {
             return false;
         this.cleanupExpiredEntries();
         if (!normalized.hasQuery) {
-            this.ensurePathState(normalized.pathKey);
+            const pathExists = !!this.state.paths[normalized.pathKey];
+            if (pathExists) {
+                return false;
+            }
+            const pathState = this.ensurePathState(normalized.pathKey);
+            pathState.trackedAt = Math.floor(Date.now() / 1000);
             this.persistState();
             return true;
         }
@@ -1119,7 +1125,8 @@ class QueryParamsTrackerService {
             }
             const hasBaseline = Boolean(pathState.baselineQuery && Object.keys(pathState.baselineQuery).length > 0);
             const hasTrackedValues = Object.keys(pathState.consumedValuesByKey).some((key) => (pathState.consumedValuesByKey[key] || []).length > 0);
-            if (!hasBaseline && !hasTrackedValues) {
+            const isNoQueryTracked = Boolean(pathState.trackedAt);
+            if (!hasBaseline && !hasTrackedValues && !isNoQueryTracked) {
                 delete this.state.paths[pathKey];
             }
         });
@@ -1156,6 +1163,10 @@ class QueryParamsTrackerService {
             .pipe(take(1))
             .subscribe({
             next: (storedState) => {
+                // Don't overwrite in-memory state if we've already tracked paths
+                if (Object.keys(this.state.paths).length > 0) {
+                    return;
+                }
                 if (this.isTrackerState(storedState)) {
                     this.state = QueryTrackerStateModel.adapt(storedState);
                     this.cleanupExpiredEntries();
@@ -1164,7 +1175,9 @@ class QueryParamsTrackerService {
                 this.state = { paths: {} };
             },
             error: () => {
-                this.state = { paths: {} };
+                if (Object.keys(this.state.paths).length === 0) {
+                    this.state = { paths: {} };
+                }
             }
         });
     }