@saleso.innovations/bridge 0.1.11 → 0.1.12

package/README.md

@@ -34,7 +34,7 @@ This installs the latest package, refreshes the CLI symlink, and restarts `cleos
 To pin a specific release (e.g. after a Cleos update):
 
 ```bash
-curl -fsSL https://amicable-elephant-407.convex.site/update-bridge.sh | bash -s -- 0.1.11
+curl -fsSL https://amicable-elephant-407.convex.site/update-bridge.sh | bash -s -- 0.1.12
 ```
 
 ## Manual usage

package/dist/ensureHermesApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureHermesApi.d.ts","sourceRoot":"","sources":["../src/ensureHermesApi.ts"],"names":[],"mappings":"AA8EA,wBAAsB,yBAAyB,IAAI,OAAO,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CA0BD;AAkDD,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAsB5D"}
+{"version":3,"file":"ensureHermesApi.d.ts","sourceRoot":"","sources":["../src/ensureHermesApi.ts"],"names":[],"mappings":"AAsEA,wBAAsB,yBAAyB,IAAI,OAAO,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CA0BD;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAsB5D"}

package/dist/ensureHermesApi.js

@@ -1,15 +1,8 @@
 import { randomBytes } from "node:crypto";
-import { execFile, spawn } from "node:child_process";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { promisify } from "node:util";
-import { DEFAULT_HERMES_API_URL } from "./constants.js";
-const execFileAsync = promisify(execFile);
 const HERMES_ENV_PATH = join(homedir(), ".hermes", ".env");
-const HEALTH_URL = DEFAULT_HERMES_API_URL.replace(/\/v1\/chat\/completions\/?$/, "/health");
-const HEALTH_POLL_MS = 1_000;
-const HEALTH_TIMEOUT_MS = 30_000;
 function parseEnvLine(line) {
     const trimmed = line.trim();
     if (!trimmed)
@@ -89,70 +82,26 @@ export async function ensureHermesApiConfigured() {
     }
     return { envPath: HERMES_ENV_PATH, changed, apiKey };
 }
-async function fetchHermesHealth(apiKey) {
-    const headers = {};
-    if (apiKey)
-        headers.authorization = `Bearer ${apiKey}`;
-    try {
-        const response = await fetch(HEALTH_URL, { headers, signal: AbortSignal.timeout(2_000) });
-        return response.ok;
-    }
-    catch {
-        return false;
-    }
-}
-async function tryRestartHermesGateway() {
-    const units = ["hermes-gateway.service", "hermes.service", "hermes-gateway", "hermes"];
-    for (const unit of units) {
-        try {
-            await execFileAsync("systemctl", ["try-restart", unit], { timeout: 10_000 });
-        }
-        catch {
-            // Unit may not exist — keep trying other names.
-        }
-    }
-}
-async function tryStartHermesGateway() {
-    await new Promise((resolve) => {
-        try {
-            const child = spawn("hermes", ["gateway"], {
-                detached: true,
-                stdio: "ignore",
-            });
-            child.on("error", () => resolve());
-            child.unref();
-            resolve();
-        }
-        catch {
-            resolve();
-        }
-    });
-}
-async function waitForHermesHealth(apiKey) {
-    const deadline = Date.now() + HEALTH_TIMEOUT_MS;
-    while (Date.now() < deadline) {
-        if (await fetchHermesHealth(apiKey))
-            return true;
-        await new Promise((resolve) => setTimeout(resolve, HEALTH_POLL_MS));
-    }
-    return false;
-}
 export async function prepareHermesForBridge() {
-    const { envPath, changed, apiKey } = await ensureHermesApiConfigured();
+    const { envPath, changed } = await ensureHermesApiConfigured();
+    const { startHermesGateway } = await import("./gatewayControl.js");
     if (changed) {
         console.log(`Configured Hermes API in ${envPath}`);
     }
-    if (await fetchHermesHealth(apiKey))
-        return;
-    if (changed) {
-        console.log("Restarting Hermes gateway to apply API settings...");
-        await tryRestartHermesGateway();
-        if (await waitForHermesHealth(apiKey))
+    try {
+        const result = await startHermesGateway();
+        if (result.alreadyRunning && !changed) {
             return;
+        }
+        if (changed) {
+            console.log("Restarting Hermes gateway to apply API settings...");
+        }
+        else if (!result.alreadyRunning) {
+            console.log("Hermes gateway not detected — starting `hermes gateway`...");
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(message);
     }
-    console.log("Hermes gateway not detected — starting `hermes gateway`...");
-    await tryStartHermesGateway();
-    if (await waitForHermesHealth(apiKey))
-        return;
-    throw new Error("Hermes is not running. Install Hermes, then run `hermes gateway` once on this machine and retry.");
 }

package/dist/gatewayControl.d.ts

@@ -0,0 +1,12 @@
+export declare function startHermesGateway(): Promise<{
+    ok: true;
+    alreadyRunning: boolean;
+}>;
+export declare function stopHermesGateway(): Promise<{
+    ok: true;
+    wasRunning: boolean;
+}>;
+export declare function restartHermesGateway(): Promise<{
+    ok: true;
+}>;
+//# sourceMappingURL=gatewayControl.d.ts.map

package/dist/gatewayControl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gatewayControl.d.ts","sourceRoot":"","sources":["../src/gatewayControl.ts"],"names":[],"mappings":"AA8EA,wBAAsB,kBAAkB,IAAI,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC,CAezF;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAAC,CAiBpF;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAyBlE"}

package/dist/gatewayControl.js

@@ -0,0 +1,119 @@
+import { execFile, spawn } from "node:child_process";
+import { promisify } from "node:util";
+import { DEFAULT_HERMES_API_URL } from "./constants.js";
+import { ensureHermesApiConfigured } from "./ensureHermesApi.js";
+const execFileAsync = promisify(execFile);
+const HEALTH_URL = DEFAULT_HERMES_API_URL.replace(/\/v1\/chat\/completions\/?$/, "/health");
+const HEALTH_POLL_MS = 1_000;
+const HEALTH_TIMEOUT_MS = 30_000;
+const GATEWAY_UNITS = ["hermes-gateway.service", "hermes.service", "hermes-gateway", "hermes"];
+async function fetchHermesHealth(apiKey) {
+    const headers = {};
+    if (apiKey)
+        headers.authorization = `Bearer ${apiKey}`;
+    try {
+        const response = await fetch(HEALTH_URL, { headers, signal: AbortSignal.timeout(2_000) });
+        return response.ok;
+    }
+    catch {
+        return false;
+    }
+}
+async function waitForHermesHealth(apiKey) {
+    const deadline = Date.now() + HEALTH_TIMEOUT_MS;
+    while (Date.now() < deadline) {
+        if (await fetchHermesHealth(apiKey))
+            return true;
+        await new Promise((resolve) => setTimeout(resolve, HEALTH_POLL_MS));
+    }
+    return false;
+}
+async function tryRestartHermesGatewayUnits() {
+    for (const unit of GATEWAY_UNITS) {
+        try {
+            await execFileAsync("systemctl", ["try-restart", unit], { timeout: 10_000 });
+        }
+        catch {
+            // Unit may not exist — keep trying other names.
+        }
+    }
+}
+async function tryStopHermesGatewayUnits() {
+    for (const unit of GATEWAY_UNITS) {
+        try {
+            await execFileAsync("systemctl", ["stop", unit], { timeout: 10_000 });
+        }
+        catch {
+            // Unit may not exist — keep trying other names.
+        }
+    }
+}
+async function tryKillHermesGatewayProcess() {
+    try {
+        await execFileAsync("pkill", ["-f", "hermes gateway"], { timeout: 5_000 });
+    }
+    catch {
+        // No matching process — that's fine.
+    }
+}
+async function spawnHermesGateway() {
+    await new Promise((resolve) => {
+        try {
+            const child = spawn("hermes", ["gateway"], {
+                detached: true,
+                stdio: "ignore",
+            });
+            child.on("error", () => resolve());
+            child.unref();
+            resolve();
+        }
+        catch {
+            resolve();
+        }
+    });
+}
+export async function startHermesGateway() {
+    const { apiKey } = await ensureHermesApiConfigured();
+    if (await fetchHermesHealth(apiKey)) {
+        return { ok: true, alreadyRunning: true };
+    }
+    await spawnHermesGateway();
+    if (await waitForHermesHealth(apiKey)) {
+        return { ok: true, alreadyRunning: false };
+    }
+    throw new Error("Hermes gateway did not become healthy. Install Hermes, then run `hermes gateway` on this machine and retry.");
+}
+export async function stopHermesGateway() {
+    const { apiKey } = await ensureHermesApiConfigured();
+    const wasRunning = await fetchHermesHealth(apiKey);
+    await tryStopHermesGatewayUnits();
+    await tryKillHermesGatewayProcess();
+    if (wasRunning) {
+        await new Promise((resolve) => setTimeout(resolve, HEALTH_POLL_MS));
+    }
+    const stillRunning = await fetchHermesHealth(apiKey);
+    if (stillRunning) {
+        throw new Error("Hermes gateway is still running. Stop it manually on the agent machine.");
+    }
+    return { ok: true, wasRunning };
+}
+export async function restartHermesGateway() {
+    const { changed, apiKey } = await ensureHermesApiConfigured();
+    if (changed) {
+        await tryRestartHermesGatewayUnits();
+        if (await waitForHermesHealth(apiKey)) {
+            return { ok: true };
+        }
+    }
+    if (await fetchHermesHealth(apiKey)) {
+        await tryRestartHermesGatewayUnits();
+        if (await waitForHermesHealth(apiKey)) {
+            return { ok: true };
+        }
+    }
+    await spawnHermesGateway();
+    if (await waitForHermesHealth(apiKey)) {
+        return { ok: true };
+    }
+    throw new Error("Hermes gateway did not restart successfully. Run `hermes gateway` on this machine and retry.");
+}

package/dist/hermesCommands.d.ts

@@ -1,4 +1,4 @@
-export declare const HERMES_COMMAND_NAMES: readonly ["runtime.health", "runtime.detailedHealth", "runtime.capabilities", "models.list", "model.set", "responses.create", "runs.create", "runs.status", "runs.stop", "jobs.list", "jobs.get", "jobs.create", "jobs.update", "jobs.pause", "jobs.resume", "jobs.runNow", "jobs.delete", "profiles.list", "profiles.create"];
+export declare const HERMES_COMMAND_NAMES: readonly ["runtime.health", "runtime.detailedHealth", "runtime.capabilities", "models.list", "model.set", "responses.create", "runs.create", "runs.status", "runs.stop", "jobs.list", "jobs.get", "jobs.create", "jobs.update", "jobs.pause", "jobs.resume", "jobs.runNow", "jobs.delete", "profiles.list", "profiles.create", "gateway.start", "gateway.stop", "gateway.restart"];
 export type HermesCommandName = (typeof HERMES_COMMAND_NAMES)[number];
 export declare function isHermesCommandName(value: string): value is HermesCommandName;
 export type HermesCommandErrorCode = "command_unsupported" | "hermes_unreachable" | "hermes_request_failed" | "invalid_command_args" | "unsupported_by_http";

package/dist/hermesCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hermesCommands.d.ts","sourceRoot":"","sources":["../src/hermesCommands.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,gUAoBvB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,iBAAiB,CAE7E;AAED,MAAM,MAAM,sBAAsB,GAC9B,qBAAqB,GACrB,oBAAoB,GACpB,uBAAuB,GACvB,sBAAsB,GACtB,qBAAqB,CAAC;AAE1B,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;gBAE1B,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM;CAI1D;AAuFD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACjE,OAAO,CAAC,OAAO,CAAC,CAmJlB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAetG"}
+{"version":3,"file":"hermesCommands.d.ts","sourceRoot":"","sources":["../src/hermesCommands.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,oXAuBvB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,iBAAiB,CAE7E;AAED,MAAM,MAAM,sBAAsB,GAC9B,qBAAqB,GACrB,oBAAoB,GACpB,uBAAuB,GACvB,sBAAsB,GACtB,qBAAqB,CAAC;AAE1B,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;gBAE1B,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM;CAI1D;AAuFD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACjE,OAAO,CAAC,OAAO,CAAC,CAyJlB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAetG"}

package/dist/hermesCommands.js

@@ -1,4 +1,5 @@
 import { resolveHermesApiConfig } from "./hermesForwarder.js";
+import { restartHermesGateway, startHermesGateway, stopHermesGateway } from "./gatewayControl.js";
 export const HERMES_COMMAND_NAMES = [
     "runtime.health",
     "runtime.detailedHealth",
@@ -19,6 +20,9 @@ export const HERMES_COMMAND_NAMES = [
     "jobs.delete",
     "profiles.list",
     "profiles.create",
+    "gateway.start",
+    "gateway.stop",
+    "gateway.restart",
 ];
 export function isHermesCommandName(value) {
     return HERMES_COMMAND_NAMES.includes(value);
@@ -234,6 +238,12 @@ export async function executeHermesCommand(command, args, options = {}) {
             throw new HermesCommandError("unsupported_by_http", "Listing Hermes profiles is not exposed over the HTTP API.");
         case "profiles.create":
             throw new HermesCommandError("unsupported_by_http", "Creating Hermes profiles is not exposed over the HTTP API. Run `hermes profile create` on the agent machine.");
+        case "gateway.start":
+            return await startHermesGateway();
+        case "gateway.stop":
+            return await stopHermesGateway();
+        case "gateway.restart":
+            return await restartHermesGateway();
         default: {
             const _exhaustive = command;
             throw new HermesCommandError("command_unsupported", `Unsupported command: ${String(_exhaustive)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saleso.innovations/bridge",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Connect your Hermes agent to the Cleos iOS app via pairing code.",
   "type": "module",
   "license": "MIT",