Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore: move HTTP server behaviour from WSServer to PlaywrightServer (#36334)
Simon Knotta439191551dd
diff --git a/packages/playwright-core/src/remote/playwrightServer.ts b/packages/playwright-core/src/remote/playwrightServer.tsindex 9a564c4252..e823f8ce87 100644--- a/packages/playwright-core/src/remote/playwrightServer.ts+++ b/packages/playwright-core/src/remote/playwrightServer.ts@@ -57,6 +57,17 @@ export class PlaywrightServer {const reuseBrowserSemaphore = new Semaphore(1);this._wsServer = new WSServer({+ onRequest: (request, response) => {+ if (request.method === 'GET' && request.url === '/json') {+ response.setHeader('Content-Type', 'application/json');+ response.end(JSON.stringify({+ wsEndpointPath: this._options.path,+ }));+ return;+ }+ response.end('Running');+ },+onUpgrade: (request, socket) => {const uaError = userAgentVersionMatchesErrorMessage(request.headers['user-agent'] || '');if (uaError)diff --git a/packages/playwright-core/src/server/utils/wsServer.ts b/packages/playwright-core/src/server/utils/wsServer.tsindex 68362f14de..5251e52d3b 100644--- a/packages/playwright-core/src/server/utils/wsServer.ts+++ b/packages/playwright-core/src/server/utils/wsServer.ts@@ -42,10 +42,11 @@ export type WSConnection = {};export type WSServerDelegate = {- onHeaders?: (headers: string[]) => void;- onUpgrade?: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined;+ onRequest: (request: http.IncomingMessage, response: http.ServerResponse) => void;+ onHeaders: (headers: string[]) => void;+ onUpgrade: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined;onConnection: (request: http.IncomingMessage, url: URL, ws: WebSocket, id: string) => WSConnection;- onClose?(): Promise<void>;+ onClose(): Promise<void>;};export class WSServer {@@ -60,16 +61,7 @@ export class WSServer {async listen(port: number = 0, hostname: string | undefined, path: string): Promise<string> {debugLogger.log('server', `Server started at ${new Date()}`);- const server = createHttpServer((request: http.IncomingMessage, response: http.ServerResponse) => {- if (request.method === 'GET' && request.url === '/json') {- response.setHeader('Content-Type', 'application/json');- response.end(JSON.stringify({- wsEndpointPath: path,- }));- return;- }- response.end('Running');- });+ const server = createHttpServer(this._delegate.onRequest);server.on('error', error => debugLogger.log('server', String(error)));this.server = server;@@ -92,8 +84,7 @@ export class WSServer {perMessageDeflate,});- if (this._delegate.onHeaders)- this._wsServer.on('headers', headers => this._delegate.onHeaders!(headers));+ this._wsServer.on('headers', headers => this._delegate.onHeaders(headers));server.on('upgrade', (request, socket, head) => {const pathname = new URL('http://localhost' + request.url!).pathname;@@ -102,13 +93,13 @@ export class WSServer {socket.destroy();return;}- const upgradeResult = this._delegate.onUpgrade?.(request, socket);+ const upgradeResult = this._delegate.onUpgrade(request, socket);if (upgradeResult) {socket.write(upgradeResult.error);socket.destroy();return;}- this._wsServer?.handleUpgrade(request, socket, head, ws => this._wsServer?.emit('connection', ws, request));+ this._wsServer!.handleUpgrade(request, socket, head, ws => this._wsServer!.emit('connection', ws, request));});this._wsServer.on('connection', (ws, request) => {