peachsim 0.1.1620 → 0.1.1635

package/cli/cloud-client.ts

@@ -46,8 +46,8 @@ import {
   RNX_METRO_MODULE_IDENTITY_VERSION,
   type RNXMetroModuleIdentityMetadata,
 } from '../src/metro-production-bundle.ts'
+import { readPackageVersionsFooter } from '../src/packageVersionsContract'
 import { rnxPublicBrand } from '../src/public-brand.ts'
-import { PEACH_SIMULATOR_PATH } from '../src/simulator-route'
 import { CHOOSE_ACCOUNT_HINT, resolveCliAuth } from './auth.ts'
 import {
   createCloudSession,
@@ -274,6 +274,26 @@ async function loadBundleSource(bundleInput: string, command: string): Promise<s
   return source
 }
 
+// a metro bundle carries react native's Platform module for exactly the
+// platform it was built for, and that module's OS constant survives
+// minification. a bundle naming only the other platform would boot against
+// native modules it was never built for, so it refuses before a host exists.
+export function assertBundleBuiltFor(
+  bytes: Buffer,
+  platform: RemotePlatform,
+  command: string,
+): void {
+  const source = bytes.toString('latin1')
+  const ios = /\bOS:\s*["']ios["']/.test(source)
+  const android = /\bOS:\s*["']android["']/.test(source)
+  if (ios === android) return
+  const built = ios ? 'ios' : 'android'
+  if (built === platform) return
+  throw new Error(
+    `${command} needs a bundle built for ${platform}; this one was built for ${built}. Rebuild with \`react-native bundle --platform ${platform}\` or run \`peach ${built} --remote\`.`,
+  )
+}
+
 // `react-native bundle --assets-dest` dest paths are not always the JS
 // descriptor's httpServerLocation with `../` replaced by `_`. Metro 0.83 does
 // that (`__node_modules`); Metro 0.84 often dests `node_modules` and keeps the
@@ -746,6 +766,11 @@ export async function produceCloudBoxArtifact(
     assetsDirectory ? 'require-assets' : 'allow-placeholders',
     assetsDirectory,
   )
+  if (!readPackageVersionsFooter(prepared.source)?.['react-native']) {
+    throw new Error(
+      'remote simulator bundle is missing __peachPackageVersions with the installed react-native version. Wrap your project Metro config with withPeach from peachsim/metro, then rebuild the bundle before running peach ios --remote or peach android --remote.',
+    )
+  }
   const warnings: string[] = []
   if (prepared.search.unconfirmed && prepared.dest) {
     warnings.push(
@@ -1662,39 +1687,54 @@ export class BoxBootFailedError extends Error {
   }
 }
 
-export interface BoxDisplayGrant {
-  url: string
-  authToken: string
-  expectedPeer: unknown
-}
-
 // how long `peach remote` waits for a fresh box's page to attach its simulator
 // before giving up on the watch url. the page boots the bundle after the
 // browser is up, and a large bundle takes a while to parse.
 const BOX_DISPLAY_GRANT_WAIT_MS = 180_000
 const BOX_DISPLAY_GRANT_RETRY_MS = 2_000
 
-function readBoxDisplayGrant(value: unknown): BoxDisplayGrant {
-  if (!isRecord(value) || !isRecord(value.grant)) {
-    throw new Error('box display-grant returned an invalid grant')
-  }
-  const grant = value.grant
-  if (
-    typeof grant.url !== 'string' ||
-    !grant.url ||
-    typeof grant.authToken !== 'string' ||
-    !grant.authToken ||
-    !isRecord(grant.expectedPeer)
-  ) {
-    throw new Error('box display-grant returned an invalid grant')
+// waits for a fresh box's page to load its app or report that the app threw
+// while booting, reading the same runtime receipts the page records. a boot
+// error throws; a slow boot that reports neither within the wait is not an
+// error, so the caller still gets its watch url.
+export async function awaitBoxBoot(options: {
+  apiOrigin: string
+  boxId: string
+  boxToken: string
+}): Promise<void> {
+  const started = Date.now()
+  while (Date.now() - started < BOX_DISPLAY_GRANT_WAIT_MS) {
+    const response = await fetch(
+      `${options.apiOrigin}/v1/boxes/${encodeURIComponent(options.boxId)}/lifecycle`,
+      { headers: { authorization: `Bearer ${options.boxToken}` } },
+    )
+    const text = await response.text()
+    if (!response.ok) throw responseError(response.status, text)
+    const status: unknown = JSON.parse(text)
+    const generation =
+      isRecord(status) && isRecord(status.browser)
+        ? status.browser.browserGeneration
+        : null
+    const receipts =
+      isRecord(status) && Array.isArray(status.runtimeReceipts)
+        ? status.runtimeReceipts
+        : []
+    for (const receipt of receipts.toReversed()) {
+      if (!isRecord(receipt) || receipt.browserGeneration !== generation) continue
+      if (receipt.kind === 'boot-failed' && typeof receipt.error === 'string') {
+        throw new BoxBootFailedError(options.boxId, receipt.error)
+      }
+      if (receipt.kind === 'loaded' || receipt.kind === 'painted') return
+    }
+    await new Promise((resolve) => setTimeout(resolve, BOX_DISPLAY_GRANT_RETRY_MS))
   }
-  return { url: grant.url, authToken: grant.authToken, expectedPeer: grant.expectedPeer }
 }
 
-// mints a watch-only display grant from the box and builds the bare shell
-// watch url for it: the same /simulator#remoteEngine fragment the nano service
-// mints, pointed at the box's display socket instead. the box token stays in
-// this process; only the grant travels in the fragment.
+// mints a watch-only display grant from the box and returns the watch url the
+// box service built for it. the service puts it on the deploy that serves the
+// box page, so the viewer runs the same engine build, and display wire, as the
+// page hosting the simulator. the box token stays in this process; only the
+// grant travels, in the url's fragment.
 export async function requestBoxWatchUrl(options: {
   apiOrigin: string
   boxId: string
@@ -1722,17 +1762,6 @@ export async function requestBoxWatchUrl(options: {
         }`,
       )
     }
-    if (response.status === 422) {
-      const text = await response.text()
-      let failure: unknown = null
-      try {
-        failure = JSON.parse(text)
-      } catch {}
-      if (isRecord(failure) && failure.code === 'boot-failed') {
-        throw new BoxBootFailedError(options.boxId, String(failure.error))
-      }
-      throw responseError(response.status, text)
-    }
     if (response.status === 409) {
       // the page has not attached its simulator yet. this is the normal state
       // right after a create, so wait rather than refusing.
@@ -1752,27 +1781,9 @@ export async function requestBoxWatchUrl(options: {
     } catch {
       throw new Error('box display-grant returned unreadable JSON')
     }
-    const grant = readBoxDisplayGrant(parsed)
-    const watch = new URL(PEACH_SIMULATOR_PATH, rnxPublicBrand.origin)
-    // the shell boots its stage at its own default device, while the box page
-    // hosts its simulator at the grant's device profile. without ?device= the
-    // tenant refuses the host hello on dimensions and paints nothing — the
-    // same param SimPage and BoxHostPage already set on their stage urls.
-    if (
-      isRecord(grant.expectedPeer) &&
-      typeof grant.expectedPeer.deviceProfile === 'string' &&
-      grant.expectedPeer.deviceProfile
-    ) {
-      watch.searchParams.set('device', grant.expectedPeer.deviceProfile)
-    }
-    watch.hash = `remoteEngine=${encodeURIComponent(
-      JSON.stringify({
-        url: grant.url,
-        authToken: grant.authToken,
-        expectedPeer: grant.expectedPeer,
-      }),
-    )}`
-    return watch.toString()
+    if (!isRecord(parsed) || typeof parsed.watchUrl !== 'string' || !parsed.watchUrl)
+      throw new Error('box display-grant returned no watch url')
+    return parsed.watchUrl
   }
 }
 

package/cli/command-registry.ts

@@ -128,6 +128,7 @@ const VALUE_FLAGS = new Set([
   '--timeout',
   '--device',
   '--posture',
+  '--render-resolution',
   '--os-version',
   '--ios-target',
   '--output',

package/cli/commands/box/search-command.ts

@@ -34,6 +34,7 @@
 import { spawn } from 'node:child_process'
 import { defineCommand, type CustomCommand } from '@peach/box/shell'
 import { PROJECT_MOUNT } from '@peach/box/shell'
+import { terminateProcessGroup } from '../../../src/process-group'
 
 // generous next to a 414ms p95: this bounds a wedged child, it does not cut off
 // a large search.
@@ -63,9 +64,9 @@ function runGitGrep(args: string[], cwd: string) {
       clearTimeout(timer)
       resolve({ stdout, stderr, exitCode })
     }
-    const timer = setTimeout(() => {
+    const timer = setTimeout(async () => {
       try {
-        child.kill('SIGKILL')
+        await terminateProcessGroup(child, 'SIGKILL')
       } catch {}
       stderr += `rg: search timed out after ${SEARCH_DEADLINE_MS}ms\n`
       finish(2)

package/cli/commands/box.ts

@@ -52,9 +52,6 @@ interface BoxCommandOptions {
   verbose?: boolean
 }
 
-// no default. a cloud box service has to be deployed before one can exist, and
-// defaulting to an origin that answers nothing would advertise a capability
-// that always fails.
 const ENDPOINT_ENV = 'PEACH_BOX_ENDPOINT'
 const API_ORIGIN_ENV = 'PEACH_API_ORIGIN'
 const BOX_TEMPLATES = new BoxTemplateRegistry([
@@ -212,23 +209,16 @@ async function runCloudBoxUse(args: string[]): Promise<number> {
   }
 }
 
-function requireEndpoint(args: string[], label: string): string | null {
-  return cloudBoxEndpoint(args, `box ${label}`)
-}
-
 /**
- * the cloud box service this command talks to, or null with the reason
- * printed. exported because `peach box send` creates a box too, and a second
- * spelling of where boxes live is a second place to configure.
+ * the cloud box service for every CLI command that selects a service. existing
+ * box references carry their own endpoint from the account service.
  */
-export function cloudBoxEndpoint(args: string[], command: string): string | null {
-  const endpoint = flag(args, 'endpoint') ?? process.env[ENDPOINT_ENV]?.trim()
-  if (endpoint) return endpoint
-  console.error(
-    `  ${rnxPublicBrand.commandName} ${command}: no cloud box service to talk to.\n` +
-      `  set ${ENDPOINT_ENV} or pass --endpoint=<url>.`,
+export function cloudBoxEndpoint(args: string[]): string {
+  return (
+    flag(args, 'endpoint')?.trim() ||
+    process.env[ENDPOINT_ENV]?.trim() ||
+    rnxPublicBrand.boxOrigin
   )
-  return null
 }
 
 /** the api origin a cloud box bills against. */
@@ -278,8 +268,7 @@ async function runBoxSend(args: string[], opts: BoxCommandOptions): Promise<numb
 async function runCloudBoxStop(args: string[], purge: boolean): Promise<number> {
   const peach = rnxPublicBrand.commandName
   const label = purge ? 'delete' : 'stop'
-  const endpoint = requireEndpoint(args, label)
-  if (!endpoint) return 1
+  const endpoint = cloudBoxEndpoint(args)
   const name = boxTarget(args, label)
   if (!name) return 1
   const { auth, header } = authHeaderOrExit(`box ${label}`)
@@ -321,7 +310,7 @@ async function runCloudBoxList(args: string[]): Promise<number> {
   const accountId = cloudAccountIdOrExit(auth)
   const client = createBoxClient(
     createCloudBoxProvider({
-      endpoint: flag(args, 'endpoint') ?? process.env[ENDPOINT_ENV]?.trim() ?? '',
+      endpoint: cloudBoxEndpoint(args),
       authority: { kind: 'account', apiOrigin: apiOrigin(args, auth), apiKey, accountId },
     }),
   )
@@ -589,15 +578,7 @@ async function runCloudBoxCreate(
 ): Promise<number> {
   const peach = rnxPublicBrand.commandName
   const json = args.includes('--json')
-  const endpoint = flag(args, 'endpoint') ?? process.env[ENDPOINT_ENV]?.trim()
-  if (!endpoint) {
-    console.error(
-      `  ${peach} box create: no cloud box service to create a box in.\n` +
-        `  set ${ENDPOINT_ENV} or pass --endpoint=<url>. \`${peach} box\` runs the\n` +
-        `  same shell locally over this checkout.`,
-    )
-    return 1
-  }
+  const endpoint = cloudBoxEndpoint(args)
 
   // --bundle IS the template choice: the box runs an app that is already
   // built, so naming a second template would ask for two different boxes.