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

dont recreate server every time

Browse source
This commit is contained in:
Simon Knott 2024-11-12 14:49:16 +01:00
parent c3f3bbfa39
commit 592f7cc2e3
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,22 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, clientI
return traceModel; return traceModel;
} }
const traceViewerServers = new Map<string, TraceViewerServerBackend>();
function getTraceViewerServer(client?: any): TraceViewerServerBackend {
let traceViewerServerBaseUrl = self.registration.scope;
if (client?.url) {
const clientUrl = new URL(client.url);
if (clientUrl.searchParams.has('server'))
traceViewerServerBaseUrl = clientUrl.searchParams.get('server')!;
}
if (!traceViewerServers.has(traceViewerServerBaseUrl))
traceViewerServers.set(traceViewerServerBaseUrl, new TraceViewerServerBackend(traceViewerServerBaseUrl));
return traceViewerServers.get(traceViewerServerBaseUrl)!;
}
// @ts-ignore // @ts-ignore
async function doFetch(event: FetchEvent): Promise<Response> { async function doFetch(event: FetchEvent): Promise<Response> {
// In order to make Accessibility Insights for Web work. // In order to make Accessibility Insights for Web work.
@ -77,6 +93,7 @@ async function doFetch(event: FetchEvent): Promise<Response> {
const request = event.request; const request = event.request;
const client = await self.clients.get(event.clientId); const client = await self.clients.get(event.clientId);
const traceViewerServer = getTraceViewerServer(client);
// When trace viewer is deployed over https, we will force upgrade // When trace viewer is deployed over https, we will force upgrade
// insecure http subresources to https. Otherwise, these will fail // insecure http subresources to https. Otherwise, these will fail
@ -93,14 +110,6 @@ async function doFetch(event: FetchEvent): Promise<Response> {
return new Response(null, { status: 200 }); return new Response(null, { status: 200 });
} }
let traceViewerServerBaseUrl = self.registration.scope;
if (client?.url) {
const clientUrl = new URL(client.url);
if (clientUrl.searchParams.has('server'))
traceViewerServerBaseUrl = clientUrl.searchParams.get('server')!;
}
const traceViewerServer = new TraceViewerServerBackend(traceViewerServerBaseUrl);
const traceUrl = url.searchParams.get('trace'); const traceUrl = url.searchParams.get('trace');
if (relativePath === '/contexts') { if (relativePath === '/contexts') {