From c0ecdc582091c026b7314cba81d891e49969c3f0 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Wed, 20 Nov 2024 09:18:47 +0100 Subject: [PATCH] fix searchparam getting --- packages/trace-viewer/src/sw/main.ts | 7 ++++--- packages/trace-viewer/src/ui/uiModeView.tsx | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/trace-viewer/src/sw/main.ts b/packages/trace-viewer/src/sw/main.ts index 4d01ef2a61..03f5e71106 100644 --- a/packages/trace-viewer/src/sw/main.ts +++ b/packages/trace-viewer/src/sw/main.ts @@ -43,9 +43,10 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client: const clientId = client?.id ?? ''; let data = clientIdToTraceUrls.get(clientId); if (!data) { - let traceViewerServerBaseUrl = new URL('../', client?.url ?? self.registration.scope); - if (traceViewerServerBaseUrl.searchParams.has('server')) - traceViewerServerBaseUrl = new URL(traceViewerServerBaseUrl.searchParams.get('server')!, traceViewerServerBaseUrl); + const clientURL = new URL(client?.url ?? self.registration.scope); + let traceViewerServerBaseUrl = new URL('../', clientURL); + if (clientURL.searchParams.has('server')) + traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server')!, traceViewerServerBaseUrl); data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) }; clientIdToTraceUrls.set(clientId, data); diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx index be0dd8f55f..568effef5b 100644 --- a/packages/trace-viewer/src/ui/uiModeView.tsx +++ b/packages/trace-viewer/src/ui/uiModeView.tsx @@ -48,8 +48,8 @@ const xtermDataSource: XtermDataSource = { const searchParams = new URLSearchParams(window.location.search); let testServerBaseUrl = new URL('../', window.location.href); -if (testServerBaseUrl.searchParams.has('server')) - testServerBaseUrl = new URL(testServerBaseUrl.searchParams.get('server')!, testServerBaseUrl); +if (searchParams.has('server')) + testServerBaseUrl = new URL(searchParams.get('server')!, testServerBaseUrl); const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl); wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:'); const queryParams = {