peachsim 0.1.664 → 0.1.666

package/src/expo-swift-host.ts

@@ -0,0 +1,248 @@
+// Expo's own autolinker selects app-owned Swift modules; the common Swift host
+// compiles their sources and a registration entry as one app process.
+import { execFile } from 'node:child_process'
+import { createHash } from 'node:crypto'
+import fs from 'node:fs'
+import { createRequire } from 'node:module'
+import os from 'node:os'
+import path from 'node:path'
+import { promisify } from 'node:util'
+import { isLoopbackHost } from './backend-origin'
+import { artifactFor, icuUrl, projectFor, serveSwiftPackageAsset } from './swift-host'
+import { MAX_SWIFT_COMPILE_FILES, MAX_SWIFT_COMPILE_SOURCE_BYTES } from './swift-submit'
+import type { IncomingMessage, ServerResponse } from 'node:http'
+
+const run = promisify(execFile)
+export const EXPO_SWIFT_ROUTE = '/__peach/expo-swift'
+export const EXPO_SWIFT_ENTRY = 'Sources/PeachExpoApp/PeachExpoEntry.swift'
+
+export async function collectExpoSwiftSources(
+  appRoot: string,
+): Promise<Record<string, string> | null> {
+  appRoot = fs.realpathSync(appRoot)
+  const appRequire = createRequire(path.join(appRoot, 'package.json'))
+  let autolinker: string
+  try {
+    autolinker = appRequire.resolve('expo-modules-autolinking/package.json')
+  } catch (error) {
+    if (
+      error &&
+      typeof error === 'object' &&
+      Reflect.get(error, 'code') === 'MODULE_NOT_FOUND'
+    )
+      return null
+    throw error
+  }
+  const { stdout } = await run(
+    process.execPath,
+    [
+      path.join(path.dirname(autolinker), 'bin/expo-modules-autolinking.js'),
+      'search',
+      '--platform',
+      'apple',
+      '--project-root',
+      appRoot,
+      '--json',
+    ],
+    { timeout: 30_000, maxBuffer: 8 * 1024 * 1024 },
+  )
+  const search: unknown = JSON.parse(stdout)
+  if (!search || typeof search !== 'object' || Array.isArray(search))
+    throw new Error('invalid Expo autolinking result')
+  const { stdout: resolvedText } = await run(
+    process.execPath,
+    [
+      path.join(path.dirname(autolinker), 'bin/expo-modules-autolinking.js'),
+      'resolve',
+      '--platform',
+      'apple',
+      '--project-root',
+      appRoot,
+      '--json',
+    ],
+    { timeout: 30_000, maxBuffer: 8 * 1024 * 1024 },
+  )
+  const resolved: unknown = JSON.parse(resolvedText)
+  const resolutions =
+    resolved && typeof resolved === 'object' ? Reflect.get(resolved, 'modules') : null
+  if (!Array.isArray(resolutions)) throw new Error('invalid Expo Apple resolution')
+  const files: Record<string, string> = {}
+  const targets: string[] = []
+  const classes: string[] = []
+  let bytes = 0
+  for (const entry of Object.values(search)) {
+    if (!entry || typeof entry !== 'object')
+      throw new Error('invalid Expo autolinking entry')
+    const sourceRoot = Reflect.get(entry, 'path')
+    if (typeof sourceRoot !== 'string')
+      throw new Error('Expo autolinking entry has no path')
+    const canonical = fs.realpathSync(sourceRoot)
+    // installed dependency implementations remain with their native seams.
+    if (canonical.split(path.sep).includes('node_modules')) continue
+    const resolution = resolutions.find(
+      (candidate) =>
+        candidate &&
+        typeof candidate === 'object' &&
+        Reflect.get(candidate, 'packageName') === Reflect.get(entry, 'name'),
+    )
+    const namespaces =
+      resolution && typeof resolution === 'object'
+        ? Reflect.get(resolution, 'swiftModuleNames')
+        : null
+    const modules =
+      resolution && typeof resolution === 'object'
+        ? Reflect.get(resolution, 'modules')
+        : null
+    if (!Array.isArray(modules) || modules.length === 0) continue
+    if (
+      !Array.isArray(namespaces) ||
+      namespaces.length !== 1 ||
+      typeof namespaces[0] !== 'string' ||
+      !/^[A-Za-z_][A-Za-z0-9_]*$/.test(namespaces[0])
+    )
+      throw new Error(
+        `${sourceRoot}: local Expo Swift modules need one Apple Swift module`,
+      )
+    const namespace: string = namespaces[0]
+    if (targets.includes(namespace))
+      throw new Error(`duplicate local Expo Swift module ${namespace}`)
+    targets.push(namespace)
+    for (const module of modules) {
+      const className =
+        module && typeof module === 'object' ? Reflect.get(module, 'class') : null
+      const name =
+        module && typeof module === 'object' ? Reflect.get(module, 'name') : null
+      if (
+        typeof className !== 'string' ||
+        !/^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)*$/.test(className) ||
+        (name !== null && typeof name !== 'string')
+      )
+        throw new Error(`${sourceRoot}: invalid Expo Apple module descriptor`)
+      classes.push(
+        `(${className.includes('.') ? className : `${namespace}.${className}`}.self, ${name === null ? 'nil' : JSON.stringify(name)})`,
+      )
+    }
+    const ios = path.join(canonical, 'ios')
+    if (fs.lstatSync(ios).isSymbolicLink())
+      throw new Error(`Expo Swift source directory is a symlink: ${ios}`)
+    const walk = (dir: string) => {
+      for (const child of fs
+        .readdirSync(dir, { withFileTypes: true })
+        .sort((a, b) => a.name.localeCompare(b.name))) {
+        const file = path.join(dir, child.name)
+        if (child.isSymbolicLink())
+          throw new Error(`Expo Swift source is a symlink: ${file}`)
+        if (child.isDirectory()) {
+          if (!child.name.startsWith('.') && child.name !== 'build') walk(file)
+          continue
+        }
+        if (!child.name.endsWith('.swift')) continue
+        const size = fs.statSync(file).size
+        bytes += size
+        if (
+          Object.keys(files).length + 1 > MAX_SWIFT_COMPILE_FILES - 2 ||
+          bytes > MAX_SWIFT_COMPILE_SOURCE_BYTES
+        )
+          throw new Error('Expo Swift sources exceed compile service caps')
+        files[
+          `Sources/${namespace}/${path.relative(ios, file).split(path.sep).join('/')}`
+        ] =
+          `#sourceLocation(file: ${JSON.stringify(file)}, line: 1)\n${fs.readFileSync(file, 'utf8')}`
+      }
+    }
+    walk(ios)
+  }
+  if (classes.length === 0) return null
+  files['Package.swift'] =
+    `// swift-tools-version: 6.0\nimport PackageDescription\nlet package = Package(name: "PeachExpo", targets: [${targets.map((name) => `.target(name: ${JSON.stringify(name)}, path: ${JSON.stringify(`Sources/${name}`)})`).join(', ')}, .executableTarget(name: "PeachExpoApp", path: "Sources/PeachExpoApp")])\n`
+  files[EXPO_SWIFT_ENTRY] =
+    `import SwiftUI\nimport ExpoModulesCore\n${targets.map((name) => `import ${name}\n`).join('')}\n@main struct PeachExpoApp: RNXPackage {\n  init() { MainActor.assumeIsolated { PeachExpoRuntime.register([${classes.join(', ')}]) } }\n  func view(props: JSON) -> PeachExpoNativeView { PeachExpoNativeView(props: props) }\n}\n\n@_expose(wasm, "peach_expo_call")\n@_cdecl("peach_expo_call")\n@MainActor public func peachExpoCall(_ payload: UnsafePointer<UInt8>?, _ length: Int32) -> UnsafeMutablePointer<UInt8>? {\n  PeachExpoRuntime.dispatch(payload, length)\n}\n`
+  return files
+}
+
+const compiling = new Map<string, Promise<unknown>>()
+
+export async function handleExpoSwiftRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+): Promise<boolean> {
+  const url = new URL(req.url ?? '/', 'http://localhost')
+  if (!url.pathname.startsWith('/__peach/swift') && url.pathname !== EXPO_SWIFT_ROUTE)
+    return false
+  const remote = req.socket.remoteAddress?.replace(/^::ffff:/, '')
+  const origin = req.headers.origin
+  if (
+    !remote ||
+    !isLoopbackHost(remote) ||
+    (origin && !isLoopbackHost(new URL(origin).hostname))
+  ) {
+    res.writeHead(403)
+    res.end('Expo Swift artifacts require a loopback client')
+    return true
+  }
+  res.setHeader('Access-Control-Allow-Origin', origin ?? '*')
+  res.setHeader('Vary', 'Origin')
+  res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin')
+  if (serveSwiftPackageAsset(url.pathname, res)) return true
+  if (url.pathname !== EXPO_SWIFT_ROUTE) return false
+  if (req.method !== 'GET') {
+    res.writeHead(405)
+    res.end('GET required')
+    return true
+  }
+  const root = url.searchParams.get('root')
+  if (!root || !path.isAbsolute(root)) {
+    res.writeHead(400)
+    res.end('missing absolute app root')
+    return true
+  }
+  try {
+    let pending = compiling.get(root)
+    if (!pending) {
+      pending = (async () => {
+        const files = await collectExpoSwiftSources(root)
+        if (!files) return null
+        const key = createHash('sha256').update(fs.realpathSync(root)).digest('hex')
+        const packagePath = path.join(os.tmpdir(), 'peach-expo-swift', key)
+        const sources = path.join(packagePath, 'Sources')
+        // this cache belongs to this adapter; original app sources are read only.
+        fs.rmSync(sources, { recursive: true, force: true })
+        fs.mkdirSync(sources, { recursive: true })
+        for (const [name, content] of Object.entries(files)) {
+          const target = path.join(packagePath, name)
+          fs.mkdirSync(path.dirname(target), { recursive: true })
+          fs.writeFileSync(target, content)
+        }
+        const moduleRoot = path.resolve(import.meta.dirname, '../../sootsim-swift')
+        const local = fs.existsSync(path.join(moduleRoot, 'toolchain.json'))
+        const artifact = await artifactFor(
+          projectFor(packagePath),
+          EXPO_SWIFT_ENTRY,
+          local ? moduleRoot : undefined,
+        )
+        const host = req.headers.host
+        if (!host) throw new Error('Expo Swift request has no host')
+        const base = `http://${host}`
+        return {
+          url: `${base}/__peach/swift/${artifact.hash}.wasm`,
+          hash: artifact.hash,
+          icuUrl: icuUrl(base, artifact),
+          rootId: `${key}/Expo`,
+        }
+      })()
+      compiling.set(root, pending)
+    }
+    const metadata = await pending
+    res.writeHead(200, {
+      'Content-Type': 'application/json',
+      'Cache-Control': 'no-store',
+    })
+    res.end(JSON.stringify(metadata))
+  } catch (error) {
+    res.writeHead(500, { 'Content-Type': 'text/plain' })
+    res.end(error instanceof Error ? error.message : String(error))
+  } finally {
+    compiling.delete(root)
+  }
+  return true
+}

