@bulolo/hermes-link 0.2.6 → 0.2.8

package/dist/{chunk-YARHXGP4.js → chunk-Q546CZFY.js}

@@ -1462,29 +1462,20 @@ function normalizeLogLevel(level) {
   return defaultLinkConfig.logLevel;
 }
 function normalizeLanHost(value) {
-  if (value === null || value === void 0) {
-    return null;
-  }
-  if (typeof value !== "string") {
-    return null;
-  }
+  if (value === null || value === void 0) return null;
+  if (typeof value !== "string") return null;
   const host = value.trim().replace(/^\[/u, "").replace(/\]$/u, "");
-  if (!host) {
-    return null;
-  }
-  if (!isUsableLanIpv4(host)) {
-    return null;
-  }
+  if (!host) return null;
+  if (!isValidHostIpv4(host)) return null;
   return host;
 }
-function isUsableLanIpv4(value) {
+function isValidHostIpv4(value) {
   const parts = value.split(".").map((part) => Number.parseInt(part, 10));
   if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) {
     return false;
   }
-  const [first, second, , fourth] = parts;
-  const privateRange = first === 10 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 168;
-  return privateRange && fourth !== 0 && fourth !== 255;
+  const [, , , fourth] = parts;
+  return fourth !== 0 && fourth !== 255;
 }
 
 // src/network/topology.ts
