Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore(dashboard): show console and network data from tracing (#40242)

Simon Knott9d005875b2a6
diff --git a/packages/dashboard/src/dashboard.tsx b/packages/dashboard/src/dashboard.tsx
index 6e6687de0c..4fc39df4bb 100644
--- a/packages/dashboard/src/dashboard.tsx
+++ b/packages/dashboard/src/dashboard.tsx
@@ -18,17 +18,21 @@ import React from 'react';
import './dashboard.css';
import { navigate, DashboardClientContext } from './index';
import { asLocator } from '@isomorphic/locatorGenerators';
+import { TraceModel } from '@isomorphic/trace/traceModel';
import { SplitView } from '@web/components/splitView';
import { ChevronLeftIcon, ChevronRightIcon, CloseIcon, PlusIcon, ReloadIcon } from './icons';
import { SettingsButton } from './settingsView';
import { Annotations, getImageLayout, clientToViewport } from './annotations';
import { ToolbarButton } from '@web/components/toolbarButton';
import { TabbedPaneTabModel, TabbedPane } from '@web/components/tabbedPane';
+import { ConsoleTab, useConsoleTabModel } from '@trace-viewer/ui/consoleTab';
import { InspectorTab } from '@trace-viewer/ui/inspectorTab';
+import { NetworkTab, useNetworkTabModel } from '@trace-viewer/ui/networkTab';
import { useSetting } from '@web/uiUtils';
import type { Tab, DashboardChannelEvents } from './dashboardChannel';
import { HighlightedElement } from '@trace-viewer/ui/snapshotTab';
+import { TraceModelContext } from '@trace-viewer/ui/traceModelContext';
function tabFavicon(url: string): string {
try {
@@ -68,6 +72,8 @@ export const Dashboard: React.FC<{
const [recording, setRecording] = React.useState(false);
const [screenshotIcon, setScreenshotIcon] = React.useState<'device-camera' | 'clippy'>('device-camera');
const [showInteractiveHint, setShowInteractiveHint] = React.useState(false);
+ const [traceModel, setTraceModel] = React.useState<TraceModel | undefined>();
+ const [selectedSidebarTab, setSelectedSidebarTab] = useSetting<string>('dashboardPropertiesTab', 'inspector');
const displayRef = React.useRef<HTMLImageElement>(null);
const screenRef = React.useRef<HTMLDivElement>(null);
@@ -158,6 +164,7 @@ export const Dashboard: React.FC<{
setContext(undefined);
setTabs(null);
setFrame(undefined);
+ setTraceModel(undefined);
setMode('readonly');
setPickingPage(null);
setRecording(false);
@@ -174,6 +181,43 @@ export const Dashboard: React.FC<{
setRecording(false);
}, [selectedTab?.page]);
+ React.useEffect(() => {
+ if (!client || !context || !sidebarVisible)
+ return;
+ client.startTracing({ browser }).catch(() => {});
+ }, [client, browser, context, sidebarVisible]);
+
+ React.useEffect(() => {
+ if (!client || !context || !sidebarVisible) {
+ setTraceModel(undefined);
+ return;
+ }
+
+ let disposed = false;
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ const poll = async () => {
+ try {
+ const { tracesDir, contextEntries } = await client.traceContextEntries({ browser });
+ if (disposed)
+ return;
+ setTraceModel(new TraceModel(tracesDir, contextEntries));
+ } catch {
+ if (!disposed)
+ setTraceModel(undefined);
+ } finally {
+ if (!disposed)
+ timer = setTimeout(poll, 500);
+ }
+ };
+
+ poll().catch(() => {});
+ return () => {
+ disposed = true;
+ if (timer)
+ clearTimeout(timer);
+ };
+ }, [client, browser, context, sidebarVisible]);
+
function imgCoords(e: React.MouseEvent): { x: number; y: number } {
const vw = frame?.viewportWidth ?? 0;
const vh = frame?.viewportHeight ?? 0;
@@ -267,6 +311,9 @@ export const Dashboard: React.FC<{
}
const picking = selectedTab?.page === pickingPage;
+ const boundaries = React.useMemo(() => ({ minimum: 0, maximum: Number.POSITIVE_INFINITY }), []);
+ const consoleModel = useConsoleTabModel(traceModel, undefined, selectedTab?.page);
+ const networkModel = useNetworkTabModel(traceModel, undefined, selectedTab?.page);
const inspectorTabs: TabbedPaneTabModel[] = [
{
@@ -293,6 +340,25 @@ export const Dashboard: React.FC<{
setHighlightedElement={setHighlightedElement}
/>,
},
+ {
+ id: 'console',
+ title: 'Console',
+ count: consoleModel.entries.length,
+ render: () => <ConsoleTab
+ consoleModel={consoleModel}
+ boundaries={boundaries}
+ />,
+ },
+ {
+ id: 'network',
+ title: 'Network',
+ count: networkModel.resources.length,
+ render: () => <NetworkTab
+ boundaries={boundaries}
+ networkModel={networkModel}
+ sdkLanguage='javascript'
+ />,
+ },
];
let overlayText: string | undefined;
@@ -304,244 +370,246 @@ export const Dashboard: React.FC<{
overlayText = 'No tabs open';
return (
- <div className='vbox'>
- <SplitView
- sidebarHidden={!sidebarVisible}
- orientation={sidebarLocation === 'bottom' ? 'vertical' : 'horizontal'}
- sidebarSize={500}
- minSidebarSize={300}
- settingName='devtoolsInspector'
- main={<div className={'dashboard-view' + (interactive ? ' interactive' : '') + (annotating ? ' annotate' : '')}>
- {/* Tab bar */}
- <div ref={tabbarRef} className='tabbar'>
- <a className='tabbar-back' href='#' title='Back to sessions' onClick={e => { e.preventDefault(); navigate('#'); }}>
- <ChevronLeftIcon />
- Sessions
- </a>
- <div id='tabstrip' className='tabstrip' role='tablist'>
- {tabs?.map(tab => (
- <div
- key={tab.page}
- className={'tab' + (tab.selected ? ' active' : '')}
- role='tab'
- aria-selected={tab.selected}
- title={tab.url || ''}
- onClick={() => client?.selectTab({ browser, context: tab.context, page: tab.page })}
- >
- {tab.faviconUrl
- ? <img className='tab-favicon' src={tab.faviconUrl} alt='' aria-hidden='true' />
- : <span className='tab-favicon placeholder' aria-hidden='true'>{tabFavicon(tab.url)}</span>}
- <span className='tab-label'>{tab.title || 'New Tab'}</span>
- <button
- className='tab-close'
- title='Close tab'
- onClick={e => {
- e.stopPropagation();
- client?.closeTab({ browser, context: tab.context, page: tab.page });
- }}
+ <TraceModelContext.Provider value={traceModel}>
+ <div className='vbox'>
+ <SplitView
+ sidebarHidden={!sidebarVisible}
+ orientation={sidebarLocation === 'bottom' ? 'vertical' : 'horizontal'}
+ sidebarSize={500}
+ minSidebarSize={300}
+ settingName='devtoolsInspector'
+ main={<div className={'dashboard-view' + (interactive ? ' interactive' : '') + (annotating ? ' annotate' : '')}>
+ {/* Tab bar */}
+ <div ref={tabbarRef} className='tabbar'>
+ <a className='tabbar-back' href='#' title='Back to sessions' onClick={e => { e.preventDefault(); navigate('#'); }}>
+ <ChevronLeftIcon />
+ Sessions
+ </a>
+ <div id='tabstrip' className='tabstrip' role='tablist'>
+ {tabs?.map(tab => (
+ <div
+ key={tab.page}
+ className={'tab' + (tab.selected ? ' active' : '')}
+ role='tab'
+ aria-selected={tab.selected}
+ title={tab.url || ''}
+ onClick={() => client?.selectTab({ browser, context: tab.context, page: tab.page })}
>
- <CloseIcon />
- </button>
- </div>
- ))}
+ {tab.faviconUrl
+ ? <img className='tab-favicon' src={tab.faviconUrl} alt='' aria-hidden='true' />
+ : <span className='tab-favicon placeholder' aria-hidden='true'>{tabFavicon(tab.url)}</span>}
+ <span className='tab-label'>{tab.title || 'New Tab'}</span>
+ <button
+ className='tab-close'
+ title='Close tab'
+ onClick={e => {
+ e.stopPropagation();
+ client?.closeTab({ browser, context: tab.context, page: tab.page });
+ }}
+ >
+ <CloseIcon />
+ </button>
+ </div>
+ ))}
+ </div>
+ <button id='new-tab-btn' className='new-tab-btn' title='New Tab' onClick={() => {
+ if (context)
+ client?.newTab({ browser, context });
+ }}>
+ <PlusIcon />
+ </button>
+ <div className='interactive-controls' />
</div>
- <button id='new-tab-btn' className='new-tab-btn' title='New Tab' onClick={() => {
- if (context)
- client?.newTab({ browser, context });
- }}>
- <PlusIcon />
- </button>
- <div className='interactive-controls' />
- </div>
-
- {/* Toolbar */}
- <div ref={toolbarRef} className='toolbar'>
- <button className='nav-btn' title='Back' aria-disabled={!interactive || undefined} onClick={() => {
- if (!interactive) {
- flashInteractiveHint();
- return;
- }
- pageTarget && client?.back(pageTarget);
- }}>
- <ChevronLeftIcon />
- </button>
- <button className='nav-btn' title='Forward' aria-disabled={!interactive || undefined} onClick={() => {
- if (!interactive) {
- flashInteractiveHint();
- return;
- }
- pageTarget && client?.forward(pageTarget);
- }}>
- <ChevronRightIcon />
- </button>
- <button className='nav-btn' title='Reload' aria-disabled={!interactive || undefined} onClick={() => {
- if (!interactive) {
- flashInteractiveHint();
- return;
- }
- pageTarget && client?.reload(pageTarget);
- }}>
- <ReloadIcon />
- </button>
- <input
- id='omnibox'
- className='omnibox'
- type='text'
- placeholder='Search or enter URL'
- spellCheck={false}
- autoComplete='off'
- value={url}
- onChange={e => {
- if (!interactive)
- return;
- setUrl(e.target.value);
- }}
- onKeyDown={e => {
- if (!interactive)
- return;
- onOmniboxKeyDown(e);
- }}
- onFocus={e => {
+
+ {/* Toolbar */}
+ <div ref={toolbarRef} className='toolbar'>
+ <button className='nav-btn' title='Back' aria-disabled={!interactive || undefined} onClick={() => {
if (!interactive) {
flashInteractiveHint();
- e.target.blur();
return;
}
- e.target.select();
- }}
- aria-disabled={!interactive || undefined}
- readOnly={!interactive}
- />
- <ToolbarButton
- className='recording'
- title={recording ? 'Stop recording' : 'Record video'}
- icon='record'
- toggled={recording}
- style={{ color: recording ? (interactive ? 'var(--color-fg-on-emphasis)' : 'var(--color-scale-red-5)') : undefined }}
- disabled={!ready}
- onClick={async () => {
- if (!client || !pageTarget)
+ pageTarget && client?.back(pageTarget);
+ }}>
+ <ChevronLeftIcon />
+ </button>
+ <button className='nav-btn' title='Forward' aria-disabled={!interactive || undefined} onClick={() => {
+ if (!interactive) {
+ flashInteractiveHint();
return;
- if (recording) {
- const { path } = await client.stopRecording(pageTarget);
- await client.reveal({ path });
- setRecording(false);
- } else {
- await client.startRecording(pageTarget);
- setRecording(true);
}
+ pageTarget && client?.forward(pageTarget);
}}>
- {recording && <span className='recording-label'>Recording...</span>}
- </ToolbarButton>
- <ToolbarButton
- className='screenshot'
- title='Copy screenshot to clipboard'
- icon={screenshotIcon}
- disabled={!ready}
- onClick={async () => {
- if (!client || !pageTarget)
+ <ChevronRightIcon />
+ </button>
+ <button className='nav-btn' title='Reload' aria-disabled={!interactive || undefined} onClick={() => {
+ if (!interactive) {
+ flashInteractiveHint();
return;
- const screenshot = await client.screenshot(pageTarget);
- const blob = await (await fetch('data:image/png;base64,' + screenshot)).blob();
- await navigator.clipboard.write([new ClipboardItem({ 'image/png': blob })]);
- setScreenshotIcon('clippy');
- setTimeout(() => setScreenshotIcon('device-camera'), 3000);
- }}
- />
- <div style={{ marginLeft: 8, borderLeft: '1px solid var(--color-border-default)', paddingLeft: 8, display: 'flex', gap: 4 }}>
- <div style={{ position: 'relative' }}>
- <ToolbarButton
- title={interactive ? 'Disable interactive mode' : 'Enable interactive mode'}
- icon='inspect'
- toggled={interactive}
- disabled={!ready}
- onClick={() => {
- if (interactive) {
+ }
+ pageTarget && client?.reload(pageTarget);
+ }}>
+ <ReloadIcon />
+ </button>
+ <input
+ id='omnibox'
+ className='omnibox'
+ type='text'
+ placeholder='Search or enter URL'
+ spellCheck={false}
+ autoComplete='off'
+ value={url}
+ onChange={e => {
+ if (!interactive)
+ return;
+ setUrl(e.target.value);
+ }}
+ onKeyDown={e => {
+ if (!interactive)
+ return;
+ onOmniboxKeyDown(e);
+ }}
+ onFocus={e => {
+ if (!interactive) {
+ flashInteractiveHint();
+ e.target.blur();
+ return;
+ }
+ e.target.select();
+ }}
+ aria-disabled={!interactive || undefined}
+ readOnly={!interactive}
+ />
+ <ToolbarButton
+ className='recording'
+ title={recording ? 'Stop recording' : 'Record video'}
+ icon='record'
+ toggled={recording}
+ style={{ color: recording ? (interactive ? 'var(--color-fg-on-emphasis)' : 'var(--color-scale-red-5)') : undefined }}
+ disabled={!ready}
+ onClick={async () => {
+ if (!client || !pageTarget)
+ return;
+ if (recording) {
+ const { path } = await client.stopRecording(pageTarget);
+ await client.reveal({ path });
+ setRecording(false);
+ } else {
+ await client.startRecording(pageTarget);
+ setRecording(true);
+ }
+ }}>
+ {recording && <span className='recording-label'>Recording...</span>}
+ </ToolbarButton>
+ <ToolbarButton
+ className='screenshot'
+ title='Copy screenshot to clipboard'
+ icon={screenshotIcon}
+ disabled={!ready}
+ onClick={async () => {
+ if (!client || !pageTarget)
+ return;
+ const screenshot = await client.screenshot(pageTarget);
+ const blob = await (await fetch('data:image/png;base64,' + screenshot)).blob();
+ await navigator.clipboard.write([new ClipboardItem({ 'image/png': blob })]);
+ setScreenshotIcon('clippy');
+ setTimeout(() => setScreenshotIcon('device-camera'), 3000);
+ }}
+ />
+ <div style={{ marginLeft: 8, borderLeft: '1px solid var(--color-border-default)', paddingLeft: 8, display: 'flex', gap: 4 }}>
+ <div style={{ position: 'relative' }}>
+ <ToolbarButton
+ title={interactive ? 'Disable interactive mode' : 'Enable interactive mode'}
+ icon='inspect'
+ toggled={interactive}
+ disabled={!ready}
+ onClick={() => {
+ if (interactive) {
+ if (pageTarget)
+ client?.cancelPickLocator(pageTarget);
+ setPickingPage(null);
+ setMode('readonly');
+ return;
+ }
if (pageTarget)
client?.cancelPickLocator(pageTarget);
setPickingPage(null);
+ setMode('interactive');
+ }}
+ />
+ {showInteractiveHint && <div className='interactive-hint-popover'>Enable interactive mode</div>}
+ </div>
+ <ToolbarButton
+ title={annotating ? 'Disable annotation mode' : 'Enable annotation mode'}
+ icon='edit'
+ toggled={annotating}
+ disabled={!ready || !frame}
+ onClick={() => {
+ if (annotating) {
setMode('readonly');
return;
}
if (pageTarget)
client?.cancelPickLocator(pageTarget);
setPickingPage(null);
- setMode('interactive');
+ setMode('annotate');
}}
/>
- {showInteractiveHint && <div className='interactive-hint-popover'>Enable interactive mode</div>}
+ <ToolbarButton
+ title={sidebarVisible ? 'Hide sidebar' : 'Show sidebar'}
+ icon={sidebarLocation === 'bottom' ? 'layout-panel' : 'layout-sidebar-right'}
+ toggled={sidebarVisible}
+ onClick={() => setSidebarVisible(!sidebarVisible)}
+ disabled={!ready}
+ />
</div>
- <ToolbarButton
- title={annotating ? 'Disable annotation mode' : 'Enable annotation mode'}
- icon='edit'
- toggled={annotating}
- disabled={!ready || !frame}
- onClick={() => {
- if (annotating) {
- setMode('readonly');
- return;
- }
- if (pageTarget)
- client?.cancelPickLocator(pageTarget);
- setPickingPage(null);
- setMode('annotate');
- }}
- />
- <ToolbarButton
- title={sidebarVisible ? 'Hide sidebar' : 'Show sidebar'}
- icon={sidebarLocation === 'bottom' ? 'layout-panel' : 'layout-sidebar-right'}
- toggled={sidebarVisible}
- onClick={() => setSidebarVisible(!sidebarVisible)}
- disabled={!ready}
- />
</div>
- </div>
-
- {/* Viewport */}
- <div className='viewport-wrapper'>
- <div className='viewport-main'>
- <div
- ref={screenRef}
- className='screen'
- tabIndex={0}
- style={{ display: frame ? '' : 'none' }}
- onMouseDown={onScreenMouseDown}
- onMouseUp={onScreenMouseUp}
- onMouseMove={onScreenMouseMove}
- onWheel={onScreenWheel}
- onKeyDown={onScreenKeyDown}
- onKeyUp={onScreenKeyUp}
- onContextMenu={e => e.preventDefault()}
- >
- <img
- ref={displayRef}
- id='display'
- className='display'
- alt='screencast'
- src={frame ? 'data:image/jpeg;base64,' + frame.data : undefined}
- />
- <Annotations
- active={annotating}
- displayRef={displayRef}
- screenRef={screenRef}
- viewportWidth={frame?.viewportWidth ?? 0}
- viewportHeight={frame?.viewportHeight ?? 0}
- />
+
+ {/* Viewport */}
+ <div className='viewport-wrapper'>
+ <div className='viewport-main'>
+ <div
+ ref={screenRef}
+ className='screen'
+ tabIndex={0}
+ style={{ display: frame ? '' : 'none' }}
+ onMouseDown={onScreenMouseDown}
+ onMouseUp={onScreenMouseUp}
+ onMouseMove={onScreenMouseMove}
+ onWheel={onScreenWheel}
+ onKeyDown={onScreenKeyDown}
+ onKeyUp={onScreenKeyUp}
+ onContextMenu={e => e.preventDefault()}
+ >
+ <img
+ ref={displayRef}
+ id='display'
+ className='display'
+ alt='screencast'
+ src={frame ? 'data:image/jpeg;base64,' + frame.data : undefined}
+ />
+ <Annotations
+ active={annotating}
+ displayRef={displayRef}
+ screenRef={screenRef}
+ viewportWidth={frame?.viewportWidth ?? 0}
+ viewportHeight={frame?.viewportHeight ?? 0}
+ />
+ </div>
+ {overlayText && <div className={'screen-overlay' + (frame ? ' has-frame' : '')}><span>{overlayText}</span></div>}
</div>
- {overlayText && <div className={'screen-overlay' + (frame ? ' has-frame' : '')}><span>{overlayText}</span></div>}
</div>
- </div>
- </div>}
- sidebar={<TabbedPane
- tabs={inspectorTabs}
- selectedTab='inspector'
- setSelectedTab={() => {}}
- rightToolbar={[
- <SettingsButton key='settings' sidebarLocation={sidebarLocation} setSidebarLocation={setSidebarLocation} />,
- ]}
- mode='default'
- />}
- />
- </div>
+ </div>}
+ sidebar={<TabbedPane
+ tabs={inspectorTabs}
+ selectedTab={selectedSidebarTab}
+ setSelectedTab={setSelectedSidebarTab}
+ rightToolbar={[
+ <SettingsButton key='settings' sidebarLocation={sidebarLocation} setSidebarLocation={setSidebarLocation} />,
+ ]}
+ mode='default'
+ />}
+ />
+ </div>
+ </TraceModelContext.Provider>
);
};
diff --git a/packages/dashboard/src/dashboardChannel.ts b/packages/dashboard/src/dashboardChannel.ts
index 44e2e94814..7d801d14be 100644
--- a/packages/dashboard/src/dashboardChannel.ts
+++ b/packages/dashboard/src/dashboardChannel.ts
@@ -16,6 +16,7 @@
import type { ClientInfo } from '../../playwright-core/src/tools/cli-client/registry';
import type { SessionStatus } from './sessionModel';
+import type { ContextEntry } from '@isomorphic/trace/entries';
export type BrowserTarget = { browser: string };
export type ContextTarget = { browser: string; context: string };
@@ -66,6 +67,8 @@ export interface DashboardChannel {
keyup(params: PageTarget & { key: string }): Promise<void>;
pickLocator(params: PageTarget): Promise<void>;
cancelPickLocator(params: PageTarget): Promise<void>;
+ startTracing(params: BrowserTarget): Promise<void>;
+ traceContextEntries(params: BrowserTarget): Promise<{ contextEntries: ContextEntry[], tracesDir: string }>;
startRecording(params: PageTarget): Promise<void>;
stopRecording(params: PageTarget): Promise<{ path: string }>;
screenshot(params: PageTarget): Promise<string>;
diff --git a/packages/playwright-core/src/tools/dashboard/DEPS.list b/packages/playwright-core/src/tools/dashboard/DEPS.list
index b5330959fa..7005c5cfbe 100644
--- a/packages/playwright-core/src/tools/dashboard/DEPS.list
+++ b/packages/playwright-core/src/tools/dashboard/DEPS.list
@@ -2,8 +2,9 @@
../../..
../../
../../server/registry/index.ts
+@isomorphic/**
@utils/**
../../serverRegistry.ts
-@utils/**
../cli-client/registry.ts
+../trace/traceParser.ts
../utils/**
diff --git a/packages/playwright-core/src/tools/dashboard/dashboardApp.ts b/packages/playwright-core/src/tools/dashboard/dashboardApp.ts
index bb7c88b15c..3f95c2a837 100644
--- a/packages/playwright-core/src/tools/dashboard/dashboardApp.ts
+++ b/packages/playwright-core/src/tools/dashboard/dashboardApp.ts
@@ -22,6 +22,7 @@ import http from 'http';
import { HttpServer } from '@utils/httpServer';
import { makeSocketPath } from '@utils/fileUtils';
import { gracefullyProcessExitDoNotHang } from '@utils/processLauncher';
+import { TraceLoader } from '@isomorphic/trace/traceLoader';
import { libPath } from '../../package';
import { playwright } from '../../inprocess';
import { findChromiumChannelBestEffort, registryDirectory } from '../../server/registry/index';
@@ -33,16 +34,43 @@ async function innerOpenDashboardApp(): Promise<api.Page> {
const httpServer = new HttpServer();
const dashboardDir = libPath('vite', 'dashboard');
+ const traces = new Map<string, TraceLoader>();
const connections = new Set<DashboardConnection>();
httpServer.createWebSocket(() => {
let connection: DashboardConnection;
// eslint-disable-next-line prefer-const
- connection = new DashboardConnection(() => connections.delete(connection));
+ connection = new DashboardConnection(() => connections.delete(connection), traces);
connections.add(connection);
return connection;
}, 'ws');
+ httpServer.routePrefix('/sha1/', (request: http.IncomingMessage, response: http.ServerResponse) => {
+ const url = new URL(request.url!, `http://${request.headers.host}`);
+ const tracesDir = url.searchParams.get('trace');
+ if (!tracesDir)
+ throw new Error('Traces directory is missing');
+ const sha1 = url.pathname.split('/sha1/')[1];
+ const loader = traces.get(tracesDir);
+ if (!loader)
+ throw new Error('Trace is not loaded');
+ loader.resourceForSha1(sha1).then(async blob => {
+ if (!blob) {
+ response.statusCode = 404;
+ response.end('Not found');
+ return;
+ }
+ const buffer = await blob.arrayBuffer();
+ response.setHeader('Content-Type', blob.type);
+ response.end(Buffer.from(buffer));
+ }).catch(e => {
+ response.statusCode = 500;
+ response.setHeader('error', String(e));
+ response.end(String(e));
+ });
+ return true;
+ });
+
httpServer.routePrefix('/', (request: http.IncomingMessage, response: http.ServerResponse) => {
const pathname = new URL(request.url!, `http://${request.headers.host}`).pathname;
const filePath = pathname === '/' ? 'index.html' : pathname.substring(1);
diff --git a/packages/playwright-core/src/tools/dashboard/dashboardController.ts b/packages/playwright-core/src/tools/dashboard/dashboardController.ts
index f88c375d39..0f6f6dcfe2 100644
--- a/packages/playwright-core/src/tools/dashboard/dashboardController.ts
+++ b/packages/playwright-core/src/tools/dashboard/dashboardController.ts
@@ -19,13 +19,16 @@ import os from 'os';
import fs from 'fs';
import { execFile } from 'child_process';
import { eventsHelper } from '@utils/eventsHelper';
+import { TraceLoader } from '@isomorphic/trace/traceLoader';
import { connectToBrowserAcrossVersions } from '../utils/connect';
import { serverRegistry } from '../../serverRegistry';
import { createClientInfo } from '../cli-client/registry';
+import { DirTraceLoaderBackend } from '../trace/traceParser';
import type * as api from '../../..';
import type { Transport } from '@utils/httpServer';
import type { Tab } from '@dashboard/dashboardChannel';
+import type { ContextEntry } from '@isomorphic/trace/entries';
import type { BrowserDescriptor, BrowserStatus } from '../../serverRegistry';
type Disposable = { dispose: () => Promise<void> };
@@ -43,9 +46,11 @@ export class DashboardConnection implements Transport {
private _visible = true;
_recordingDir: string;
+ _traceMap: Map<string, TraceLoader>;
- constructor(onclose: () => void) {
+ constructor(onclose: () => void, traceMap: Map<string, TraceLoader>) {
this._onclose = onclose;
+ this._traceMap = traceMap;
this._recordingDir = fs.mkdtempSync(path.join(os.tmpdir(), 'playwright-recordings-'));
}
@@ -209,6 +214,7 @@ class AttachedBrowser {
private _selectedPage: api.Page | null = null;
private _screencastRunning = false;
private _recordingPath: string | null = null;
+ private _tracingStarted = false;
private _pageListeners: Disposable[] = [];
private _contextListeners: Disposable[] = [];
@@ -249,7 +255,13 @@ class AttachedBrowser {
this._selectedPage.screencast.stop().catch(() => {});
this._screencastRunning = false;
this._recordingPath = null;
+ if (this._tracingStarted)
+ this._context.tracing.stop().catch(() => {});
+ this._tracingStarted = false;
this._selectedPage = null;
+ const tracesDir = this._descriptor.browser.launchOptions.tracesDir;
+ if (tracesDir)
+ this._owner._traceMap.delete(tracesDir);
}
async setScreencastActive(active: boolean) {
@@ -352,6 +364,28 @@ class AttachedBrowser {
await this.pageForId(params.page)?.cancelPickLocator();
}
+ async startTracing() {
+ if (this._tracingStarted)
+ return;
+ await this._context.tracing.start({
+ snapshots: true,
+ live: true,
+ });
+ this._tracingStarted = true;
+ }
+
+ async traceContextEntries(): Promise<{ contextEntries: ContextEntry[]; tracesDir: string }> {
+ const tracesDir = this._descriptor.browser.launchOptions.tracesDir;
+ if (!tracesDir)
+ throw new Error('Tracing requires launchOptions.tracesDir');
+ const backend = new DirTraceLoaderBackend(tracesDir);
+ const loader = new TraceLoader();
+ await loader.load(backend);
+ this._owner._traceMap.set(tracesDir, loader);
+ const contextEntries = loader.contextEntries.filter(entry => entry.contextId === this.contextGuid);
+ return { contextEntries, tracesDir };
+ }
+
async startRecording(params: { page: string }) {
const page = this.pageForId(params.page);
if (!page)
diff --git a/packages/trace-viewer/src/ui/consoleTab.tsx b/packages/trace-viewer/src/ui/consoleTab.tsx
index 3e35af381a..b9e9121878 100644
--- a/packages/trace-viewer/src/ui/consoleTab.tsx
+++ b/packages/trace-viewer/src/ui/consoleTab.tsx
@@ -59,7 +59,7 @@ const ansiColours = {
}
};
-export function useConsoleTabModel(model: TraceModel | undefined, selectedTime: Boundaries | undefined): ConsoleTabModel {
+export function useConsoleTabModel(model: TraceModel | undefined, selectedTime: Boundaries | undefined, pageId?: string): ConsoleTabModel {
const { entries } = React.useMemo(() => {
if (!model)
return { entries: [] };
@@ -87,6 +87,8 @@ export function useConsoleTabModel(model: TraceModel | undefined, selectedTime:
});
for (const event of logEvents) {
if (event.type === 'console') {
+ if (pageId && event.pageId !== pageId)
+ continue;
const colours = event.messageType === 'error' ? ansiColours.error : event.messageType === 'warning' ? ansiColours.warning : ansiColours.log;
const body = event.args && event.args.length ? format(event.args, colours) : formatAnsi(event.text, colours);
const url = event.location.url;
@@ -105,6 +107,8 @@ export function useConsoleTabModel(model: TraceModel | undefined, selectedTime:
});
}
if (event.type === 'event' && event.method === 'pageError') {
+ if (pageId && event.pageId !== pageId)
+ continue;
addEntry({
browserError: event.params.error,
isError: true,
@@ -129,7 +133,7 @@ export function useConsoleTabModel(model: TraceModel | undefined, selectedTime:
}
}
return { entries };
- }, [model]);
+ }, [model, pageId]);
const filteredEntries = React.useMemo(() => {
if (!selectedTime)
diff --git a/packages/trace-viewer/src/ui/networkTab.tsx b/packages/trace-viewer/src/ui/networkTab.tsx
index f3c32a9748..01ad15a62b 100644
--- a/packages/trace-viewer/src/ui/networkTab.tsx
+++ b/packages/trace-viewer/src/ui/networkTab.tsx
@@ -49,16 +49,18 @@ type ColumnName = keyof RenderedEntry;
type Sorting = { by: ColumnName, negate: boolean};
const NetworkGridView = GridView<RenderedEntry>;
-export function useNetworkTabModel(model: TraceModel | undefined, selectedTime: Boundaries | undefined): NetworkTabModel {
+export function useNetworkTabModel(model: TraceModel | undefined, selectedTime: Boundaries | undefined, pageId?: string): NetworkTabModel {
const resources = React.useMemo(() => {
const resources = model?.resources || [];
const filtered = resources.filter(resource => {
+ if (pageId && resource.pageref !== pageId)
+ return false;
if (!selectedTime)
return true;
return !!resource._monotonicTime && (resource._monotonicTime >= selectedTime.minimum && resource._monotonicTime <= selectedTime.maximum);
});
return filtered;
- }, [model, selectedTime]);
+ }, [model, selectedTime, pageId]);
const contextIdMap = React.useMemo(() => new ContextIdMap(model), [model]);
return { resources, contextIdMap };
}
diff --git a/tests/mcp/dashboard.spec.ts b/tests/mcp/dashboard.spec.ts
index ca5e0cc21d..8efe0661ff 100644
--- a/tests/mcp/dashboard.spec.ts
+++ b/tests/mcp/dashboard.spec.ts
@@ -84,3 +84,29 @@ test('should pick locator from browser', async ({ cli, server, openDashboard })
await expect(dashboard.locator('.cm-wrapper').first()).toContainText(`getByRole('button', { name: 'Submit' })`);
}).toPass();
});
+
+test('should show console and network tabs in sidebar', async ({ cli, server, openDashboard }) => {
+ server.setContent('/dashboard-network-marker', JSON.stringify({ marker: 'dashboard-response-payload-marker' }), 'application/json');
+ await cli('open', server.PREFIX);
+
+ const dashboard = await openDashboard();
+ await dashboard.locator('.session-chip').click();
+ await dashboard.getByRole('button', { name: 'Show sidebar' }).click();
+
+ await cli('run-code', `async (page) => {
+ await page.evaluate(async () => {
+ console.log('dashboard-console-marker');
+ await fetch('${server.PREFIX}/dashboard-network-marker');
+ });
+ }`);
+
+ await dashboard.getByRole('tab', { name: 'Console' }).click();
+ await expect(dashboard.locator('.console-tab')).toContainText('dashboard-console-marker');
+
+ await dashboard.getByRole('tab', { name: 'Network' }).click();
+ await expect(dashboard.getByLabel('Network requests')).toContainText('dashboard-network-marker');
+
+ await dashboard.getByLabel('Network requests').getByText('dashboard-network-marker').click();
+ await dashboard.getByRole('tab', { name: 'Response' }).click();
+ await expect(dashboard.locator('.network-response-body')).toContainText('dashboard-response-payload-marker');
+});