From 92bbb2e3df4a5c6d0a1b6dcb519f5ec8efdeac88 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Tue, 12 Nov 2024 14:51:07 +0100 Subject: [PATCH] rename --- packages/trace-viewer/src/sw/main.ts | 10 +++++----- packages/trace-viewer/src/sw/traceModelBackends.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/trace-viewer/src/sw/main.ts b/packages/trace-viewer/src/sw/main.ts index 1ce131020c..acc3f1ecfd 100644 --- a/packages/trace-viewer/src/sw/main.ts +++ b/packages/trace-viewer/src/sw/main.ts @@ -18,7 +18,7 @@ import { splitProgress } from './progress'; import { unwrapPopoutUrl } from './snapshotRenderer'; import { SnapshotServer } from './snapshotServer'; import { TraceModel } from './traceModel'; -import { FetchTraceModelBackend, TraceViewerServerBackend, ZipTraceModelBackend } from './traceModelBackends'; +import { FetchTraceModelBackend, TraceViewerServer, ZipTraceModelBackend } from './traceModelBackends'; import { TraceVersionError } from './traceModernizer'; // @ts-ignore @@ -38,7 +38,7 @@ const loadedTraces = new Map }>(); -async function loadTrace(traceUrl: string, traceFileName: string | null, clientId: string, traceViewerServer: TraceViewerServerBackend, limit: number | undefined, progress: (done: number, total: number) => undefined): Promise { +async function loadTrace(traceUrl: string, traceFileName: string | null, clientId: string, traceViewerServer: TraceViewerServer, limit: number | undefined, progress: (done: number, total: number) => undefined): Promise { await gc(); let data = clientIdToTraceUrls.get(clientId); if (!data) { @@ -69,9 +69,9 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, clientI return traceModel; } -const traceViewerServers = new Map(); +const traceViewerServers = new Map(); -function getTraceViewerServer(client?: any): TraceViewerServerBackend { +function getTraceViewerServer(client?: any): TraceViewerServer { let traceViewerServerBaseUrl = self.registration.scope; if (client?.url) { const clientUrl = new URL(client.url); @@ -80,7 +80,7 @@ function getTraceViewerServer(client?: any): TraceViewerServerBackend { } if (!traceViewerServers.has(traceViewerServerBaseUrl)) - traceViewerServers.set(traceViewerServerBaseUrl, new TraceViewerServerBackend(traceViewerServerBaseUrl)); + traceViewerServers.set(traceViewerServerBaseUrl, new TraceViewerServer(traceViewerServerBaseUrl)); return traceViewerServers.get(traceViewerServerBaseUrl)!; } diff --git a/packages/trace-viewer/src/sw/traceModelBackends.ts b/packages/trace-viewer/src/sw/traceModelBackends.ts index 1ed7b6bd25..ec367575e3 100644 --- a/packages/trace-viewer/src/sw/traceModelBackends.ts +++ b/packages/trace-viewer/src/sw/traceModelBackends.ts @@ -28,7 +28,7 @@ export class ZipTraceModelBackend implements TraceModelBackend { private _entriesPromise: Promise>; private _traceURL: string; - constructor(traceURL: string, server: TraceViewerServerBackend, progress: Progress) { + constructor(traceURL: string, server: TraceViewerServer, progress: Progress) { this._traceURL = traceURL; zipjs.configure({ baseURL: self.location.href } as any); this._zipReader = new zipjs.ZipReader( @@ -84,9 +84,9 @@ export class ZipTraceModelBackend implements TraceModelBackend { export class FetchTraceModelBackend implements TraceModelBackend { private _entriesPromise: Promise>; private _path: string; - private _server: TraceViewerServerBackend; + private _server: TraceViewerServer; - constructor(path: string, server: TraceViewerServerBackend) { + constructor(path: string, server: TraceViewerServer) { this._path = path; this._server = server; this._entriesPromise = server.readFile(path).then(async response => { @@ -137,7 +137,7 @@ export class FetchTraceModelBackend implements TraceModelBackend { } } -function formatUrl(trace: string, server: TraceViewerServerBackend) { +function formatUrl(trace: string, server: TraceViewerServer) { let url = trace.startsWith('http') || trace.startsWith('blob') ? trace : server.getFileURL(trace).toString(); // Dropbox does not support cors. if (url.startsWith('https://www.dropbox.com/')) @@ -145,7 +145,7 @@ function formatUrl(trace: string, server: TraceViewerServerBackend) { return url; } -export class TraceViewerServerBackend { +export class TraceViewerServer { constructor(private readonly baseUrl: string) {} getFileURL(path: string): URL {