@multiplayer-app/sandbox 7.0.5 → 7.0.6

package/README.md

@@ -173,7 +173,8 @@ pnpm --filter @multiplayer-app/sandbox run cli -- images pull --from s3://<bucke
 
 Base images can also be built from scratch with `scripts/setup-vm-images.sh`
 (QEMU/Firecracker kernel + initramfs) or `scripts/setup-docker-images.sh`
-(Docker engine images).
+(Docker engine images). For a step-by-step walkthrough of running `qemu`
+locally on macOS, see [`docs/qemu-local-setup.md`](../../docs/qemu-local-setup.md).
 
 To build a complete, portable catalog for all runners, use:
 

package/dist/cli.js

@@ -28,7 +28,7 @@ var import_config5 = require("dotenv/config");
 var import_commander = require("commander");
 
 // package.json
-var version = "7.0.5";
+var version = "7.0.6";
 
 // src/config.ts
 var import_os2 = __toESM(require("os"));
@@ -620,6 +620,7 @@ var MockExecutor = class {
 
 // src/executor/qemu-executor.ts
 var import_child_process2 = require("child_process");
+var import_http2 = __toESM(require("http"));
 var import_net = __toESM(require("net"));
 var import_path4 = __toESM(require("path"));
 var import_promises3 = __toESM(require("fs/promises"));
@@ -655,8 +656,8 @@ var QemuExecutor = class {
     this.usedSerialPorts = /* @__PURE__ */ new Set();
     this.bin = config.bin ?? "qemu-system-aarch64";
     this.vmDataPath = config.vmDataPath ?? import_path4.default.join(import_os6.default.tmpdir(), "qemu-vms");
-    this.httpPortStart = config.httpPortRangeStart ?? 9e3;
-    this.httpPortEnd = config.httpPortRangeEnd ?? 9099;
+    this.httpPortStart = config.portRangeStart ?? 9e3;
+    this.httpPortEnd = config.portRangeEnd ?? 9099;
     this.vncBasePort = config.vncBasePort ?? 5900;
     this.serialBasePort = config.serialBasePort ?? 8e3;
     this.accel = config.accel ?? "hvf";
@@ -808,6 +809,7 @@ var QemuExecutor = class {
     this.vms.set(spec.vmId, vm);
     if (runMode === "job") vm.serialBuffer = connectSerialBuffer(serialPort);
     await waitForQmp(qmpSocketPath);
+    if (runMode !== "job") await waitForHttp("127.0.0.1", hostPort);
     src_default.info({ vmId: spec.vmId, hostPort, vncPort, serialPort, runMode }, "qemu vm ready");
     return handle;
   }
@@ -957,9 +959,9 @@ var QemuExecutor = class {
   async proxyHttp(vmId, request) {
     const vm = this.vms.get(vmId);
     if (!vm?.handle.running) throw new Error(`vm ${vmId} is not running`);
-    const { default: http8 } = await import("http");
+    const { default: http9 } = await import("http");
     return new Promise((resolve, reject) => {
-      const req = http8.request(
+      const req = http9.request(
         {
           host: "127.0.0.1",
           port: vm.hostPort,
@@ -1033,6 +1035,26 @@ function waitForQmp(socketPath, timeoutMs = 3e4) {
     attempt();
   });
 }
+function waitForHttp(host, port, timeoutMs = 6e4) {
+  return new Promise((resolve, reject) => {
+    const deadline = Date.now() + timeoutMs;
+    const attempt = () => {
+      if (Date.now() > deadline)
+        return reject(new Error(`timed out waiting for HTTP at ${host}:${port}`));
+      const req = import_http2.default.get(`http://${host}:${port}/health`, (res) => {
+        if (res.statusCode && res.statusCode < 500) return resolve();
+        res.resume();
+        setTimeout(attempt, 1e3);
+      });
+      req.on("error", () => setTimeout(attempt, 1e3));
+      req.setTimeout(2e3, () => {
+        req.destroy();
+        setTimeout(attempt, 1e3);
+      });
+    };
+    attempt();
+  });
+}
 async function sendQmpCommand(socketPath, execute) {
   return new Promise((resolve, reject) => {
     const sock = import_net.default.createConnection(socketPath);
@@ -1078,7 +1100,7 @@ async function sendQmpCommand(socketPath, execute) {
 var import_child_process3 = require("child_process");
 var import_child_process4 = require("child_process");
 var import_util = require("util");
-var import_http2 = __toESM(require("http"));
+var import_http3 = __toESM(require("http"));
 var import_net2 = __toESM(require("net"));
 var import_path5 = __toESM(require("path"));
 var import_promises4 = __toESM(require("fs/promises"));
@@ -1215,7 +1237,7 @@ var FirecrackerExecutor = class {
       host_dev_name: tapName
     });
     await fcRequest(apiSocketPath, "PUT", "/actions", { action_type: "InstanceStart" });
-    if (runMode !== "job") await waitForHttp(guestIp, 8080);
+    if (runMode !== "job") await waitForHttp2(guestIp, 8080);
     const metadata = { apiSocketPath, tapName, subnet, guestIp, pid: proc.pid };
     const handle = {
       vmId: spec.vmId,
@@ -1378,7 +1400,7 @@ var FirecrackerExecutor = class {
     const vm = this.vms.get(vmId);
     if (!vm?.handle.running) throw new Error(`vm ${vmId} is not running`);
     return new Promise((resolve, reject) => {
-      const req = import_http2.default.request(
+      const req = import_http3.default.request(
         {
           host: vm.guestIp,
           port: 8080,
@@ -1424,7 +1446,7 @@ var FirecrackerExecutor = class {
 function fcRequest(socketPath, method, urlPath, body) {
   return new Promise((resolve, reject) => {
     const payload = JSON.stringify(body);
-    const req = import_http2.default.request(
+    const req = import_http3.default.request(
       {
         socketPath,
         method,
@@ -1473,13 +1495,13 @@ function waitForSocket(socketPath, timeoutMs = 1e4) {
     attempt();
   });
 }
-function waitForHttp(host, port, timeoutMs = 6e4) {
+function waitForHttp2(host, port, timeoutMs = 6e4) {
   return new Promise((resolve, reject) => {
     const deadline = Date.now() + timeoutMs;
     const attempt = () => {
       if (Date.now() > deadline)
         return reject(new Error(`timed out waiting for HTTP at ${host}:${port}`));
-      const req = import_http2.default.get(`http://${host}:${port}/health`, (res) => {
+      const req = import_http3.default.get(`http://${host}:${port}/health`, (res) => {
         if (res.statusCode && res.statusCode < 500) return resolve();
         res.resume();
         setTimeout(attempt, 1e3);
@@ -1497,7 +1519,7 @@ function waitForHttp(host, port, timeoutMs = 6e4) {
 // src/executor/docker-executor.ts
 var import_child_process5 = require("child_process");
 var import_util2 = require("util");
-var import_http3 = __toESM(require("http"));
+var import_http4 = __toESM(require("http"));
 var DEFAULT_EXEC_TIMEOUT_MS2 = 6e4;
 var MAX_EXEC_TIMEOUT_MS2 = 3e5;
 var MAX_OUTPUT_BYTES4 = 1024 * 1024;
@@ -1789,7 +1811,7 @@ var DockerExecutor = class {
     const vm = this.mustGet(vmId);
     if (!vm.handle.running) throw new Error(`vm ${vmId} is not running`);
     return new Promise((resolve, reject) => {
-      const req = import_http3.default.request(
+      const req = import_http4.default.request(
         {
           host: "127.0.0.1",
           port: vm.hostPort,
@@ -1907,7 +1929,7 @@ var DockerExecutor = class {
     const deadline = Date.now() + timeoutMs;
     for (; ; ) {
       const ok = await new Promise((resolve) => {
-        const req = import_http3.default.get({ host: "127.0.0.1", port, path: "/", timeout: 2e3 }, (res) => {
+        const req = import_http4.default.get({ host: "127.0.0.1", port, path: "/", timeout: 2e3 }, (res) => {
           res.resume();
           resolve(true);
         });
@@ -1955,7 +1977,7 @@ var import_util3 = require("util");
 var import_promises5 = __toESM(require("fs/promises"));
 var import_os8 = __toESM(require("os"));
 var import_path6 = __toESM(require("path"));
-var import_http4 = __toESM(require("http"));
+var import_http5 = __toESM(require("http"));
 var DEFAULT_EXEC_TIMEOUT_MS3 = 6e4;
 var MAX_EXEC_TIMEOUT_MS3 = 3e5;
 var MAX_OUTPUT_BYTES5 = 1024 * 1024;
@@ -2263,7 +2285,7 @@ var DockerSandboxExecutor = class {
     const vm = this.mustGet(vmId);
     if (!vm.handle.running) throw new Error(`vm ${vmId} is not running`);
     return new Promise((resolve, reject) => {
-      const req = import_http4.default.request(
+      const req = import_http5.default.request(
         {
           host: "127.0.0.1",
           port: vm.hostPort,
@@ -2372,7 +2394,7 @@ var DockerSandboxExecutor = class {
   }
   async probeAgent(port) {
     return new Promise((resolve) => {
-      const req = import_http4.default.get({ host: "127.0.0.1", port, path: "/", timeout: 2e3 }, (res) => {
+      const req = import_http5.default.get({ host: "127.0.0.1", port, path: "/", timeout: 2e3 }, (res) => {
         res.resume();
         resolve(true);
       });
@@ -2395,7 +2417,7 @@ var DockerSandboxExecutor = class {
 };
 
 // src/executor/remote-executor.ts
-var import_http5 = __toESM(require("http"));
+var import_http6 = __toESM(require("http"));
 var import_https = __toESM(require("https"));
 var JOB_POLL_INTERVAL_MS = 3e3;
 var RemoteExecutor = class {
@@ -2501,7 +2523,7 @@ var RemoteExecutor = class {
   }
   request(method, path8, body) {
     const url = new URL(this.base + path8);
-    const lib = url.protocol === "https:" ? import_https.default : import_http5.default;
+    const lib = url.protocol === "https:" ? import_https.default : import_http6.default;
     const payload = body !== void 0 ? JSON.stringify(body) : void 0;
     return new Promise((resolve, reject) => {
       const req = lib.request(
@@ -2846,7 +2868,7 @@ var LambdaMicrovmExecutor = class {
 };
 
 // src/executor/fargate-executor.ts
-var import_http6 = __toESM(require("http"));
+var import_http7 = __toESM(require("http"));
 var import_client_ecs = require("@aws-sdk/client-ecs");
 var JOB_POLL_INTERVAL_MS2 = 5e3;
 var FARGATE_MEM_RANGES = {
@@ -3038,7 +3060,7 @@ var FargateExecutor = class {
     const vm = this.mustGet(vmId);
     if (!vm.handle.running) throw new Error(`vm ${vmId} is not running`);
     return new Promise((resolve, reject) => {
-      const req = import_http6.default.request(
+      const req = import_http7.default.request(
         {
           host: vm.ip,
           port: this.config.guestPort ?? 8080,
@@ -4185,9 +4207,9 @@ async function prepareWorkerImages(config, env = process.env) {
 }
 
 // src/health-server.ts
-var import_http7 = __toESM(require("http"));
+var import_http8 = __toESM(require("http"));
 async function startSandboxHealthServer(options) {
-  const server = import_http7.default.createServer((req, res) => {
+  const server = import_http8.default.createServer((req, res) => {
     const pathname = new URL(req.url ?? "/", "http://localhost").pathname;
     if (pathname === `${options.pathPrefix}/healthz`) {
       res.writeHead(200, { "content-type": "application/json" });