@deeeed/metamask-harness 0.51.1 → 0.51.3

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 0.51.3 - 2026-09-14
+
+### Fixed
+
+- `fixtures set` on mobile bounds the setup-wallet leaf at six minutes instead of two: after an unlock the app hydrates every account before it answers the bridge again, and a large fixture on a loaded Mac took past the old bound while the wallet itself reached the unlocked home screen. `MM_HARNESS_FIXTURES_SET_TIMEOUT_MS` still overrides it.
+## 0.51.2 - 2026-09-14
+
+### Fixed
+
+- Mobile native builds no longer pass `--no-bundler` to Expo: a Debug configuration starts the bundler regardless, so 0.51.1 left Expo attached to a stray Metro on 8081 and the launch never returned. Instead the build env answers Expo's one `lsof` lookup for the Metro listener from the harness's `metro.pid`; Expo's 350 ms lsof budget is what a busy Mac missed. A reused Metro listener now records its pid too.
+
 ## 0.51.1 - 2026-09-13
 
 ### Fixed

package/adapters/mobile/open-device.sh

@@ -81,6 +81,46 @@ for _rb in "$SCRIPT_DIR/../shared/activate-repo-ruby.sh" "$SCRIPT_DIR/lib/activa
   [ -f "$_rb" ] && { . "$_rb"; break; }
 done
 unset _rb
+# shellcheck disable=SC1091
+for _hp in "$SCRIPT_DIR/../shared/harness-path.sh" "$SCRIPT_DIR/lib/harness-path.sh"; do
+  [ -f "$_hp" ] && { . "$_hp"; break; }
+done
+unset _hp
+
+# Expo's run:ios / run:android bookkeeping asks lsof which process listens on
+# the Metro port, before and after the native build, under a 350 ms budget.
+# lsof scans every process on the machine, so a busy Mac misses that budget
+# and Expo aborts a finished build with "Port became busy running another
+# process while the app was compiling". The harness started that listener and
+# recorded it in metro.pid: answer that one query from the record and hand
+# every other lsof call to the real binary.
+write_lsof_shim() {
+  local dir="$1" real_lsof
+  real_lsof="$(command -v lsof 2>/dev/null || true)"
+  [ -n "$real_lsof" ] || return 0
+  {
+    printf '#!/usr/bin/env bash\n'
+    printf 'REAL_LSOF=%q\n' "$real_lsof"
+    cat <<'SHIM'
+# Exactly Expo's listener query and nothing else. A recycled pid after a Metro
+# death is the only way this can lie, and a dead Metro fails the build anyway.
+if [ $# -eq 4 ] && [ "$1" = "-i:${MM_HARNESS_BUILD_WATCHER_PORT:-}" ] && [ "$2" = "-P" ] && [ "$3" = "-t" ] && [ "$4" = "-sTCP:LISTEN" ] \
+  && [ -f "${MM_HARNESS_METRO_PID_FILE:-/nonexistent}" ]; then
+  pid="$(cat "$MM_HARNESS_METRO_PID_FILE" 2>/dev/null)"
+  if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then printf '%s\n' "$pid"; exit 0; fi
+fi
+exec "$REAL_LSOF" "$@"
+SHIM
+  } > "$dir/lsof"
+  chmod +x "$dir/lsof"
+}
+
+metro_pid_file() {
+  command -v recipe_runtime_dir >/dev/null 2>&1 || return 1
+  local runtime
+  runtime="$(recipe_runtime_dir)" || return 1
+  printf '%s/%s/metro.pid' "$TARGET" "$runtime"
+}
 
 # --- iOS helpers --------------------------------------------------------------
 
@@ -90,7 +130,7 @@ ios_app_installed() {
 }
 
 run_ios_native_build() (
-  local sim_target="$1" bundle_id="$2" reason="$3" build_env="" build_script="" build_type=""
+  local sim_target="$1" bundle_id="$2" reason="$3" build_env="" build_script="" build_type="" shim_dir=""
   case "$bundle_id" in
     io.metamask.MetaMask|io.metamask) build_script="start:ios"; build_type="main" ;;
     io.metamask.MetaMask-Flask) build_script="start:ios:flask"; build_type="flask" ;;
