@rallycry/conveyor-k3 0.1.5 → 0.1.6

package/dist/vm-qemu.js

@@ -472,7 +472,7 @@ import { join } from "path";
 import { Socket } from "net";
 var MAX_RELAYS = 16;
 var MAX_RELAY_BYTES = 1024 * 1024 * 1024;
-var RELAY_LIFETIME_MS = 6e4;
+var RELAY_CONNECT_MS = 6e4;
 var RELAY_IDLE_MS = 3e4;
 var GUARD_FRESH_MS = 6e3;
 var RELAY_PREFIX = "--conveyor-vm-relay";
@@ -665,10 +665,10 @@ function currentGuardStillValid(root, runId) {
     return false;
   }
 }
-function runRelay(root, invocation) {
-  return Promise.resolve().then(() => runRelayNow(root, invocation));
+function runRelay(root, invocation, io) {
+  return Promise.resolve().then(() => runRelayNow(root, invocation, io));
 }
-function runRelayNow(root, invocation) {
+function runRelayNow(root, invocation, io) {
   const guard = readLiveGuard(root);
   assertApprovedDestination(root, invocation);
   const record = registerRelay(root, guard.runId);
@@ -677,15 +677,19 @@ function runRelayNow(root, invocation) {
     let sent = 0;
     let received = 0;
     let guardTimer;
-    let lifetimeTimer;
-    const socket = new Socket();
+    let connectTimer;
+    const { socket, input, output } = io ?? {
+      socket: new Socket(),
+      input: process.stdin,
+      output: process.stdout
+    };
     const finish = (error) => {
       if (finished) return;
       finished = true;
       if (guardTimer) clearInterval(guardTimer);
-      if (lifetimeTimer) clearTimeout(lifetimeTimer);
+      if (connectTimer) clearTimeout(connectTimer);
       socket.destroy();
-      process.stdin.destroy();
+      input.destroy();
       try {
         unregisterRelay(root, record);
       } catch {
@@ -695,30 +699,34 @@ function runRelayNow(root, invocation) {
     };
     const exceedsLimit = (total) => total > MAX_RELAY_BYTES;
     socket.setTimeout(RELAY_IDLE_MS, () => finish(new Error("VM relay idle timeout")));
+    socket.once("connect", () => {
+      if (connectTimer) clearTimeout(connectTimer);
+      connectTimer = void 0;
+    });
     socket.on("error", () => finish(new Error("VM relay connection failed")));
     socket.on("close", () => finish());
     socket.on("data", (chunk) => {
       received += chunk.length;
       if (exceedsLimit(received)) return finish(new Error("VM relay receive limit exceeded"));
-      if (!process.stdout.write(chunk)) socket.pause();
+      if (!output.write(chunk)) socket.pause();
     });
-    process.stdout.on("drain", () => socket.resume());
-    process.stdout.on("error", () => finish(new Error("VM relay output failed")));
-    process.stdin.on("data", (chunk) => {
+    output.on("drain", () => socket.resume());
+    output.on("error", () => finish(new Error("VM relay output failed")));
+    input.on("data", (chunk) => {
       sent += chunk.length;
       if (exceedsLimit(sent)) return finish(new Error("VM relay send limit exceeded"));
-      if (!socket.write(chunk)) process.stdin.pause();
+      if (!socket.write(chunk)) input.pause();
     });
-    socket.on("drain", () => process.stdin.resume());
-    process.stdin.on("end", () => socket.end());
-    process.stdin.on("error", () => finish(new Error("VM relay input failed")));
+    socket.on("drain", () => input.resume());
+    input.on("end", () => socket.end());
+    input.on("error", () => finish(new Error("VM relay input failed")));
     guardTimer = setInterval(() => {
       if (!currentGuardStillValid(root, record.runId))
         finish(new Error("VM relay guard is no longer healthy"));
     }, 2e3);
-    lifetimeTimer = setTimeout(
-      () => finish(new Error("VM relay lifetime exceeded")),
-      RELAY_LIFETIME_MS
+    connectTimer = setTimeout(
+      () => finish(new Error("VM relay connection timed out")),
+      RELAY_CONNECT_MS
     );
     socket.connect(invocation.port, invocation.address);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-k3",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Managed personal compute for Conveyor. Installs and maintains a k3s cluster that runs your own card builds, kept converged on Conveyor's desired state.",
   "keywords": [
     "cloudflared",