Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore: simplify trace sw (#37706)
Pavel Feldman2c0c709f60ef
diff --git a/docs/src/test-cli-js.md b/docs/src/test-cli-js.mdindex d45ee1d6a3..de9ff5ff33 100644--- a/docs/src/test-cli-js.md+++ b/docs/src/test-cli-js.md@@ -254,12 +254,15 @@ Analyze and view test traces for debugging. [Read more about Trace Viewer](./tra#### Syntax```bash-npx playwright show-trace [options] <trace>+npx playwright show-trace [options] [trace]```#### Examples```bash+# Open trace viewer without a specific trace (can load traces via UI)+npx playwright show-trace+# View a trace filenpx playwright show-trace trace.zipdiff --git a/packages/playwright-core/src/cli/program.ts b/packages/playwright-core/src/cli/program.tsindex 5dc18774b7..9056896f86 100644--- a/packages/playwright-core/src/cli/program.ts+++ b/packages/playwright-core/src/cli/program.ts@@ -375,13 +375,13 @@ program});program- .command('show-trace [trace...]')+ .command('show-trace [trace]').option('-b, --browser <browserType>', 'browser to use, one of cr, chromium, ff, firefox, wk, webkit', 'chromium').option('-h, --host <host>', 'Host to serve trace on; specifying this option opens trace in a browser tab').option('-p, --port <port>', 'Port to serve trace on, 0 for any free port; specifying this option opens trace in a browser tab').option('--stdin', 'Accept trace URLs over stdin to update the viewer').description('show trace viewer')- .action(function(traces, options) {+ .action(function(trace, options) {if (options.browser === 'cr')options.browser = 'chromium';if (options.browser === 'ff')@@ -396,12 +396,13 @@ program};if (options.port !== undefined || options.host !== undefined)- runTraceInBrowser(traces, openOptions).catch(logErrorAndExit);+ runTraceInBrowser(trace, openOptions).catch(logErrorAndExit);else- runTraceViewerApp(traces, options.browser, openOptions, true).catch(logErrorAndExit);+ runTraceViewerApp(trace, options.browser, openOptions, true).catch(logErrorAndExit);}).addHelpText('afterAll', `Examples:+ $ show-trace$ show-trace https://example.com/trace.zip`);type Options = {diff --git a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts b/packages/playwright-core/src/server/trace/viewer/traceViewer.tsindex 3c367e4ad6..48a504209a 100644--- a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts+++ b/packages/playwright-core/src/server/trace/viewer/traceViewer.ts@@ -52,16 +52,16 @@ export type TraceViewerAppOptions = {persistentContextOptions?: Parameters<BrowserType['launchPersistentContext']>[2];};-function validateTraceUrls(traceUrls: string[]) {- for (const traceUrl of traceUrls) {- let traceFile = traceUrl;- // If .json is requested, we'll synthesize it.- if (traceUrl.endsWith('.json'))- traceFile = traceUrl.substring(0, traceUrl.length - '.json'.length);-- if (!traceUrl.startsWith('http://') && !traceUrl.startsWith('https://') && !fs.existsSync(traceFile) && !fs.existsSync(traceFile + '.trace'))- throw new Error(`Trace file ${traceUrl} does not exist!`);- }+function validateTraceUrl(traceUrl: string | undefined) {+ if (!traceUrl)+ return;+ let traceFile = traceUrl;+ // If .json is requested, we'll synthesize it.+ if (traceUrl.endsWith('.json'))+ traceFile = traceUrl.substring(0, traceUrl.length - '.json'.length);++ if (!traceUrl.startsWith('http://') && !traceUrl.startsWith('https://') && !fs.existsSync(traceFile) && !fs.existsSync(traceFile + '.trace'))+ throw new Error(`Trace file ${traceUrl} does not exist!`);}export async function startTraceViewerServer(options?: TraceViewerServerOptions): Promise<HttpServer> {@@ -108,11 +108,11 @@ export async function startTraceViewerServer(options?: TraceViewerServerOptions)return server;}-export async function installRootRedirect(server: HttpServer, traceUrls: string[], options: TraceViewerRedirectOptions) {+export async function installRootRedirect(server: HttpServer, traceUrl: string | undefined, options: TraceViewerRedirectOptions) {const params = new URLSearchParams();if (path.sep !== path.posix.sep)params.set('pathSeparator', path.sep);- for (const traceUrl of traceUrls)+ if (traceUrl)params.append('trace', traceUrl);if (server.wsGuid())params.append('ws', server.wsGuid()!);@@ -146,20 +146,20 @@ export async function installRootRedirect(server: HttpServer, traceUrls: string[});}-export async function runTraceViewerApp(traceUrls: string[], browserName: string, options: TraceViewerServerOptions & { headless?: boolean }, exitOnClose?: boolean) {- validateTraceUrls(traceUrls);+export async function runTraceViewerApp(traceUrl: string | undefined, browserName: string, options: TraceViewerServerOptions & { headless?: boolean }, exitOnClose?: boolean) {+ validateTraceUrl(traceUrl);const server = await startTraceViewerServer(options);- await installRootRedirect(server, traceUrls, options);+ await installRootRedirect(server, traceUrl, options);const page = await openTraceViewerApp(server.urlPrefix('precise'), browserName, options);if (exitOnClose)page.on('close', () => gracefullyProcessExitDoNotHang(0));return page;}-export async function runTraceInBrowser(traceUrls: string[], options: TraceViewerServerOptions) {- validateTraceUrls(traceUrls);+export async function runTraceInBrowser(traceUrl: string | undefined, options: TraceViewerServerOptions) {+ validateTraceUrl(traceUrl);const server = await startTraceViewerServer(options);- await installRootRedirect(server, traceUrls, options);+ await installRootRedirect(server, traceUrl, options);await openTraceInBrowser(server.urlPrefix('human-readable'));}diff --git a/packages/playwright/src/runner/testServer.ts b/packages/playwright/src/runner/testServer.tsindex 08fc4415e7..733956ed6e 100644--- a/packages/playwright/src/runner/testServer.ts+++ b/packages/playwright/src/runner/testServer.ts@@ -262,7 +262,7 @@ export class TestServerDispatcher implements TestServerInterface {export async function runUIMode(configFile: string | undefined, configCLIOverrides: ConfigCLIOverrides, options: TraceViewerServerOptions & TraceViewerRedirectOptions): Promise<reporterTypes.FullResult['status']> {const configLocation = resolveConfigLocation(configFile);return await innerRunTestServer(configLocation, configCLIOverrides, options, async (server: HttpServer, cancelPromise: ManualPromise<void>) => {- await installRootRedirect(server, [], { ...options, webApp: 'uiMode.html' });+ await installRootRedirect(server, undefined, { ...options, webApp: 'uiMode.html' });if (options.host !== undefined || options.port !== undefined) {await openTraceInBrowser(server.urlPrefix('human-readable'));} else {diff --git a/packages/trace-viewer/src/sw/main.ts b/packages/trace-viewer/src/sw/main.tsindex cdce3261fe..64d22a4263 100644--- a/packages/trace-viewer/src/sw/main.ts+++ b/packages/trace-viewer/src/sw/main.ts@@ -36,19 +36,19 @@ const scopePath = new URL(self.registration.scope).pathname;const loadedTraces = new Map<string, { traceModel: TraceModel, snapshotServer: SnapshotServer }>();-const clientIdToTraceUrls = new Map<string, { limit: number | undefined, traceUrls: Set<string>, traceViewerServer: TraceViewerServer }>();+type ClientData = {+ traceUrl: string;+ traceViewerServer: TraceViewerServer+};+const clientIdToTraceUrls = new Map<string, ClientData>();-async function loadTrace(traceUrl: string, traceFileName: string | null, client: any | undefined, limit: number | undefined, progress: (done: number, total: number) => undefined): Promise<TraceModel> {- await gc();+async function loadTrace(traceUrl: string, traceFileName: string | null, client: any | undefined, progress: (done: number, total: number) => undefined): Promise<TraceModel> {const clientId = client?.id ?? '';- let data = clientIdToTraceUrls.get(clientId);- if (!data) {- const clientURL = new URL(client?.url ?? self.registration.scope);- const traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server') ?? '../', clientURL);- data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };- clientIdToTraceUrls.set(clientId, data);- }- data.traceUrls.add(traceUrl);+ const clientURL = new URL(client?.url ?? self.registration.scope);+ const traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server') ?? '../', clientURL);+ const data: ClientData = { traceUrl, traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };+ clientIdToTraceUrls.set(clientId, data);+ await gc();const traceModel = new TraceModel();try {@@ -106,8 +106,7 @@ async function doFetch(event: FetchEvent): Promise<Response> {if (relativePath === '/contexts') {try {- const limit = url.searchParams.has('limit') ? +url.searchParams.get('limit')! : undefined;- const traceModel = await loadTrace(traceUrl!, url.searchParams.get('traceFileName'), client, limit, (done: number, total: number) => {+ const traceModel = await loadTrace(traceUrl!, url.searchParams.get('traceFileName'), client, (done: number, total: number) => {client.postMessage({ method: 'progress', params: { done, total } });});return new Response(JSON.stringify(traceModel!.contextEntries), {@@ -209,12 +208,7 @@ async function gc() {clientIdToTraceUrls.delete(clientId);continue;}- if (data.limit !== undefined) {- const ordered = [...data.traceUrls];- // Leave the newest requested traces.- data.traceUrls = new Set(ordered.slice(ordered.length - data.limit));- }- data.traceUrls.forEach(url => usedTraces.add(url));+ usedTraces.add(data.traceUrl);}for (const traceUrl of loadedTraces.keys()) {diff --git a/packages/trace-viewer/src/sw/traceModel.ts b/packages/trace-viewer/src/sw/traceModel.tsindex dc18e4e6cb..e86129c778 100644--- a/packages/trace-viewer/src/sw/traceModel.ts+++ b/packages/trace-viewer/src/sw/traceModel.ts@@ -61,7 +61,6 @@ export class TraceModel {let done = 0;for (const ordinal of ordinals) {const contextEntry = createEmptyContext();- contextEntry.traceUrl = backend.traceURL();contextEntry.hasSource = hasSource;const modernizer = new TraceModernizer(contextEntry, this._snapshotStorage);@@ -138,7 +137,6 @@ function stripEncodingFromContentType(contentType: string) {function createEmptyContext(): ContextEntry {return {origin: 'testRunner',- traceUrl: '',startTime: Number.MAX_SAFE_INTEGER,wallTime: Number.MAX_SAFE_INTEGER,endTime: 0,diff --git a/packages/trace-viewer/src/types/entries.ts b/packages/trace-viewer/src/types/entries.tsindex a28efe4026..7d36030e63 100644--- a/packages/trace-viewer/src/types/entries.ts+++ b/packages/trace-viewer/src/types/entries.ts@@ -22,7 +22,6 @@ import type * as trace from '@trace/trace';export type ContextEntry = {origin: 'testRunner'|'library';- traceUrl: string;startTime: number;endTime: number;browserName: string;diff --git a/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx b/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsxindex ba44a66c30..608ece9fc1 100644--- a/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx+++ b/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx@@ -36,7 +36,7 @@ export const LiveWorkbenchLoader: React.FC<{ traceJson: string }> = ({ traceJsonconst model = await loadSingleTraceFile(traceJson);setModel(model);} catch {- const model = new MultiTraceModel([]);+ const model = new MultiTraceModel('', []);setModel(model);} finally {setCounter(counter + 1);@@ -54,8 +54,7 @@ export const LiveWorkbenchLoader: React.FC<{ traceJson: string }> = ({ traceJsonasync function loadSingleTraceFile(traceJson: string): Promise<MultiTraceModel> {const params = new URLSearchParams();params.set('trace', traceJson);- params.set('limit', '1');const response = await fetch(`contexts?${params.toString()}`);const contextEntries = await response.json() as ContextEntry[];- return new MultiTraceModel(contextEntries);+ return new MultiTraceModel(traceJson, contextEntries);}diff --git a/packages/trace-viewer/src/ui/modelUtil.ts b/packages/trace-viewer/src/ui/modelUtil.tsindex 5f8c3da6e9..4db70cd4c1 100644--- a/packages/trace-viewer/src/ui/modelUtil.ts+++ b/packages/trace-viewer/src/ui/modelUtil.ts@@ -85,12 +85,14 @@ export class MultiTraceModel {readonly sources: Map<string, SourceModel>;resources: ResourceSnapshot[];readonly actionCounters: Map<string, number>;+ readonly traceUrl: string;- constructor(contexts: ContextEntry[]) {+ constructor(traceUrl: string, contexts: ContextEntry[]) {contexts.forEach(contextEntry => indexModel(contextEntry));const libraryContext = contexts.find(context => context.origin === 'library');+ this.traceUrl = traceUrl;this.browserName = libraryContext?.browserName || '';this.sdkLanguage = libraryContext?.sdkLanguage;this.channel = libraryContext?.channel;@@ -110,7 +112,7 @@ export class MultiTraceModel {this.hasSource = contexts.some(c => c.hasSource);this.hasStepData = contexts.some(context => context.origin === 'testRunner');this.resources = [...contexts.map(c => c.resources)].flat();- this.attachments = this.actions.flatMap(action => action.attachments?.map(attachment => ({ ...attachment, traceUrl: action.context.traceUrl })) ?? []);+ this.attachments = this.actions.flatMap(action => action.attachments?.map(attachment => ({ ...attachment, traceUrl })) ?? []);this.visibleAttachments = this.attachments.filter(attachment => !attachment.name.startsWith('_'));this.events.sort((a1, a2) => a1.time - a2.time);@@ -179,30 +181,9 @@ function indexModel(context: ContextEntry) {}function mergeActionsAndUpdateTiming(contexts: ContextEntry[]) {- const traceFileToContexts = new Map<string, ContextEntry[]>();- for (const context of contexts) {- const traceFile = context.traceUrl;- let list = traceFileToContexts.get(traceFile);- if (!list) {- list = [];- traceFileToContexts.set(traceFile, list);- }- list.push(context);- }-const result: ActionTraceEventInContext[] = [];- let traceFileId = 0;- for (const [, contexts] of traceFileToContexts) {- // Action ids are unique only within a trace file. If there are- // traces from more than one file we make the ids unique across the- // files. The code does not update snapshot ids as they are always- // retrieved from a particular trace file.- if (traceFileToContexts.size > 1)- makeCallIdsUniqueAcrossTraceFiles(contexts, ++traceFileId);- // Align action times across runner and library contexts within each trace file.- const actions = mergeActionsAndUpdateTimingSameTrace(contexts);- result.push(...actions);- }+ const actions = mergeActionsAndUpdateTimingSameTrace(contexts);+ result.push(...actions);result.sort((a1, a2) => {if (a2.parentId === a1.callId)@@ -229,17 +210,6 @@ function mergeActionsAndUpdateTiming(contexts: ContextEntry[]) {return result;}-function makeCallIdsUniqueAcrossTraceFiles(contexts: ContextEntry[], traceFileId: number) {- for (const context of contexts) {- for (const action of context.actions) {- if (action.callId)- action.callId = `${traceFileId}:${action.callId}`;- if (action.parentId)- action.parentId = `${traceFileId}:${action.parentId}`;- }- }-}-let lastTmpStepId = 0;function mergeActionsAndUpdateTimingSameTrace(contexts: ContextEntry[]): ActionTraceEventInContext[] {diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsxindex 2839d9877e..041a4e988f 100644--- a/packages/trace-viewer/src/ui/snapshotTab.tsx+++ b/packages/trace-viewer/src/ui/snapshotTab.tsx@@ -17,7 +17,7 @@import './snapshotTab.css';import * as React from 'react';import type { ActionTraceEvent } from '@trace/trace';-import { context, type MultiTraceModel, nextActionByStartTime, previousActionByEndTime } from './modelUtil';+import { type MultiTraceModel, nextActionByStartTime, previousActionByEndTime } from './modelUtil';import { Toolbar } from '@web/components/toolbar';import { ToolbarButton } from '@web/components/toolbarButton';import { clsx, useMeasure, useSetting } from '@web/uiUtils';@@ -47,7 +47,7 @@ export const SnapshotTabsView: React.FunctionComponent<{setIsInspecting: (isInspecting: boolean) => void,highlightedElement: HighlightedElement,setHighlightedElement: (element: HighlightedElement) => void,-}> = ({ action, sdkLanguage, testIdAttributeName, isInspecting, setIsInspecting, highlightedElement, setHighlightedElement }) => {+}> = ({ action, model, sdkLanguage, testIdAttributeName, isInspecting, setIsInspecting, highlightedElement, setHighlightedElement }) => {const [snapshotTab, setSnapshotTab] = React.useState<'action'|'before'|'after'>('action');const [shouldPopulateCanvasFromScreenshot] = useSetting('shouldPopulateCanvasFromScreenshot', false);@@ -57,8 +57,8 @@ export const SnapshotTabsView: React.FunctionComponent<{}, [action]);const { snapshotInfoUrl, snapshotUrl, popoutUrl } = React.useMemo(() => {const snapshot = snapshots[snapshotTab];- return snapshot ? extendSnapshot(snapshot, shouldPopulateCanvasFromScreenshot) : { snapshotInfoUrl: undefined, snapshotUrl: undefined, popoutUrl: undefined };- }, [snapshots, snapshotTab, shouldPopulateCanvasFromScreenshot]);+ return model && snapshot ? extendSnapshot(model.traceUrl, snapshot, shouldPopulateCanvasFromScreenshot) : { snapshotInfoUrl: undefined, snapshotUrl: undefined, popoutUrl: undefined };+ }, [snapshots, snapshotTab, shouldPopulateCanvasFromScreenshot, model]);const snapshotUrls = React.useMemo((): SnapshotUrls | undefined => snapshotInfoUrl !== undefined ? { snapshotInfoUrl, snapshotUrl, popoutUrl } : undefined, [snapshotInfoUrl, snapshotUrl, popoutUrl]);@@ -414,9 +414,9 @@ export function collectSnapshots(action: ActionTraceEvent | undefined): Snapshotconst isUnderTest = new URLSearchParams(window.location.search).has('isUnderTest');const serverParam = new URLSearchParams(window.location.search).get('server');-export function extendSnapshot(snapshot: Snapshot, shouldPopulateCanvasFromScreenshot: boolean): SnapshotUrls {+export function extendSnapshot(traceUrl: string, snapshot: Snapshot, shouldPopulateCanvasFromScreenshot: boolean): SnapshotUrls {const params = new URLSearchParams();- params.set('trace', context(snapshot.action).traceUrl);+ params.set('trace', traceUrl);params.set('name', snapshot.snapshotName);if (isUnderTest)params.set('isUnderTest', 'true');@@ -436,7 +436,7 @@ export function extendSnapshot(snapshot: Snapshot, shouldPopulateCanvasFromScreepopoutParams.set('r', snapshotUrl);if (serverParam)popoutParams.set('server', serverParam);- popoutParams.set('trace', context(snapshot.action).traceUrl);+ popoutParams.set('trace', traceUrl);if (snapshot.point) {popoutParams.set('pointX', String(snapshot.point.x));popoutParams.set('pointY', String(snapshot.point.y));diff --git a/packages/trace-viewer/src/ui/uiModeTraceView.tsx b/packages/trace-viewer/src/ui/uiModeTraceView.tsxindex 7c4a964a56..382e6e669f 100644--- a/packages/trace-viewer/src/ui/uiModeTraceView.tsx+++ b/packages/trace-viewer/src/ui/uiModeTraceView.tsx@@ -75,7 +75,7 @@ export const TraceView: React.FC<{const model = await loadSingleTraceFile(traceLocation);setModel({ model, isLive: true });} catch {- const model = new MultiTraceModel([]);+ const model = new MultiTraceModel('', []);model.errorDescriptors.push(...result.errors.flatMap(error => !!error.message ? [{ message: error.message }] : []));setModel({ model, isLive: false });} finally {@@ -113,8 +113,7 @@ const outputDirForTestCase = (testCase: reporterTypes.TestCase): string | undefiasync function loadSingleTraceFile(url: string): Promise<MultiTraceModel> {const params = new URLSearchParams();params.set('trace', url);- params.set('limit', '1');const response = await fetch(`contexts?${params.toString()}`);const contextEntries = await response.json() as ContextEntry[];- return new MultiTraceModel(contextEntries);+ return new MultiTraceModel(url, contextEntries);}diff --git a/packages/trace-viewer/src/ui/workbenchLoader.tsx b/packages/trace-viewer/src/ui/workbenchLoader.tsxindex dec7ae059a..9def0cfdb9 100644--- a/packages/trace-viewer/src/ui/workbenchLoader.tsx+++ b/packages/trace-viewer/src/ui/workbenchLoader.tsx@@ -15,7 +15,6 @@*/import * as React from 'react';-import type { ContextEntry } from '../types/entries';import { MultiTraceModel } from './modelUtil';import './workbenchLoader.css';import { Workbench } from './workbench';@@ -27,8 +26,8 @@ import { DefaultSettingsView } from './defaultSettingsView';export const WorkbenchLoader: React.FunctionComponent<{}> = () => {const [isServer, setIsServer] = React.useState<boolean>(false);- const [traceURLs, setTraceURLs] = React.useState<string[]>([]);- const [uploadedTraceNames, setUploadedTraceNames] = React.useState<string[]>([]);+ const [traceURL, setTraceURL] = React.useState<string>();+ const [uploadedTraceName, setUploadedTraceName] = React.useState<string>();const [model, setModel] = React.useState<MultiTraceModel>(emptyModel);const [progress, setProgress] = React.useState<{ done: number, total: number }>({ done: 0, total: 0 });const [dragOver, setDragOver] = React.useState<boolean>(false);@@ -37,25 +36,19 @@ export const WorkbenchLoader: React.FunctionComponent<{const [showProgressDialog, setShowProgressDialog] = React.useState<boolean>(false);const processTraceFiles = React.useCallback((files: FileList) => {- const blobUrls = [];- const fileNames = [];const url = new URL(window.location.href);- for (let i = 0; i < files.length; i++) {- const file = files.item(i);- if (!file)- continue;- const blobTraceURL = URL.createObjectURL(file);- blobUrls.push(blobTraceURL);- fileNames.push(file.name);- url.searchParams.append('trace', blobTraceURL);- url.searchParams.append('traceFileName', file.name);- }+ if (!files.length)+ return;+ const file = files.item(0)!;+ const blobTraceURL = URL.createObjectURL(file);+ url.searchParams.append('trace', blobTraceURL);+ url.searchParams.append('traceFileName', file.name);const href = url.toString();// Snapshot loaders will inherit the trace url from the query parameters,// so set it here.window.history.pushState({}, '', href);- setTraceURLs(blobUrls);- setUploadedTraceNames(fileNames);+ setTraceURL(blobTraceURL);+ setUploadedTraceName(file.name);setDragOver(false);setProcessingErrorMessage(null);}, []);@@ -106,15 +99,13 @@ export const WorkbenchLoader: React.FunctionComponent<{React.useEffect(() => {const params = new URL(window.location.href).searchParams;- const newTraceURLs = params.getAll('trace');+ const url = params.get('trace');setIsServer(params.has('isServer'));// Don't accept file:// URLs - this means we re opened locally.- for (const url of newTraceURLs) {- if (url.startsWith('file:')) {- setFileForLocalModeError(url || null);- return;- }+ if (url?.startsWith('file:')) {+ setFileForLocalModeError(url || null);+ return;}if (params.has('isServer')) {@@ -123,52 +114,52 @@ export const WorkbenchLoader: React.FunctionComponent<{wsURL.protocol = (window.location.protocol === 'https:' ? 'wss:' : 'ws:');const testServerConnection = new TestServerConnection(new WebSocketTestServerTransport(wsURL));testServerConnection.onLoadTraceRequested(async params => {- setTraceURLs(params.traceUrl ? [params.traceUrl] : []);+ setTraceURL(params.traceUrl);setDragOver(false);setProcessingErrorMessage(null);});testServerConnection.initialize({}).catch(() => {});- } else if (!newTraceURLs.some(url => url.startsWith('blob:'))) {+ } else if (url && !url.startsWith('blob:')) {// Don't re-use blob file URLs on page load (results in Fetch error)- setTraceURLs(newTraceURLs);+ setTraceURL(url);}}, []);React.useEffect(() => {(async () => {- if (traceURLs.length) {- const swListener = (event: any) => {- if (event.data.method === 'progress')- setProgress(event.data.params);- };+ if (!traceURL) {+ setModel(emptyModel);+ return;+ }++ const swListener = (event: any) => {+ if (event.data.method === 'progress')+ setProgress(event.data.params);+ };+ try {navigator.serviceWorker.addEventListener('message', swListener);setProgress({ done: 0, total: 1 });- const contextEntries: ContextEntry[] = [];- for (let i = 0; i < traceURLs.length; i++) {- const url = traceURLs[i];- const params = new URLSearchParams();- params.set('trace', url);- if (uploadedTraceNames.length)- params.set('traceFileName', uploadedTraceNames[i]);- params.set('limit', String(traceURLs.length));- const response = await fetch(`contexts?${params.toString()}`);- if (!response.ok) {- if (!isServer)- setTraceURLs([]);- setProcessingErrorMessage((await response.json()).error);- return;- }- contextEntries.push(...(await response.json()));++ const params = new URLSearchParams();+ params.set('trace', traceURL);+ if (uploadedTraceName)+ params.set('traceFileName', uploadedTraceName);+ const response = await fetch(`contexts?${params.toString()}`);+ if (!response.ok) {+ if (!isServer)+ setTraceURL(undefined);+ setProcessingErrorMessage((await response.json()).error);+ return;}- navigator.serviceWorker.removeEventListener('message', swListener);- const model = new MultiTraceModel(contextEntries);+ const contextEntries = await response.json();+ const model = new MultiTraceModel(traceURL, contextEntries);setProgress({ done: 0, total: 0 });setModel(model);- } else {- setModel(emptyModel);+ } finally {+ navigator.serviceWorker.removeEventListener('message', swListener);}})();- }, [isServer, traceURLs, uploadedTraceNames]);+ }, [isServer, traceURL, uploadedTraceName]);const showLoading = progress.done !== progress.total && progress.total !== 0 && !processingErrorMessage;@@ -184,7 +175,7 @@ export const WorkbenchLoader: React.FunctionComponent<{}}, [showLoading]);- const showFileUploadDropArea = !!(!isServer && !dragOver && !fileForLocalModeError && (!traceURLs.length || processingErrorMessage));+ const showFileUploadDropArea = !!(!isServer && !dragOver && !fileForLocalModeError && (!traceURL || processingErrorMessage));return <div className='vbox workbench-loader' onDragOver={event => { event.preventDefault(); setDragOver(true); }}><div className='hbox header' {...(showFileUploadDropArea ? { inert: true } : {})}>@@ -222,14 +213,13 @@ export const WorkbenchLoader: React.FunctionComponent<{<button onClick={() => {const input = document.createElement('input');input.type = 'file';- input.multiple = true;input.click();input.addEventListener('change', e => handleFileInputChange(e));}} type='button'>Select file(s)</button><div style={{ maxWidth: 400 }}>Playwright Trace Viewer is a Progressive Web App, it does not send your trace anywhere,it opens it locally.</div></div>}- {isServer && !traceURLs.length && <div className='drop-target'>+ {isServer && !traceURL && <div className='drop-target'><div className='title'>Select test to see the trace</div></div>}{dragOver && <div className='drop-target'@@ -240,4 +230,4 @@ export const WorkbenchLoader: React.FunctionComponent<{</div>;};-export const emptyModel = new MultiTraceModel([]);+export const emptyModel = new MultiTraceModel('', []);diff --git a/tests/config/traceViewerFixtures.ts b/tests/config/traceViewerFixtures.tsindex 9dedc6c579..7f07b9c9ca 100644--- a/tests/config/traceViewerFixtures.ts+++ b/tests/config/traceViewerFixtures.ts@@ -30,7 +30,7 @@ type BaseWorkerFixtures = {};export type TraceViewerFixtures = {- showTraceViewer: (trace: string[], options?: {host?: string, port?: number}) => Promise<TraceViewerPage>;+ showTraceViewer: (trace: string | undefined, options?: {host?: string, port?: number}) => Promise<TraceViewerPage>;runAndTrace: (body: () => Promise<void>, optsOverrides?: Parameters<BrowserContext['tracing']['start']>[0]) => Promise<TraceViewerPage>;};@@ -153,8 +153,8 @@ export const traceViewerFixtures: Fixtures<TraceViewerFixtures, {}, BaseTestFixtshowTraceViewer: async ({ playwright, browserName, headless }, use, testInfo) => {const browsers: Browser[] = [];const contextImpls: any[] = [];- await use(async (traces: string[], { host, port } = {}) => {- const pageImpl = await runTraceViewerApp(traces, browserName, { headless, host, port });+ await use(async (trace: string | undefined, { host, port } = {}) => {+ const pageImpl = await runTraceViewerApp(trace, browserName, { headless, host, port });const contextImpl = pageImpl.browserContext;const browser = await playwright.chromium.connectOverCDP(contextImpl._browser.options.wsEndpoint);browsers.push(browser);@@ -173,7 +173,7 @@ export const traceViewerFixtures: Fixtures<TraceViewerFixtures, {}, BaseTestFixtawait context.tracing.start({ snapshots: true, screenshots: true, sources: true, ...optsOverrides });await body();await context.tracing.stop({ path: traceFile });- return showTraceViewer([traceFile]);+ return showTraceViewer(traceFile);});},};diff --git a/tests/config/utils.ts b/tests/config/utils.tsindex 41571186a3..7b2c8ff30a 100644--- a/tests/config/utils.ts+++ b/tests/config/utils.ts@@ -164,7 +164,7 @@ export async function parseTrace(file: string): Promise<{ resources: Map<string,const backend = new TraceBackend(file);const traceModel = new TraceModel();await traceModel.load(backend, () => {});- const model = new MultiTraceModel(traceModel.contextEntries);+ const model = new MultiTraceModel(file, traceModel.contextEntries);const actions = model.filteredActions([]);const { rootItem } = buildActionTree(actions);const actionTree: string[] = [];diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.tsindex e888559a0f..e42c0faa20 100644--- a/tests/library/trace-viewer.spec.ts+++ b/tests/library/trace-viewer.spec.ts@@ -91,20 +91,20 @@ test.beforeAll(async function recordTrace({ browser, browserName, browserType, s});test('should show empty trace viewer', async ({ showTraceViewer }, testInfo) => {- const traceViewer = await showTraceViewer([testInfo.outputPath()]);+ const traceViewer = await showTraceViewer(testInfo.outputPath());await expect(traceViewer.page).toHaveTitle('Playwright Trace Viewer');});test('should open two trace viewers', async ({ showTraceViewer }, testInfo) => {const port = testInfo.workerIndex + 48321;- const traceViewer1 = await showTraceViewer([testInfo.outputPath()], { host: 'localhost', port });+ const traceViewer1 = await showTraceViewer(testInfo.outputPath(), { host: 'localhost', port });await expect(traceViewer1.page).toHaveTitle('Playwright Trace Viewer');- const traceViewer2 = await showTraceViewer([testInfo.outputPath()], { host: 'localhost', port });+ const traceViewer2 = await showTraceViewer(testInfo.outputPath(), { host: 'localhost', port });await expect(traceViewer2.page).toHaveTitle('Playwright Trace Viewer');});test('should open trace viewer on specific host', async ({ showTraceViewer }, testInfo) => {- const traceViewer = await showTraceViewer([testInfo.outputPath()], { host: '127.0.0.1' });+ const traceViewer = await showTraceViewer(testInfo.outputPath(), { host: '127.0.0.1' });await expect(traceViewer.page).toHaveTitle('Playwright Trace Viewer');await expect(traceViewer.page).toHaveURL(/127.0.0.1/);});@@ -152,7 +152,7 @@ test('should show tracing.group in the action list with location', async ({ runA});test('should open simple trace viewer', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await expect(traceViewer.actionTitles).toHaveText([/Create page/,/Navigate to "data:"/,@@ -231,12 +231,12 @@ test('should show action context on locators and other common actions', async ({});test('should complain about newer version of trace in old viewer', async ({ showTraceViewer, asset }, testInfo) => {- const traceViewer = await showTraceViewer([asset('trace-from-the-future.zip')]);+ const traceViewer = await showTraceViewer(asset('trace-from-the-future.zip'));await expect(traceViewer.page.getByText('The trace was created by a newer version of Playwright and is not supported by this version of the viewer.')).toBeVisible();});test('should properly synchronize local and remote time', async ({ showTraceViewer, asset }, testInfo) => {- const traceViewer = await showTraceViewer([asset('trace-remote-time-diff.zip')]);+ const traceViewer = await showTraceViewer(asset('trace-remote-time-diff.zip'));// The total duration should be sub 10s, rather than 16h.await expect.poll(async () =>parseInt(await traceViewer.page.locator('.timeline-time').last().innerText(), 10)@@ -244,7 +244,7 @@ test('should properly synchronize local and remote time', async ({ showTraceView});test('should contain action info', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Click');await traceViewer.page.getByText('Log', { exact: true }).click();await expect(traceViewer.logLines).toContainText([@@ -261,7 +261,7 @@ test('should render network bars', async ({ page, runAndTrace, server }) => {});test('should render console', async ({ showTraceViewer, browserName }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.showConsoleTab();await expect(traceViewer.consoleLineMessages.nth(0)).toHaveText('Info');@@ -292,7 +292,7 @@ test('should render console', async ({ showTraceViewer, browserName }) => {});test('should open console errors on click', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await expect(traceViewer.actionIconsText('Evaluate')).toHaveText(['2', '1']);await expect(traceViewer.page.getByRole('tabpanel', { name: 'Console' })).toBeHidden();await traceViewer.actionIcons('Evaluate').click();@@ -300,7 +300,7 @@ test('should open console errors on click', async ({ showTraceViewer }) => {});test('should show params and return value', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Evaluate');await expect(traceViewer.callLines).toHaveText(['',@@ -326,7 +326,7 @@ test('should show params and return value', async ({ showTraceViewer }) => {});test('should show null as a param', async ({ showTraceViewer, browserName }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Evaluate', 1);await expect(traceViewer.callLines).toHaveText(['',@@ -340,7 +340,7 @@ test('should show null as a param', async ({ showTraceViewer, browserName }) =>});test('should have correct snapshot size', async ({ showTraceViewer }, testInfo) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('SET VIEWPORT');await traceViewer.selectSnapshot('Before');await expect(traceViewer.snapshotContainer).toHaveCSS('width', '1280px');@@ -351,7 +351,7 @@ test('should have correct snapshot size', async ({ showTraceViewer }, testInfo)});test('should have correct stack trace', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Click');await traceViewer.showSourceTab();@@ -362,7 +362,7 @@ test('should have correct stack trace', async ({ showTraceViewer }) => {});test('should have network requests', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Navigate');await traceViewer.showNetworkTab();await expect(traceViewer.networkRequests).toContainText([/frame.htmlGET200text\/html/]);@@ -840,7 +840,7 @@ test('should preserve currentSrc', async ({ browser, server, showTraceViewer })await page.context().tracing.stop({ path: traceFile });await page.close();- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);const frame = await traceViewer.snapshotFrame('Set content');await expect(frame.locator('#target1')).toHaveAttribute('src', server.PREFIX + '/digits/3.png');await expect(frame.locator('#target2')).toHaveAttribute('src', server.PREFIX + '/digits/6.png');@@ -986,7 +986,7 @@ test('should highlight expect failure', async ({ page, server, runAndTrace }) =>});test('should show action source', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Click');await traceViewer.showSourceTab();@@ -1024,7 +1024,7 @@ test('should follow redirects', async ({ page, runAndTrace, server, asset }) =>});test('should include metainfo', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.page.getByRole('tab', { name: 'Metadata' }).click();const callLine = traceViewer.metadataTab.locator('.call-line');await expect(callLine.getByText('start time')).toHaveText(/start time:[\d/,: ]+/);@@ -1038,68 +1038,12 @@ test('should include metainfo', async ({ showTraceViewer }) => {await expect(callLine.getByText('events')).toHaveText(/events:[\d]+/);});-test('should open two trace files', async ({ context, page, request, server, showTraceViewer }, testInfo) => {- await (request as any)._tracing.start({ snapshots: true });- await context.tracing.start({ snapshots: true, sources: true });- {- const response = await request.get(server.PREFIX + '/simple.json');- await expect(response).toBeOK();- }- await page.goto(server.PREFIX + '/input/button.html');- {- const response = await request.head(server.PREFIX + '/simplezip.json');- await expect(response).toBeOK();- }- await page.locator('button').click();- await page.locator('button').click();- {- const response = await request.post(server.PREFIX + '/one-style.css');- await expect(response).toBeOK();- }- const apiTrace = testInfo.outputPath('api.zip');- const contextTrace = testInfo.outputPath('context.zip');- await (request as any)._tracing.stop({ path: apiTrace });- await context.tracing.stop({ path: contextTrace });-- const traceViewer = await showTraceViewer([contextTrace, apiTrace]);-- await traceViewer.selectAction('GET');- await traceViewer.selectAction('HEAD');- await traceViewer.selectAction('POST');- await expect(traceViewer.actionTitles).toHaveText([- /GET "\/simple\.json"/,- /Navigate to "\/input\/button\.html"/,- /HEAD "\/simplezip\.json"/,- /Click.*locator\('button'\)/,- /Click.*locator\('button'\)/,- /POST "\/one-style\.css"/,- ]);-- await traceViewer.page.getByRole('tab', { name: 'Metadata' }).click();- const callLine = traceViewer.page.locator('.call-line');- // Should get metadata from the context trace- await expect(callLine.getByText('start time')).toHaveText(/start time:[\d/,: ]+/);- // duration in the metadata section- await expect(callLine.getByText('duration').first()).toHaveText(/duration:[\dms]+/);- await expect(callLine.getByText('engine')).toHaveText(/engine:[\w]+/);- await expect(callLine.getByText('platform')).toHaveText(/platform:[\w]+/);- await expect(callLine.getByText('width')).toHaveText(/width:[\d]+/);- await expect(callLine.getByText('height')).toHaveText(/height:[\d]+/);- await expect(callLine.getByText('pages')).toHaveText(/pages:1/);- await expect(callLine.getByText('actions')).toHaveText(/actions:6/);- await expect(callLine.getByText('events')).toHaveText(/events:[\d]+/);-});--test('should open two trace files of the same test (v6)', async ({ showTraceViewer, asset }) => {- const traceViewer = await showTraceViewer([asset('test-trace1.zip'), asset('test-trace2.zip')]);+test('should open v6 trace file', async ({ showTraceViewer, asset }) => {+ const traceViewer = await showTraceViewer(asset('test-trace1.zip'));// Same actions from different test runs should not be merged.await expect(traceViewer.actionTitles).toHaveText([- /Before Hooks/,/Before Hooks/,/page.goto/, // Legacy trace does not have titles- /page.goto/, // Legacy trace does not have titles- /expect.toBe/,- /After Hooks/,/expect.toBe/,/After Hooks/,]);@@ -1210,13 +1154,13 @@ test('should update highlight when typing snapshot', async ({ page, runAndTrace,});test('should open trace-1.31', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([path.join(__dirname, '../assets/trace-1.31.zip')]);+ const traceViewer = await showTraceViewer(path.join(__dirname, '../assets/trace-1.31.zip'));const snapshot = await traceViewer.snapshotFrame('Click');await expect(snapshot.locator('[__playwright_target__]')).toHaveText(['Submit']);});test('should open trace-1.37', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([path.join(__dirname, '../assets/trace-1.37.zip')]);+ const traceViewer = await showTraceViewer(path.join(__dirname, '../assets/trace-1.37.zip'));const snapshot = await traceViewer.snapshotFrame('page.goto');await expect(snapshot.locator('div')).toHaveCSS('background-color', 'rgb(255, 0, 0)');@@ -1422,7 +1366,7 @@ test('should preserve noscript when javascript is disabled', async ({ browser, sawait page.context().tracing.stop({ path: traceFile });await page.close();- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);const frame = await traceViewer.snapshotFrame('Set content');await expect(frame.getByText('javascript is disabled!')).toBeVisible();});@@ -1439,7 +1383,7 @@ test('should remove noscript by default', async ({ browser, server, showTraceVieawait page.context().tracing.stop({ path: traceFile });await page.close();- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);const frame = await traceViewer.snapshotFrame('Set content');await expect(frame.getByText('Always visible')).toBeVisible();await expect(frame.getByText('Enable JavaScript to run this app.')).toBeHidden();@@ -1457,7 +1401,7 @@ test('should remove noscript when javaScriptEnabled is set to true', async ({ brawait page.context().tracing.stop({ path: traceFile });await page.close();- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);const frame = await traceViewer.snapshotFrame('Set content');await expect(frame.getByText('Always visible')).toBeVisible();await expect(frame.getByText('Enable JavaScript to run this app.')).toBeHidden();@@ -1482,7 +1426,7 @@ test('should open snapshot in new browser context', async ({ browser, page, runA});test('should show similar actions from legacy library-only trace', async ({ showTraceViewer, asset }) => {- const traceViewer = await showTraceViewer([asset('trace-library-1.46.zip')]);+ const traceViewer = await showTraceViewer(asset('trace-library-1.46.zip'));await traceViewer.showAllActions();await expect(traceViewer.actionTitles).toHaveText([/page\.setContent/,@@ -1568,7 +1512,7 @@ test('should not record network actions', {test('should show baseURL in metadata pane', {annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31847' },}, async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Evaluate');await traceViewer.showMetadataTab();await expect(traceViewer.metadataTab).toContainText('baseURL:https://example.com');@@ -1577,7 +1521,7 @@ test('should show baseURL in metadata pane', {test('should not leak recorders', {annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33086' },}, async ({ showTraceViewer, platform }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);const aliveCount = async () => {return await traceViewer.page.evaluate(() => {@@ -1767,14 +1711,14 @@ test('should show a modal dialog', async ({ runAndTrace, page, platform, browser});test('should open settings dialog', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Navigate');await traceViewer.showSettings();await expect(traceViewer.settingsDialog).toBeVisible();});test('should toggle theme color', async ({ showTraceViewer, page }) => {- const traceViewer = await showTraceViewer([traceFile]);+ const traceViewer = await showTraceViewer(traceFile);await traceViewer.selectAction('Navigate');await traceViewer.showSettings();@@ -1824,7 +1768,7 @@ test('should toggle canvas rendering', async ({ runAndTrace, page }) => {});test('should render blob trace received from message', async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([], { host: 'localhost' });+ const traceViewer = await showTraceViewer(undefined, { host: 'localhost' });await expect(traceViewer.page.locator('.drop-target')).toBeVisible();await expect(traceViewer.actionTitles).not.toBeVisible();@@ -1864,7 +1808,7 @@ test('should render blob trace received from message', async ({ showTraceViewer});test("shouldn't render not-blob trace received from message", async ({ showTraceViewer }) => {- const traceViewer = await showTraceViewer([], { host: 'localhost' });+ const traceViewer = await showTraceViewer(undefined, { host: 'localhost' });await expect(traceViewer.page.locator('.drop-target')).toBeVisible();await expect(traceViewer.actionTitles).not.toBeVisible();@@ -1933,7 +1877,7 @@ test('should render locator descriptions', async ({ runAndTrace, page }) => {test('should load trace from HTTP with progress indicator', async ({ showTraceViewer, server }) => {const [traceViewer, res] = await Promise.all([- showTraceViewer([server.PREFIX]),+ showTraceViewer(server.PREFIX),new Promise<http.ServerResponse>(resolve => {server.setRoute('/', (req, res) => resolve(res));}),