@@ -102,11 +142,15 @@ run_ios_native_build() (
   printf '%s; installing with yarn %s (WATCHER_PORT=%s)\n' "$reason" "$build_script" "$PORT" >&2
   build_env="$(mktemp "${TMPDIR:-/tmp}/mm-harness-ios-build-env.XXXXXX")" || return 1
   chmod 600 "$build_env" || { rm -f "$build_env"; return 1; }
-  trap 'rm -f "$build_env"' EXIT HUP INT TERM
+  shim_dir="$(mktemp -d "${TMPDIR:-/tmp}/mm-harness-build-shim.XXXXXX")" || { rm -f "$build_env"; return 1; }
+  trap 'rm -rf "$build_env" "$shim_dir"' EXIT HUP INT TERM
+  write_lsof_shim "$shim_dir"
   {
     printf 'export MM_HARNESS_BUILD_WATCHER_PORT=%q\n' "$PORT"
     printf 'export MM_HARNESS_BUILD_IOS_SIMULATOR=%q\n' "$sim_target"
     printf 'export MM_HARNESS_BUILD_TYPE=%q\n' "$build_type"
+    printf 'export MM_HARNESS_METRO_PID_FILE=%q\n' "$(metro_pid_file || true)"
+    printf 'export PATH=%q:"$PATH"\n' "$shim_dir"
     cat <<'BUILD_ENV'
 mm_harness_restore_build_target() {
   export WATCHER_PORT="$MM_HARNESS_BUILD_WATCHER_PORT"
@@ -126,31 +170,6 @@ source() {
   mm_harness_restore_build_target
   return "$status"
 }
-# The harness owns Metro on WATCHER_PORT. Expo's own bundler management
-# re-checks that port after the build with lsof under a 350 ms budget, which a
-# loaded machine misses, and then aborts with "Port became busy". Build only:
-# --no-bundler, which Expo refuses next to --port, so the port argument goes.
-mm_harness_expo_build_args() {
-  local arg skip=false
-  MM_HARNESS_EXPO_ARGS=()
-  for arg in "$@"; do
-    if [ "$skip" = true ]; then skip=false; continue; fi
-    case "$arg" in
-      --port) skip=true; continue ;;
-      --port=*) continue ;;
-    esac
-    MM_HARNESS_EXPO_ARGS+=("$arg")
-  done
-  MM_HARNESS_EXPO_ARGS+=(--no-bundler)
-}
-yarn() {
-  if [ "${1:-}" = expo ] && [ "${2:-}" = run:ios ]; then
-    mm_harness_expo_build_args "$@"
-    command yarn "${MM_HARNESS_EXPO_ARGS[@]}"
-  else
-    command yarn "$@"
-  fi
-}
 mm_harness_restore_build_target
 BUILD_ENV
   } > "$build_env"
@@ -306,7 +325,7 @@ android_app_installed() {
 }
 
 run_android_native_build() (
-  local serial="$1" expo_device="$2" pkg="$3" reason="$4" build_env="" build_script=""
+  local serial="$1" expo_device="$2" pkg="$3" reason="$4" build_env="" build_script="" shim_dir=""
   case "$pkg" in
     io.metamask) build_script="start:android" ;;
     io.metamask.flask) build_script="start:android:flask" ;;
