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

start

Browse source
This commit is contained in:
Simon Knott 2024-10-29 13:20:04 +01:00
parent 0221f15f4f
commit 28a0aa420b
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,6 @@ export class ZipTraceModelBackend implements TraceModelBackend {
constructor(traceURL: string, progress: Progress) { constructor(traceURL: string, progress: Progress) {
this._traceURL = traceURL; this._traceURL = traceURL;
zipjs.configure({ baseURL: self.location.href } as any);
this._zipReader = new zipjs.ZipReader( this._zipReader = new zipjs.ZipReader(
new zipjs.HttpReader(formatUrl(traceURL), { mode: 'cors', preventHeadRequest: true } as any), new zipjs.HttpReader(formatUrl(traceURL), { mode: 'cors', preventHeadRequest: true } as any),
{ useWebWorkers: false }); { useWebWorkers: false });
@ -82,16 +81,19 @@ export class ZipTraceModelBackend implements TraceModelBackend {
} }
export class FetchTraceModelBackend implements TraceModelBackend { export class FetchTraceModelBackend implements TraceModelBackend {
private _entriesPromise: Promise<Map<string, string>>; private _entriesPromise: Promise<Map<string, URL>>;
private _traceURL: string; private _traceURL: string;
constructor(traceURL: string) { constructor(traceURL: string) {
this._traceURL = traceURL; this._traceURL = traceURL;
this._entriesPromise = fetch('/trace/file?path=' + encodeURIComponent(traceURL)).then(async response => { this._entriesPromise = fetch(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, URL>();
for (const entry of json.entries) for (const entry of json.entries) {
entries.set(entry.name, entry.path); const entryURL = new URL(traceURL);
entryURL.searchParams.set('path', entry.path);
entries.set(entry.name, entryURL);
}
return entries; return entries;
}); });
} }
@ -126,15 +128,15 @@ export class FetchTraceModelBackend implements TraceModelBackend {
private async _readEntry(entryName: string): Promise<Response | undefined> { private async _readEntry(entryName: string): Promise<Response | undefined> {
const entries = await this._entriesPromise; const entries = await this._entriesPromise;
const fileName = entries.get(entryName); const fileURL = entries.get(entryName);
if (!fileName) if (!fileURL)
return; return;
return fetch('/trace/file?path=' + encodeURIComponent(fileName)); return fetch(fileURL);
} }
} }
function formatUrl(trace: string) { function formatUrl(trace: string) {
let url = trace.startsWith('http') || trace.startsWith('blob') ? trace : `file?path=${encodeURIComponent(trace)}`; let url = trace;
// Dropbox does not support cors. // Dropbox does not support cors.
if (url.startsWith('https://www.dropbox.com/')) if (url.startsWith('https://www.dropbox.com/'))
url = 'https://dl.dropboxusercontent.com/' + url.substring('https://www.dropbox.com/'.length); url = 'https://dl.dropboxusercontent.com/' + url.substring('https://www.dropbox.com/'.length);