@hermespilot/link 0.1.7 → 0.1.8

package/README.md

@@ -40,6 +40,8 @@ hermes update
 hermes gateway run
 ```
 
+If Hermes Agent is configured through `~/.hermes/.env`, Link follows the same `API_SERVER_*` overrides when calling the local API Server.
+
 CLI output follows the current system language when it is Chinese or English. You can override it for a single command with `HERMESLINK_LANG=zh-CN` or `HERMESLINK_LANG=en`.
 
 ## Runtime data

package/dist/{chunk-SCIAZZ4C.js → chunk-L2NM2XMX.js}

@@ -4,7 +4,7 @@ import Router from "@koa/router";
 import { Readable } from "stream";
 
 // src/constants.ts
-var LINK_VERSION = "0.1.7";
+var LINK_VERSION = "0.1.8";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -146,12 +146,16 @@ async function readHermesApiServerConfig(profileName = "default", configPath = r
     throw error;
   });
   if (!existingRaw) {
-    return {};
+    return applyEnvOverrides({}, await readHermesApiServerEnvOverrides(profileName), false);
   }
   const config = toRecord(YAML.parse(existingRaw));
   const platforms = toRecord(config.platforms);
   const apiServer = toRecord(platforms.api_server);
-  return readApiServerConfig(apiServer, true);
+  return applyEnvOverrides(
+    readApiServerConfig(apiServer, true),
+    await readHermesApiServerEnvOverrides(profileName),
+    true
+  );
 }
 async function ensureHermesApiServerKey(profileName = "default", configPath = resolveHermesConfigPath(profileName)) {
   return ensureHermesApiServerConfig(profileName, configPath);
@@ -168,10 +172,12 @@ async function ensureHermesApiServerConfig(profileName = "default", configPath =
   const platforms = ensureRecord(config, "platforms");
   const apiServer = ensureRecord(platforms, "api_server");
   const extra = ensureRecord(apiServer, "extra");
-  const beforeKey = typeof extra.key === "string" && extra.key.length > 0 ? extra.key : null;
-  const beforeEnabled = apiServer.enabled === true;
-  const beforeHost = typeof extra.host === "string" && extra.host.trim() ? extra.host : null;
-  const beforePort = typeof extra.port === "number" && Number.isFinite(extra.port) ? extra.port : null;
+  const envOverrides = await readHermesApiServerEnvOverrides(profileName);
+  const before = applyEnvOverrides(readApiServerConfig(apiServer), envOverrides, false);
+  const beforeKey = before.key?.trim() ? before.key : null;
+  const beforeEnabled = before.enabled === true;
+  const beforeHost = before.host?.trim() ? before.host : null;
+  const beforePort = typeof before.port === "number" && Number.isFinite(before.port) ? before.port : null;
   let changed = false;
   let enabledAdded = false;
   let hostAdded = false;
@@ -198,7 +204,7 @@ async function ensureHermesApiServerConfig(profileName = "default", configPath =
   if (!changed) {
     return {
       configPath,
-      apiServer: readApiServerConfig(apiServer, true),
+      apiServer: applyEnvOverrides(readApiServerConfig(apiServer, true), envOverrides, true),
       changed: false,
       keyAdded: false,
       enabledAdded: false,
@@ -217,7 +223,7 @@ async function ensureHermesApiServerConfig(profileName = "default", configPath =
   await writeFile(configPath, document.toString(), { mode: 384 });
   return {
     configPath,
-    apiServer: readApiServerConfig(apiServer, true),
+    apiServer: applyEnvOverrides(readApiServerConfig(apiServer, true), envOverrides, true),
     changed: true,
     keyAdded: !beforeKey,
     enabledAdded,
@@ -239,6 +245,73 @@ function readApiServerConfig(apiServerOrExtra, withDefaults = false) {
     key: typeof extra.key === "string" ? extra.key : void 0
   };
 }
+async function readHermesApiServerEnvOverrides(profileName) {
+  const values = await readHermesEnvFile(profileName);
+  for (const key of ["API_SERVER_ENABLED", "API_SERVER_HOST", "API_SERVER_PORT", "API_SERVER_KEY"]) {
+    const value = process.env[key];
+    if (typeof value === "string" && value.trim()) {
+      values[key] = value;
+    }
+  }
+  const port = Number.parseInt(values.API_SERVER_PORT ?? "", 10);
+  return {
+    enabled: parseEnvBoolean(values.API_SERVER_ENABLED),
+    host: values.API_SERVER_HOST?.trim() || void 0,
+    port: Number.isFinite(port) ? port : void 0,
+    key: values.API_SERVER_KEY?.trim() || void 0
+  };
+}
+async function readHermesEnvFile(profileName) {
+  const envPath = path3.join(resolveHermesProfileDir(profileName), ".env");
+  const raw = await readFile2(envPath, "utf8").catch((error) => {
+    if (isNodeError2(error, "ENOENT")) {
+      return "";
+    }
+    throw error;
+  });
+  const values = {};
+  for (const line of raw.split(/\r?\n/u)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const match = /^(?:export\s+)?(?<key>[A-Za-z_][A-Za-z0-9_]*)=(?<value>.*)$/u.exec(trimmed);
+    if (!match?.groups) {
+      continue;
+    }
+    values[match.groups.key] = unquoteEnvValue(match.groups.value.trim());
+  }
+  return values;
+}
+function applyEnvOverrides(config, env, withDefaults) {
+  const host = env.host ?? config.host;
+  const port = env.port ?? config.port;
+  return {
+    enabled: env.enabled ?? config.enabled,
+    host: withDefaults ? host ?? DEFAULT_HERMES_API_SERVER_HOST : host,
+    port: withDefaults ? port ?? DEFAULT_HERMES_API_SERVER_PORT : port,
+    key: env.key ?? config.key
+  };
+}
+function parseEnvBoolean(value) {
+  if (!value) {
+    return void 0;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (["1", "true", "yes", "on"].includes(normalized)) {
+    return true;
+  }
+  if (["0", "false", "no", "off"].includes(normalized)) {
+    return false;
+  }
+  return void 0;
+}
+function unquoteEnvValue(value) {
+  if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+    return value.slice(1, -1);
+  }
+  return value;
+}
 function buildNotice(flags) {
   const fields = [];
   if (flags.enabledAdded) {
@@ -305,7 +378,7 @@ var gatewayStartInFlight = null;
 async function ensureHermesApiServerAvailable(options = {}) {
   const configResult = await ensureHermesApiServerConfig();
   const fetcher = options.fetchImpl ?? fetch;
-  if (await isHermesApiHealthy(configResult.apiServer, fetcher)) {
+  if (!options.forceRestart && await isHermesApiHealthy(configResult.apiServer, fetcher)) {
     return { available: true, configResult, started: false };
   }
   if (!shouldAutoStart(options.autoStart)) {
@@ -520,6 +593,15 @@ async function callHermesApi(path9, init, options) {
   const availability = await ensureHermesApiServerAvailable({ fetchImpl: options.fetchImpl });
   const config = availability.configResult.apiServer;
   const fetcher = options.fetchImpl ?? fetch;
+  const request = () => fetchHermesApi(fetcher, config, path9, init);
+  const response = await request();
+  if (response.status !== 401) {
+    return response;
+  }
+  await ensureHermesApiServerAvailable({ fetchImpl: options.fetchImpl, forceRestart: true });
+  return await request();
+}
+async function fetchHermesApi(fetcher, config, path9, init) {
   const headers = new Headers(init.headers);
   headers.set("accept", headers.get("accept") ?? "application/json");
   if (config.key) {
@@ -534,12 +616,37 @@ async function callHermesApi(path9, init, options) {
   });
 }
 async function readJsonResponse(response) {
-  const payload = await response.json().catch(() => null);
+  const raw = await response.text().catch(() => "");
+  const payload = parseJsonObject(raw);
   if (!response.ok || typeof payload !== "object" || payload === null) {
-    throw new LinkHttpError(502, "hermes_response_invalid", "Hermes API Server returned an invalid response");
+    throw new LinkHttpError(
+      502,
+      "hermes_response_invalid",
+      `Hermes API Server returned HTTP ${response.status}: ${readUpstreamMessage(payload, raw)}`
+    );
   }
   return payload;
 }
+function parseJsonObject(raw) {
+  if (!raw.trim()) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    return typeof parsed === "object" && parsed !== null ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function readUpstreamMessage(payload, raw) {
+  const error = typeof payload?.error === "object" && payload.error !== null ? payload.error : null;
+  const message = readString(error ?? {}, "message") ?? readString(payload ?? {}, "message");
+  if (message) {
+    return message;
+  }
+  const body = raw.trim().replace(/\s+/gu, " ").slice(0, 500);
+  return body || "empty response body";
+}
 function readString(payload, key) {
   const value = payload[key];
   return typeof value === "string" && value.trim() ? value.trim() : null;
@@ -2989,4 +3096,4 @@ export {
   getLinkLogFile,
   createApp
 };
-//# sourceMappingURL=chunk-SCIAZZ4C.js.map
+//# sourceMappingURL=chunk-L2NM2XMX.js.map