@multiplayer-app/sandbox 7.0.5 → 7.0.6

package/dist/executor/qemu-executor.d.ts

@@ -8,8 +8,8 @@ export interface QemuConfig {
     kernelPath?: string;
     initrdPath?: string;
     vmDataPath?: string;
-    httpPortRangeStart?: number;
-    httpPortRangeEnd?: number;
+    portRangeStart?: number;
+    portRangeEnd?: number;
     vncBasePort?: number;
     serialBasePort?: number;
     accel?: string;

package/dist/executor/qemu-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qemu-executor.d.ts","sourceRoot":"","sources":["../../src/executor/qemu-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"qemu-executor.d.ts","sourceRoot":"","sources":["../../src/executor/qemu-executor.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -58,7 +58,7 @@ var import_os2 = __toESM(require("os"));
 var import_path2 = __toESM(require("path"));
 
 // package.json
-var version = "7.0.5";
+var version = "7.0.6";
 
 // src/images.ts
 var import_fs = __toESM(require("fs"));
@@ -646,6 +646,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"));
@@ -681,8 +682,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";
@@ -834,6 +835,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;
   }
@@ -983,9 +985,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,
@@ -1059,6 +1061,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);
@@ -1104,7 +1126,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"));
@@ -1241,7 +1263,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,
@@ -1404,7 +1426,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,
@@ -1450,7 +1472,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,
@@ -1499,13 +1521,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);
@@ -1523,7 +1545,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;
@@ -1815,7 +1837,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,
@@ -1933,7 +1955,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);
         });
@@ -1981,7 +2003,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;
@@ -2289,7 +2311,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,
@@ -2398,7 +2420,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);
       });
@@ -2421,7 +2443,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 {
@@ -2527,7 +2549,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(
@@ -2872,7 +2894,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 = {
@@ -3064,7 +3086,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,
@@ -4154,9 +4176,9 @@ function attachConsoleRelays(executor, sandboxSocket) {
 }
 
 // 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" });