-
Notifications
You must be signed in to change notification settings - Fork 5.8k
feat(har): include WebSocket in .har
#41015
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,9 +30,10 @@ import { helper } from '../helper'; | |
| import * as network from '../network'; | ||
| import { nullProgress } from '../progress'; | ||
|
|
||
| import { Page } from '../page'; | ||
|
|
||
| import type { RegisteredListener } from '@utils/eventsHelper'; | ||
| import type { APIRequestEvent, APIRequestFinishedEvent } from '../fetch'; | ||
| import type { Page } from '../page'; | ||
| import type { Worker } from '../page'; | ||
| import type { HeadersArray, LifecycleEvent } from '../types'; | ||
| import type * as har from '@trace/har'; | ||
|
|
@@ -102,7 +103,10 @@ export class HarTracer { | |
| ]; | ||
| if (this._context instanceof BrowserContext) { | ||
| this._eventListeners.push( | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.Page, (page: Page) => this._createPageEntryIfNeeded(page)), | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.Page, (page: Page) => { | ||
| this._addPageEventListeners(page); | ||
| this._createPageEntryIfNeeded(page); | ||
| }), | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.Request, (request: network.Request) => this._onRequest(request)), | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestFinished, ({ request, response }) => this._onRequestFinished(request, response).catch(() => {})), | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestFailed, request => this._onRequestFailed(request)), | ||
|
|
@@ -111,11 +115,21 @@ export class HarTracer { | |
| eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestFulfilled, request => this._onRequestFulfilled(request)), | ||
| eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestContinued, request => this._onRequestContinued(request)), | ||
| ); | ||
| for (const page of this._context.pages()) | ||
| for (const page of this._context.pages()) { | ||
| this._addPageEventListeners(page); | ||
| this._createPageEntryIfNeeded(page); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private _addPageEventListeners(page: Page) { | ||
| if (this._page && page !== this._page) | ||
| return; | ||
| this._eventListeners.push( | ||
| eventsHelper.addEventListener(page, Page.Events.WebSocket, (webSocket: network.WebSocket) => this._onWebSocket(page, webSocket)), | ||
| ); | ||
| } | ||
|
|
||
| private _shouldIncludeEntryWithUrl(urlString: string) { | ||
| return !this._options.urlFilter || urlMatches(this._baseURL, urlString, this._options.urlFilter); | ||
| } | ||
|
|
@@ -418,6 +432,49 @@ export class HarTracer { | |
| harEntry._wasContinued = true; | ||
| } | ||
|
|
||
| private _onWebSocket(page: Page, webSocket: network.WebSocket) { | ||
| if (!this._shouldIncludeEntryWithUrl(webSocket.url())) | ||
| return; | ||
| const url = network.parseURL(webSocket.url()); | ||
| if (!url) | ||
| return; | ||
|
|
||
| const pageEntry = this._createPageEntryIfNeeded(page); | ||
| const harEntry = createHarEntry(pageEntry?.id, 'GET', url, page.mainFrame().guid, this._options); | ||
| harEntry._resourceType = 'websocket'; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we populate it for other types from Request.resourceType and maybe place to harEntry.request._resourceType (to match playwright api) or is it not worth it?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i can do that in a followup
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| harEntry._webSocketMessages = []; | ||
|
|
||
| const eventListeners = [ | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.Request, ({ headers }: { headers: HeadersArray }) => { | ||
| this._recordRequestHeadersAndCookies(harEntry, headers); | ||
| }), | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.Response, ({ status, statusText, headers }: { status: number, statusText: string, headers: HeadersArray }) => { | ||
| harEntry.response.status = status; | ||
| harEntry.response.statusText = statusText; | ||
| this._recordResponseHeaders(harEntry, headers); | ||
| }), | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.FrameSent, ({ opcode, data, timestamp }: { opcode: number, data: string, timestamp: number }) => { | ||
| harEntry._webSocketMessages!.push({ type: 'send', time: timestamp, opcode, data }); | ||
| }), | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.FrameReceived, ({ opcode, data, timestamp }: { opcode: number, data: string, timestamp: number }) => { | ||
| harEntry._webSocketMessages!.push({ type: 'receive', time: timestamp, opcode, data }); | ||
| }), | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.SocketError, (errorMessage: string) => { | ||
| harEntry.response._failureText = errorMessage; | ||
| }), | ||
| eventsHelper.addEventListener(webSocket, network.WebSocket.Events.Close, () => { | ||
| eventsHelper.removeEventListeners(eventListeners); | ||
|
|
||
| if (this._started) | ||
| this._delegate.onEntryFinished(harEntry); | ||
| }), | ||
| ]; | ||
| this._eventListeners.push(...eventListeners); | ||
|
|
||
| if (this._started) | ||
| this._delegate.onEntryStarted(harEntry); | ||
| } | ||
|
|
||
| private _storeResponseContent(buffer: Buffer | undefined, content: har.Content, resourceType: string) { | ||
| if (!buffer) { | ||
| content.size = 0; | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.