http-request-manager 18.13.13 → 18.13.15

package/fesm2022/http-request-manager.mjs

@@ -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;
@@ -1055,13 +1057,31 @@ class QueryParamsTrackerService {
         }
     }
     normalizePath(pathSegments) {
-        return pathSegments
+        const normalizedSegments = pathSegments
+            .map((segment) => this.extractPathFromSegment(segment))
+            .flatMap((segment) => segment.split('/'))
             .map((segment) => String(segment).trim())
-            .filter((segment) => segment.length > 0)
-            .join('/')
-            .replace(/([^:]\/+)\/+/g, '$1')
-            .replace(/^\//, '')
-            .replace(/\/$/, '');
+            .filter((segment) => segment.length > 0);
+        // Treat leading "rest" as transport/base-path noise for stable cache keys.
+        if (normalizedSegments[0]?.toLowerCase() === 'rest') {
+            normalizedSegments.shift();
+        }
+        return normalizedSegments.join('/');
+    }
+    extractPathFromSegment(segment) {
+        const raw = String(segment).trim();
+        if (!raw) {
+            return '';
+        }
+        try {
+            if (/^https?:\/\//i.test(raw)) {
+                return new URL(raw).pathname;
+            }
+        }
+        catch {
+            return raw;
+        }
+        return raw;
     }
     normalizeParamKey(key) {
         return String(key).trim().toLowerCase();
@@ -1159,10 +1179,8 @@ class QueryParamsTrackerService {
         sessionStorage.setItem(TRACKER_SESSION_INIT_KEY, '1');
     }
     restoreState() {
-        const syncState = this.localStorageManager.getPersistedStoreSync(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 +1204,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))