rebase

Author: mxschmitt

packages/playwright-core/bin/webkit-wsl-pipe-wrapper.mjs

@@ -1,12 +1,18 @@
 // @ts-check
 import net from 'net';
+import fs from 'fs';
 import { execSync, spawn } from 'child_process';
 
 const socketPort = process.env.PW_WKWSL_PORT;
 delete process.env.PW_WKWSL_PORT;
 if (!socketPort)
     throw new Error('PW_WKWSL_PORT env var is not set');
 
+const [executable, ...args] = process.argv.slice(2);
+
+if (!(await fs.promises.stat(executable)).isFile())
+    throw new Error(`Executable does not exist. Did you update Playwright recently? Make sure to run npx playwright install webkit-wsl`);
+
 const address = (() => {
     if (execSync('wslinfo --networking-mode', { encoding: 'utf8' }).trim() === 'nat') {
         const ip = execSync('ip route show', { encoding: 'utf8' }).trim().split('\n').find(line => line.includes('default'))?.split(' ')[2];
@@ -25,8 +31,6 @@ await new Promise((resolve, reject) => {
     socket.on('error', reject);
 });
 
-const [executable, ...args] = process.argv.slice(2);
-
 // 3 is readFD and 4 is writeFD
 const child = spawn(executable, args, {
     stdio: ['inherit', 'inherit', 'inherit', 'pipe', 'pipe']

packages/playwright-core/src/server/browserType.ts

@@ -272,7 +272,7 @@ export abstract class BrowserType extends SdkObject {
       if (options.cdpPort !== undefined || !this.supportsPipeTransport())
         transport = await WebSocketTransport.connect(progress, wsEndpoint!);
       else
-        transport = new PipeTransport(processLifecycleHooks.writePipe(launchedProcess), processLifecycleHooks.readPipe(launchedProcess));
+        transport = processLifecycleHooks.createTransport(launchedProcess);
       return { browserProcess, artifactsDir: prepared.artifactsDir, userDataDir: prepared.userDataDir, transport };
     } catch (error) {
       transport?.close();
@@ -353,8 +353,9 @@ export abstract class BrowserType extends SdkObject {
       preLaunch: async () => {},
       onExit: async () => {},
       amendEnvironment: async env => env,
-      readPipe: p => p.stdio[4] as NodeJS.ReadableStream,
-      writePipe: p => p.stdio[3] as NodeJS.WritableStream,
+      createTransport(p): ConnectionTransport {
+        return new PipeTransport(p.stdio[3] as NodeJS.WritableStream, p.stdio[4] as NodeJS.ReadableStream);
+      }
     };
   }
 }
@@ -363,8 +364,7 @@ export type LaunchLifecycleHooks = {
   preLaunch(): Promise<void>;
   onExit(): Promise<void>;
   amendEnvironment(env: Env, options: types.LaunchOptions, userDataDir: string, isPersistent: boolean): Promise<Env>;
-  readPipe(p: ChildProcess): NodeJS.ReadableStream;
-  writePipe(p: ChildProcess): NodeJS.WritableStream;
+  createTransport(p: ChildProcess): ConnectionTransport;
 };
 
 function copyTestHooks(from: object, to: object) {

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

@@ -25,6 +25,7 @@ import { BrowserType, kNoXServerRunningError, LaunchLifecycleHooks } from '../br
 import { WKBrowser } from '../webkit/wkBrowser';
 import { spawnAsync } from '../utils/spawnAsync';
 import { registry } from '../registry';
+import { PipeTransport } from '../pipeTransport';
 
 import type { BrowserOptions } from '../browser';
 import type { SdkObject } from '../instrumentation';
@@ -116,7 +117,7 @@ export class WebKit extends BrowserType {
         async amendEnvironment(env, options, userDataDir, isPersistent) {
           return {
             ...env,
-            'CURL_COOKIE_JAR_PATH': process.platform === 'win32' && isPersistent && options.channel !== 'webkit-wsl' ? path.join(userDataDir, 'cookiejar.db') : undefined,
+            'CURL_COOKIE_JAR_PATH': process.platform === 'win32' && isPersistent ? path.join(userDataDir, 'cookiejar.db') : undefined,
           };
         }
       };
@@ -146,8 +147,9 @@ export class WebKit extends BrowserType {
           'PW_WKWSL_PORT': (transportServer.address() as net.AddressInfo)?.port?.toString() ?? '',
         };
       },
-      readPipe: () => readPipe,
-      writePipe: () => writePipe,
+      createTransport(p): ConnectionTransport {
+        return new PipeTransport(writePipe, readPipe);
+      }
     };
   }
 }