vxrn 2.0.0-beta.99.1 → 2.6.1

package/src/utils/nativeRun.ts

@@ -1,5 +1,5 @@
 import { execFileSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readdirSync, readFileSync } from 'node:fs'
 import module from 'node:module'
 import path from 'node:path'
 
@@ -21,6 +21,8 @@ export function buildNativeRunCommand(args: {
   // whenever more than one simulator exists.
   if (args.simulator) argv.push('--simulator', args.simulator)
   if (args.udid) argv.push('--udid', args.udid)
+  if (args.platform === 'android' && process.env.ANDROID_SERIAL)
+    argv.push('--device', process.env.ANDROID_SERIAL)
   return {
     command: args.platform === 'ios' ? 'run-ios' : 'run-android',
     argv,
@@ -43,6 +45,28 @@ async function devServerRunning(port: number): Promise<boolean> {
   }
 }
 
+// community cli logs a missing android device as an error and still exits
+// 0, so a run with no target would read as a successful install. one checks
+// the target itself, with the adb community cli resolves.
+function connectedAndroidDevices(): string[] {
+  const sdk = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT
+  const adb = sdk ? path.join(sdk, 'platform-tools', 'adb') : 'adb'
+  let out: string
+  try {
+    out = execFileSync(adb, ['devices'], { encoding: 'utf8' })
+  } catch {
+    throw new Error(
+      `\nCould not run ${adb}. Install the Android SDK platform tools and set ANDROID_HOME.`
+    )
+  }
+  return out
+    .split('\n')
+    .slice(1)
+    .map((line) => line.trim().split(/\s+/))
+    .filter(([serial, state]) => serial && state === 'device')
+    .map(([serial]) => serial!)
+}
+
 export type NativeRunSpawn = (
   executable: string,
   argv: string[],
@@ -87,18 +111,27 @@ export async function nativeRun({
     )
   }
 
+  if (platform === 'android') {
+    const devices = connectedAndroidDevices()
+    const serial = process.env.ANDROID_SERIAL
+    if (!devices.length || (serial && !devices.includes(serial))) {
+      throw new Error(
+        serial
+          ? `\nAndroid device ${serial} is not connected (connected: ${devices.join(', ') || 'none'}).`
+          : '\nNo Android device or emulator is connected. Start an emulator or plug in a device, then re-run this command.'
+      )
+    }
+  }
+
   // source-built React-Core bakes RCT_METRO_PORT from this environment
   // into a preprocessor define that RCTBundleURLProvider uses as its
   // default packager port. with prebuilt pods the port is already baked
   // (8081), so the simulator default below is what points the app.
   process.env.RCT_METRO_PORT = String(resolvedPort)
 
-  // resolve the community cli from the user's project, since vxrn may be
-  // installed globally or at the root workspace.
-  const require = module.createRequire(root + '/')
-  const cliPackageJson = require.resolve('@react-native-community/cli/package.json', {
-    paths: [root],
-  })
+  // vxrn owns the cli; cwd still selects the app's config and native project.
+  const require = module.createRequire(import.meta.url)
+  const cliPackageJson = require.resolve('@react-native-community/cli/package.json')
   const bin = path.join(path.dirname(cliPackageJson), 'build', 'bin.js')
 
   spawn(process.execPath, [bin, command, ...argv], {
@@ -116,23 +149,18 @@ export async function nativeRun({
 // localhost at its baked-in port (8081 with prebuilt pods) and gives up
 // with "no script url" when the dev server lives on one's port. writing
 // the provider's jsLocation default aims it at the real server.
+// the bundle id the built app carries, read from the ios project either
+// prebuild generated, so an app configured by native.app or app.json both
+// resolve.
 export function resolveIosBundleId(root: string): string | null {
-  try {
-    const appJson = joinAppJson(root)
-    if (!appJson) return null
-    const parsed = JSON.parse(readFileSync(appJson, 'utf8')) as {
-      expo?: { ios?: { bundleIdentifier?: unknown } }
-    }
-    const id = parsed?.expo?.ios?.bundleIdentifier
-    return typeof id === 'string' && id ? id : null
-  } catch {
-    return null
-  }
-}
-
-function joinAppJson(root: string): string | null {
-  const file = path.join(root, 'app.json')
-  return existsSync(file) ? file : null
+  const iosDir = path.join(root, 'ios')
+  if (!existsSync(iosDir)) return null
+  const project = readdirSync(iosDir).find((entry) => entry.endsWith('.xcodeproj'))
+  if (!project) return null
+  const pbxproj = path.join(iosDir, project, 'project.pbxproj')
+  if (!existsSync(pbxproj)) return null
+  const match = readFileSync(pbxproj, 'utf8').match(/PRODUCT_BUNDLE_IDENTIFIER = "?([A-Za-z0-9.-]+)"?;/)
+  return match ? match[1] : null
 }
 
 function bootedSimulatorUdid(): string | null {

package/src/utils/nativeSourceArtifacts.test.ts

@@ -0,0 +1,39 @@
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, test, vi } from 'vitest'
+import { nativeSourceContract, renderSwiftSourceGlue, writeSwiftPackageArtifacts } from './nativeSourceContract'
+
+// directory enumeration order is unspecified and differs between node and bun.
+vi.mock('node:fs', async (importOriginal) => {
+  const fs = await importOriginal<typeof import('node:fs')>()
+  return {
+    ...fs,
+    readdirSync: (path: import('node:fs').PathLike, options: { withFileTypes: true }) => {
+      return fs.readdirSync(path, options)
+        .sort((a, b) => a.name < b.name ? 1 : a.name > b.name ? -1 : 0)
+    },
+  }
+})
+
+test('package hash and glue use canonical file order regardless of directory enumeration', () => {
+  const root = mkdtempSync(join(tmpdir(), 'one-source-order-'))
+  try {
+    const pkg = join(root, 'native-source')
+    mkdirSync(pkg)
+    const audio = '@MainActor final class Audio: PeachModule { init() {}\n func value() -> Double { 1 }\n}'
+    const echo = '@MainActor final class Echo: PeachModule { init() {}\n func value() -> Double { 2 }\n}'
+    writeFileSync(join(pkg, 'Echo.swift'), echo)
+    writeFileSync(join(pkg, 'Audio.swift'), audio)
+    const actual = writeSwiftPackageArtifacts(pkg)
+    const expected = renderSwiftSourceGlue('native_source', [
+      nativeSourceContract(join(pkg, 'Audio.swift'), audio),
+      nativeSourceContract(join(pkg, 'Echo.swift'), echo),
+    ])
+    expect(Object.keys(actual.files)).toEqual(['Audio.swift', 'Echo.swift'])
+    expect(actual.hash).toBe(expected.hash)
+    expect(actual.glue).toBe(expected.source)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})