Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix searchparam getting

Browse source
This commit is contained in:
Simon Knott 2024-11-20 09:18:47 +01:00
parent f8e05b0a89
commit c0ecdc5820
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/trace-viewer/src/sw/main.ts
View file

@ -43,9 +43,10 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client:
const clientId = client?.id ?? ''; const clientId = client?.id ?? '';
let data = clientIdToTraceUrls.get(clientId); let data = clientIdToTraceUrls.get(clientId);
if (!data) { if (!data) {
let traceViewerServerBaseUrl = new URL('../', client?.url ?? self.registration.scope); const clientURL = new URL(client?.url ?? self.registration.scope);
if (traceViewerServerBaseUrl.searchParams.has('server')) let traceViewerServerBaseUrl = new URL('../', clientURL);
traceViewerServerBaseUrl = new URL(traceViewerServerBaseUrl.searchParams.get('server')!, traceViewerServerBaseUrl); if (clientURL.searchParams.has('server'))
traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server')!, traceViewerServerBaseUrl);
data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) }; data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };
clientIdToTraceUrls.set(clientId, data); clientIdToTraceUrls.set(clientId, data);

4
packages/trace-viewer/src/ui/uiModeView.tsx
View file

@ -48,8 +48,8 @@ const xtermDataSource: XtermDataSource = {
const searchParams = new URLSearchParams(window.location.search); const searchParams = new URLSearchParams(window.location.search);
let testServerBaseUrl = new URL('../', window.location.href); let testServerBaseUrl = new URL('../', window.location.href);
if (testServerBaseUrl.searchParams.has('server')) if (searchParams.has('server'))
testServerBaseUrl = new URL(testServerBaseUrl.searchParams.get('server')!, testServerBaseUrl); testServerBaseUrl = new URL(searchParams.get('server')!, testServerBaseUrl);
const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl); const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl);
wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:'); wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:');
const queryParams = { const queryParams = {