@rallycry/conveyor-k3 0.1.7 → 0.1.8

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