http-request-manager 18.13.15 → 18.13.17

package/fesm2022/http-request-manager.mjs

@@ -1209,12 +1209,49 @@ class QueryParamsTrackerService {
             return;
         }
         const syncState = this.localStorageManager.getPersistedStoreSync(TRACKER_STORE_NAME);
-        if (!this.isTrackerState(syncState)) {
+        if (this.isTrackerState(syncState)) {
+            this.state = QueryTrackerStateModel.adapt(syncState);
+            this.cleanupExpiredEntries();
             return;
         }
-        this.state = QueryTrackerStateModel.adapt(syncState);
+        const fallbackState = this.getTrackerStateFromRawStorage();
+        if (!this.isTrackerState(fallbackState)) {
+            return;
+        }
+        this.state = QueryTrackerStateModel.adapt(fallbackState);
         this.cleanupExpiredEntries();
     }
+    getTrackerStateFromRawStorage() {
+        const rawSources = [
+            this.safeParseRawStorage(localStorage.getItem('storage')),
+            this.safeParseRawStorage(sessionStorage.getItem('storage')),
+        ];
+        for (const source of rawSources) {
+            if (!Array.isArray(source)) {
+                continue;
+            }
+            for (const entry of source) {
+                if (this.isTrackerState(entry?.data)) {
+                    return entry.data;
+                }
+                if (this.isTrackerState(entry)) {
+                    return entry;
+                }
+            }
+        }
+        return null;
+    }
+    safeParseRawStorage(value) {
+        if (!value) {
+            return null;
+        }
+        try {
+            return JSON.parse(value);
+        }
+        catch {
+            return null;
+        }
+    }
     persistState() {
         this.localStorageManager.storeExists$(TRACKER_STORE_NAME)
             .pipe(take(1))
@@ -1239,7 +1276,23 @@ class QueryParamsTrackerService {
         }, {}));
     }
     isTrackerState(value) {
-        return this.isPlainObject(value) && this.isPlainObject(value.paths);
+        if (!this.isPlainObject(value) || !this.isPlainObject(value.paths)) {
+            return false;
+        }
+        return Object.keys(value.paths).every((pathKey) => this.isTrackerPathState(value.paths[pathKey]));
+    }
+    isTrackerPathState(value) {
+        if (!this.isPlainObject(value)) {
+            return false;
+        }
+        const hasValidConsumedValues = typeof value.consumedValuesByKey === 'undefined' || this.isPlainObject(value.consumedValuesByKey);
+        const hasValidTrackedAt = typeof value.trackedAt === 'undefined' || typeof value.trackedAt === 'number';
+        const hasValidWatchExpiresAt = typeof value.watchExpiresAt === 'undefined' || typeof value.watchExpiresAt === 'number';
+        const hasValidBaselineQuery = typeof value.baselineQuery === 'undefined' || this.isPlainObject(value.baselineQuery);
+        const hasTrackerMarkers = this.isPlainObject(value.consumedValuesByKey) ||
+            typeof value.trackedAt === 'number' ||
+            this.isPlainObject(value.baselineQuery);
+        return hasValidConsumedValues && hasValidTrackedAt && hasValidWatchExpiresAt && hasValidBaselineQuery && hasTrackerMarkers;
     }
     isPlainObject(value) {
         return Object.prototype.toString.call(value) === '[object Object]';