@bulolo/hermes-link 0.2.9 → 0.3.1

package/dist/cli/index.js

@@ -3,7 +3,6 @@ import {
   DAEMON_LOG_FILE,
   LINK_COMMAND,
   LINK_VERSION,
-  bootstrapWithRelay,
   createRotatingTextLogWriter,
   currentCliScriptPath,
   detectRuntimeEnvironment,
@@ -19,11 +18,11 @@ import {
   readRecentGatewayLogEntries,
   readRecentLogEntries,
   resolveRuntimePaths,
-  saveAssignedLinkId,
   saveConfig,
   startLinkService,
   writeJsonFile
-} from "../chunk-GHAP2EHA.js";
+} from "../chunk-ZO2S4ZIO.js";
+import "../chunk-NP3Y2NVF.js";
 
 // src/cli/index.ts
 import { mkdir as mkdir3 } from "fs/promises";
@@ -234,59 +233,49 @@ function pairingSessionPath(sessionId, paths) {
 }
 async function runPairingPreflight(options) {
   const token = await generateAppConnectToken(options.paths);
-  const routes = options.identity.link_id ? await discoverRouteCandidates({
+  const routes = await discoverRouteCandidates({
     port: options.config.port,
-    relayBaseUrl: options.config.relayBaseUrl,
-    linkId: options.identity.link_id,
-    installId: options.identity.install_id,
-    publicKeyPem: options.identity.public_key_pem,
     configuredLanHost: options.config.lanHost
-  }).catch(() => null) : null;
+  }).catch(() => null);
   const localApiUrl = `http://127.0.0.1:${options.config.port}`;
-  const preferredUrls = (routes?.preferredUrls ?? []).filter(
-    (u) => !u.includes("/api/v1/relay/")
-  );
-  const bestUrl = preferredUrls[0] ?? localApiUrl;
+  const preferredUrls = (routes?.preferredUrls ?? []).length > 0 ? routes.preferredUrls : [localApiUrl];
   const sessionId = `ps_${token.token.slice(0, 16)}`;
   const session = {
     session_id: sessionId,
     code: token.token,
     link_id: options.identity.link_id ?? "",
     display_name: "Hermes Link",
-    local_api_url: bestUrl,
-    server_base_url: options.config.serverBaseUrl,
-    relay_base_url: options.config.relayBaseUrl,
-    preferred_urls: preferredUrls.length > 0 ? preferredUrls : [localApiUrl],
+    local_api_url: preferredUrls[0] ?? localApiUrl,
+    preferred_urls: preferredUrls,
     created_at: (/* @__PURE__ */ new Date()).toISOString(),
     expires_at: token.expiresAt
   };
   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,
-    lanUrls,
-    publicUrls
-  });
+  const qrPayload = {
+    kind: "hermes_link_pairing",
+    version: 1,
+    link_id: options.identity.link_id ?? "",
+    display_name: "Hermes Link",
+    session_id: sessionId,
+    code: token.token,
+    preferred_urls: preferredUrls
+  };
+  const pageUrl = buildLocalPairingPageUrl(options.config.port, sessionId, token.token);
   if (options.openBrowser !== false) {
-    await openSystemBrowser(pairingUrl).catch(() => void 0);
+    await openSystemBrowser(pageUrl).catch(() => void 0);
   }
-  return { pairingUrl, connectToken: token.token, bestUrl };
+  return {
+    qrPayload: JSON.stringify(qrPayload),
+    pageUrl,
+    connectToken: token.token,
+    sessionId,
+    preferredUrls
+  };
 }
