From 6e37ea14235e9600c0a02769247bbe5c0b1cf15e Mon Sep 17 00:00:00 2001
From: Simon Knott <info@simonknott.de>
Date: Thu, 31 Oct 2024 13:14:11 +0100
Subject: [PATCH] move url replacement

---
 .../trace-viewer/src/sw/traceModelBackends.ts | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/trace-viewer/src/sw/traceModelBackends.ts b/packages/trace-viewer/src/sw/traceModelBackends.ts
index fa351879bd..23c343fded 100644
--- a/packages/trace-viewer/src/sw/traceModelBackends.ts
+++ b/packages/trace-viewer/src/sw/traceModelBackends.ts
@@ -81,19 +81,16 @@ export class ZipTraceModelBackend implements TraceModelBackend {
 }
 
 export class FetchTraceModelBackend implements TraceModelBackend {
-  private _entriesPromise: Promise<Map<string, URL>>;
+  private _entriesPromise: Promise<Map<string, string>>;
   private _traceURL: string;
 
   constructor(traceURL: string) {
     this._traceURL = traceURL;
     this._entriesPromise = fetch(traceURL).then(async response => {
       const json = JSON.parse(await response.text());
-      const entries = new Map<string, URL>();
-      for (const entry of json.entries) {
-        const entryURL = new URL(traceURL);
-        entryURL.searchParams.set('path', entry.path);
-        entries.set(entry.name, entryURL);
-      }
+      const entries = new Map<string, string>();
+      for (const entry of json.entries)
+        entries.set(entry.name, entry.path);
       return entries;
     });
   }
@@ -128,9 +125,12 @@ export class FetchTraceModelBackend implements TraceModelBackend {
 
   private async _readEntry(entryName: string): Promise<Response | undefined> {
     const entries = await this._entriesPromise;
-    const fileURL = entries.get(entryName);
-    if (!fileURL)
+    const filePath = entries.get(entryName);
+    if (!filePath)
       return;
-    return fetch(fileURL);
+
+    const url = new URL(this.traceURL());
+    url.searchParams.set('path', filePath);
+    return fetch(url);
   }
 }