fix(sw): fix UI mode on codespaces by not passing `server` (#33664)
This commit is contained in:
Родитель
6e19bc341f
Коммит
8c1002a98b
|
@ -125,8 +125,6 @@ export async function installRootRedirect(server: HttpServer, traceUrls: string[
|
|||
for (const reporter of options.reporter || [])
|
||||
params.append('reporter', reporter);
|
||||
|
||||
params.set('server', server.urlPrefix('precise'));
|
||||
|
||||
const urlPath = `./trace/${options.webApp || 'index.html'}?${params.toString()}`;
|
||||
server.routePath('/', (_, response) => {
|
||||
response.statusCode = 302;
|
||||
|
|
|
@ -43,12 +43,9 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client:
|
|||
const clientId = client?.id ?? '';
|
||||
let data = clientIdToTraceUrls.get(clientId);
|
||||
if (!data) {
|
||||
let traceViewerServerBaseUrl = self.registration.scope;
|
||||
if (client?.url) {
|
||||
const clientUrl = new URL(client.url);
|
||||
if (clientUrl.searchParams.has('server'))
|
||||
traceViewerServerBaseUrl = clientUrl.searchParams.get('server')!;
|
||||
}
|
||||
let traceViewerServerBaseUrl = new URL('../', client?.url ?? self.registration.scope);
|
||||
if (traceViewerServerBaseUrl.searchParams.has('server'))
|
||||
traceViewerServerBaseUrl = new URL(traceViewerServerBaseUrl.searchParams.get('server')!, traceViewerServerBaseUrl);
|
||||
|
||||
data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };
|
||||
clientIdToTraceUrls.set(clientId, data);
|
||||
|
|
|
@ -146,7 +146,7 @@ function formatUrl(trace: string, server: TraceViewerServer) {
|
|||
}
|
||||
|
||||
export class TraceViewerServer {
|
||||
constructor(private readonly baseUrl: string) {}
|
||||
constructor(private readonly baseUrl: URL) {}
|
||||
|
||||
getFileURL(path: string): URL {
|
||||
const url = new URL('trace/file', this.baseUrl);
|
||||
|
|
|
@ -47,9 +47,11 @@ const xtermDataSource: XtermDataSource = {
|
|||
};
|
||||
|
||||
const searchParams = new URLSearchParams(window.location.search);
|
||||
const guid = searchParams.get('ws');
|
||||
const wsURL = new URL(`../${guid}`, window.location.toString());
|
||||
wsURL.protocol = (window.location.protocol === 'https:' ? 'wss:' : 'ws:');
|
||||
let testServerBaseUrl = new URL('../', window.location.href);
|
||||
if (testServerBaseUrl.searchParams.has('server'))
|
||||
testServerBaseUrl = new URL(testServerBaseUrl.searchParams.get('server')!, testServerBaseUrl);
|
||||
const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl);
|
||||
wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:');
|
||||
const queryParams = {
|
||||
args: searchParams.getAll('arg'),
|
||||
grep: searchParams.get('grep') || undefined,
|
||||
|
|
Загрузка…
Ссылка в новой задаче