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

refactor formatURL

Browse source
This commit is contained in:
Simon Knott 2024-10-24 13:44:50 +02:00
parent 9e7c675a47
commit a87d729e2f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/trace-viewer/src/sw/traceModelBackends.ts
View file

@ -31,7 +31,7 @@ export class ZipTraceModelBackend implements TraceModelBackend {
constructor(traceURL: string, progress: Progress) { constructor(traceURL: string, progress: Progress) {
this._traceURL = traceURL; this._traceURL = traceURL;
this._zipReader = new zipjs.ZipReader( this._zipReader = new zipjs.ZipReader(
new zipjs.HttpReader(formatUrl(traceURL), { mode: 'cors', preventHeadRequest: true } as any), new zipjs.HttpReader(formatTraceFileUrl(traceURL), { mode: 'cors', preventHeadRequest: true } as any),
{ useWebWorkers: false }); { useWebWorkers: false });
this._entriesPromise = this._zipReader.getEntries({ onprogress: progress }).then(entries => { this._entriesPromise = this._zipReader.getEntries({ onprogress: progress }).then(entries => {
const map = new Map<string, zip.Entry>(); const map = new Map<string, zip.Entry>();
@ -86,7 +86,7 @@ export class FetchTraceModelBackend implements TraceModelBackend {
constructor(traceURL: string) { constructor(traceURL: string) {
this._traceURL = traceURL; this._traceURL = traceURL;
this._entriesPromise = fetch(formatUrl(traceURL)).then(async response => { this._entriesPromise = fetch(formatTraceFileUrl(traceURL)).then(async response => {
const json = JSON.parse(await response.text()); const json = JSON.parse(await response.text());
const entries = new Map<string, string>(); const entries = new Map<string, string>();
for (const entry of json.entries) for (const entry of json.entries)
@ -129,14 +129,14 @@ export class FetchTraceModelBackend implements TraceModelBackend {
if (!fileName) if (!fileName)
return; return;
return fetch(formatUrl(fileName)); return fetch(formatTraceFileUrl(fileName));
} }
} }
const baseURL = new URL(self.location.href); const baseURL = new URL(self.location.href);
baseURL.port = baseURL.searchParams.get('testServerPort') ?? baseURL.port; baseURL.port = baseURL.searchParams.get('testServerPort') ?? baseURL.port;
function formatUrl(trace: string) { function formatTraceFileUrl(trace: string) {
if (trace.startsWith('https://www.dropbox.com/')) if (trace.startsWith('https://www.dropbox.com/'))
return 'https://dl.dropboxusercontent.com/' + trace.substring('https://www.dropbox.com/'.length); return 'https://dl.dropboxusercontent.com/' + trace.substring('https://www.dropbox.com/'.length);