rnxsim 0.1.519 → 0.1.520

package/cli/cloud-dispatch.ts

@@ -157,13 +157,9 @@ export async function dispatchCloudBoundary({
     }
     try {
       const descriptor = cloudSession.requireCloudSessionShellUpdate()
-      await cloudClient.closeCloudBox(session)
+      await cloudClient.closeCloudSession(session)
       cloudSession.publishCloudSessionToShell(null, descriptor)
-      console.log(
-        session.service === 'box'
-          ? `  closed: remote box ${session.boxId}`
-          : `  closed: remote simulator ${session.simId}`,
-      )
+      console.log(`  closed: remote simulator ${session.simId}`)
       return { handled: true, code: 0 }
     } catch (error) {
       console.error(
@@ -173,21 +169,6 @@ export async function dispatchCloudBoundary({
     }
   }
 
-  // a box relays the whole bridge vocabulary to the page hosting its
-  // simulator, which runs the same shell the local CLI drives. so there is no
-  // subset to police: every command below reaches it through the ordinary
-  // bridge, which createBridgeFromParsed points at the box. claim is specific
-  // to nano.
-  if (session.service === 'box') {
-    if (command === 'claim') {
-      console.error(
-        `  rnx ${command} is not available for a box; its simulator is held by the Box page. use rnx box stop to end the box.`,
-      )
-      return { handled: true, code: 1 }
-    }
-    return { handled: false }
-  }
-
   if (command === 'claim') {
     try {
       const descriptor = cloudSession.requireCloudSessionShellUpdate()

package/cli/cloud-session.ts

@@ -10,10 +10,9 @@ export const RNX_SHELL_UPDATE_PREFIX = '__RNX_SHELL_UPDATE_V1__'
 export const RNX_SHELL_UPDATE_SET_PREFIX = `${RNX_SHELL_UPDATE_PREFIX}set:`
 export const RNX_SHELL_UPDATE_UNSET = `${RNX_SHELL_UPDATE_PREFIX}unset`
 
-// the shell's remote target. two services answer rnx commands and they are
-// addressed differently, so the session names which one it is rather than
-// leaving a reader to infer it from which fields happen to be filled in.
-export type CloudSession = CloudSimSession | CloudBoxSession
+// the shell's remote target: one simulator on the instance API, addressed by
+// its own id and token.
+export type CloudSession = CloudSimSession
 
 export type RemotePlatform = 'ios' | 'android'
 
@@ -23,39 +22,25 @@ export interface CloudSessionArtifactIdentity {
 }
 
 /**
- * one remote host, addressed by the box token, and the simulator inside it
- * that ordinary commands reach with the simulator token. this is what
- * `rnx ios --remote` produces.
+ * one remote simulator and the claim ordinary commands drive it with. the
+ * watch URL the create returned rides along so a reattach reopens the same
+ * simulator. a nano-box simulator keeps the box that hosts it; an instance
+ * API simulator has no box.
  */
 export interface CloudSimSession {
   version: 3
   service: 'sim'
-  boxId: string
-  boxToken: string
   simId: string
   apiOrigin: string
   claimId: string
   token: string
+  streamUrl?: string | null
   platform?: RemotePlatform
   device?: string
   artifact?: CloudSessionArtifactIdentity
-}
-
-/**
- * a micro box, whose simulator lives in its own Box page rather than in the
- * service. there is nothing to claim and no separate simulator token: the box
- * token addresses the box, and the box relays each command to the page that
- * is hosting it.
- */
-export interface CloudBoxSession {
-  version: 3
-  service: 'box'
-  boxId: string
-  boxToken: string
-  apiOrigin: string
-  platform?: RemotePlatform
-  device?: string
-  artifact?: CloudSessionArtifactIdentity
+  /** nano-box simulators only: the box that hosts them. absent on the instance API. */
+  boxId?: string
+  boxToken?: string
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -86,70 +71,43 @@ export function normalizeCloudOrigin(source: string): string {
 }
 
 export function createCloudSession(input: {
-  boxId: string
-  boxToken: string
   simId: string
   apiOrigin: string
   claimId: string
   token: string
+  streamUrl?: string | null
   platform?: RemotePlatform
   device?: string
   artifact?: CloudSessionArtifactIdentity
+  boxId?: string
+  boxToken?: string
 }): CloudSimSession {
+  const boxId = input.boxId?.trim() ?? ''
+  const boxToken = input.boxToken ?? ''
+  if ((boxId === '') !== (boxToken === '')) {
+    throw new Error('cloud session names a box with both its id and its token')
+  }
   const session: CloudSimSession = {
     version: CLOUD_SESSION_VERSION,
     service: 'sim',
-    boxId: input.boxId.trim(),
-    boxToken: input.boxToken,
     simId: input.simId.trim(),
     apiOrigin: normalizeCloudOrigin(input.apiOrigin.trim()),
     claimId: input.claimId.trim(),
     token: input.token,
+    ...(input.streamUrl ? { streamUrl: input.streamUrl } : {}),
     ...(input.platform ? { platform: input.platform } : {}),
     ...(input.device?.trim() ? { device: input.device.trim() } : {}),
     ...(input.artifact ? { artifact: input.artifact } : {}),
+    ...(boxId && boxToken ? { boxId, boxToken } : {}),
   }
-  if (
-    !session.boxId ||
-    !session.boxToken ||
-    !session.simId ||
-    !session.claimId ||
-    !session.token
-  ) {
-    throw new Error('cloud session requires box, simulator, origin, claim, and tokens')
-  }
-  return session
-}
-
-export function createCloudBoxSession(input: {
-  boxId: string
-  boxToken: string
-  apiOrigin: string
-  platform?: RemotePlatform
-  device?: string
-  artifact?: CloudSessionArtifactIdentity
-}): CloudBoxSession {
-  const session: CloudBoxSession = {
-    version: CLOUD_SESSION_VERSION,
-    service: 'box',
-    boxId: input.boxId.trim(),
-    boxToken: input.boxToken,
-    apiOrigin: normalizeCloudOrigin(input.apiOrigin.trim()),
-    ...(input.platform ? { platform: input.platform } : {}),
-    ...(input.device?.trim() ? { device: input.device.trim() } : {}),
-    ...(input.artifact ? { artifact: input.artifact } : {}),
-  }
-  if (!session.boxId || !session.boxToken) {
-    throw new Error('cloud box session requires a box, an origin, and a box token')
+  if (!session.simId || !session.claimId || !session.token) {
+    throw new Error('cloud session requires a simulator, an origin, a claim, and a token')
   }
   return session
 }
 
 export function serializeCloudSession(session: CloudSession): string {
-  const validated =
-    session.service === 'sim'
-      ? createCloudSession(session)
-      : createCloudBoxSession(session)
+  const validated = createCloudSession(session)
   return Buffer.from(JSON.stringify(validated), 'utf8').toString('base64url')
 }
 
@@ -175,14 +133,8 @@ export function parseCloudSession(encoded: string): CloudSession {
   if (!isRecord(parsed) || parsed.version !== CLOUD_SESSION_VERSION) {
     throw new Error(`${RNX_CLOUD_SESSION_ENV} is invalid`)
   }
-  const boxId = parsed.boxId
-  const boxToken = parsed.boxToken
   const apiOrigin = parsed.apiOrigin
-  if (
-    typeof boxId !== 'string' ||
-    typeof boxToken !== 'string' ||
-    typeof apiOrigin !== 'string'
-  ) {
+  if (typeof apiOrigin !== 'string') {
     throw new Error(`${RNX_CLOUD_SESSION_ENV} is invalid`)
   }
   const platform =
@@ -198,17 +150,10 @@ export function parseCloudSession(encoded: string): CloudSession {
             typeof parsed.artifact.bytes === 'number' ? parsed.artifact.bytes : undefined,
         }
       : undefined
+  const streamUrl = typeof parsed.streamUrl === 'string' ? parsed.streamUrl : undefined
+  const boxId = typeof parsed.boxId === 'string' ? parsed.boxId : undefined
+  const boxToken = typeof parsed.boxToken === 'string' ? parsed.boxToken : undefined
   try {
-    if (parsed.service === 'box') {
-      return createCloudBoxSession({
-        boxId,
-        boxToken,
-        apiOrigin,
-        platform,
-        device,
-        artifact,
-      })
-    }
     const simId = parsed.simId
     const claimId = parsed.claimId
     const token = parsed.token
@@ -221,15 +166,16 @@ export function parseCloudSession(encoded: string): CloudSession {
       throw new Error('unreadable cloud session')
     }
     return createCloudSession({
-      boxId,
-      boxToken,
       simId,
       apiOrigin,
       claimId,
       token,
+      streamUrl,
       platform,
       device,
       artifact,
+      boxId,
+      boxToken,
     })
   } catch {
     throw new Error(`${RNX_CLOUD_SESSION_ENV} is invalid`)

package/cli/commands/box.ts

@@ -11,7 +11,6 @@
 // boxTarget below.
 
 import { spawn } from 'node:child_process'
-import fs from 'node:fs/promises'
 import path from 'node:path'
 import { createInterface } from 'node:readline'
 import { BoxClientError, createBoxClient } from '@rnx/box/client'
@@ -34,6 +33,7 @@ import {
 import { readDefaultBox, writeDefaultBox } from '../../src/home-paths'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { authHeaderOrExit, cloudAccountIdOrExit, type CliAuth } from '../auth'
+import { produceCloudBoxArtifact, type CloudBoxArtifactProduction } from '../cloud-client'
 import { findRepositoryPackageRoot } from '../setup-repository'
 import { resolvePlacement } from '../ws-bridge'
 import { BundleFilePlane } from './box/bundle-plane'
@@ -214,7 +214,7 @@ function requireEndpoint(args: string[], label: string): string | null {
 
 /**
  * the cloud box service this command talks to, or null with the reason
- * printed. exported because `rnx ios --remote` creates a box too, and a second
+ * printed. exported because `rnx box send` creates a box too, and a second
  * spelling of where boxes live is a second place to configure.
  */
 export function cloudBoxEndpoint(args: string[], command: string): string | null {
@@ -520,10 +520,10 @@ function cloudBoxClient(options: {
 /**
  * create a Box that runs an app somebody already built.
  *
- * `box create --bundle` reaches this with a file from disk and `rnx ios
- * --remote` with the artifact it just produced. both are the same box: the
- * bundle is the whole project, the provenance says so, and the page that opens
- * it boots that bundle instead of building anything.
+ * `box create --bundle` reaches this with a file from disk and `rnx box send`
+ * with the artifact it just produced. both are the same box: the bundle is
+ * the whole project, the provenance says so, and the page that opens it boots
+ * that bundle instead of building anything.
  */
 export async function createPrebuiltBundleBox(options: {
   bundle: Uint8Array
@@ -589,22 +589,26 @@ async function runCloudBoxCreate(
     // a prebuilt box carries no sources, so there is no checkout to read and
     // this can run anywhere, including a directory that is not a repository.
     const resolved = path.resolve(bundlePath)
-    let read: Buffer
+    // the page boots these bytes with no asset server behind it, so the Metro
+    // assets beside the bundle are embedded the way every other remote path
+    // embeds them. the box service owns the size ceiling, not this producer.
+    let artifact: CloudBoxArtifactProduction
     try {
-      read = await fs.readFile(resolved)
+      artifact = await produceCloudBoxArtifact(resolved)
     } catch (error) {
       console.error(
-        `  ${rnx} box create: could not read the bundle at ${resolved}: ${
+        `  ${rnx} box create: could not prepare the bundle at ${resolved}: ${
           error instanceof Error ? error.message : String(error)
         }`,
       )
       return 1
     }
-    if (read.byteLength === 0) {
+    if (artifact.bytes.byteLength === 0) {
       console.error(`  ${rnx} box create: the bundle at ${resolved} is empty.`)
       return 1
     }
-    source = { bundle: new Uint8Array(read) }
+    for (const warning of artifact.warnings) console.error(`  ${warning}`)
+    source = { bundle: new Uint8Array(artifact.bytes) }
     defaultName = path.basename(resolved).replace(/\.[^.]+$/, '')
   } else {
     const root = findRepositoryPackageRoot(process.cwd())

package/cli/commands/inspect.ts

@@ -648,6 +648,35 @@ export function printShellPerfReport(result: Record<string, any>) {
       )
     }
   }
+  const liveFrames = result.liveFrames
+  if (liveFrames && typeof liveFrames === 'object') {
+    const tenant = liveFrames.tenant
+    const compositorLive =
+      liveFrames.compositor && typeof liveFrames.compositor === 'object'
+        ? liveFrames.compositor
+        : null
+    console.log(``)
+    console.log(`    live frames (GL / camera / video / WebGPU / maps):`)
+    if (tenant && typeof tenant === 'object') {
+      const presentation = tenant.presentation ?? {}
+      console.log(
+        `      tenant published ${presentation.publishes ?? 0} · skipped ${presentation.backpressureSkips ?? 0} (in-flight) · stale-healed ${presentation.staleHeals ?? 0} · density ${tenant.renderDensity ?? '?'}`,
+      )
+    } else {
+      console.log(`      tenant stats unavailable (tenant did not answer)`)
+    }
+    if (compositorLive) {
+      console.log(
+        `      compositor received ${compositorLive.publishes ?? 0} on ${compositorLive.activeChannels ?? 0} channel(s) · ${compositorLive.uploads ?? 0} texture uploads · ${compositorLive.uploadMsTotal ?? 0}ms total / ${compositorLive.uploadMsMax ?? 0}ms max`,
+      )
+      const shared = compositorLive.sharedDeviceImages
+      if (shared && typeof shared === 'object') {
+        console.log(
+          `      shared device: ${shared.bitmapUploadRequests ?? 0} upload requests · ${shared.bitmapUploadsHeld ?? 0} held (motion) · ${shared.bitmapUploadBytes ?? 0} bytes · ${shared.bitmapCacheHits ?? 0} cache hits`,
+        )
+      }
+    }
+  }
   if (surfaces.length > 0) {
     console.log(``)
     console.log(`    surfaces (last 100 frames):`)
@@ -3749,9 +3778,13 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         // wrap in async to support await in worker mode. no identifier
         // rewriting — the snippet runs verbatim so tokens like `root`,
         // `debug`, `test` refer to whatever the user actually typed.
+        // multi-statement snippets need a block body: the bare expression
+        // form terminates at the first `;` (Unexpected token).
         let expandedCode = code
         if (!expandedCode.startsWith('(async')) {
-          expandedCode = `(async () => ${expandedCode})()`
+          expandedCode = /[;\n]/.test(expandedCode)
+            ? `(async () => { ${expandedCode} })()`
+            : `(async () => ${expandedCode})()`
         }
         const result = await bridge.send({ type: 'evaluate', code: expandedCode })
         console.log(JSON.stringify(result, null, 2))