@forgezero/agent 0.1.149 → 0.1.151

package/dist/agent-heartbeat.js

@@ -495,11 +495,9 @@ var stagedFromJournal = (journal, root) => ({
 });
 var restartAgent = async (target, run) => {
   const helpers = target === "compute" ? COMPUTE_HELPER_UNITS : ["forgezero-metal-helper.service"];
-  for (const unit of helpers)
-    await run({ command: "/usr/bin/systemctl", args: ["try-restart", unit] });
   const service = target === "compute" ? "forgezero-agent.service" : "forgezero-metal-agent.service";
-  if (!await runOk(run, "/usr/bin/systemctl", ["restart", service])) {
-    throw new Error(`systemd could not restart ${service}`);
+  if (!await runOk(run, "/usr/bin/systemctl", ["restart", ...helpers, service])) {
+    throw new Error(`systemd could not restart ${[...helpers, service].join(", ")}`);
   }
 };
 var candidateUnit = (target) => target === "compute" ? "forgezero-agent-candidate.service" : "forgezero-metal-agent-candidate.service";
@@ -532,34 +530,51 @@ var socketPaths = (publicSocket = process.env.FZ_AGENT_PUBLIC_SOCKET ?? DEFAULT_
 var targetProbe = (target, run) => target === "compute" ? () => probeAgentSocket() : async () => await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-agent.service"]) && await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-helper.service"]);
 function probeAgentSocket(socketPath = DEFAULT_SOCKET, timeoutMs = 5000) {
   return new Promise((resolve3) => {
-    const socket = connect2(socketPath);
     let settled = false;
-    let buffer = "";
+    let socket;
+    const deadline = Date.now() + timeoutMs;
     const finish = (value) => {
       if (settled)
         return;
       settled = true;
-      clearTimeout(timer);
-      socket.destroy();
+      socket?.destroy();
       resolve3(value);
     };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    socket.on("connect", () => socket.write(`{"op":"identity"}
+    const attempt = () => {
+      if (settled || Date.now() >= deadline)
+        return finish(false);
+      if (!existsSync3(socketPath)) {
+        const remaining = deadline - Date.now();
+        return setTimeout(attempt, Math.min(100, remaining));
+      }
+      let buffer = "";
+      const candidate = connect2(socketPath);
+      socket = candidate;
+      candidate.on("connect", () => candidate.write(`{"op":"identity"}
 `));
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("utf8");
-      const newline = buffer.indexOf(`
+      candidate.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        const newline = buffer.indexOf(`
 `);
-      if (newline < 0)
-        return;
-      try {
-        const response = JSON.parse(buffer.slice(0, newline));
-        finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
-      } catch {
-        finish(false);
-      }
-    });
-    socket.on("error", () => finish(false));
+        if (newline < 0)
+          return;
+        try {
+          const response = JSON.parse(buffer.slice(0, newline));
+          finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
+        } catch {
+          finish(false);
+        }
+      });
+      candidate.once("error", () => {
+        candidate.destroy();
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+          finish(false);
+        else
+          setTimeout(attempt, Math.min(100, remaining));
+      });
+    };
+    attempt();
   });
 }
 async function activateAgentRelease(staged, options = {}) {
@@ -933,7 +948,7 @@ async function postSignedNode(options, path, body) {
 }
 
 // src/version.ts
-var VERSION3 = "0.1.149";
+var VERSION3 = "0.1.151";
 
 // src/agent-heartbeat.ts
 function readAgentHostMetrics() {

package/dist/agent-update-helper.js

@@ -495,11 +495,9 @@ var stagedFromJournal = (journal, root) => ({
 });
 var restartAgent = async (target, run) => {
   const helpers = target === "compute" ? COMPUTE_HELPER_UNITS : ["forgezero-metal-helper.service"];
-  for (const unit of helpers)
-    await run({ command: "/usr/bin/systemctl", args: ["try-restart", unit] });
   const service = target === "compute" ? "forgezero-agent.service" : "forgezero-metal-agent.service";
-  if (!await runOk(run, "/usr/bin/systemctl", ["restart", service])) {
-    throw new Error(`systemd could not restart ${service}`);
+  if (!await runOk(run, "/usr/bin/systemctl", ["restart", ...helpers, service])) {
+    throw new Error(`systemd could not restart ${[...helpers, service].join(", ")}`);
   }
 };
 var candidateUnit = (target) => target === "compute" ? "forgezero-agent-candidate.service" : "forgezero-metal-agent-candidate.service";
@@ -532,34 +530,51 @@ var socketPaths = (publicSocket = process.env.FZ_AGENT_PUBLIC_SOCKET ?? DEFAULT_
 var targetProbe = (target, run) => target === "compute" ? () => probeAgentSocket() : async () => await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-agent.service"]) && await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-helper.service"]);
 function probeAgentSocket(socketPath = DEFAULT_SOCKET, timeoutMs = 5000) {
   return new Promise((resolve3) => {
-    const socket = connect2(socketPath);
     let settled = false;
-    let buffer = "";
+    let socket;
+    const deadline = Date.now() + timeoutMs;
     const finish = (value) => {
       if (settled)
         return;
       settled = true;
-      clearTimeout(timer);
-      socket.destroy();
+      socket?.destroy();
       resolve3(value);
     };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    socket.on("connect", () => socket.write(`{"op":"identity"}
+    const attempt = () => {
+      if (settled || Date.now() >= deadline)
+        return finish(false);
+      if (!existsSync3(socketPath)) {
+        const remaining = deadline - Date.now();
+        return setTimeout(attempt, Math.min(100, remaining));
+      }
+      let buffer = "";
+      const candidate = connect2(socketPath);
+      socket = candidate;
+      candidate.on("connect", () => candidate.write(`{"op":"identity"}
 `));
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("utf8");
-      const newline = buffer.indexOf(`
+      candidate.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        const newline = buffer.indexOf(`
 `);
-      if (newline < 0)
-        return;
-      try {
-        const response = JSON.parse(buffer.slice(0, newline));
-        finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
-      } catch {
-        finish(false);
-      }
-    });
-    socket.on("error", () => finish(false));
+        if (newline < 0)
+          return;
+        try {
+          const response = JSON.parse(buffer.slice(0, newline));
+          finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
+        } catch {
+          finish(false);
+        }
+      });
+      candidate.once("error", () => {
+        candidate.destroy();
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+          finish(false);
+        else
+          setTimeout(attempt, Math.min(100, remaining));
+      });
+    };
+    attempt();
   });
 }
 async function activateAgentRelease(staged, options = {}) {

package/dist/bootstrap.js

@@ -1460,7 +1460,7 @@ var UPDATE_RETRY_BASE_MS = 5 * 60000;
 var UPDATE_RETRY_MAX_MS = 24 * 60 * 60000;
 
 // src/version.ts
-var VERSION = "0.1.149";
+var VERSION = "0.1.151";
 
 // src/software.ts
 var PINNED_BUN_VERSION = "1.3.14";

package/dist/fz-agent.js

@@ -11632,7 +11632,7 @@ async function writeAndCloseProcessInput(input, value) {
 }
 
 // src/version.ts
-var VERSION2 = "0.1.149";
+var VERSION2 = "0.1.151";
 
 // src/ssh-bootstrap.ts
 function deriveMetalAdmissionProvisioning(lscpu) {
@@ -14654,11 +14654,9 @@ var stagedFromJournal = (journal, root) => ({
 });
 var restartAgent = async (target2, run2) => {
   const helpers = target2 === "compute" ? COMPUTE_HELPER_UNITS : ["forgezero-metal-helper.service"];
-  for (const unit of helpers)
-    await run2({ command: "/usr/bin/systemctl", args: ["try-restart", unit] });
   const service = target2 === "compute" ? "forgezero-agent.service" : "forgezero-metal-agent.service";
-  if (!await runOk(run2, "/usr/bin/systemctl", ["restart", service])) {
-    throw new Error(`systemd could not restart ${service}`);
+  if (!await runOk(run2, "/usr/bin/systemctl", ["restart", ...helpers, service])) {
+    throw new Error(`systemd could not restart ${[...helpers, service].join(", ")}`);
   }
 };
 var candidateUnit = (target2) => target2 === "compute" ? "forgezero-agent-candidate.service" : "forgezero-metal-agent-candidate.service";
@@ -14691,34 +14689,51 @@ var socketPaths = (publicSocket = process.env.FZ_AGENT_PUBLIC_SOCKET ?? DEFAULT_
 var targetProbe = (target2, run2) => target2 === "compute" ? () => probeAgentSocket() : async () => await runOk(run2, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-agent.service"]) && await runOk(run2, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-helper.service"]);
 function probeAgentSocket(socketPath = DEFAULT_SOCKET, timeoutMs = 5000) {
   return new Promise((resolve4) => {
-    const socket = connect6(socketPath);
     let settled = false;
-    let buffer = "";
+    let socket;
+    const deadline = Date.now() + timeoutMs;
     const finish = (value) => {
       if (settled)
         return;
       settled = true;
-      clearTimeout(timer);
-      socket.destroy();
+      socket?.destroy();
       resolve4(value);
     };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    socket.on("connect", () => socket.write(`{"op":"identity"}
+    const attempt = () => {
+      if (settled || Date.now() >= deadline)
+        return finish(false);
+      if (!existsSync14(socketPath)) {
+        const remaining = deadline - Date.now();
+        return setTimeout(attempt, Math.min(100, remaining));
+      }
+      let buffer = "";
+      const candidate = connect6(socketPath);
+      socket = candidate;
+      candidate.on("connect", () => candidate.write(`{"op":"identity"}
 `));
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("utf8");
-      const newline = buffer.indexOf(`
+      candidate.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        const newline = buffer.indexOf(`
 `);
-      if (newline < 0)
-        return;
-      try {
-        const response = JSON.parse(buffer.slice(0, newline));
-        finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
-      } catch {
-        finish(false);
-      }
-    });
-    socket.on("error", () => finish(false));
+        if (newline < 0)
+          return;
+        try {
+          const response = JSON.parse(buffer.slice(0, newline));
+          finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
+        } catch {
+          finish(false);
+        }
+      });
+      candidate.once("error", () => {
+        candidate.destroy();
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+          finish(false);
+        else
+          setTimeout(attempt, Math.min(100, remaining));
+      });
+    };
+    attempt();
   });
 }
 async function activateAgentRelease(staged, options = {}) {

package/dist/fz.js

@@ -8058,7 +8058,7 @@ var UPDATE_RETRY_BASE_MS = 5 * 60000;
 var UPDATE_RETRY_MAX_MS = 24 * 60 * 60000;
 
 // src/version.ts
-var VERSION2 = "0.1.149";
+var VERSION2 = "0.1.151";
 
 // src/software.ts
 var PINNED_BUN_VERSION = "1.3.14";

package/dist/metal-bootstrap.js

@@ -366,7 +366,7 @@ function systemdAgentEgressDirectives(loopbackTcpPorts = []) {
 }
 
 // src/version.ts
-var VERSION = "0.1.149";
+var VERSION = "0.1.151";
 
 // src/otel-collector.ts
 var FORGEZERO_OTEL_COLLECTOR_UNIT = "forgezero-otel-collector.service";

package/dist/operator-bootstrap.js

@@ -1460,7 +1460,7 @@ var UPDATE_RETRY_BASE_MS = 5 * 60000;
 var UPDATE_RETRY_MAX_MS = 24 * 60 * 60000;
 
 // src/version.ts
-var VERSION = "0.1.149";
+var VERSION = "0.1.151";
 
 // src/software.ts
 var PINNED_BUN_VERSION = "1.3.14";

package/dist/platform-fleet-verification.js

@@ -495,11 +495,9 @@ var stagedFromJournal = (journal, root) => ({
 });
 var restartAgent = async (target, run) => {
   const helpers = target === "compute" ? COMPUTE_HELPER_UNITS : ["forgezero-metal-helper.service"];
-  for (const unit of helpers)
-    await run({ command: "/usr/bin/systemctl", args: ["try-restart", unit] });
   const service = target === "compute" ? "forgezero-agent.service" : "forgezero-metal-agent.service";
-  if (!await runOk(run, "/usr/bin/systemctl", ["restart", service])) {
-    throw new Error(`systemd could not restart ${service}`);
+  if (!await runOk(run, "/usr/bin/systemctl", ["restart", ...helpers, service])) {
+    throw new Error(`systemd could not restart ${[...helpers, service].join(", ")}`);
   }
 };
 var candidateUnit = (target) => target === "compute" ? "forgezero-agent-candidate.service" : "forgezero-metal-agent-candidate.service";
@@ -532,34 +530,51 @@ var socketPaths = (publicSocket = process.env.FZ_AGENT_PUBLIC_SOCKET ?? DEFAULT_
 var targetProbe = (target, run) => target === "compute" ? () => probeAgentSocket() : async () => await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-agent.service"]) && await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-helper.service"]);
 function probeAgentSocket(socketPath = DEFAULT_SOCKET, timeoutMs = 5000) {
   return new Promise((resolve3) => {
-    const socket = connect2(socketPath);
     let settled = false;
-    let buffer = "";
+    let socket;
+    const deadline = Date.now() + timeoutMs;
     const finish = (value) => {
       if (settled)
         return;
       settled = true;
-      clearTimeout(timer);
-      socket.destroy();
+      socket?.destroy();
       resolve3(value);
     };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    socket.on("connect", () => socket.write(`{"op":"identity"}
+    const attempt = () => {
+      if (settled || Date.now() >= deadline)
+        return finish(false);
+      if (!existsSync3(socketPath)) {
+        const remaining = deadline - Date.now();
+        return setTimeout(attempt, Math.min(100, remaining));
+      }
+      let buffer = "";
+      const candidate = connect2(socketPath);
+      socket = candidate;
+      candidate.on("connect", () => candidate.write(`{"op":"identity"}
 `));
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("utf8");
-      const newline = buffer.indexOf(`
+      candidate.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        const newline = buffer.indexOf(`
 `);
-      if (newline < 0)
-        return;
-      try {
-        const response = JSON.parse(buffer.slice(0, newline));
-        finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
-      } catch {
-        finish(false);
-      }
-    });
-    socket.on("error", () => finish(false));
+        if (newline < 0)
+          return;
+        try {
+          const response = JSON.parse(buffer.slice(0, newline));
+          finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
+        } catch {
+          finish(false);
+        }
+      });
+      candidate.once("error", () => {
+        candidate.destroy();
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+          finish(false);
+        else
+          setTimeout(attempt, Math.min(100, remaining));
+      });
+    };
+    attempt();
   });
 }
 async function activateAgentRelease(staged, options = {}) {
@@ -3066,7 +3081,7 @@ function requestSoftware(requirements, socketPath = DEFAULT_SOFTWARE_HELPER_SOCK
 }
 
 // src/version.ts
-var VERSION3 = "0.1.149";
+var VERSION3 = "0.1.151";
 
 // src/egress-policy.ts
 import { realpathSync as realpathSync3 } from "node:fs";

package/dist/provision.js

@@ -495,11 +495,9 @@ var stagedFromJournal = (journal, root) => ({
 });
 var restartAgent = async (target, run) => {
   const helpers = target === "compute" ? COMPUTE_HELPER_UNITS : ["forgezero-metal-helper.service"];
-  for (const unit of helpers)
-    await run({ command: "/usr/bin/systemctl", args: ["try-restart", unit] });
   const service = target === "compute" ? "forgezero-agent.service" : "forgezero-metal-agent.service";
-  if (!await runOk(run, "/usr/bin/systemctl", ["restart", service])) {
-    throw new Error(`systemd could not restart ${service}`);
+  if (!await runOk(run, "/usr/bin/systemctl", ["restart", ...helpers, service])) {
+    throw new Error(`systemd could not restart ${[...helpers, service].join(", ")}`);
   }
 };
 var candidateUnit = (target) => target === "compute" ? "forgezero-agent-candidate.service" : "forgezero-metal-agent-candidate.service";
@@ -532,34 +530,51 @@ var socketPaths = (publicSocket = process.env.FZ_AGENT_PUBLIC_SOCKET ?? DEFAULT_
 var targetProbe = (target, run) => target === "compute" ? () => probeAgentSocket() : async () => await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-agent.service"]) && await runOk(run, "/usr/bin/systemctl", ["is-active", "--quiet", "forgezero-metal-helper.service"]);
 function probeAgentSocket(socketPath = DEFAULT_SOCKET, timeoutMs = 5000) {
   return new Promise((resolve3) => {
-    const socket = connect2(socketPath);
     let settled = false;
-    let buffer = "";
+    let socket;
+    const deadline = Date.now() + timeoutMs;
     const finish = (value) => {
       if (settled)
         return;
       settled = true;
-      clearTimeout(timer);
-      socket.destroy();
+      socket?.destroy();
       resolve3(value);
     };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    socket.on("connect", () => socket.write(`{"op":"identity"}
+    const attempt = () => {
+      if (settled || Date.now() >= deadline)
+        return finish(false);
+      if (!existsSync3(socketPath)) {
+        const remaining = deadline - Date.now();
+        return setTimeout(attempt, Math.min(100, remaining));
+      }
+      let buffer = "";
+      const candidate = connect2(socketPath);
+      socket = candidate;
+      candidate.on("connect", () => candidate.write(`{"op":"identity"}
 `));
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("utf8");
-      const newline = buffer.indexOf(`
+      candidate.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        const newline = buffer.indexOf(`
 `);
-      if (newline < 0)
-        return;
-      try {
-        const response = JSON.parse(buffer.slice(0, newline));
-        finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
-      } catch {
-        finish(false);
-      }
-    });
-    socket.on("error", () => finish(false));
+        if (newline < 0)
+          return;
+        try {
+          const response = JSON.parse(buffer.slice(0, newline));
+          finish(response.ok === false && response.error?.code === "APP_OPERATION_REFUSED");
+        } catch {
+          finish(false);
+        }
+      });
+      candidate.once("error", () => {
+        candidate.destroy();
+        const remaining = deadline - Date.now();
+        if (remaining <= 0)
+          finish(false);
+        else
+          setTimeout(attempt, Math.min(100, remaining));
+      });
+    };
+    attempt();
   });
 }
 async function activateAgentRelease(staged, options = {}) {
@@ -3066,7 +3081,7 @@ function requestSoftware(requirements, socketPath = DEFAULT_SOFTWARE_HELPER_SOCK
 }
 
 // src/version.ts
-var VERSION3 = "0.1.149";
+var VERSION3 = "0.1.151";
 
 // src/egress-policy.ts
 import { realpathSync as realpathSync3 } from "node:fs";

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** One package version shared by both public binaries. Pinned to package.json by tests. */
-export declare const VERSION = "0.1.149";
+export declare const VERSION = "0.1.151";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgezero/agent",
-  "version": "0.1.149",
+  "version": "0.1.151",
   "type": "module",
   "scripts": {
     "check": "tsc --noEmit",