rnxsim 0.1.499 → 0.1.501

package/cli/commands/platform.ts

@@ -1,9 +1,8 @@
 // `rnx ios` and `rnx android` — start a simulator on that platform.
 //
-// the platform picks the device; the command context picks WHERE the sim runs
-// (this machine, a local box, or `--remote`). there is deliberately no
-// per-place spelling such as `rnx remote ios`, so this file only resolves the
-// device and hands the rest to the normal open path.
+// the platform picks the device; the command context picks where the sim runs
+// (this machine, a local box, or the `rnx remote` namespace). this file resolves
+// the device and hands the rest to the normal open path.
 
 import {
   DEFAULT_DEVICE_BY_PLATFORM,
@@ -15,6 +14,7 @@ import {
 } from 'sootsim-engine/settings'
 import { settingsStore } from 'sootsim-engine/settings/store'
 import { rnxPublicBrand } from '../../src/public-brand'
+import { UnsupportedRemoteHostError } from '../cloud-client'
 import { rethrowIfExit } from '../run-rnx'
 
 const PLATFORM_LABEL: Record<RuntimePlatform, string> = {
@@ -26,13 +26,13 @@ function isDeviceModel(value: string): value is DeviceModel {
   return value in devices
 }
 
-const REMOTE_USAGE =
-  'usage: rnx ios --remote <local bundle.js|https://bundle-url> [--device <model>]'
-
 // flags this command reads for itself rather than treating as the bundle.
 const REMOTE_VALUE_FLAGS = new Set(['--device', '--name', '--endpoint'])
 
-function remoteInputFromArgs(args: string[]): {
+function remoteInputFromArgs(
+  args: string[],
+  platform: RuntimePlatform,
+): {
   bundlePath: string
   name: string | null
 } {
@@ -43,14 +43,15 @@ function remoteInputFromArgs(args: string[]): {
     if (arg === '--remote' || arg === '--nano') continue
     if (REMOTE_VALUE_FLAGS.has(arg)) {
       const value = args[++index] ?? null
-      if (!value) throw new Error(`rnx ios --remote ${arg} requires a value`)
+      if (!value) throw new Error(`rnx remote ${platform} ${arg} requires a value`)
       if (arg === '--name') name = value
       continue
     }
     const assigned = arg.match(/^(--[a-z-]+)=(.*)$/)
     if (assigned && REMOTE_VALUE_FLAGS.has(assigned[1] ?? '')) {
       const value = assigned[2] ?? ''
-      if (!value) throw new Error(`rnx ios --remote ${assigned[1]} requires a value`)
+      if (!value)
+        throw new Error(`rnx remote ${platform} ${assigned[1]} requires a value`)
       if (assigned[1] === '--name') name = value
       continue
     }
@@ -62,14 +63,20 @@ function remoteInputFromArgs(args: string[]): {
       arg.startsWith('--session=') ||
       arg.startsWith('--tab=')
     ) {
-      throw new Error('rnx ios --remote creates a new simulator and cannot target --sim')
+      throw new Error(
+        `rnx remote ${platform} creates a new simulator and cannot target --sim`,
+      )
     }
     if (arg.startsWith('-')) {
-      throw new Error(`rnx ios --remote does not support ${arg}`)
+      throw new Error(`rnx remote ${platform} does not support ${arg}`)
     }
     positional.push(arg)
   }
-  if (positional.length !== 1 || !positional[0]) throw new Error(REMOTE_USAGE)
+  if (positional.length !== 1 || !positional[0]) {
+    throw new Error(
+      `usage: rnx remote ${platform} <local bundle.js|https://bundle-url> [--device <model>]`,
+    )
+  }
   return { bundlePath: positional[0], name }
 }
 
@@ -87,7 +94,7 @@ function boxNameForBundle(bundlePath: string): string {
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-+|-+$/g, '')
-  if (!name) throw new Error(`rnx ios --remote could not name a box after ${bundlePath}`)
+  if (!name) throw new Error(`rnx remote could not name a box after ${bundlePath}`)
   return name
 }
 
@@ -99,7 +106,9 @@ export async function runPlatformCommand(
   // `--device` is applied to the settings store before dispatch, so a
   // contradiction shows up here as a platform mismatch. refuse it by name
   // rather than silently overriding whichever one the user meant.
-  const explicitDevice = args.find((_, i) => args[i - 1] === '--device')
+  const assignedDevice = args.find((arg) => arg.startsWith('--device='))
+  const explicitDevice =
+    args.find((_, i) => args[i - 1] === '--device') ?? assignedDevice?.slice(9)
   let selectedDevice: DeviceModel
   if (explicitDevice !== undefined) {
     if (!isDeviceModel(explicitDevice)) {
@@ -135,15 +144,16 @@ export async function runPlatformCommand(
   }
 
   if (args.includes('--remote')) {
-    if (platform !== 'ios') {
-      console.error(
-        `  ${rnxPublicBrand.commandName} android --remote is not available; remote simulators are iOS only`,
-      )
+    if (platform === 'android' && args.includes('--nano')) {
+      const error = new UnsupportedRemoteHostError('android', 'nano')
+      console.error(`  ${error.message}`)
       return 1
     }
     try {
-      const input = remoteInputFromArgs(args)
-      if (!args.includes('--nano')) return await runRemoteBox(input, args)
+      const input = remoteInputFromArgs(args, platform)
+      if (!args.includes('--nano')) {
+        return await runRemoteBox(input, args, platform, selectedDevice)
+      }
       const {
         publishCloudSessionToShell,
         readCloudSession,
@@ -151,30 +161,63 @@ export async function runPlatformCommand(
       } = await import('../cloud-session')
       const descriptor = requireCloudSessionShellUpdate()
       const { authHeaderOrExit, cloudAccountIdOrExit } = await import('../auth')
-      const { auth, header } = authHeaderOrExit('ios --remote')
+      const { auth, header } = authHeaderOrExit(`${platform} --remote`)
       const accountId = cloudAccountIdOrExit(auth)
+      const { closeCloudBox, createCloudBox, claimCloudSimulator, addCloudSimulator } =
+        await import('../cloud-client')
+      const artifact = await (
+        await import('../cloud-client')
+      ).produceCloudArtifact(input.bundlePath)
       const existingSession = readCloudSession()
-      if (existingSession) {
-        const { addCloudSimulator } = await import('../cloud-client')
-        const added = await addCloudSimulator(existingSession, {
-          device: selectedDevice,
-          authorization: header,
-          accountId,
-        })
-        publishCloudSessionToShell(added.session, descriptor)
-        console.log(`  remote simulator: ${added.receipt.simId}`)
-        console.log(`  claim expires: ${added.receipt.claim.expiresAt}`)
+      if (
+        existingSession &&
+        existingSession.service === 'sim' &&
+        existingSession.platform === platform &&
+        existingSession.artifact?.sha256 &&
+        existingSession.artifact.sha256 === artifact.sha256 &&
+        args.includes('--reconnect')
+      ) {
+        const claimed = await claimCloudSimulator(existingSession)
+        publishCloudSessionToShell(claimed.session, descriptor)
+        console.log(
+          `  reconnected to remote simulator: ${existingSession.simId} (${platform})`,
+        )
+        console.log(`  claim expires: ${claimed.claim.expiresAt}`)
         console.log(
           '  commands: describe, find, get tree|node|count|memory, wait ready|selector, do, reset, logs, state, screenshot',
         )
         return 0
       }
-      const { closeCloudBox, createCloudBox } = await import('../cloud-client')
+      if (existingSession) {
+        if (
+          existingSession.service === 'sim' &&
+          (!existingSession.platform || existingSession.platform === platform) &&
+          (!existingSession.artifact ||
+            existingSession.artifact.sha256 === artifact.sha256 ||
+            args.includes('--new'))
+        ) {
+          const added = await addCloudSimulator(existingSession, {
+            device: selectedDevice,
+            authorization: header,
+            accountId,
+          })
+          publishCloudSessionToShell(added.session, descriptor)
+          console.log(`  remote simulator: ${added.receipt.simId}`)
+          console.log(`  claim expires: ${added.receipt.claim.expiresAt}`)
+          console.log(
+            '  commands: describe, find, get tree|node|count|memory, wait ready|selector, do, reset, logs, state, screenshot',
+          )
+          return 0
+        }
+        await closeCloudBox(existingSession)
+        publishCloudSessionToShell(null, descriptor)
+      }
       const created = await createCloudBox({
         bundlePath: input.bundlePath,
         device: selectedDevice,
         authorization: header,
         accountId,
+        platform,
       })
       try {
         publishCloudSessionToShell(created.session, descriptor)
@@ -185,6 +228,7 @@ export async function runPlatformCommand(
       const receipt = created.receipt
       const produced = created.artifact
       console.log(`  remote simulator: ${receipt.simulator.simId}`)
+      console.log(`  platform: ${platform}`)
       console.log(`  artifact: ${receipt.artifact.id} (${receipt.artifact.bytes} bytes)`)
       console.log(
         `  source bundle: sha256:${produced.source.sha256} (${produced.source.bytes} bytes)`,
@@ -209,7 +253,7 @@ export async function runPlatformCommand(
     } catch (error) {
       rethrowIfExit(error)
       console.error(
-        `  ${rnxPublicBrand.commandName} ios --remote failed: ${
+        `  ${rnxPublicBrand.commandName} ${platform} --remote failed: ${
           error instanceof Error ? error.message : String(error)
         }`,
       )
@@ -259,17 +303,16 @@ export function runRemotePlatformCommand(
   args: string[],
   opts: { port?: number } = {},
 ): Promise<number | undefined> {
-  if (platform === 'android') {
-    console.error(
-      `  ${rnxPublicBrand.commandName} remote android is not available: rnxsim/cloud only creates iOS simulators`,
-    )
+  if (platform === 'android' && args.includes('--nano')) {
+    const error = new UnsupportedRemoteHostError('android', 'nano')
+    console.error(`  ${error.message}`)
     return Promise.resolve(1)
   }
   return runPlatformCommand(platform, ['--remote', ...args], opts)
 }
 
 /**
- * `rnx ios --remote` — the app runs in a Box.
+ * `rnx ios --remote` and `rnx android --remote` — the app runs in a Box.
  *
  * the artifact is produced here, self-contained, exactly as it always was: one
  * JavaScript file with its Metro assets embedded, so nothing it needs is left
@@ -279,17 +322,69 @@ export function runRemotePlatformCommand(
 async function runRemoteBox(
   input: { bundlePath: string; name: string | null },
   args: string[],
+  platform: RuntimePlatform = 'ios',
+  selectedDevice?: string,
 ): Promise<number> {
-  const command = 'ios --remote'
-  const [{ produceCloudArtifact }, box, { authHeaderOrExit, cloudAccountIdOrExit }] =
-    await Promise.all([import('../cloud-client'), import('./box'), import('../auth')])
+  const command = `${platform} --remote`
+  const [
+    { produceCloudArtifact, closeCloudBox },
+    box,
+    { readCloudBoxSession },
+    { authHeaderOrExit, cloudAccountIdOrExit },
+    {
+      createCloudBoxSession,
+      publishCloudSessionToShell,
+      readCloudSession,
+      serializeCloudSession,
+      RNX_CLOUD_SESSION_ENV,
+    },
+  ] = await Promise.all([
+    import('../cloud-client'),
+    import('./box'),
+    import('rnx-cloud-box/client'),
+    import('../auth'),
+    import('../cloud-session'),
+  ])
+  const artifact = await produceCloudArtifact(input.bundlePath, Number.POSITIVE_INFINITY)
   const endpoint = box.cloudBoxEndpoint(args, command)
   if (!endpoint) return 1
+
+  const existingSession = readCloudSession()
+  if (
+    existingSession &&
+    existingSession.service === 'box' &&
+    existingSession.apiOrigin === endpoint &&
+    existingSession.platform === platform &&
+    existingSession.device === selectedDevice &&
+    existingSession.artifact?.sha256 === artifact.sha256
+  ) {
+    const live = await readCloudBoxSession({
+      endpoint: existingSession.apiOrigin,
+      boxId: existingSession.boxId,
+      accessToken: existingSession.boxToken,
+    })
+    if (live.sessionId) {
+      console.log(
+        `  reconnected to remote simulator: ${existingSession.boxId} (${platform})`,
+      )
+      console.log(
+        '  commands: describe, find, get tree|node|count|memory, wait ready|selector, do, reset, logs, state, screenshot',
+      )
+      return 0
+    }
+  }
+
   const { auth, header } = authHeaderOrExit(command)
   const accountId = cloudAccountIdOrExit(auth)
-  // the Box holds the bundle in parts, so the size a single message can carry
-  // is not what limits this one and there is no cap to apply here.
-  const artifact = await produceCloudArtifact(input.bundlePath, Number.POSITIVE_INFINITY)
+
+  if (existingSession) {
+    await closeCloudBox(existingSession)
+    try {
+      publishCloudSessionToShell(null)
+    } catch {
+      // no shell update channel is required outside an interactive rnx shell
+    }
+  }
   const created = await box.createPrebuiltBundleBox({
     bundle: new Uint8Array(artifact.bytes),
     name: input.name ?? boxNameForBundle(input.bundlePath),
@@ -299,7 +394,27 @@ async function runRemoteBox(
     accountId,
   })
   const produced = artifact.receipt
+  const session = createCloudBoxSession({
+    boxId: created.id,
+    boxToken: created.accessToken ?? '',
+    apiOrigin: endpoint,
+    platform,
+    device: selectedDevice,
+    artifact: {
+      sha256: artifact.sha256,
+      bytes: artifact.bytes.length,
+    },
+  })
+  try {
+    publishCloudSessionToShell(session)
+  } catch {
+    // shell update fd not configured
+  }
+  process.env[RNX_CLOUD_SESSION_ENV] = serializeCloudSession(session)
+
   console.log(`  box: ${created.id} (${artifact.bytes.length} bytes)`)
+  console.log(`  platform: ${platform}`)
+  if (selectedDevice) console.log(`  device: ${selectedDevice}`)
   console.log(
     `  source bundle: sha256:${produced.source.sha256} (${produced.source.bytes} bytes)`,
   )
@@ -313,11 +428,18 @@ async function runRemoteBox(
   // against it, so say which one won rather than leaving it invisible.
   if (artifact.assetsDirectory) console.log(`  asset dest: ${artifact.assetsDirectory}`)
   for (const warning of artifact.warnings) console.warn(`  warning: ${warning}`)
-  const pageUrl = created.description.pageUrl
-  if (!pageUrl) {
+  console.log(
+    '  commands: describe, find, get tree|node|count|memory, wait ready|selector, do, reset, logs, state, screenshot',
+  )
+  if (!created.description.pageUrl) {
     console.error('  the box service returned no page to open')
     return 1
   }
+  const pageUrl = new URL(created.description.pageUrl)
+  pageUrl.searchParams.set(
+    'device',
+    selectedDevice ?? DEFAULT_DEVICE_BY_PLATFORM[platform],
+  )
   console.log(`  open ${pageUrl}`)
-  return box.openInBrowser(pageUrl)
+  return box.openInBrowser(pageUrl.toString())
 }

package/cli/commands/preview.ts

@@ -26,7 +26,7 @@ rnx preview — publish a prebuilt React Native bundle as a standalone share
 usage:
   rnx preview <bundle.js|https://bundle-url> [--platform ios|android] [--open]
 
-The share contains the immutable build and its Metro assets. It is not a recorded replay.
+The share contains the immutable build and its automatically discovered Metro assets. It is not a recorded replay.
 `)
     return 0
   }