@@ -318,11 +337,15 @@ run_android_native_build() (
   printf '%s; installing with yarn %s (WATCHER_PORT=%s)\n' "$reason" "$build_script" "$PORT" >&2
   build_env="$(mktemp "${TMPDIR:-/tmp}/mm-harness-android-build-env.XXXXXX")" || return 1
   chmod 600 "$build_env" || { rm -f "$build_env"; return 1; }
-  trap 'rm -f "$build_env"' EXIT HUP INT TERM
+  shim_dir="$(mktemp -d "${TMPDIR:-/tmp}/mm-harness-build-shim.XXXXXX")" || { rm -f "$build_env"; return 1; }
+  trap 'rm -rf "$build_env" "$shim_dir"' EXIT HUP INT TERM
+  write_lsof_shim "$shim_dir"
   {
     printf 'export MM_HARNESS_BUILD_ANDROID_SERIAL=%q\n' "$serial"
     printf 'export MM_HARNESS_BUILD_ANDROID_EXPO_DEVICE=%q\n' "$expo_device"
     printf 'export MM_HARNESS_BUILD_WATCHER_PORT=%q\n' "$PORT"
+    printf 'export MM_HARNESS_METRO_PID_FILE=%q\n' "$(metro_pid_file || true)"
+    printf 'export PATH=%q:"$PATH"\n' "$shim_dir"
     cat <<'BUILD_ENV'
 mm_harness_restore_android_build_target() {
   export WATCHER_PORT="$MM_HARNESS_BUILD_WATCHER_PORT"
@@ -342,24 +365,9 @@ source() {
   mm_harness_restore_android_build_target
   return "$status"
 }
-# --no-bundler without --port: the harness owns Metro on WATCHER_PORT (see the
-# iOS build env for why).
-mm_harness_expo_build_args() {
-  local arg skip=false
-  MM_HARNESS_EXPO_ARGS=()
-  for arg in "$@"; do
-    if [ "$skip" = true ]; then skip=false; continue; fi
-    case "$arg" in
-      --port) skip=true; continue ;;
-      --port=*) continue ;;
-    esac
-    MM_HARNESS_EXPO_ARGS+=("$arg")
-  done
-}
 yarn() {
   if [ "${1:-}" = expo ] && [ "${2:-}" = run:android ]; then
-    mm_harness_expo_build_args "$@"
-    command yarn "${MM_HARNESS_EXPO_ARGS[@]}" "$MM_HARNESS_BUILD_ANDROID_EXPO_DEVICE" --no-bundler
+    command yarn "$@" "$MM_HARNESS_BUILD_ANDROID_EXPO_DEVICE"
   else
     command yarn "$@"
   fi

package/adapters/mobile/start-metro.sh

@@ -218,6 +218,12 @@ if metro_ready; then
     rm -f "$PID_FILE"
   elif metro_listener_valid; then
     printf 'Metro already running and valid on port %s\n' "$PORT" >&2
+    # A reused listener still needs its record: the native build answers
+    # Expo's port lookup from metro.pid.
+    if [ ! -f "$PID_FILE" ]; then
+      lsof -nP -iTCP:"$PORT" -sTCP:LISTEN -t 2>/dev/null | head -1 > "$PID_FILE" || true
+      [ -s "$PID_FILE" ] || rm -f "$PID_FILE"
+    fi
     exit 0
   else
     stop_metro_listener || exit 1

package/dist/commands/fixtures.js

@@ -10,6 +10,7 @@ import { applyDeviceTargeting } from "./device-target.js";
 import { ADAPTER_DETECT_NEXT, checkoutBusyOut, EXIT, flag, parseFlags, resolveAdapter, scriptOverride, spawnScript, spawnScriptStreaming, str, targetOf, usageOut } from "./shared.js";
 const FIXTURES_BOOLEANS = /* @__PURE__ */ new Set(["dev", "force", "json"]);
 const FIXTURE_STREAM_TIMEOUT_MS = 12e4;
+const MOBILE_SETUP_WALLET_TIMEOUT_MS = 36e4;
 async function handleFixtures(argv) {
   const { positional, options } = parseFlags(argv, FIXTURES_BOOLEANS);
   if (!positional[0]) return fixturesStatus(options);
@@ -246,8 +247,8 @@ async function handleFixturesLocked(argv) {
           }
         }
       }
-      const configuredTimeout = Number(process.env.MM_HARNESS_FIXTURES_SET_TIMEOUT_MS ?? FIXTURE_STREAM_TIMEOUT_MS);
-      const timeoutMs = Number.isFinite(configuredTimeout) && configuredTimeout > 0 ? configuredTimeout : FIXTURE_STREAM_TIMEOUT_MS;
+      const configuredTimeout = Number(process.env.MM_HARNESS_FIXTURES_SET_TIMEOUT_MS ?? MOBILE_SETUP_WALLET_TIMEOUT_MS);
+      const timeoutMs = Number.isFinite(configuredTimeout) && configuredTimeout > 0 ? configuredTimeout : MOBILE_SETUP_WALLET_TIMEOUT_MS;
       if (!resetError) {
         mobileSetupResult = await spawnScriptStreaming(
           setupWalletSh,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deeeed/metamask-harness",
-  "version": "0.51.1",
+  "version": "0.51.3",
   "type": "module",
   "bin": {
     "mm-harness": "bin/mm-harness"