Skip to content

Commit 041e7e3

Browse files
dcroussodgozman
authored andcommitted
cherry-pick(#41364): fix(har): WebSocket message timestamps should be in milliseconds
the `timestamp` should also be multipled by 1000 just like the `walltime` fixes <#41360>
1 parent b8a0fc3 commit 041e7e3

4 files changed

Lines changed: 32 additions & 14 deletions

File tree

‎packages/playwright-core/src/server/chromium/crNetworkManager.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ export class CRNetworkManager {
549549

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

@@ -559,7 +559,7 @@ export class CRNetworkManager {
559559
}
560560

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

565565
private _maybeUpdateRequestSession(sessionInfo: SessionInfo, request: InterceptableRequest) {

‎packages/playwright-core/src/server/webkit/webview/wvPage.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ export class WVPage implements PageDelegate {
954954

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

@@ -964,7 +964,7 @@ export class WVPage implements PageDelegate {
964964
}
965965

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

970970
shouldToggleStyleSheetToSyncAnimations(): boolean {

‎packages/playwright-core/src/server/webkit/wkPage.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ export class WKPage implements PageDelegate {
12141214

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

@@ -1224,7 +1224,7 @@ export class WKPage implements PageDelegate {
12241224
}
12251225

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

12301230
async _grantPermissions(origin: string, permissions: string[]) {

‎tests/library/har-websocket.spec.ts‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ it('should include websocket handshake headers and status', async ({ contextFact
100100
const { page, getLog } = await pageWithHar(contextFactory, testInfo);
101101
await page.goto(server.EMPTY_PAGE);
102102

103+
const beforeMs = Date.now();
103104
const wsUrl = `ws://${server.HOST}/ws`;
104105
const closed = page.evaluate(url => new Promise<void>(resolve => {
105106
const ws = new WebSocket(url);
@@ -108,6 +109,7 @@ it('should include websocket handshake headers and status', async ({ contextFact
108109
}), wsUrl);
109110
await closed;
110111
const log = await getLog();
112+
const afterMs = Date.now();
111113

112114
const wsEntry = log.entries.find(e => e.request.url === wsUrl)! as Entry;
113115
expect(wsEntry._resourceType).toBe('websocket');
@@ -116,6 +118,10 @@ it('should include websocket handshake headers and status', async ({ contextFact
116118
expect(wsEntry.response.statusText).toBe('Switching Protocols');
117119
expect(wsEntry.response.headersSize).toBe(responseHeadersSize(wsEntry.response.headers));
118120

121+
const wallTimeMs = new Date(wsEntry.startedDateTime).getTime();
122+
expect(wallTimeMs).toBeGreaterThanOrEqual(beforeMs);
123+
expect(wallTimeMs).toBeLessThanOrEqual(afterMs);
124+
119125
const requestHeaderNames = wsEntry.request.headers.map(h => h.name.toLowerCase());
120126
expect(requestHeaderNames).toContain('upgrade');
121127
expect(requestHeaderNames).toContain('connection');
@@ -135,12 +141,19 @@ async function testWebSocketMessages(contextFactory, server, testInfo, content)
135141
const incomingBinary = [(new Array(125)).fill(0x01), (new Array(126)).fill(0x01), (new Array(2 ** 16)).fill(0x01)];
136142
const outgoingText = ['y'.repeat(125), 'y'.repeat(126), 'y'.repeat(2 ** 16)];
137143
const outgoingBinary = [(new Array(125)).fill(0x02), (new Array(126)).fill(0x02), (new Array(2 ** 16)).fill(0x02)];
144+
const incomingCount = incomingText.length + incomingBinary.length;
145+
const outgoingCount = outgoingText.length + outgoingBinary.length;
146+
const delayMs = 100;
138147

139-
server.onceWebSocketConnection(ws => {
140-
for (const text of incomingText)
148+
server.onceWebSocketConnection(async ws => {
149+
for (const text of incomingText) {
141150
ws.send(text);
142-
for (const binary of incomingBinary)
151+
await new Promise(resolve => setTimeout(resolve, delayMs));
152+
}
153+
for (const binary of incomingBinary) {
154+
await new Promise(resolve => setTimeout(resolve, delayMs));
143155
ws.send(Buffer.from(binary));
156+
}
144157
});
145158

146159
const outputPath = content === 'embed' ? undefined : 'test.har.zip';
@@ -149,20 +162,24 @@ async function testWebSocketMessages(contextFactory, server, testInfo, content)
149162

150163
const beforeMs = Date.now();
151164
const wsUrl = `ws://${server.HOST}/ws`;
152-
const closed = page.evaluate(({ url, incomingCount, outgoingText, outgoingBinary }) => new Promise<void>(resolve => {
165+
const closed = page.evaluate(({ url, incomingCount, outgoingText, outgoingBinary, delayMs }) => new Promise<void>(resolve => {
153166
let count = 0;
154167
const ws = new WebSocket(url);
155-
ws.addEventListener('message', () => {
168+
ws.addEventListener('message', async () => {
156169
if (++count < incomingCount)
157170
return;
158-
for (const text of outgoingText)
171+
for (const text of outgoingText) {
159172
ws.send(text);
160-
for (const binary of outgoingBinary)
173+
await new Promise(resolve => setTimeout(resolve, delayMs));
174+
}
175+
for (const binary of outgoingBinary) {
176+
await new Promise(resolve => setTimeout(resolve, delayMs));
161177
ws.send(new Uint8Array(binary));
178+
}
162179
ws.close();
163180
});
164181
ws.addEventListener('close', () => resolve());
165-
}), { url: wsUrl, incomingCount: incomingText.length + incomingBinary.length, outgoingText, outgoingBinary });
182+
}), { url: wsUrl, incomingCount, outgoingText, outgoingBinary, delayMs });
166183
await closed;
167184
const afterMs = Date.now();
168185

@@ -204,6 +221,7 @@ async function testWebSocketMessages(contextFactory, server, testInfo, content)
204221
}
205222
expect(messages[0].time).toBeLessThanOrEqual(messages[1].time);
206223
expect(wsEntry.time).toBeGreaterThanOrEqual(messages[messages.length - 1].time - messages[0].time);
224+
expect(wsEntry.time).toBeGreaterThanOrEqual(delayMs * (incomingCount + outgoingCount));
207225
}
208226

209227
it('should embed websocket messages', async ({ contextFactory, server }, testInfo) => {

0 commit comments

Comments
 (0)