http-request-manager 18.13.12 → 18.13.14

package/fesm2022/http-request-manager.mjs

@@ -910,9 +910,9 @@ const DEFAULT_TRACKER_OPTIONS = SettingOptions.adapt({
 });
 class QueryParamsTrackerService {
     constructor() {
+        this.localStorageManager = inject(LocalStorageManagerService);
         this.state = { paths: {} };
         this.stateRestored = false;
-        this.localStorageManager = inject(LocalStorageManagerService);
     }
     clearTracking(resetSessionInit = false) {
         this.state = { paths: {} };
@@ -923,6 +923,7 @@ class QueryParamsTrackerService {
     }
     checkRequestOptions(requestOptions = [], options = {}) {
         this.ensureStateRestored();
+        this.tryHydrateStateFromPersistedStore();
         const normalized = this.normalizeRequestOptions(requestOptions);
         if (!normalized.pathKey)
             return false;
@@ -944,6 +945,7 @@ class QueryParamsTrackerService {
     }
     matchesPath(requestOptions = [], expectedPathOptions = []) {
         this.ensureStateRestored();
+        this.tryHydrateStateFromPersistedStore();
         const requestPath = this.normalizeRequestOptions(requestOptions).pathKey;
         const expectedPath = this.normalizeRequestOptions(expectedPathOptions).pathKey;
         return Boolean(requestPath) && requestPath === expectedPath;
@@ -1159,10 +1161,8 @@ class QueryParamsTrackerService {
         sessionStorage.setItem(TRACKER_SESSION_INIT_KEY, '1');
     }
     restoreState() {
-        const syncState = this.localStorageManager.getStoreSync(TRACKER_STORE_NAME);
-        if (this.isTrackerState(syncState)) {
-            this.state = QueryTrackerStateModel.adapt(syncState);
-            this.cleanupExpiredEntries();
+        this.tryHydrateStateFromPersistedStore();
+        if (Object.keys(this.state.paths).length > 0) {
             return;
         }
         this.localStorageManager.store$(TRACKER_STORE_NAME)
@@ -1186,6 +1186,17 @@ class QueryParamsTrackerService {
             }
         });
     }
+    tryHydrateStateFromPersistedStore() {
+        if (Object.keys(this.state.paths).length > 0) {
+            return;
+        }
+        const syncState = this.localStorageManager.getPersistedStoreSync(TRACKER_STORE_NAME);
+        if (!this.isTrackerState(syncState)) {
+            return;
+        }
+        this.state = QueryTrackerStateModel.adapt(syncState);
+        this.cleanupExpiredEntries();
+    }
     persistState() {
         this.localStorageManager.storeExists$(TRACKER_STORE_NAME)
             .pipe(take(1))
@@ -5463,6 +5474,59 @@ class LocalStorageManagerService extends ComponentStore {
             return storageData;
         }
     }
+    getPersistedStoreSync(storeName) {
+        storeName = this.validStoreName(String(storeName || ''));
+        if (!storeName || !this.app?.appID) {
+            return null;
+        }
+        const settingsStr = localStorage.getItem(this.storageSettingsName);
+        if (!settingsStr) {
+            return null;
+        }
+        let settings = [];
+        try {
+            const decryptedSettings = this.encryption.decrypt(settingsStr, this.app.appID);
+            settings = decryptedSettings ? JSON.parse(decryptedSettings) : [];
+        }
+        catch {
+            return null;
+        }
+        const foundSetting = settings.find(item => item.name === storeName);
+        if (!foundSetting) {
+            return null;
+        }
+        const rawStores = foundSetting.options?.storage === StorageType.GLOBAL
+            ? localStorage.getItem(this.storageName)
+            : sessionStorage.getItem(this.storageName);
+        if (!rawStores) {
+            return null;
+        }
+        let stores = [];
+        try {
+            stores = JSON.parse(rawStores);
+        }
+        catch {
+            return null;
+        }
+        const foundStore = stores.find(item => item.id === foundSetting.id);
+        if (!foundStore) {
+            return null;
+        }
+        const options = SettingOptions.adapt(foundSetting.options);
+        let storageData = foundStore.data;
+        if (options.encrypted) {
+            const decryptedData = this.encryption.decrypt(foundStore.data, this.app.appID);
+            if (decryptedData !== null) {
+                storageData = decryptedData;
+            }
+        }
+        try {
+            return this.isString(storageData) ? JSON.parse(storageData) : storageData;
+        }
+        catch {
+            return storageData;
+        }
+    }
     startTimer() {
         const timer$ = interval(1000 * 3).pipe(withLatestFrom(this.data$), map(([_, state]) => state), tap((state) => {
             const expired = this.expired(state) ? this.expired(state) : [];