@absolutejs/absolute 0.20.0-beta.42 → 0.20.0-beta.43

package/dist/mobile/index.js

@@ -3788,11 +3788,12 @@ import {
 
 // src/mobile/remoteMacWire.ts
 var ABSOLUTE_REMOTE_MAC_EVENT_PREFIX = "ABSOLUTE_REMOTE_MAC\t";
-var ABSOLUTE_REMOTE_MAC_PROTOCOL_VERSION = 1;
+var ABSOLUTE_REMOTE_MAC_PROTOCOL_VERSION = 2;
 
 // src/mobile/remoteMacProtocol.ts
 var PROFILE_FORMAT = 1;
 var REMOTE_STDIN_FLUSH_ATTEMPTS = 3;
+var REMOTE_SESSION_CLOSE_TIMEOUT_MS = 2000;
 var PROFILE_NAME = /^[a-z0-9](?:[a-z0-9._-]{0,62}[a-z0-9])?$/u;
 var SSH_DESTINATION = /^(?:[A-Za-z0-9._-]+@)?[A-Za-z0-9._:-]+$/u;
 var defaultProfilePath = () => join7(homedir2(), ".absolutejs", "mobile", "remote-macs.json");
@@ -3994,6 +3995,11 @@ var removeAbsoluteRemoteMacProfile = async (name, profilePath) => {
   return true;
 };
 var projectIdentity = (projectRoot, appId) => createHash7("sha256").update(`${resolvePath2(projectRoot)}\x00${appId}`).digest("hex").slice(0, 20);
+var createAbsoluteRemoteExpoIosDevProject = (config, projectRoot, profile) => {
+  if (config.engine !== "expo")
+    throw new TypeError("Remote Expo execution requires mobile.engine: expo.");
+  return createAbsoluteRemoteIosDevProject(config, projectRoot, profile);
+};
 var createAbsoluteRemoteIosDevProject = (config, projectRoot, profile) => ({
   cap: join7(resolvePath2(projectRoot), "node_modules", ".bin", "cap"),
   config,
@@ -4085,6 +4091,7 @@ var portableMobileConfig = (project) => ({
   appId: project.config.appId,
   appName: project.config.appName,
   bundleDirectory: portableRelativePath(project.projectRoot, project.config.bundleDirectory),
+  engine: project.config.engine,
   ...project.config.deepLinkScheme || project.config.deepLinkHosts.length > 1 || project.config.appleAppIdPrefix ? {
     deepLinks: {
       ...project.config.deepLinkScheme ? { scheme: project.config.deepLinkScheme } : {},
@@ -4097,6 +4104,16 @@ var portableMobileConfig = (project) => ({
     }
   } : {},
   entry: project.config.entry,
+  ...project.config.engine === "expo" ? {
+    expo: { sdkVersion: project.config.expoSdkVersion ?? 57 },
+    routes: {
+      default: "web",
+      native: Object.fromEntries(Object.entries(project.config.expoNativeRoutes).map(([route, module]) => [
+        route,
+        portableRelativePath(project.projectRoot, module)
+      ]))
+    }
+  } : {},
   ...project.config.iosVersion ? { ios: { version: project.config.iosVersion } } : {},
   nativeProject: {
     directory: portableRelativePath(project.projectRoot, project.config.nativeProjectDirectory),
@@ -4188,7 +4205,32 @@ var consumeLines2 = async (stream, onLine) => {
     reader.releaseLock();
   }
 };
-var startAbsoluteRemoteIosDevSession = async (options) => {
+var startAbsoluteRemoteExpoIosDevSession = async (options) => {
+  const session = await startAbsoluteRemoteDevSession({
+    certificateAuthorityPath: options.certificateAuthorityPath,
+    deviceIdentifier: options.deviceIdentifier,
+    https: options.https,
+    installAgent: options.installAgent,
+    log: options.log,
+    metroPort: options.metroPort,
+    onExpoPhaseTiming: options.onPhaseTiming,
+    onExpoStateChange: options.onStateChange,
+    port: options.port,
+    project: options.project,
+    serverHost: options.serverHost,
+    signal: options.signal,
+    syncProject: options.syncProject,
+    transport: options.transport
+  });
+  return {
+    close: session.close,
+    metroPort: options.metroPort,
+    platforms: ["ios"],
+    timings: session.timings
+  };
+};
+var startAbsoluteRemoteIosDevSession = (options) => startAbsoluteRemoteDevSession(options);
+var startAbsoluteRemoteDevSession = async (options) => {
   const startedAt = performance.now();
   const transport = options.transport ?? defaultTransport;
   const installAgent = options.installAgent ?? installAbsoluteRemoteMacAgent;
@@ -4202,9 +4244,22 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
   const encodedConfig = Buffer.from(JSON.stringify(portableMobileConfig(options.project))).toString("base64url");
   const encodedCertificateAuthority = options.certificateAuthorityPath ? (await readFile9(options.certificateAuthorityPath)).toString("base64url") : undefined;
   const physicalDevice = options.deviceIdentifier !== undefined;
-  let relayPort;
-  if (physicalDevice)
-    relayPort = options.port <= 49151 ? options.port + 16384 : options.port - 16384;
+  const expo = options.project.config.engine === "expo";
+  if (expo && options.metroPort === undefined)
+    throw new TypeError("Remote Expo execution requires a Metro port.");
+  if (options.metroPort === options.port)
+    throw new TypeError("Expo Metro and AbsoluteJS must use different ports.");
+  const translatedRelayPort = (sourcePort) => sourcePort <= 49151 ? sourcePort + 16384 : sourcePort - 16384;
+  const occupiedRemotePorts = new Set([options.port, options.metroPort].filter((value) => value !== undefined));
+  const reserveRelayPort = (sourcePort) => {
+    let candidate = translatedRelayPort(sourcePort);
+    while (occupiedRemotePorts.has(candidate))
+      candidate = candidate === 65535 ? 1024 : candidate + 1;
+    occupiedRemotePorts.add(candidate);
+    return candidate;
+  };
+  const relayPort = physicalDevice ? reserveRelayPort(options.port) : undefined;
+  const metroRelayPort = physicalDevice && options.metroPort !== undefined ? reserveRelayPort(options.metroPort) : undefined;
   if (physicalDevice && !options.serverHost)
     throw new Error("Remote physical iOS development requires the Remote Mac LAN host.");
   const remoteCommand = [
@@ -4217,6 +4272,7 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
     String(options.port),
     "--mobile-config",
     shellQuote(encodedConfig),
+    ...expo && options.metroPort !== undefined ? ["--metro-port", String(options.metroPort)] : [],
     ...encodedCertificateAuthority ? [
       "--certificate-authority",
       shellQuote(encodedCertificateAuthority)
@@ -4228,7 +4284,8 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
       "--server-host",
       shellQuote(options.serverHost ?? ""),
       "--relay-port",
-      String(relayPort)
+      String(relayPort),
+      ...expo && metroRelayPort !== undefined ? ["--metro-relay-port", String(metroRelayPort)] : []
     ] : []
   ].join(" ");
   const command = [
@@ -4237,6 +4294,10 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
     "ExitOnForwardFailure=yes",
     "-R",
     physicalDevice ? `127.0.0.1:${relayPort}:127.0.0.1:${options.port}` : `${options.port}:127.0.0.1:${options.port}`,
+    ...expo && options.metroPort !== undefined ? [
+      "-R",
+      physicalDevice ? `127.0.0.1:${metroRelayPort}:127.0.0.1:${options.metroPort}` : `${options.metroPort}:127.0.0.1:${options.metroPort}`
+    ] : [],
     "/bin/sh -lc",
     shellQuote(remoteCommand)
   ];
@@ -4262,11 +4323,19 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
     if (event.type === "native-log")
       options.nativeLog?.(event.entry);
     if (event.type === "state") {
-      ({ state } = event);
-      options.onStateChange?.(state);
+      if (expo)
+        options.onExpoStateChange?.(event.state);
+      else {
+        state = event.state;
+        options.onStateChange?.(state);
+      }
+    }
+    if (event.type === "timing") {
+      if (expo)
+        options.onExpoPhaseTiming?.(event);
+      else
+        options.onPhaseTiming?.(event);
     }
-    if (event.type === "timing")
-      options.onPhaseTiming?.(event);
     if (event.type === "ready") {
       ready = event;
       resolveReady();
@@ -4308,9 +4377,26 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
     pending.clear();
     return;
   });
-  await readyPromise;
+  try {
+    await readyPromise;
+  } catch (error) {
+    process2.stdin.end();
+    process2.kill();
+    await process2.exited.catch(() => {
+      return;
+    });
+    throw error;
+  }
   if (!ready)
     throw fatal ?? new Error("Remote Mac did not become ready.");
+  if (ready.engine !== options.project.config.engine) {
+    process2.stdin.end();
+    process2.kill();
+    await process2.exited.catch(() => {
+      return;
+    });
+    throw new Error("Remote Mac executor returned the wrong mobile engine.");
+  }
   const totalDuration = performance.now() - startedAt;
   let currentReady = {
     ...ready,
@@ -4322,11 +4408,11 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
       total: totalDuration
     }
   };
-  options.log?.(`Remote Mac connected (${options.project.profile.name}); agent ${agent.uploaded ? "uploaded" : "cache hit"}, project synced, and iOS ready in ${totalDuration.toFixed(2)}ms.`);
+  options.log?.(`Remote Mac connected (${options.project.profile.name}); agent ${agent.uploaded ? "uploaded" : "cache hit"}, project synced, and ${expo ? "Expo " : ""}iOS ready in ${totalDuration.toFixed(2)}ms.`);
   const request = (commandName) => {
     const id = randomUUID4();
     const response = new Promise((resolve6, reject) => pending.set(id, { reject, resolve: resolve6 }));
-    process2.stdin.write(`${JSON.stringify({ command: commandName, id, v: 1 })}
+    process2.stdin.write(`${JSON.stringify({ command: commandName, id, v: ABSOLUTE_REMOTE_MAC_PROTOCOL_VERSION })}
 `);
     const flush = async () => {
       for (let attempt = 0;attempt < REMOTE_STDIN_FLUSH_ATTEMPTS; attempt++) {
@@ -4345,13 +4431,24 @@ var startAbsoluteRemoteIosDevSession = async (options) => {
     if (closed)
       return;
     closed = true;
-    await request("close").catch(() => {
-      return;
-    });
+    const timeout = () => new Promise((resolve6) => setTimeout(() => resolve6("timeout"), REMOTE_SESSION_CLOSE_TIMEOUT_MS));
+    await Promise.race([
+      request("close").catch(() => {
+        return;
+      }),
+      timeout()
+    ]);
     process2.stdin.end();
-    await process2.exited.catch(() => {
-      return;
-    });
+    const exit = await Promise.race([
+      process2.exited.then(() => "exited").catch(() => "exited"),
+      timeout()
+    ]);
+    if (exit === "timeout") {
+      process2.kill();
+      await process2.exited.catch(() => {
+        return;
+      });
+    }
   };
   const makeSession = () => ({
     close,
@@ -7020,7 +7117,8 @@ var commandEnvironment = (options) => ({
     ABSOLUTE_EXPO_DEVELOPMENT_CA_PATH: options.certificateAuthorityPath
   } : {},
   ...options.androidOrigin ? { EXPO_PUBLIC_ABSOLUTE_DEV_ANDROID_ORIGIN: options.androidOrigin } : {},
-  ...options.iosOrigin ? { EXPO_PUBLIC_ABSOLUTE_DEV_IOS_ORIGIN: options.iosOrigin } : {}
+  ...options.iosOrigin ? { EXPO_PUBLIC_ABSOLUTE_DEV_IOS_ORIGIN: options.iosOrigin } : {},
+  ...options.metroHost ? { REACT_NATIVE_PACKAGER_HOSTNAME: options.metroHost } : {}
 });
 var absoluteExpoExecutable = async (project) => {
   const executable = join16(project, "node_modules", ".bin", "expo");
@@ -7034,8 +7132,8 @@ var absoluteExpoExecutable = async (project) => {
 var planAbsoluteExpoDevSession = (config, options) => {
   if (config.engine !== "expo")
     throw new TypeError("The Expo development controller requires Expo.");
-  if (options.platforms.length === 0)
-    throw new TypeError("Expo development requires a local target platform.");
+  if (options.platforms.length === 0 && options.metro === "external")
+    throw new TypeError("External Expo execution requires a target platform.");
   const secureOrigin = [options.androidOrigin, options.iosOrigin].some((origin) => origin && new URL(origin).protocol === "https:");
   if (secureOrigin && !options.certificateAuthorityPath)
     throw new TypeError("Expo HTTPS development requires the AbsoluteJS development CA certificate.");
@@ -7052,7 +7150,7 @@ var planAbsoluteExpoDevSession = (config, options) => {
     env,
     role: "metro"
   };
-  const prepare = {
+  const prepare = options.platforms.length === 0 ? undefined : {
     args: [
       "prebuild",
       "--clean",
@@ -7080,7 +7178,11 @@ var planAbsoluteExpoDevSession = (config, options) => {
     return command;
   });
   return {
-    commands: [prepare, metro, ...native],
+    commands: [
+      ...prepare ? [prepare] : [],
+      ...options.metro === "external" ? [] : [metro],
+      ...native
+    ],
     metroPort: options.metroPort,
     project: config.nativeProjectDirectory
   };
@@ -7169,47 +7271,48 @@ var startAbsoluteExpoDevSession = async (options) => {
   const prepareCommand = plan.commands.find((command) => command.role === "native-prepare");
   const metroCommand = plan.commands.find((command) => command.role === "metro");
   const nativeCommands = plan.commands.filter((command) => command.role === "native-build");
-  if (!prepareCommand)
-    throw new TypeError("Expo native preparation command is missing.");
-  if (!metroCommand)
-    throw new TypeError("Expo Metro command is missing.");
-  setState("preparing-native");
-  const prepareStarted = performance.now();
-  const prepareProcess = run(executable, prepareCommand.args, {
-    cwd: plan.project,
-    env: { ...process.env, ...prepareCommand.env },
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  forwardLines(prepareProcess, (line) => {
-    if (line)
-      log(`[prebuild] ${line}`);
-  });
-  const abortPrepare = () => void stopProcess(prepareProcess);
-  options.signal?.addEventListener("abort", abortPrepare, { once: true });
-  const prepareExit = await waitForExit(prepareProcess);
-  options.signal?.removeEventListener("abort", abortPrepare);
-  if (options.signal?.aborted)
-    throw abortError();
-  if (prepareExit !== 0) {
-    setState("failed");
-    throw new Error(`Expo native preparation exited with status ${prepareExit}.`);
-  }
-  const prepareMs = performance.now() - prepareStarted;
-  timings["preparing-native"] = prepareMs;
-  options.onPhaseTiming?.({
-    durationMs: prepareMs,
-    phase: "preparing-native"
-  });
-  setState("starting-metro");
+  const runPrepareCommand = async (command) => {
+    setState("preparing-native");
+    const prepareStarted = performance.now();
+    const prepareProcess = run(executable, command.args, {
+      cwd: plan.project,
+      env: { ...process.env, ...command.env },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    forwardLines(prepareProcess, (line) => {
+      if (line)
+        log(`[prebuild] ${line}`);
+    });
+    const abortPrepare = () => void stopProcess(prepareProcess);
+    options.signal?.addEventListener("abort", abortPrepare, { once: true });
+    const prepareExit = await waitForExit(prepareProcess);
+    options.signal?.removeEventListener("abort", abortPrepare);
+    if (options.signal?.aborted)
+      throw abortError();
+    if (prepareExit !== 0) {
+      setState("failed");
+      throw new Error(`Expo native preparation exited with status ${prepareExit}.`);
+    }
+    publishTiming("preparing-native", performance.now() - prepareStarted);
+  };
+  if (prepareCommand)
+    await runPrepareCommand(prepareCommand);
+  const managedMetro = metroCommand !== undefined;
+  if (managedMetro)
+    setState("starting-metro");
   const metroStarted = performance.now();
-  const metro = run(executable, metroCommand.args, {
+  const metro = metroCommand ? run(executable, metroCommand.args, {
     cwd: plan.project,
     env: { ...process.env, ...metroCommand.env },
     stdio: ["ignore", "pipe", "pipe"]
-  });
+  }) : undefined;
   let metroReady = false;
   let resolveMetro;
   const metroPromise = new Promise((resolve14, reject) => {
+    if (!metro) {
+      resolve14();
+      return;
+    }
     const timeout = setTimeout(() => {
       reject(new Error("Expo Metro did not become ready within 60 seconds."));
     }, METRO_READY_TIMEOUT_MS);
@@ -7224,15 +7327,19 @@ var startAbsoluteExpoDevSession = async (options) => {
       }
     });
   });
-  forwardLines(metro, (line) => {
-    if (line)
-      log(`[metro] ${line}`);
-    if (!metroReady && /(?:Waiting on|Metro waiting on|Dev server ready)/iu.test(line)) {
-      metroReady = true;
-      resolveMetro?.();
-    }
-  });
-  const abort = () => void stopProcess(metro);
+  if (metro)
+    forwardLines(metro, (line) => {
+      if (line)
+        log(`[metro] ${line}`);
+      if (!metroReady && /(?:Waiting on|Metro waiting on|Dev server ready)/iu.test(line)) {
+        metroReady = true;
+        resolveMetro?.();
+      }
+    });
+  const abort = () => {
+    if (metro)
+      stopProcess(metro);
+  };
   options.signal?.addEventListener("abort", abort, { once: true });
   const runNativeCommand = async (command) => {
     if (options.signal?.aborted)
@@ -7313,12 +7420,8 @@ var startAbsoluteExpoDevSession = async (options) => {
   try {
     await startPhysicalIosEnrollment();
     await metroPromise;
-    const metroMs = performance.now() - metroStarted;
-    timings["starting-metro"] = metroMs;
-    options.onPhaseTiming?.({
-      durationMs: metroMs,
-      phase: "starting-metro"
-    });
+    if (managedMetro)
+      publishTiming("starting-metro", performance.now() - metroStarted);
     await runNativeCommands(nativeCommands);
     setState("ready");
     return {
@@ -7327,14 +7430,16 @@ var startAbsoluteExpoDevSession = async (options) => {
       timings,
       close: async () => {
         options.signal?.removeEventListener("abort", abort);
-        await stopProcess(metro);
+        if (metro)
+          await stopProcess(metro);
         await closeEnrollmentServer();
         setState("closed");
       }
     };
   } catch (error) {
     options.signal?.removeEventListener("abort", abort);
-    await stopProcess(metro);
+    if (metro)
+      await stopProcess(metro);
     await closeEnrollmentServer();
     setState("failed");
     throw error;
@@ -9407,6 +9512,7 @@ export {
   syncAbsoluteRemoteMacProject,
   syncAbsoluteExpoWebAssets,
   startAbsoluteRemoteIosDevSession,
+  startAbsoluteRemoteExpoIosDevSession,
   startAbsoluteIosTcpRelay,
   startAbsoluteIosDevSession,
   startAbsoluteIosCaEnrollmentServer,
@@ -9483,6 +9589,7 @@ export {
   discoverAbsoluteDeviceCapabilities,
   directAbsoluteProjectPackages,
   createAbsoluteRemoteIosDevProject,
+  createAbsoluteRemoteExpoIosDevProject,
   createAbsoluteMobileUpgradeResponse,
   createAbsoluteMobileRouteMetadataPlugin,
   createAbsoluteMobilePreviewPlugin,
@@ -9545,5 +9652,5 @@ export {
   ABSOLUTE_ANDROID_RELEASE_FORMAT
 };
 
-//# debugId=711828E2D236C77164756E2164756E21
+//# debugId=97C358B153ACDA7B64756E2164756E21
 //# sourceMappingURL=index.js.map