refactor(onboard): pass heartbeat activity as data

Author: cv

src/lib/sandbox-base-image/local-build-heartbeat.test.ts

@@ -38,11 +38,8 @@ describe("local sandbox base-image build heartbeat", () => {
       Record<string, unknown>,
     ];
     expect(executable).toBe("/node");
-    expect(args.slice(0, 2)).toEqual([
-      "-e",
-      expect.stringContaining("Still working on sandbox base image build"),
-    ]);
-    expect(args.slice(2)).toEqual(["25000", "42"]);
+    expect(args.slice(0, 2)).toEqual(["-e", expect.any(String)]);
+    expect(args.slice(2)).toEqual(["25000", "42", "build"]);
     expect(options).toEqual({ env: {}, stdio: ["ignore", "inherit", "inherit"] });
     expect(fixture.child.unref).toHaveBeenCalledOnce();
     expect(fixture.child.kill).toHaveBeenCalledWith("SIGTERM");

src/lib/sandbox-base-image/local-build-heartbeat.ts

@@ -7,21 +7,20 @@ const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
 
 type HeartbeatActivity = "build" | "pull";
 
-function heartbeatChildScript(activity: HeartbeatActivity): string {
-  return [
-    "const intervalMs = Number(process.argv[1]);",
-    "const parentPid = Number(process.argv[2]);",
-    "const startedAt = Date.now();",
-    "const stop = () => process.exit(0);",
-    'process.on("SIGINT", stop);',
-    'process.on("SIGTERM", stop);',
-    "setInterval(() => {",
-    "  try { process.kill(parentPid, 0); } catch { stop(); return; }",
-    "  const elapsedSeconds = Math.max(0, Math.round((Date.now() - startedAt) / 1000));",
-    `  process.stdout.write(\`  ⏳ Still working on sandbox base image ${activity}… (\${elapsedSeconds}s elapsed)\\n\`);`,
-    "}, intervalMs);",
-  ].join("\n");
-}
+const HEARTBEAT_CHILD_SCRIPT = [
+  "const intervalMs = Number(process.argv[1]);",
+  "const parentPid = Number(process.argv[2]);",
+  "const activity = process.argv[3];",
+  "const startedAt = Date.now();",
+  "const stop = () => process.exit(0);",
+  'process.on("SIGINT", stop);',
+  'process.on("SIGTERM", stop);',
+  "setInterval(() => {",
+  "  try { process.kill(parentPid, 0); } catch { stop(); return; }",
+  "  const elapsedSeconds = Math.max(0, Math.round((Date.now() - startedAt) / 1000));",
+  "  process.stdout.write(`  ⏳ Still working on sandbox base image ${activity}… (${elapsedSeconds}s elapsed)\\n`);",
+  "}, intervalMs);",
+].join("\n");
 
 type SpawnHeartbeat = typeof spawn;
 
@@ -48,9 +47,10 @@ export function withLocalBuildHeartbeat<T>(
       options.nodeExecutable ?? process.execPath,
       [
         "-e",
-        heartbeatChildScript(options.activity ?? "build"),
+        HEARTBEAT_CHILD_SCRIPT,
         String(intervalMs),
         String(options.parentPid ?? process.pid),
+        options.activity ?? "build",
       ],
       { env: {}, stdio: ["ignore", "inherit", "inherit"] },
     );