@bulolo/hermes-link 0.2.3 → 0.2.7

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

@@ -1529,33 +1529,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;
@@ -3506,8 +3524,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-ZN3XW7FI.js";
 
 // src/cli/index.ts
 import { mkdir as mkdir3 } from "fs/promises";
@@ -262,28 +262,30 @@ async function runPairingPreflight(options) {
   };
   await mkdir2(options.paths.pairingDir, { recursive: true, mode: 448 }).catch(() => void 0);
   await writeJsonFile(pairingSessionPath(sessionId, options.paths), session);
+  const lanUrls = (routes?.lanIps ?? []).map((ip) => `http://${ip}:${options.config.port}`);
+  const publicUrls = (routes?.publicIpv4s ?? []).map((ip) => `http://${ip}:${options.config.port}`);
   const pairingUrl = buildPairingUrl({
     linkId: options.identity.link_id ?? "",
     installId: options.identity.install_id,
     connectToken: token.token,
     port: options.config.port,
-    localApiUrl: bestUrl,
-    preferredUrls: session.preferred_urls
+    lanUrls,
+    publicUrls
   });
   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({
     link_id: params.linkId,
     install_id: params.installId,
     connect_token: params.connectToken,
-    port: String(params.port),
-    local_url: params.localApiUrl,
-    preferred_urls: params.preferredUrls.join(",")
+    port: String(params.port)
   });
+  if (params.lanUrls.length > 0) qs.set("lan_urls", params.lanUrls.join(","));
+  if (params.publicUrls.length > 0) qs.set("public_urls", params.publicUrls.join(","));
   return `hermesapp://pair?${qs.toString()}`;
 }
 
@@ -441,10 +443,14 @@ async function cmdPair(paths) {
     return;
   }
   const result = await runPairingPreflight({ identity, config, paths });
+  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:  ${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-ZN3XW7FI.js";
 export {
   startLinkService
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bulolo/hermes-link",
-  "version": "0.2.3",
+  "version": "0.2.7",
   "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",