peachsim 0.1.939 → 0.1.1399

package/src/expoKotlinContract.ts

@@ -0,0 +1,70 @@
+import { insertBundleGlobalFooter, readBundleGlobalFooter } from './bundleGlobalFooter'
+
+// what the dev server answers for an app's local Expo Kotlin modules on an
+// Android device: one linked Kotlin/Wasm process, or each module's diagnostic.
+// a process that links compose views needs the tenant's kotlin native runtime.
+// a release bundle carries the same result as a footer.
+export interface ExpoKotlinCompilationResult {
+  namespaces: string[]
+  module: { url: string; hash: string; compose: boolean } | null
+  failures: { namespace: string; diagnostic: string }[]
+}
+
+function record(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+}
+
+export function readExpoKotlinMetadata(value: unknown): ExpoKotlinCompilationResult {
+  const invalid = () => new Error('invalid Expo Kotlin compilation metadata')
+  if (
+    !record(value) ||
+    !Array.isArray(value.namespaces) ||
+    !Array.isArray(value.failures)
+  )
+    throw invalid()
+  const namespaces: string[] = []
+  for (const namespace of value.namespaces) {
+    if (typeof namespace !== 'string') throw invalid()
+    namespaces.push(namespace)
+  }
+  const failures: ExpoKotlinCompilationResult['failures'] = []
+  for (const failure of value.failures) {
+    if (
+      !record(failure) ||
+      typeof failure.namespace !== 'string' ||
+      typeof failure.diagnostic !== 'string'
+    )
+      throw invalid()
+    failures.push({ namespace: failure.namespace, diagnostic: failure.diagnostic })
+  }
+  const module = value.module
+  if (module === null) return { namespaces, module: null, failures }
+  if (
+    !record(module) ||
+    typeof module.url !== 'string' ||
+    typeof module.hash !== 'string' ||
+    typeof module.compose !== 'boolean'
+  )
+    throw invalid()
+  return {
+    namespaces,
+    module: { url: module.url, hash: module.hash, compose: module.compose },
+    failures,
+  }
+}
+
+export function readExpoKotlinFooter(source: string): ExpoKotlinCompilationResult | null {
+  const value = readBundleGlobalFooter(source, '__peachExpoKotlin')
+  return value === null ? null : readExpoKotlinMetadata(value)
+}
+
+export function insertExpoKotlinFooter(
+  source: string,
+  metadata: ExpoKotlinCompilationResult,
+): string {
+  return insertBundleGlobalFooter(
+    source,
+    '__peachExpoKotlin',
+    readExpoKotlinMetadata(metadata),
+  )
+}

package/src/expoSwiftContract.ts

