@rallycry/conveyor-k3 0.1.5 → 0.1.7

package/dist/cli.js

@@ -9427,9 +9427,10 @@ async function installUnits(ports, bundle, cloudflaredBin, maintenanceHour) {
     changed = true;
   }
   if (changed) await runOrThrow(ports.exec, "systemctl", ["daemon-reload"]);
-  await runOrThrow(ports.exec, "systemctl", ["enable", "--now", TUNNEL_UNIT]);
-  await runOrThrow(ports.exec, "systemctl", ["enable", "--now", DAEMON_UNIT]);
-  await runOrThrow(ports.exec, "systemctl", ["enable", "--now", UPDATE_TIMER]);
+  await runOrThrow(ports.exec, "systemctl", ["enable", TUNNEL_UNIT]);
+  await runOrThrow(ports.exec, "systemctl", ["restart", TUNNEL_UNIT]);
+  await runOrThrow(ports.exec, "systemctl", ["enable", DAEMON_UNIT]);
+  await runOrThrow(ports.exec, "systemctl", ["enable", UPDATE_TIMER]);
 }
 async function recordSetupState(ports, bundle, appliedVersion, bins) {
   await ports.fs.ensureDir(STATE_DIR);
@@ -9472,6 +9473,25 @@ async function resolveBinaries(exec, state, selfPath) {
   };
 }
 
+// src/commands/setup-session.ts
+init_exec();
+async function withSetupConnection(ports, connection, enroll) {
+  for (const unit of [UPDATE_TIMER, UPDATE_UNIT, DAEMON_UNIT]) {
+    if (await ports.fs.readFile(`${SYSTEMD_DIR}/${unit}`))
+      await runOrThrow(ports.exec, "systemctl", ["stop", unit]);
+  }
+  let result;
+  try {
+    await connection.connect();
+    result = await enroll();
+  } finally {
+    connection.disconnect();
+  }
+  await runOrThrow(ports.exec, "systemctl", ["start", DAEMON_UNIT]);
+  await runOrThrow(ports.exec, "systemctl", ["start", UPDATE_TIMER]);
+  return result;
+}
+
 // src/lib/guest-vm.ts
 async function requireGuestVm(exec) {
   try {
@@ -10497,24 +10517,25 @@ async function runSetup(exec) {
   const cloudflaredBin = await ensureCloudflared(ports);
   await ensureCaPool(ports);
   const connection = new ClusterConnection({ apiUrl: env.apiUrl, clusterToken: env.clusterToken });
-  await connection.connect();
-  const bundle = await connection.enroll();
-  log(`Enrolled as ${bundle.hostname}.`);
-  await installUnits(ports, bundle, cloudflaredBin, bundle.desiredState.maintenance.hour);
-  const runningConveyorPods = await countRunningConveyorPods(exec);
-  const result = await reconcile(
-    { exec, fs: nodeFileSystem, runningConveyorPods },
-    bundle.desiredState
-  );
-  for (const warning of result.warnings) log(warning);
-  const saToken = await mintServiceAccountToken(ports);
-  await connection.completeEnrollment({ saToken });
-  await recordSetupState(ports, bundle, result.appliedVersion, {
-    bun: await resolveBunBin(ports),
-    cli: ports.cliBin,
-    cloudflared: cloudflaredBin
+  const bundle = await withSetupConnection(ports, connection, async () => {
+    const enrollment = await connection.enroll();
+    log(`Enrolled as ${enrollment.hostname}.`);
+    await installUnits(ports, enrollment, cloudflaredBin, enrollment.desiredState.maintenance.hour);
+    const runningConveyorPods = await countRunningConveyorPods(exec);
+    const result = await reconcile(
+      { exec, fs: nodeFileSystem, runningConveyorPods },
+      enrollment.desiredState
+    );
+    for (const warning of result.warnings) log(warning);
+    const saToken = await mintServiceAccountToken(ports);
+    await connection.completeEnrollment({ saToken });
+    await recordSetupState(ports, enrollment, result.appliedVersion, {
+      bun: await resolveBunBin(ports),
+      cli: ports.cliBin,
+      cloudflared: cloudflaredBin
+    });
+    return enrollment;
   });
-  connection.disconnect();
   const registries = parseRegistries(await nodeFileSystem.readFile(REGISTRIES_FILE));
   const missing = missingAuthHosts(registries, requiredAuthHosts(bundle.desiredState.namespaces));
   log("");

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.7",
   "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",