package/src/host/bridge-host.ts

@@ -16,6 +16,7 @@ import {
   SOOTSIM_BRIDGE_SIM_CLOSE_REASON,
 } from '../bridge-constants.ts'
 import { getCliVersion } from '../cli-version.ts'
+import { handleExpoSwiftRequest } from '../expo-swift-host.ts'
 import {
   activeRuntimeDir as getActiveRuntimeDir,
   claimDaemonLockfile,
@@ -1482,6 +1483,24 @@ export class SootSimBridgeHost {
     res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin')
     res.setHeader('Document-Policy', 'js-profiling')
 
+    if (
+      req.url?.startsWith('/__peach/expo-swift') ||
+      req.url?.startsWith('/__peach/swift')
+    ) {
+      void handleExpoSwiftRequest(req, res)
+        .then((handled) => {
+          if (!handled) {
+            res.writeHead(404)
+            res.end('Swift 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
     // BEFORE the read-only method check below — otherwise tenant bundles

package/src/skills/builtin/a11y-review.ts

@@ -31,7 +31,9 @@ export const skill: RNXSkill = {
 
         try {
           await page.goto(context.url, { waitUntil: 'networkidle' })
-          await page.waitForFunction('window.__sootsimTest', { timeout: 10000 })
+          await page.waitForFunction('window.__sootsimTest', undefined, {
+            timeout: 10000,
+          })
           await page.waitForTimeout(2000)
 
           // get accessibility tree

package/src/skills/builtin/perf-profile.ts

@@ -44,9 +44,11 @@ export const skill: RNXSkill = {
 
         try {
           await page.goto(context.url, { waitUntil: 'networkidle' })
-          await page.waitForFunction('window.__sootsimTest && window.__sootsimA11y', {
-            timeout: 10000,
-          })
+          await page.waitForFunction(
+            'window.__sootsimTest && window.__sootsimA11y',
+            undefined,
+            { timeout: 10000 },
+          )
           await page.waitForTimeout(1000)
 
           // reset profiler

package/src/vite-plugin.ts

@@ -74,7 +74,7 @@ const rnAssetRegistryPath = path.resolve(
 )
 const reactBridgePath = path.resolve(
   workspaceRoot,
-  'packages/contrast-kit/src/react-bridge.ts',
+  'packages/peach-kit/src/react-bridge.ts',
 )
 const sootsimBrowserSourceAliases = [
   {
@@ -1344,7 +1344,7 @@ function reactBridgePlugin(): Plugin {
           importer.includes('/peachsim/src/') ||
           importer.includes('/peach-engine/src/') ||
           importer.includes('/peach-compat/src/') ||
-          importer.includes('/contrast-kit/src/') ||
+          importer.includes('/peach-kit/src/') ||
           importer.includes('react-reconciler')
 
         if (!shouldRedirect) return null
@@ -1401,7 +1401,7 @@ export function workerReactBridgePlugin(): Plugin {
           importer.includes('/peachsim/src/') ||
           importer.includes('/peach-engine/src/') ||
           importer.includes('/peach-compat/src/') ||
-          importer.includes('/contrast-kit/src/') ||
+          importer.includes('/peach-kit/src/') ||
           importer.includes('react-reconciler') ||
           importer.includes('/node_modules/')