peachsim 0.1.939 → 0.1.1399

package/cli/drivers/playwright.ts

@@ -18,7 +18,11 @@ import { createServer } from 'net'
 import { tmpdir } from 'os'
 import { join } from 'path'
 import { AUTOMATION_SIM_IDLE_REAP_TTL_MS } from '../../src/bridge-constants'
-import { headlessHostCommand } from '../../src/desktop-host-delivery'
+import {
+  desktopHostDelivery,
+  desktopHostPlatform,
+  headlessHostCommand,
+} from '../../src/desktop-host-delivery'
 import { playwrightHostLogName } from '../../src/playwright-host-log'
 import { ensureProfile, playwrightProfileUserDataDir } from '../../src/profiles'
 import { RNX_INTERNAL_CHILDREN, RNX_INTERNAL_COMMAND } from '../internal-child'
@@ -34,6 +38,7 @@ import {
 import type {
   Driver,
   DriverAvailability,
+  DriverCompletion,
   DriverLaunchOptions,
   DriverLaunchResult,
 } from './types'
@@ -148,11 +153,32 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
   // a headless run attaches the installed standalone desktop host, which
   // renders natively and lets the page present only on capture; the host
   // reaches the browser over cdp, so it needs a debugging port.
-  const hostCommand = headless ? headlessHostCommand() : null
+  let hostCommand: string[] | null = null
+  if (headless && desktopHostPlatform()) {
+    try {
+      hostCommand = headlessHostCommand()
+      if (!hostCommand) {
+        // a missing or older host upgrades to the channel's current release; one published
+        // before the headless host existed leaves this run on the browser engine alone
+        await desktopHostDelivery().install()
+        hostCommand = headlessHostCommand()
+        if (!hostCommand)
+          console.error(
+            '  native host release has no headless host yet; rendering in the browser',
+          )
+      }
+    } catch (error) {
+      return {
+        launched: false,
+        message: `native headless host provisioning failed: ${String(error)}`,
+      }
+    }
+  }
   const cdpPort = opts.cdpPort ?? (hostCommand ? await freePort() : undefined)
 
   const errLog = join(tmpdir(), playwrightHostLogName(Date.now(), process.pid))
   const connectAckFile = `${errLog}.connected`
+  const completionFile = `${errLog}.completed`
   const errFd = openSync(errLog, 'a')
   try {
     // spawn the browser host detached so Chrome outlives `peach
@@ -187,12 +213,17 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
             ? { SOOTSIM_PW_VIEWPORT: `${opts.viewport.width}x${opts.viewport.height}` }
             : {}),
           SOOTSIM_PW_CONNECTED_ACK_FILE: connectAckFile,
+          PEACH_PW_COMPLETION_FILE: completionFile,
           SOOTSIM_PW_CONNECT_TIMEOUT_MS: String(opts.connectTimeoutMs ?? 120_000),
           SOOTSIM_PW_OWNER_PID: String(ownerPid),
           SOOTSIM_PW_LIBRARY_PATH: provisioning.libraryPath ?? '',
         },
       },
     )
+    const completion = new Promise<DriverCompletion>((resolve) => {
+      child.once('exit', (code, signal) => resolve({ code, signal }))
+      child.once('error', () => resolve({ code: null, signal: null }))
+    })
     child.unref()
 
     // name both lifetime bounds: the bridge closes an automation sim neither a
@@ -211,6 +242,8 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
       attachUrl: targetUrl.href,
       connectAckFile,
       diagnosticLogPath: errLog,
+      completion,
+      completionFile,
     }
   } catch (err) {
     return {

package/cli/drivers/types.ts

@@ -69,6 +69,11 @@ export interface DriverLaunchOptions {
   bridgePort?: number
 }
 
+export interface DriverCompletion {
+  code: number | null
+  signal: NodeJS.Signals | null
+}
+
 export interface DriverLaunchResult {
   // true when the process was successfully spawned.
   launched: boolean
@@ -82,6 +87,9 @@ export interface DriverLaunchResult {
   attachUrl?: string
   connectAckFile?: string
   diagnosticLogPath?: string
+  // foreground guest hosts await the detached driver's exit without polling.
+  completion?: Promise<DriverCompletion>
+  completionFile?: string
 }
 
 export interface Driver {