-function buildPairingUrl(params) {
-  const qs = new URLSearchParams({
-    link_id: params.linkId,
-    install_id: params.installId,
-    connect_token: params.connectToken,
-    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()}`;
+function buildLocalPairingPageUrl(port, sessionId, connectToken) {
+  const qs = new URLSearchParams({ session_id: sessionId, connect_token: connectToken });
+  return `http://127.0.0.1:${port}/pair?${qs.toString()}`;
 }
 
 // src/cli/index.ts
@@ -403,24 +392,9 @@ async function cmdDaemon(paths) {
     process.exitCode = 1;
     return;
   }
-  const config = await loadConfig(paths);
   const identity = await ensureIdentity(paths);
-  let relayToken = "";
-  try {
-    const bootstrapResult = await bootstrapWithRelay({
-      relayBaseUrl: config.relayBaseUrl,
-      identity,
-      port: config.port
-    });
-    if (!identity.link_id) {
-      await saveAssignedLinkId(bootstrapResult.linkId, paths);
-    }
-    relayToken = bootstrapResult.token;
-  } catch (err) {
-    process.stderr.write(`Warning: Relay bootstrap failed: ${err.message}
-`);
-  }
-  const service = await startLinkService({ config, identity, paths, relayToken });
+  const config = await loadConfig(paths);
+  const service = await startLinkService({ config, identity, paths });
   process.stdout.write(`Hermes Link running on port ${config.port}
 `);
   const shutdown = async () => {
@@ -437,22 +411,24 @@ async function cmdDaemonSupervisor(paths) {
 async function cmdPair(paths) {
   const config = await loadConfig(paths);
   const identity = await ensureIdentity(paths);
-  if (!identity.link_id) {
-    process.stderr.write("Error: Hermes Link is not connected to relay. Run 'hermeslink start' first.\n");
-    process.exitCode = 1;
-    return;
-  }
-  const result = await runPairingPreflight({ identity, config, paths });
-  const pageBase = result.bestUrl.replace(/\/+$/u, "");
-  const pageUrl = `${pageBase}/pair?connect_token=${encodeURIComponent(result.connectToken)}`;
+  const result = await runPairingPreflight({ identity, config, paths, openBrowser: false });
   process.stdout.write("\n");
-  qrcode.generate(result.pairingUrl, { small: true });
+  qrcode.generate(result.qrPayload, { small: true });
+  process.stdout.write(`
+Pairing page:    ${result.pageUrl}
+`);
+  process.stdout.write(`Session ID:      ${result.sessionId}
+`);
+  process.stdout.write(`Connect token:   ${result.connectToken}
+`);
+  process.stdout.write(`Preferred URLs:  ${result.preferredUrls.join(", ")}
+`);
   process.stdout.write(`
-Pairing URL:   ${result.pairingUrl}
+App \u626B\u63CF\u4E8C\u7EF4\u7801\u540E\uFF0C\u8C03\u7528\u4EE5\u4E0B\u63A5\u53E3\u5B8C\u6210\u914D\u5BF9\uFF1A
 `);
-  process.stdout.write(`Pairing page:  ${pageUrl}
+  process.stdout.write(`  POST ${result.preferredUrls[0]}/api/v1/pairing/claim
 `);
-  process.stdout.write(`Connect token: ${result.connectToken}
+  process.stdout.write(`  Body: { "session_id": "${result.sessionId}", "claim_token": "<code>" }
 `);
 }
 async function cmdConfig(paths) {
@@ -530,13 +506,13 @@ async function cmdLogs(paths) {
 }
 async function cmdAutostart(paths) {
   const subcommand = args[1];
-  if (subcommand === "enable") {
+  if (subcommand === "enable" || subcommand === "on") {
     const status2 = await enableAutostart();
     process.stdout.write(`Autostart ${status2.enabled ? "enabled" : "could not be enabled"} (${status2.method})
 `);
     return;
   }
-  if (subcommand === "disable") {
+  if (subcommand === "disable" || subcommand === "off") {
     const status2 = await disableAutostart();
     process.stdout.write(`Autostart ${status2.enabled ? "still enabled" : "disabled"} (${status2.method})
 `);
@@ -560,6 +536,7 @@ Commands:
   config get         Show current configuration
   config set         Set a configuration value
   autostart          Show/enable/disable autostart
+  autostart on|off   Enable or disable autostart
   logs               Show recent log entries (--gateway for gateway logs)
   version            Print version
 

package/dist/errors-KGEGMUYS.js

@@ -0,0 +1,8 @@
+import {
+  LinkHttpError,
+  isLinkHttpError
+} from "./chunk-NP3Y2NVF.js";
+export {
+  LinkHttpError,
+  isLinkHttpError
+};

package/dist/http/app.d.ts

@@ -1,7 +1,6 @@
 import Koa from 'koa';
 import { Server } from 'http';
 import { z } from 'zod';
-import { EventEmitter } from 'events';
 
 interface RuntimePaths {
     homeDir: string;
@@ -23,10 +22,6 @@ type Language = "auto" | "en" | "zh-CN";
 interface LinkConfig {
     port: number;
     lanHost: string | null;
-    serverBaseUrl: string;
-    relayBaseUrl: string;
-    appConnectTokenIssuer: string;
-    appConnectTokenAudience: string;
     language: Language;
     logLevel: LogLevel;
 }
@@ -55,55 +50,14 @@ declare const linkIdentitySchema: z.ZodObject<{
 }>;
 type LinkIdentity = z.infer<typeof linkIdentitySchema>;
 
-type RelayClientState = "disconnected" | "connecting" | "connected" | "closing";
-interface RelayClientOptions {
-    relayBaseUrl: string;
-    identity: LinkIdentity;
-    token: string;
-    paths?: RuntimePaths;
-    fetchImpl?: typeof fetch;
-    reconnectDelayMs?: number;
-    maxReconnectDelayMs?: number;
-    pingIntervalMs?: number;
-}
-interface RelayMessage {
-    type: string;
-    [key: string]: unknown;
-}
-declare class RelayClient extends EventEmitter {
-    private options;
-    private ws;
-    private state;
-    private token;
-    private logger;
-    private reconnectTimer;
-    private pingTimer;
-    private reconnectDelay;
-    private closed;
-    constructor(options: RelayClientOptions);
-    get currentState(): RelayClientState;
-    start(): void;
-    stop(): void;
-    send(message: RelayMessage): void;
-    private connect;
-    private buildWsUrl;
-    private scheduleReconnect;
-    private maybeRefreshTokenAndReconnect;
-    private startPing;
-    private stopPing;
-    private clearTimers;
-}
-
 interface LinkServiceOptions {
     config: LinkConfig;
     identity: LinkIdentity;
     paths: RuntimePaths;
-    relayToken: string;
 }
 interface LinkService {
     app: Koa;
     server: Server;
-    relayClient: RelayClient;
     stop(): Promise<void>;
 }
 declare function startLinkService(options: LinkServiceOptions): Promise<LinkService>;

package/dist/http/app.js

@@ -1,6 +1,7 @@
 import {
   startLinkService
-} from "../chunk-GHAP2EHA.js";
+} from "../chunk-ZO2S4ZIO.js";
+import "../chunk-NP3Y2NVF.js";
 export {
   startLinkService
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bulolo/hermes-link",
-  "version": "0.2.9",
-  "description": "Hermes Link companion service and CLI for connecting hermes-agent through zhiji",
+  "version": "0.3.1",
+  "description": "Local companion service and CLI for Hermes Agent, enabling mobile and LAN access",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -17,9 +17,10 @@
   "keywords": [
     "hermes",
     "hermes-agent",
-    "relay",
     "link",
-    "cli"
+    "cli",
+    "local",
+    "lan"
   ],
   "publishConfig": {
     "access": "public"
@@ -31,13 +32,20 @@
     "build": "tsup src/cli/index.ts src/http/app.ts --format esm --target node20 --dts --clean",
     "check": "tsc --noEmit",
     "dev": "tsx src/cli/index.ts",
+    "dev:run": "npm run build && node ./dist/cli/index.js daemon --foreground",
+    "dev:watch": "tsup src/cli/index.ts src/http/app.ts --format esm --target node20 --watch",
     "preinstall": "node ./scripts/check-node-version.mjs",
     "postinstall": "node ./scripts/postinstall.mjs",
     "prepack": "npm run build",
     "start": "node ./dist/cli/index.js",
-    "test": "vitest",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:e2e": "vitest run tests/e2e",
     "publish:npm": "npm publish --access public --registry https://registry.npmjs.org"
   },
+  "overrides": {
+    "generator-function": "1.x"
+  },
   "dependencies": {
     "@koa/cors": "^5.0.0",
     "@koa/router": "^15.4.0",
@@ -66,4 +74,4 @@
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   }
-}
+}