@rallycry/conveyor-k3 0.1.6 → 0.1.8

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

@@ -683,6 +683,17 @@ function runRelayNow(root, invocation, io) {
       input: process.stdin,
       output: process.stdout
     };
+    const signals = ["SIGINT", "SIGTERM", "SIGHUP"];
+    const cleanup = () => {
+      try {
+        unregisterRelay(root, record);
+      } catch {
+      }
+    };
+    const terminated = (signal) => {
+      finish(new Error("VM relay terminated"));
+      process.kill(process.pid, signal);
+    };
     const finish = (error) => {
       if (finished) return;
       finished = true;
@@ -690,13 +701,14 @@ function runRelayNow(root, invocation, io) {
       if (connectTimer) clearTimeout(connectTimer);
       socket.destroy();
       input.destroy();
-      try {
-        unregisterRelay(root, record);
-      } catch {
-      }
+      for (const signal of signals) process.removeListener(signal, terminated);
+      process.removeListener("exit", cleanup);
+      cleanup();
       if (error) process.exitCode = 1;
       resolve();
     };
+    process.once("exit", cleanup);
+    for (const signal of signals) process.once(signal, terminated);
     const exceedsLimit = (total) => total > MAX_RELAY_BYTES;
     socket.setTimeout(RELAY_IDLE_MS, () => finish(new Error("VM relay idle timeout")));
     socket.once("connect", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-k3",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "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",