Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ export class CRNetworkManager {

_onWebSocketWillSendHandshakeRequest(event: Protocol.Network.webSocketWillSendHandshakeRequestPayload) {
const wallTimeMs = event.wallTime * 1000;
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp);
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp * 1000);
this._page!.frameManager.onWebSocketRequest(event.requestId, headersObjectToArray(event.request.headers, '\n'), wallTimeMs);
}

Expand All @@ -559,7 +559,7 @@ export class CRNetworkManager {
}

_timestampToWallTimeMsForWebSocket(requestId: string, timestamp: number): number {
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp;
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp * 1000;
}

private _maybeUpdateRequestSession(sessionInfo: SessionInfo, request: InterceptableRequest) {
Expand Down
4 changes: 2 additions & 2 deletions packages/playwright-core/src/server/webkit/webview/wvPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ export class WVPage implements PageDelegate {

_onWebSocketWillSendHandshakeRequest(event: Protocol.Network.webSocketWillSendHandshakeRequestPayload) {
const wallTimeMs = event.walltime * 1000;
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp);
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp * 1000);
this._page.frameManager.onWebSocketRequest(event.requestId, headersObjectToArray(event.request.headers), wallTimeMs);
}

Expand All @@ -1026,7 +1026,7 @@ export class WVPage implements PageDelegate {
}

_timestampToWallTimeMsForWebSocket(requestId: string, timestamp: number): number {
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp;
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp * 1000;
}

shouldToggleStyleSheetToSyncAnimations(): boolean {
Expand Down
4 changes: 2 additions & 2 deletions packages/playwright-core/src/server/webkit/wkPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ export class WKPage implements PageDelegate {

_onWebSocketWillSendHandshakeRequest(event: Protocol.Network.webSocketWillSendHandshakeRequestPayload) {
const wallTimeMs = event.walltime * 1000;
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp);
this._timestampBaselineForWebSocket.set(event.requestId, wallTimeMs - event.timestamp * 1000);
this._page.frameManager.onWebSocketRequest(event.requestId, headersObjectToArray(event.request.headers), wallTimeMs);
}

Expand All @@ -1219,7 +1219,7 @@ export class WKPage implements PageDelegate {
}

_timestampToWallTimeMsForWebSocket(requestId: string, timestamp: number): number {
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp;
return this._timestampBaselineForWebSocket.get(requestId)! + timestamp * 1000;
}

async _grantPermissions(origin: string, permissions: string[]) {
Expand Down
35 changes: 35 additions & 0 deletions tests/library/trace-viewer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,41 @@ test('should show websocket messages', {
await expect(wsList.getByRole('option').nth(3)).toContainText('Binary');
});

test('should show websocket message times in milliseconds', {
annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/41360' }
}, async ({ page, server, runAndTrace }) => {
server.onceWebSocketConnection(ws => {
ws.on('message', message => ws.send(`echo:${message}`));
});

const traceViewer = await runAndTrace(async () => {
await page.goto(server.EMPTY_PAGE);
await page.evaluate(async url => {
const ws = new WebSocket(url);
const waitForMessage = () => new Promise(resolve => ws.addEventListener('message', resolve, { once: true }));
await new Promise(resolve => ws.addEventListener('open', resolve, { once: true }));
ws.send('first');
await waitForMessage();
await new Promise(resolve => setTimeout(resolve, 1500));
ws.send('second');
await waitForMessage();
ws.close();
await new Promise(resolve => ws.addEventListener('close', resolve, { once: true }));
}, `ws://${server.HOST}/ws`);
});

await traceViewer.showNetworkTab();
await traceViewer.networkRequests.filter({ hasText: 'ws' }).filter({ hasText: 'websocket' }).click();

const messagesTab = traceViewer.networkTab.getByRole('tabpanel', { name: 'Messages' });
await traceViewer.networkTab.getByRole('tab', { name: 'Messages' }).click();
const wsList = messagesTab.getByRole('listbox', { name: 'WebSocket messages' });
await expect(wsList.getByRole('option')).toHaveCount(4);
await expect(wsList.getByRole('option').nth(2)).toContainText('second');
const secondMessageTime = await wsList.getByRole('option').nth(2).locator('.network-websocket-message-time').textContent();
expect(parseMillis(secondMessageTime!)).toBeGreaterThan(1000);
});

test('should show snapshot URL and copy button', async ({ page, runAndTrace, server }) => {
const traceViewer = await runAndTrace(async () => {
await page.goto(server.EMPTY_PAGE);
Expand Down