rn-iso 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-iso",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Isolated React Native dev environments per project/worktree",
   "type": "module",
   "bin": {

package/src/commands/android.js

@@ -60,10 +60,11 @@ export default function androidCommand(program) {
       }
       // With --managed-metro, rn-iso owns Metro: detached so it survives the
       // invoking shell (agents run builds from finite shells), output to the
-      // per-project log file, and the build CLI gets --no-packager /
-      // --no-bundler so it cannot start a second Metro on the same port.
-      // Without the flag, the build CLI owns Metro as usual (interactive
-      // bundler UX for humans).
+      // per-project log file. The build CLI is then kept from starting its own:
+      // bare RN gets --no-packager; expo gets --port and reuses the Metro
+      // already listening on that port. ensureMetro waits for /status so the
+      // port is bound before the build's reuse check runs. Without the flag,
+      // the build CLI owns Metro as usual (interactive bundler UX for humans).
       if (opts.managedMetro) {
         const metro = await ensureMetro({ projectPath: root, isExpo, port: proj.metroPort });
         if (metro.alreadyRunning) {
@@ -72,6 +73,9 @@ export default function androidCommand(program) {
           setMetro(root, proj.metroPort, metro.pid);
           console.log(chalk.dim(`Metro started detached (pid ${metro.pid}, port ${proj.metroPort})`));
           console.log(chalk.dim(`Metro log: ${logFileFor(root)}`));
+          if (!metro.ready) {
+            console.log(chalk.yellow(`Warning: Metro on port ${proj.metroPort} did not report ready; the build may start its own.`));
+          }
         }
       } else {
         const metroAlreadyUp = await isMetroRunning(proj.metroPort);

package/src/commands/ios.js

@@ -56,10 +56,11 @@ export default function iosCommand(program) {
       }
       // With --managed-metro, rn-iso owns Metro: detached so it survives the
       // invoking shell (agents run builds from finite shells), output to the
-      // per-project log file, and the build CLI gets --no-packager /
-      // --no-bundler so it cannot start a second Metro on the same port.
-      // Without the flag, the build CLI owns Metro as usual (interactive
-      // bundler UX for humans).
+      // per-project log file. The build CLI is then kept from starting its own:
+      // bare RN gets --no-packager; expo gets --port and reuses the Metro
+      // already listening on that port. ensureMetro waits for /status so the
+      // port is bound before the build's reuse check runs. Without the flag,
+      // the build CLI owns Metro as usual (interactive bundler UX for humans).
       if (opts.managedMetro) {
         const metro = await ensureMetro({ projectPath: root, isExpo, port: proj.metroPort });
         if (metro.alreadyRunning) {
@@ -68,6 +69,9 @@ export default function iosCommand(program) {
           setMetro(root, proj.metroPort, metro.pid);
           console.log(chalk.dim(`Metro started detached (pid ${metro.pid}, port ${proj.metroPort})`));
           console.log(chalk.dim(`Metro log: ${logFileFor(root)}`));
+          if (!metro.ready) {
+            console.log(chalk.yellow(`Warning: Metro on port ${proj.metroPort} did not report ready; the build may start its own.`));
+          }
         }
       } else {
         const metroAlreadyUp = await isMetroRunning(proj.metroPort);

package/src/metro.js

@@ -25,8 +25,8 @@ export function buildMetroSpawnArgs({ isExpo, port, extras = [] }) {
   };
 }
 
-export async function ensureMetro({ projectPath, isExpo, port, extras = [], detach = true }) {
-  if (await isMetroRunning(port)) return { alreadyRunning: true, pid: null };
+export async function ensureMetro({ projectPath, isExpo, port, extras = [], detach = true, readyTimeoutMs = 30000 }) {
+  if (await isMetroRunning(port)) return { alreadyRunning: true, pid: null, ready: true };
 
   const log = logFileFor(projectPath);
   const fd = openSync(log, 'a');
@@ -40,7 +40,22 @@ export async function ensureMetro({ projectPath, isExpo, port, extras = [], deta
     env: { ...process.env, RCT_METRO_PORT: String(port) },
   });
   if (detach) child.unref();
-  return { alreadyRunning: false, pid: child.pid };
+
+  // Wait until the dev server answers /status. The build CLI's "a Metro is
+  // already on this port, reuse it" detection only fires once the port is
+  // bound, so returning before that races the build into spawning a second
+  // Metro. readyTimeoutMs <= 0 skips the wait.
+  const ready = readyTimeoutMs > 0 ? await waitForMetroReady(port, readyTimeoutMs) : false;
+  return { alreadyRunning: false, pid: child.pid, ready };
+}
+
+export async function waitForMetroReady(port, timeoutMs = 30000, intervalMs = 500) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await isMetroRunning(port)) return true;
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+  return false;
 }
 
 export function killMetroByPid(pid) {

package/src/runner.js

@@ -76,11 +76,17 @@ export function detectScriptCli(scriptBody) {
   return 'unknown';
 }
 
-// Flag that stops the build CLI from spawning its own packager. rn-iso owns
-// Metro (detached, log file, pid tracked), so the build must not start a
-// second one on the same port.
-function skipPackagerFlag(cli) {
-  return cli === 'expo' ? '--no-bundler' : '--no-packager';
+// Flags that stop the build CLI from spawning its own packager when rn-iso owns
+// Metro (detached, log file, pid tracked). Bare RN takes --no-packager. Expo
+// gets NO flag: `expo run` rejects --port together with --no-bundler, and
+// --no-bundler also pins the dev server to 8081 with no override. Instead we
+// pass --port <managed port> and rely on `expo run` detecting the Metro already
+// listening on that port and reusing it (reuseExistingPort) rather than
+// spawning its own. Callers must have the managed Metro listening before the
+// build runs (ensureMetro waits for /status).
+function noPackagerFlags(cli, noPackager) {
+  if (!noPackager) return [];
+  return cli === 'expo' ? [] : ['--no-packager'];
 }
 
 // iOS run command. Prefers the project's `ios` script if present (the most
@@ -99,15 +105,14 @@ export function buildIosCommand({ projectRoot, packageManager, scriptName, isExp
       return buildScriptCommand(packageManager, scriptName, [
         deviceFlag,
         `--port ${port}`,
-        ...(noPackager ? [skipPackagerFlag(cli)] : []),
+        ...noPackagerFlags(cli, noPackager),
         ...tail,
       ]);
     }
   }
   const tailStr = tail.length ? ' ' + tail.join(' ') : '';
   if (isExpo) {
-    const skip = noPackager ? ' --no-bundler' : '';
-    return `npx expo run:ios --device ${udid} --port ${port}${skip}${tailStr}`;
+    return `npx expo run:ios --device ${udid} --port ${port}${tailStr}`;
   }
   const skip = noPackager ? ' --no-packager' : '';
   return `npx react-native run-ios --udid ${udid} --port ${port}${skip}${tailStr}`;
@@ -128,15 +133,14 @@ export function buildAndroidCommand({ projectRoot, packageManager, scriptName, i
       return buildScriptCommand(packageManager, scriptName, [
         deviceFlag,
         `--port ${port}`,
-        ...(noPackager ? [skipPackagerFlag(cli)] : []),
+        ...noPackagerFlags(cli, noPackager),
         ...tail,
       ]);
     }
   }
   const tailStr = tail.length ? ' ' + tail.join(' ') : '';
   if (isExpo) {
-    const skip = noPackager ? ' --no-bundler' : '';
-    return `npx expo run:android --device "${expoDeviceArg}" --port ${port}${skip}${tailStr}`;
+    return `npx expo run:android --device "${expoDeviceArg}" --port ${port}${tailStr}`;
   }
   const skip = noPackager ? ' --no-packager' : '';
   return `RCT_METRO_PORT=${port} npx react-native run-android --device ${serial}${skip}${tailStr}`;