Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(route): expose WebSocket subprotocols on WebSocketRoute by rohitpaulk · Pull Request #40377 · microsoft/playwright · GitHub
Skip to content
Merged
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
59 changes: 59 additions & 0 deletions docs/src/api/class-websocketroute.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,6 +377,65 @@ Message to send.



## method: WebSocketRoute.protocols
* since: v1.60
- returns: <[Array]<[string]>>

The list of WebSocket subprotocols requested by the page, as passed via the second argument to the [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the `Sec-WebSocket-Protocol` request header.

Returns an empty array if no protocols were specified.

**Usage**

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if this should go here or at the top, doesn't look like the other methods have usage examples inline.


```js
await page.routeWebSocket('wss://example.com/ws', ws => {
if (ws.protocols().includes('chat.v2'))
ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
else
ws.close({ code: 1002, reason: 'Unsupported protocol' });
});
```

```java
page.routeWebSocket("wss://example.com/ws", ws -> {
if (ws.protocols().contains("chat.v2")) {
ws.onMessage(frame -> ws.send("v2:" + frame.text()));
} else {
ws.close(1002, "Unsupported protocol");
}
});
```

```python async
async def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
await ws.close(code=1002, reason="Unsupported protocol")

await page.route_web_socket("wss://example.com/ws", handler)
```

```python sync
def handler(ws: WebSocketRoute):
if "chat.v2" in ws.protocols:
ws.on_message(lambda message: ws.send(f"v2:{message}"))
else:
ws.close(code=1002, reason="Unsupported protocol")

page.route_web_socket("wss://example.com/ws", handler)
```

```csharp
await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
if (ws.Protocols.Contains("chat.v2"))
ws.OnMessage(frame => ws.Send($"v2:{frame.Text}"));
else
ws.CloseAsync(new() { Code = 1002, Reason = "Unsupported protocol" });
});
```


## method: WebSocketRoute.url
* since: v1.48
- returns: <[string]>
Expand Down
5 changes: 3 additions & 2 deletions packages/injected/src/webSocketMock.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };

export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
export type OnCreatePayload = { type: 'onCreate', id: string, url: string, protocols: string[] };
export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
Expand DownExpand Up@@ -147,7 +147,8 @@ export function inject(globalThis: GlobalThis) {

this._id = generateId();
idToWebSocket.set(this._id, this);
binding({ type: 'onCreate', id: this._id, url: this.url });
const protocolsList = Array.isArray(protocols) ? [...protocols] : (protocols ? [protocols] : []);
binding({ type: 'onCreate', id: this._id, url: this.url, protocols: protocolsList });
}

// --- native WebSocket implementation ---
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-client/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
8 changes: 8 additions & 0 deletions packages/playwright-core/src/client/network.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,6 +485,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
},

protocols: () => {
return [...this._initializer.protocols];
},

close: async (options: { code?: number, reason?: string } = {}) => {
await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
},
Expand DownExpand Up@@ -534,6 +538,10 @@ export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel>
return this._initializer.url;
}

protocols(): string[] {
return [...this._initializer.protocols];
}

async close(options: { code?: number, reason?: string } = {}) {
await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
}
Expand Down
1 change: 1 addition & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2430,6 +2430,7 @@ scheme.RouteFulfillParams = tObject({
scheme.RouteFulfillResult = tOptional(tObject({}));
scheme.WebSocketRouteInitializer = tObject({
url: tString,
protocols: tArray(tString),
});
scheme.WebSocketRouteMessageFromPageEvent = tObject({
message: tString,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,8 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
private _frame: Frame;
private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();

constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, protocols: string[], frame: Frame) {
super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url, protocols });
this._id = id;
this._frame = frame;
this._eventListeners.push(
Expand DownExpand Up@@ -76,7 +76,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Web
else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
scope = contextDispatcher;
if (scope) {
new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
new WebSocketRouteDispatcher(scope, payload.id, payload.url, payload.protocols, source.frame);
} else {
const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
source.frame.evaluateExpression(progress, `globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
Expand Down
21 changes: 21 additions & 0 deletions packages/playwright-core/types/types.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16538,6 +16538,27 @@ export interface WebSocketRoute {
*/
connectToServer(): WebSocketRoute;

/**
* The list of WebSocket subprotocols requested by the page, as passed via the second argument to the
* [`WebSocket` constructor](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket). Corresponds to the
* `Sec-WebSocket-Protocol` request header.
*
* Returns an empty array if no protocols were specified.
*
* **Usage**
*
* ```js
* await page.routeWebSocket('wss://example.com/ws', ws => {
* if (ws.protocols().includes('chat.v2'))
* ws.onMessage(message => ws.send(JSON.stringify({ version: 2, echo: message })));
* else
* ws.close({ code: 1002, reason: 'Unsupported protocol' });
* });
* ```
*
*/
protocols(): Array<string>;

/**
* Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
* on the result of
Expand Down
1 change: 1 addition & 0 deletions packages/protocol/src/channels.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4197,6 +4197,7 @@ export interface RouteEvents {
// ----------- WebSocketRoute -----------
export type WebSocketRouteInitializer = {
url: string,
protocols: string[],
};
export interface WebSocketRouteEventTarget {
on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3744,6 +3744,9 @@ WebSocketRoute:

initializer:
url: string
protocols:
type: array
items: string

commands:

Expand Down
34 changes: 34 additions & 0 deletions tests/library/route-web-socket.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -578,3 +578,37 @@ test('should work with baseURL', async ({ contextFactory, server }) => {
`message: data=echo origin=ws://${server.HOST} lastEventId=`,
]);
});

test('should expose protocols to the route handler', async ({ page, server }) => {
const routes: WebSocketRoute[] = [];
await page.routeWebSocket(/.*/, ws => {
routes.push(ws);
});

await page.goto(server.EMPTY_PAGE);
await page.evaluate(({ host }) => {
(window as any).wsNone = new WebSocket('ws://' + host + '/ws-none');
(window as any).wsString = new WebSocket('ws://' + host + '/ws-string', 'chat.v1');
(window as any).wsArray = new WebSocket('ws://' + host + '/ws-array', ['chat.v2', 'chat.v1']);
}, { host: server.HOST });

await expect.poll(() => routes.length).toBe(3);

const byUrl = new Map(routes.map(r => [new URL(r.url()).pathname, r] as const));
expect(byUrl.get('/ws-none')!.protocols()).toEqual([]);
expect(byUrl.get('/ws-string')!.protocols()).toEqual(['chat.v1']);
expect(byUrl.get('/ws-array')!.protocols()).toEqual(['chat.v2', 'chat.v1']);
});

test('should expose protocols on server-side route', async ({ page, server }) => {
const { promise, resolve } = withResolvers<{ page: WebSocketRoute, server: WebSocketRoute }>();
await page.routeWebSocket(/.*/, ws => {
const serverRoute = ws.connectToServer();
resolve({ page: ws, server: serverRoute });
});

await setupWS(page, server, 'blob', ['chat.v2', 'chat.v1']);
const { page: pageRoute, server: serverRoute } = await promise;
expect(pageRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
expect(serverRoute.protocols()).toEqual(['chat.v2', 'chat.v1']);
});
Loading