@@ -1517,7 +1508,7 @@ function discoverLanIpsFromInterfaces(interfaces) {
   for (const [name, items] of Object.entries(interfaces)) {
     if (shouldIgnoreInterface(name)) continue;
     for (const item of items ?? []) {
-      if (!item.internal && item.address && item.family === "IPv4" && isUsableLanIpv42(item.address, item.netmask)) {
+      if (!item.internal && item.address && item.family === "IPv4" && isUsableLanIpv4(item.address, item.netmask)) {
         candidates.push({ name, address: item.address });
       }
     }
@@ -1529,33 +1520,51 @@ function discoverLanIpsFromInterfaces(interfaces) {
 }
 async function observePublicRoute(options) {
   const fetcher = options.fetchImpl ?? fetch;
-  const response = await fetcher(
-    `${options.relayBaseUrl.replace(/\/+$/u, "")}/api/v1/relay/public-route/observe`,
-    {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        ...options.relayBootstrapToken ? { authorization: `Bearer ${options.relayBootstrapToken}` } : {}
-      },
-      body: JSON.stringify({
-        install_id: options.installId,
-        link_id: options.linkId,
-        public_key_pem: options.publicKeyPem
-      })
-    }
-  );
-  const payload = await response.json().catch(() => null);
-  const record = typeof payload?.record === "object" && payload.record !== null ? payload.record : null;
-  const observed = typeof payload?.observed === "object" && payload.observed !== null ? payload.observed : null;
-  const values = [
-    readIpRecord(record?.ipv4),
-    readIpRecord(record?.ipv6),
-    typeof observed?.ip === "string" ? observed.ip : null
-  ].filter((v) => Boolean(v));
-  return {
-    publicIpv4s: unique(values.filter(isUsablePublicIpv4)),
-    publicIpv6s: unique(values.filter(isUsablePublicIpv6))
-  };
+  const simpleIp = await fetchPublicIpSimple(fetcher).catch(() => null);
+  try {
+    const response = await fetcher(
+      `${options.relayBaseUrl.replace(/\/+$/u, "")}/api/v1/relay/public-route/observe`,
+      {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          ...options.relayBootstrapToken ? { authorization: `Bearer ${options.relayBootstrapToken}` } : {}
+        },
+        body: JSON.stringify({
+          install_id: options.installId,
+          link_id: options.linkId,
+          public_key_pem: options.publicKeyPem
+        }),
+        signal: AbortSignal.timeout(5e3)
+      }
+    );
+    const payload = await response.json().catch(() => null);
+    const record = typeof payload?.record === "object" && payload.record !== null ? payload.record : null;
+    const observed = typeof payload?.observed === "object" && payload.observed !== null ? payload.observed : null;
+    const values = [
+      simpleIp,
+      readIpRecord(record?.ipv4),
+      readIpRecord(record?.ipv6),
+      typeof observed?.ip === "string" ? observed.ip : null
+    ].filter((v) => Boolean(v));
+    return {
+      publicIpv4s: unique(values.filter(isUsablePublicIpv4)),
+      publicIpv6s: unique(values.filter(isUsablePublicIpv6))
+    };
+  } catch {
+    const values = [simpleIp].filter((v) => Boolean(v));
+    return {
+      publicIpv4s: unique(values.filter(isUsablePublicIpv4)),
+      publicIpv6s: []
+    };
+  }
+}
+async function fetchPublicIpSimple(fetcher) {
+  const res = await fetcher("https://api.ipify.org?format=json", {
+    signal: AbortSignal.timeout(4e3)
+  });
+  const data = await res.json();
+  return typeof data.ip === "string" && data.ip.trim() ? data.ip.trim() : null;
 }
 function readIpRecord(value) {
   if (typeof value !== "object" || value === null) return null;
@@ -1575,7 +1584,7 @@ function compareLanCandidate(left, right) {
 function interfacePriority(name) {
   return /^(en|eth|wlan|wi-fi|wifi)/iu.test(name) ? 0 : 1;
 }
-function isUsableLanIpv42(address, netmask) {
+function isUsableLanIpv4(address, netmask) {
   return isPrivateIpv4(address) && !isNetworkOrBroadcastIpv4Address(address, netmask);
 }
 function isUsablePublicIpv4(address) {
@@ -3506,8 +3515,9 @@ async function startLinkService(options) {
   const statsRouter = createStatisticsRouter({ db, paths });
   app.use(statsRouter.routes());
   app.use(statsRouter.allowedMethods());
+  const listenHost = process.env.HERMESLINK_LISTEN_HOST ?? "0.0.0.0";
   const server = await new Promise((resolve, reject) => {
-    const s = app.listen(config.port, "127.0.0.1", () => resolve(s));
+    const s = app.listen(config.port, listenHost, () => resolve(s));
     s.once("error", reject);
   });
   const relayClient = new RelayClient({

package/dist/cli/index.js

@@ -23,7 +23,7 @@ import {
   saveConfig,
   startLinkService,
   writeJsonFile
-} from "../chunk-YARHXGP4.js";
+} from "../chunk-Q546CZFY.js";
 
 // src/cli/index.ts
 import { mkdir as mkdir3 } from "fs/promises";
@@ -275,7 +275,7 @@ async function runPairingPreflight(options) {
   if (options.openBrowser !== false) {
     await openSystemBrowser(pairingUrl).catch(() => void 0);
   }
-  return { pairingUrl, connectToken: token.token };
+  return { pairingUrl, connectToken: token.token, bestUrl };
 }
 function buildPairingUrl(params) {
   const qs = new URLSearchParams({
@@ -288,10 +288,6 @@ function buildPairingUrl(params) {
   if (params.publicUrls.length > 0) qs.set("public_urls", params.publicUrls.join(","));
   return `hermesapp://pair?${qs.toString()}`;
 }
-function buildLocalPairingPageUrl(port, connectToken) {
-  const qs = new URLSearchParams({ connect_token: connectToken });
-  return `http://127.0.0.1:${port}/pair?${qs.toString()}`;
-}
 
 // src/cli/index.ts
 var args = process.argv.slice(2);
@@ -447,13 +443,14 @@ async function cmdPair(paths) {
     return;
   }
   const result = await runPairingPreflight({ identity, config, paths });
-  const localPageUrl = buildLocalPairingPageUrl(config.port, result.connectToken);
+  const pageBase = result.bestUrl.replace(/\/+$/u, "");
+  const pageUrl = `${pageBase}/pair?connect_token=${encodeURIComponent(result.connectToken)}`;
   process.stdout.write("\n");
   qrcode.generate(result.pairingUrl, { small: true });
   process.stdout.write(`
 Pairing URL:   ${result.pairingUrl}
 `);
-  process.stdout.write(`Pairing page:  ${localPageUrl}
+  process.stdout.write(`Pairing page:  ${pageUrl}
 `);
   process.stdout.write(`Connect token: ${result.connectToken}
 `);

package/dist/http/app.js

@@ -1,6 +1,6 @@
 import {
   startLinkService
-} from "../chunk-YARHXGP4.js";
+} from "../chunk-Q546CZFY.js";
 export {
   startLinkService
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bulolo/hermes-link",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Hermes Link companion service and CLI for connecting hermes-agent through zhiji",
   "license": "MIT",
   "type": "module",
@@ -36,7 +36,7 @@
     "prepack": "npm run build",
     "start": "node ./dist/cli/index.js",
     "test": "vitest",
-    "publish:npm": "npm publish --access public"
+    "publish:npm": "npm publish --access public --registry https://registry.npmjs.org"
   },
   "dependencies": {
     "@koa/cors": "^5.0.0",