@@ -1,3 +1,5 @@
+import { insertBundleGlobalFooter, readBundleGlobalFooter } from './bundleGlobalFooter'
+
 export interface ExpoSwiftSourceUnit {
   namespace: string
   moduleId: string
@@ -64,8 +66,6 @@ export function isExpoSwiftCompilationResult(
   return remaining.size === 0
 }
 
-const FOOTER_PREFIX = 'globalThis.__peachExpoSwift='
-
 export function readExpoSwiftMetadata(value: unknown): ExpoSwiftCompilationResult | null {
   if (value === null || value === undefined) return null
   if (!isExpoSwiftCompilationResult(value))
@@ -74,14 +74,7 @@ export function readExpoSwiftMetadata(value: unknown): ExpoSwiftCompilationResul
 }
 
 export function readExpoSwiftFooter(source: string): ExpoSwiftCompilationResult | null {
-  const start = source.lastIndexOf(`\n${FOOTER_PREFIX}`)
-  if (start < 0) return null
-  const end = source.indexOf('\n', start + 1)
-  const line = source.slice(start + 1, end < 0 ? undefined : end)
-  if (!line.endsWith(';')) throw new Error('Expo Swift footer is truncated')
-  const metadata = readExpoSwiftMetadata(JSON.parse(line.slice(FOOTER_PREFIX.length, -1)))
-  if (!metadata) throw new Error('Expo Swift footer has no metadata')
-  return metadata
+  return readExpoSwiftMetadata(readBundleGlobalFooter(source, '__peachExpoSwift'))
 }
 
 export function insertExpoSwiftFooter(
@@ -89,19 +82,5 @@ export function insertExpoSwiftFooter(
   metadata: ExpoSwiftCompilationResult,
 ): string {
   readExpoSwiftMetadata(metadata)
-  const start = source.lastIndexOf(`\n${FOOTER_PREFIX}`)
-  if (start >= 0) {
-    readExpoSwiftFooter(source)
-    const end = source.indexOf('\n', start + 1)
-    source = source.slice(0, start) + (end < 0 ? '' : source.slice(end))
-  }
-  const json = JSON.stringify(metadata)
-    .replace(/\u2028/g, '\\u2028')
-    .replace(/\u2029/g, '\\u2029')
-    .replace(/<\//g, '<\\/')
-  const footer = `\n${FOOTER_PREFIX}${json};`
-  const identity = source.lastIndexOf('\nglobalThis.__sootsimModulePaths=')
-  return identity < 0
-    ? source + footer
-    : source.slice(0, identity) + footer + source.slice(identity)
+  return insertBundleGlobalFooter(source, '__peachExpoSwift', metadata)
 }

package/src/home-paths.ts

@@ -35,6 +35,7 @@ import { randomUUID } from 'node:crypto'
 import fs from 'node:fs'
 import { homedir } from 'node:os'
 import path from 'node:path'
+import type { DriverId } from '../cli/drivers/types'
 
 export const PEACH_HOME_ENV = 'PEACH_HOME'
 export const ACTIVE_RUNTIME_FILE = 'active'
@@ -56,7 +57,7 @@ export function rnxHomeDir(): string {
 // persistent launchd / systemd agent: dev shells shouldn't register an agent
 // whose Program path points at workspace artifacts that change between
 // sessions, and whose served engine assets are the stale prod build instead
-// of the live `bun dev:sootsim` output.
+// of the live `bun dev:peach` output.
 //
 // overrides:
 //   SOOTSIM_DEV=1 / SOOTSIM_DEV=0           force the answer
@@ -224,7 +225,7 @@ export interface SharedConfig {
   homeScreen?: import('@peach/globals').PeachHomeScreenConfig
   telemetry?: boolean
   onboardingVersion?: number
-  simulatorDriver?: 'electron' | 'playwright'
+  simulatorDriver?: SimulatorDriverPreference
   settings?: Record<string, unknown>
   [key: string]: unknown
 }
@@ -262,7 +263,7 @@ export function writeSharedConfig(patch: Partial<SharedConfig>): SharedConfig {
 
 const CURRENT_ONBOARDING_VERSION = 1
 
-export type SimulatorDriverPreference = 'electron' | 'playwright'
+export type SimulatorDriverPreference = DriverId
 
 export function isOnboardingComplete(): boolean {
   return readSharedConfig().onboardingVersion === CURRENT_ONBOARDING_VERSION
@@ -270,7 +271,9 @@ export function isOnboardingComplete(): boolean {
 
 export function readSimulatorDriverPreference(): SimulatorDriverPreference | null {
   const driver = readSharedConfig().simulatorDriver
-  return driver === 'electron' || driver === 'playwright' ? driver : null
+  return driver === 'desktop' || driver === 'electron' || driver === 'playwright'
+    ? driver
+    : null
 }
 
 export function writeOnboardingPreferences(driver: SimulatorDriverPreference): void {

package/src/host/bridge-host.ts

@@ -505,7 +505,7 @@ export class SootSimBridgeHost {
       !fs.existsSync(path.join(this.activeRuntimeDirPath, 'index.html'))
 
     for (let attempt = 0; attempt < this.portFallbackCount; attempt++) {
-      const candidate = this.preferredPort + attempt
+      const candidate = this.preferredPort === 0 ? 0 : this.preferredPort + attempt
       try {
         const boundPort = await this.bindOnce(candidate, options?.silent === true)
         this.effectivePort = boundPort
@@ -513,7 +513,7 @@ export class SootSimBridgeHost {
         this.startedAt = Date.now()
         if (attempt > 0 && !options?.silent) {
           process.stderr.write(
-            `ws bridge bound to port ${candidate} (preferred ${this.preferredPort} was taken)\n`,
+            `ws bridge bound to port ${boundPort} (preferred ${this.preferredPort} was taken)\n`,
           )
         }
         try {
@@ -533,7 +533,7 @@ export class SootSimBridgeHost {
         }
         if (!options?.silent) {
           process.stderr.write(
-            `ws bridge port ${candidate} already in use, trying ${candidate + 1}\n`,
+            `ws bridge port ${candidate} already in use, trying ${this.preferredPort === 0 ? 'another ephemeral port' : candidate + 1}\n`,
           )
         }
         // bindOnce already cleaned up httpServer/wss on failure
@@ -1383,6 +1383,8 @@ export class SootSimBridgeHost {
     // daemon would silently validate published code instead of the checkout.
     // local-publish writes the marker above when it stages a source build.
     if (process.env.PEACH_HOME && isSootsimDevCheckout() && !readActiveRuntime()) {
+      this.bootstrapping = false
+      if (this.httpServer) this.writeLockfileSnapshot()
       return
     }
     void this.runRuntimeUpdate('startup')
@@ -1549,6 +1551,24 @@ export class SootSimBridgeHost {
         })
       return
     }
+    if (
+      req.url?.startsWith('/__peach/expo-kotlin') ||
+      req.url?.startsWith('/__peach/kotlin-artifact/')
+    ) {
+      void import('../expo-kotlin-host.ts')
+        .then(({ handleExpoKotlinRequest }) => handleExpoKotlinRequest(req, res))
+        .then((handled) => {
+          if (!handled) {
+            res.writeHead(404)
+            res.end('Kotlin artifact not found')
+          }
+        })
+        .catch((error: unknown) => {
+          res.writeHead(500)
+          res.end(String(error))
+        })
+      return
+    }
 
     // proxy + app-api routes need to accept POST/PUT/DELETE/PATCH/OPTIONS
     // because they forward the request to a real upstream. handle them

package/src/host/fetch-proxy-handler.ts

@@ -35,6 +35,8 @@ import {
 } from '../backend-origin.ts'
 import {
   buildFetchProxyUpstreamHeaders,
+  FETCH_PROXY_FAILURE_HEADER,
+  FETCH_PROXY_FAILURE_PARAM,
   nodeRequestHeaderEntries,
   resolveFetchProxyTargetUrl,
 } from './fetch-proxy-overrides.ts'
@@ -344,6 +346,17 @@ export async function handleFetchProxyRequest(
         } catch {}
       }
     }
+    if (!res.headersSent && params.has(FETCH_PROXY_FAILURE_PARAM)) {
+      const code = (err as { code?: unknown })?.code
+      res.statusCode = 502
+      res.setHeader(
+        FETCH_PROXY_FAILURE_HEADER,
+        typeof code === 'string' ? code : 'unknown',
+      )
+      applyFetchProxyCors(req, res)
+      res.end()
+      return
+    }
     // an upstream that cannot be reached fails the page's request the way a
     // direct fetch would: as a network error, never a response. a synthetic
     // 5xx reads as a live server answering (the bundle loader then polls it as

package/src/host/fetch-proxy-overrides.ts

@@ -14,6 +14,17 @@
 // the name itself reach upstream (see buildFetchProxyUpstreamHeaders).
 export const FETCH_PROXY_NATIVE_USER_AGENT_HEADER = 'x-sootsim-native-user-agent'
 
+// a fetch cannot read why a request failed: the browser reports every
+// transport failure as the same TypeError. the engine's fetch transport adds
+// this query parameter to the proxy requests it sends, and for those alone
+// the proxy answers an unreachable upstream with a 502 naming the node error
+// code (ENOTFOUND, ECONNREFUSED, ECONNRESET, ...) under the header below; the
+// transport turns that answer back into a rejection carrying the code, so
+// URLSession can report the error iOS reports. every other consumer (xhr,
+// images, webview loads) keeps the bare network error.
+export const FETCH_PROXY_FAILURE_PARAM = 'peachFailure'
+export const FETCH_PROXY_FAILURE_HEADER = 'x-peach-upstream-failure'
+
 const HOST_HEADER_OVERRIDES: Array<{
   hostSuffix: string
   headers: Record<string, string>

package/src/host/replacement-module-handler.ts

@@ -85,6 +85,11 @@ export async function handleReplacementModuleRequest(
     return false
   }
 
+  // the route check comes first: dev servers mount this handler ahead of every
+  // request, so the loopback guard must only refuse replacement-module requests,
+  // never the bundle and status requests a LAN device or remote emulator makes.
+  if (url.pathname !== REPLACEMENT_MODULE_ROUTE) return false
+
   if (options.requireLoopbackOrigin) {
     const origin = req.headers.origin
     const remoteAddress = req.socket.remoteAddress?.replace(/^::ffff:/, '')
@@ -103,8 +108,6 @@ export async function handleReplacementModuleRequest(
     }
   }
 
-  if (url.pathname !== REPLACEMENT_MODULE_ROUTE) return false
-
   if (options.requestToken && url.searchParams.get('token') !== options.requestToken) {
     res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' })
     res.end('replacement module request token is invalid')

package/src/index.ts

@@ -42,6 +42,7 @@ export {
   rnxCaptureRasterRegions,
   packRnxCaptureRegions,
   rnxRasterFrames,
+  rnxRasterRegionRequests,
   RNX_SCREEN_CAPTURE_VERSION,
   selectRnxRasterNodeIds,
   type RnxCaptureAccessibility,
@@ -62,10 +63,11 @@ export {
   type RnxCaptureTree,
   type RnxCaptureVisualEvidence,
   type RnxRasterRegionTree,
+  type RnxRasterSelection,
   type RnxScreenCapture,
 } from './capture-contract'
 
-export { rnxPlugin } from './vite-plugin-one'
+export { peachPlugin } from './vite-plugin-one'
 export { default as metroPlugin } from './metro-plugin'
 export { default as jumpToSourceBabelPlugin } from './jump-to-source-babel'
 export {