npm - @bulolo/hermes-link - Versions diffs - 0.3.4 → 0.3.6 - Mend

@bulolo/hermes-link 0.3.4 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +330 -439
package/README.zh-CN.md +739 -0
package/dist/{chunk-ELQBIHDQ.js → chunk-7IVSOP5F.js} +300 -132
package/dist/cli/index.js +12 -7
package/dist/http/app.js +1 -1
package/package.json +2 -2
package/README.en.md +0 -630

package/dist/{chunk-ELQBIHDQ.js → chunk-7IVSOP5F.js} RENAMED Viewed

@@ -1546,9 +1546,9 @@ async function discoverRouteCandidates(options) {
   const publicIpv4s = unique(publicIps.publicIpv4s.filter(isUsablePublicIpv4)).slice(0, MAX_PUBLIC_IPV4S);
   const publicIpv6s = unique(publicIps.publicIpv6s.filter(isUsablePublicIpv6)).slice(0, MAX_PUBLIC_IPV6S);
   const preferredUrls = [
+    ...lanIps.map((ip) => buildDirectUrl(ip, options.port)),
     ...publicIpv4s.map((ip) => buildDirectUrl(ip, options.port)),
-    ...publicIpv6s.map((ip) => buildDirectUrl(ip, options.port)),
-    ...lanIps.map((ip) => buildDirectUrl(ip, options.port))
+    ...publicIpv6s.map((ip) => buildDirectUrl(ip, options.port))
   ];
   return { lanIps, publicIpv4s, publicIpv6s, preferredUrls, environment };
 }
@@ -8885,10 +8885,29 @@ async function startLinkService(options) {
   });
   const rootRouter = new Router13();
   rootRouter.get("/pair", async (ctx) => {
-    const connectToken = typeof ctx.query.connect_token === "string" ? ctx.query.connect_token : "";
-    const sessionId = typeof ctx.query.session_id === "string" ? ctx.query.session_id : connectToken ? `ps_${connectToken.slice(0, 16)}` : "";
-    ctx.type = "text/html";
-    ctx.body = await buildPairingPage({ port: config.port, connectToken, sessionId, identity });
+    const sessionId = typeof ctx.query.session_id === "string" ? ctx.query.session_id : "";
+    if (!sessionId) {
+      ctx.status = 400;
+      ctx.type = "text/plain";
+      ctx.body = "Missing session_id";
+      return;
+    }
+    const session = await readPairingSession(sessionId, paths);
+    if (!session) {
+      ctx.status = 404;
+      ctx.type = "text/plain";
+      ctx.body = "Pairing session not found";
+      return;
+    }
+    const claimed = await isPairingSessionClaimed(sessionId, paths);
+    ctx.set("content-type", "text/html; charset=utf-8");
+    ctx.set("cache-control", "no-store");
+    ctx.body = await renderPairingPage({
+      session,
+      claimed,
+      version: LINK_VERSION,
+      linkId: identity.link_id ?? session.link_id
+    });
   });
   rootRouter.get("/api/v1/status", async (ctx) => {
     await authenticateRequest(ctx, paths);
@@ -8980,151 +8999,300 @@ async function startLinkService(options) {
   };
   return { app, server, stop };
 }
-async function buildPairingPage(options) {
-  const { port, connectToken, sessionId, identity } = options;
-  const qrPayload = connectToken ? JSON.stringify({
+function escapeHtml(s) {
+  return s.replace(/&/gu, "&amp;").replace(/</gu, "&lt;").replace(/>/gu, "&gt;").replace(/"/gu, "&quot;");
+}
+function formatDate(iso, locale = "zh-CN") {
+  const d = new Date(iso);
+  if (!Number.isFinite(d.getTime())) return iso;
+  return d.toLocaleString(locale, { hour12: locale !== "zh-CN" });
+}
+async function renderPairingPage(options) {
+  const { session, claimed, version, linkId } = options;
+  const isExpired = !claimed && isPairingSessionExpired(session);
+  const qrPayload = JSON.stringify({
     kind: "hermes_link_pairing",
     version: 1,
-    link_id: identity.link_id ?? "",
-    display_name: "Hermes Link",
-    session_id: sessionId,
-    code: connectToken,
-    preferred_urls: [`http://127.0.0.1:${port}`]
-  }) : "";
-  let qrHtml = "";
-  if (qrPayload) {
-    try {
-      const qrSvg = await QRCode.toString(qrPayload, {
-        type: "svg",
-        margin: 1,
-        width: 240,
-        errorCorrectionLevel: "M"
-      });
-      qrHtml = `<div class="qr">${qrSvg}</div>`;
-    } catch {
-      qrHtml = "";
-    }
-  }
-  const baseUrl = `http://127.0.0.1:${port}`;
-  return `<!DOCTYPE html>
+    link_id: session.link_id,
+    display_name: session.display_name,
+    session_id: session.session_id,
+    code: session.code,
+    preferred_urls: session.preferred_urls
+  });
+  const qrSvg = await QRCode.toString(qrPayload, { type: "svg", margin: 1, width: 320, errorCorrectionLevel: "M" });
+  const qrDataUri = `data:image/svg+xml;base64,${Buffer.from(qrSvg).toString("base64")}`;
+  const currentUrl = session.local_api_url.replace(/\/+$/u, "");
+  const expiresAtMs = Date.parse(session.expires_at);
+  const initialState = claimed ? "claimed" : isExpired ? "expired" : "waiting";
+  return `<!doctype html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Hermes Link \u2014 Pairing</title>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="color-scheme" content="light dark" />
+  <title>Hermes Link Pairing</title>
   <style>
-    * { box-sizing: border-box; margin: 0; padding: 0; }
-    body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; background: #0f0f0f; color: #e5e5e5; display: flex; align-items: center; justify-content: center; min-height: 100vh; padding: 1rem; }
-    .card { background: #1a1a1a; border: 1px solid #2a2a2a; border-radius: 12px; padding: 2rem; max-width: 520px; width: 100%; }
-    h1 { font-size: 1.2rem; font-weight: 600; margin-bottom: 0.25rem; text-align: center; }
-    .subtitle { color: #6b7280; font-size: 0.85rem; text-align: center; margin-bottom: 1.5rem; }
-    .qr { display: flex; justify-content: center; margin-bottom: 1.5rem; }
-    .qr svg { width: 200px; height: 200px; background: #fff; border-radius: 8px; padding: 8px; }
-    .section { margin-bottom: 1.25rem; }
-    .label { font-size: 0.75rem; color: #6b7280; margin-bottom: 0.35rem; text-transform: uppercase; letter-spacing: 0.05em; }
-    .mono { font-family: monospace; background: #0f0f0f; border: 1px solid #2a2a2a; border-radius: 6px; padding: 0.6rem 0.75rem; font-size: 0.78rem; word-break: break-all; color: #7dd3fc; cursor: pointer; user-select: all; }
-    .mono:hover { border-color: #3b82f6; }
-    .divider { border: none; border-top: 1px solid #2a2a2a; margin: 1.5rem 0; }
-    button { background: #3b82f6; color: #fff; border: none; border-radius: 8px; padding: 0.7rem 1.5rem; font-size: 0.9rem; cursor: pointer; width: 100%; }
-    button:hover { background: #2563eb; }
-    button:disabled { background: #374151; cursor: not-allowed; color: #6b7280; }
-    .status { margin-top: 0.75rem; font-size: 0.85rem; padding: 0.5rem 0.75rem; border-radius: 6px; display: none; text-align: center; }
-    .status.success { color: #6ee7b7; background: #064e3b22; display: block; }
-    .status.error { color: #fca5a5; background: #7f1d1d22; display: block; }
-    .result-row { margin-top: 0.5rem; }
-    .tag { display: inline-block; font-size: 0.7rem; background: #1e3a5f; color: #93c5fd; border-radius: 4px; padding: 0.1rem 0.4rem; margin-bottom: 0.25rem; }
+    :root {
+      color-scheme: light dark;
+      --bg: #f4f5f7;
+      --panel: rgba(255,255,255,0.78);
+      --panel-strong: rgba(255,255,255,0.94);
+      --text: #151922;
+      --muted: #5f6673;
+      --line: rgba(21,25,34,0.12);
+      --accent: #2d5cff;
+      --accent-soft: rgba(45,92,255,0.12);
+      --good: #0b8457;
+      --shadow: 0 24px 90px rgba(18,24,38,0.12);
+    }
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --bg: #0c1017;
+        --panel: rgba(16,20,28,0.78);
+        --panel-strong: rgba(16,20,28,0.94);
+        --text: #eef2f8;
+        --muted: #9ba4b3;
+        --line: rgba(255,255,255,0.12);
+        --accent: #8ab4ff;
+        --accent-soft: rgba(138,180,255,0.12);
+        --good: #67d7a7;
+        --shadow: 0 24px 90px rgba(0,0,0,0.45);
+      }
+    }
+    * { box-sizing: border-box; }
+    body { margin: 0; min-height: 100vh; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; color: var(--text); background: linear-gradient(180deg, var(--bg) 0%, color-mix(in srgb, var(--bg) 88%, var(--accent) 12%) 100%); }
+    .shell { min-height: 100vh; display: grid; place-items: center; padding: 28px 18px; }
+    .panel { width: min(1040px, 100%); border: 1px solid var(--line); border-radius: 28px; background: var(--panel); box-shadow: var(--shadow); backdrop-filter: blur(18px); overflow: hidden; }
+    .hero { display: grid; grid-template-columns: minmax(0, 1.1fr) minmax(320px, 390px); gap: 0; }
+    .copy { padding: 34px 34px 30px; border-right: 1px solid var(--line); }
+    .header-row { display: flex; justify-content: space-between; align-items: center; }
+    .eyebrow { display: inline-flex; align-items: center; gap: 10px; padding: 8px 12px; border-radius: 999px; background: var(--accent-soft); color: var(--accent); font-size: 13px; font-weight: 600; }
+    .lang-btn { background: var(--accent-soft); color: var(--accent); border: none; border-radius: 999px; padding: 6px 14px; font-size: 12px; font-weight: 600; cursor: pointer; font-family: inherit; line-height: 1; }
+    .lang-btn:hover { opacity: 0.75; }
+    h1 { margin: 18px 0 12px; font-size: clamp(34px, 4vw, 52px); line-height: 1.02; }
+    .subtitle { max-width: 42ch; margin: 0; color: var(--muted); font-size: 16px; line-height: 1.7; }
+    .meta-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 14px; margin-top: 26px; }
+    .meta { padding: 16px 16px 15px; border-radius: 18px; background: var(--panel-strong); border: 1px solid var(--line); }
+    .meta-label { display: block; color: var(--muted); font-size: 12px; line-height: 1.4; margin-bottom: 8px; }
+    .meta-value { font-size: 15px; line-height: 1.5; word-break: break-word; }
+    .steps { display: grid; gap: 10px; margin-top: 18px; }
+    .step { display: flex; gap: 12px; align-items: flex-start; padding: 14px 16px; border: 1px solid var(--line); border-radius: 18px; background: var(--panel-strong); }
+    .step-badge { flex: none; width: 26px; height: 26px; border-radius: 999px; display: grid; place-items: center; background: var(--accent-soft); color: var(--accent); font-size: 13px; font-weight: 600; }
+    .step-title { font-size: 14px; line-height: 1.45; margin: 0; font-weight: 600; }
+    .step-copy { margin: 3px 0 0; color: var(--muted); font-size: 13px; line-height: 1.55; }
+    .hint { margin: 10px 0 0; color: var(--muted); font-size: 13px; line-height: 1.55; }
+    .qr { padding: 26px 26px 30px; background: linear-gradient(180deg, rgba(255,255,255,0.16), rgba(255,255,255,0)); }
+    .card { border: 1px solid var(--line); border-radius: 24px; background: var(--panel-strong); padding: 20px; }
+    .status { display: flex; justify-content: space-between; align-items: center; gap: 12px; margin-bottom: 18px; }
+    .status-title { margin: 0; font-size: 18px; line-height: 1.3; }
+    .pill { display: inline-flex; align-items: center; justify-content: center; padding: 7px 11px; border-radius: 999px; background: rgba(11,132,87,0.12); color: var(--good); font-size: 12px; font-weight: 600; white-space: nowrap; }
+    .qr-frame { display: grid; place-items: center; padding: 18px; border-radius: 24px; background: linear-gradient(180deg, rgba(45,92,255,0.06), rgba(45,92,255,0)); border: 1px solid var(--line); }
+    .qr-frame img { width: min(100%, 300px); aspect-ratio: 1; display: block; border-radius: 18px; background: #fff; padding: 14px; }
+    .manual { margin-top: 16px; border: 1px solid var(--line); border-radius: 18px; overflow: hidden; }
+    .manual-row { display: flex; flex-direction: column; gap: 2px; padding: 12px 16px; background: rgba(0,0,0,0.03); }
+    .manual-row + .manual-row { border-top: 1px solid var(--line); }
+    .manual-label { font-size: 11px; color: var(--muted); letter-spacing: 0.04em; }
+    .manual-value { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace; font-size: 14px; word-break: break-all; user-select: all; }
+    .manual-value.code { font-size: 20px; letter-spacing: 0.16em; text-align: center; }
+    .footer { display: flex; justify-content: space-between; gap: 18px; flex-wrap: wrap; padding-top: 16px; color: var(--muted); font-size: 13px; line-height: 1.55; }
+    @media (max-width: 920px) { .hero { grid-template-columns: 1fr; } .copy { border-right: none; border-bottom: 1px solid var(--line); } }
+    @media (max-width: 640px) { .copy, .qr { padding: 22px 18px; } .meta-grid { grid-template-columns: 1fr; } .status { align-items: flex-start; flex-direction: column; } .code { font-size: 18px; letter-spacing: 0.14em; } }
   </style>
 </head>
 <body>
-  <div class="card">
-    <h1>Hermes Link Pairing</h1>
-    <p class="subtitle">\u7AEF\u53E3 ${port} \xB7 ${identity.link_id ?? "\u672A\u5206\u914D"}</p>
+  <main class="shell">
+    <section class="panel">
+      <div class="hero">
+        <div class="copy">
+          <div class="header-row">
+            <span class="eyebrow">Hermes Link \xB7 ${escapeHtml(version)}</span>
+            <button id="langToggle" class="lang-btn">\u4E2D\u6587</button>
+          </div>
+          <h1 data-i18n="h1">Complete Pairing in the App</h1>
+          <p class="subtitle" data-i18n="subtitle">Scan the QR code or enter the connect token to link this device.</p>
+          <div class="meta-grid">
+            <div class="meta">
+              <span class="meta-label" data-i18n="metaLocalUrl">Local Address</span>
+              <div class="meta-value">${escapeHtml(currentUrl)}</div>
+            </div>
+            <div class="meta">
+              <span class="meta-label">Link ID</span>
+              <div class="meta-value">${escapeHtml(linkId)}</div>
+            </div>
+            <div class="meta">
+              <span class="meta-label" data-i18n="metaConnectToken">Connect Token</span>
+              <div class="meta-value">${escapeHtml(session.code)}</div>
+            </div>
+            <div class="meta">
+              <span class="meta-label" data-i18n="metaExpires">Expires</span>
+              <div class="meta-value" id="expiresValue" data-iso="${escapeHtml(session.expires_at)}">${escapeHtml(formatDate(session.expires_at, "en-US"))}</div>
+            </div>
+          </div>
+          <div class="steps">
+            <div class="step">
+              <div class="step-badge">1</div>
+              <div>
+                <p class="step-title" data-i18n="step1Title">Open &ldquo;Connect Hermes Link&rdquo; in the App</p>
+                <p class="step-copy" data-i18n="step1Copy">Find the &ldquo;Connect Link&rdquo; entry in the App, then scan the QR code or enter the token manually. The App will switch to this Link automatically after pairing.</p>
+              </div>
+            </div>
+            <div class="step">
+              <div class="step-badge">2</div>
+              <div>
+                <p class="step-title" data-i18n="step2Title">Scan the QR code, or enter the address and token manually</p>
+                <p class="step-copy" data-i18n="step2Copy">If scanning is inconvenient, enter the address and connect token below in the App.</p>
+              </div>
+            </div>
+            <div class="step">
+              <div class="step-badge">3</div>
+              <div>
+                <p class="step-title" data-i18n="step3Title">This page will update automatically once pairing is complete</p>
+                <p class="step-copy" id="statusHint">${initialState === "claimed" ? "Pairing complete. You can close this page." : initialState === "expired" ? "This QR code has expired. Please run hermeslink pair again." : "Open the App to scan, or copy the connect token for manual entry."}</p>
+              </div>
+            </div>
+          </div>
+          <p class="hint" data-i18n="hint">You can keep this page open to check pairing status later. If pairing has already succeeded, the page will not prompt for a re-scan.</p>
+        </div>
+        <div class="qr">
+          <div class="card">
+            <div class="status">
+              <h2 class="status-title" id="statusTitle">${initialState === "claimed" ? "Pairing Complete" : initialState === "expired" ? "Pairing Expired" : "Waiting for App to Scan"}</h2>
+              <span class="pill" id="statusPill">${initialState === "claimed" ? "Scanned" : initialState === "expired" ? "Expired" : "Waiting"}</span>
+            </div>
+            <div class="qr-frame">
+              <img src="${qrDataUri}" alt="Hermes Link pairing QR code" />
+            </div>
+            <div class="manual">
+              <div class="manual-row">
+                <span class="manual-label" data-i18n="manualAddrLabel">Address (pick any that works)</span>
+                ${session.preferred_urls.map((u) => `<span class="manual-value">${escapeHtml(u)}</span>`).join("\n                ")}
+              </div>
+              <div class="manual-row">
+                <span class="manual-label" data-i18n="manualTokenLabel">Connect Token</span>
+                <span class="manual-value code">${escapeHtml(session.code)}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
+  </main>
+  <script>
+    const sessionId = ${JSON.stringify(session.session_id)};
+    const expiresAtMs = ${Number.isFinite(expiresAtMs) ? String(expiresAtMs) : "Number.NaN"};
+    const initialClaimed = ${JSON.stringify(claimed)};
-    ${qrHtml}
+    const T = {
+      zh: {
+        h1: '\u5728 App \u91CC\u5B8C\u6210\u8FD9\u6B21\u914D\u5BF9',
+        subtitle: '\u626B\u7801\u6216\u624B\u52A8\u8F93\u5165\u914D\u5BF9\u7801\uFF0C\u5B8C\u6210 App \u4E0E\u672C\u673A\u7684\u8FDE\u63A5\u3002',
+        metaLocalUrl: '\u672C\u5730\u5730\u5740',
+        metaConnectToken: '\u914D\u5BF9\u7801',
+        metaExpires: '\u8FC7\u671F\u65F6\u95F4',
+        step1Title: '\u5728 App \u91CC\u6253\u5F00\u201C\u8FDE\u63A5 Hermes Link\u201D',
+        step1Copy: '\u5728 App \u91CC\u627E\u5230\u201C\u8FDE\u63A5 Link\u201D\u5165\u53E3\uFF0C\u9009\u62E9\u626B\u7801\u6216\u624B\u52A8\u8F93\u5165\u914D\u5BF9\u7801\u3002\u914D\u5BF9\u6210\u529F\u540E\uFF0CApp \u4F1A\u81EA\u52A8\u5207\u5230\u8FD9\u53F0 Link\u3002',
+        step2Title: '\u626B\u4E8C\u7EF4\u7801\uFF0C\u6216\u624B\u52A8\u586B\u5199\u5730\u5740\u548C\u914D\u5BF9\u7801',
+        step2Copy: '\u5982\u679C\u626B\u7801\u4E0D\u65B9\u4FBF\uFF0C\u53EF\u5728 App \u91CC\u624B\u52A8\u8F93\u5165\u4E0B\u65B9\u7684\u5730\u5740\u548C\u914D\u5BF9\u7801\u5B8C\u6210\u8FDE\u63A5\u3002',
+        step3Title: '\u914D\u5BF9\u6210\u529F\u540E\uFF0C\u8FD9\u4E2A\u9875\u9762\u4F1A\u81EA\u52A8\u53D8\u6210\u5DF2\u5B8C\u6210\u72B6\u6001',
+        hint: '\u53EF\u5728\u7EC8\u7AEF\u7EE7\u7EED\u4FDD\u7559\u8FD9\u4E2A\u9875\u9762\uFF0C\u65B9\u4FBF\u7A0D\u540E\u6838\u5BF9\u72B6\u6001\uFF1B\u5982\u679C\u914D\u5BF9\u5DF2\u7ECF\u6210\u529F\uFF0C\u9875\u9762\u4E0D\u4F1A\u518D\u8981\u6C42\u91CD\u65B0\u626B\u7801\u3002',
+        manualAddrLabel: '\u5730\u5740\uFF08\u4EFB\u9009\u4E00\u4E2A\u53EF\u7528\u7684\uFF09',
+        manualTokenLabel: '\u914D\u5BF9\u7801',
+        status_waiting: '\u7B49\u5F85 App \u626B\u7801',
+        status_claimed: '\u5DF2\u5B8C\u6210\u914D\u5BF9',
+        status_expired: '\u914D\u5BF9\u5DF2\u8FC7\u671F',
+        pill_waiting: '\u7B49\u5F85\u4E2D',
+        pill_claimed: '\u5DF2\u626B\u7801',
+        pill_expired: '\u5DF2\u8FC7\u671F',
+        hint_waiting: '\u6253\u5F00 App \u626B\u7801\uFF0C\u6216\u8005\u590D\u5236\u914D\u5BF9\u7801\u624B\u52A8\u8F93\u5165\u3002',
+        hint_claimed: 'App \u5DF2\u5B8C\u6210\u914D\u5BF9\uFF0C\u8FD9\u4E2A\u9875\u9762\u53EF\u4EE5\u5173\u95ED\u3002',
+        hint_expired: '\u8FD9\u6B21\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C hermeslink pair\u3002',
+        expires_locale: 'zh-CN',
+        langToggle: 'EN',
+      },
+      en: {
+        h1: 'Complete Pairing in the App',
+        subtitle: 'Scan the QR code or enter the connect token to link this device.',
+        metaLocalUrl: 'Local Address',
+        metaConnectToken: 'Connect Token',
+        metaExpires: 'Expires',
+        step1Title: 'Open \u201CConnect Hermes Link\u201D in the App',
+        step1Copy: 'Find the \u201CConnect Link\u201D entry in the App, then scan the QR code or enter the token manually. The App will switch to this Link automatically after pairing.',
+        step2Title: 'Scan the QR code, or enter the address and token manually',
+        step2Copy: 'If scanning is inconvenient, enter the address and connect token below in the App.',
+        step3Title: 'This page will update automatically once pairing is complete',
+        hint: 'You can keep this page open to check pairing status later. If pairing has already succeeded, the page will not prompt for a re-scan.',
+        manualAddrLabel: 'Address (pick any that works)',
+        manualTokenLabel: 'Connect Token',
+        status_waiting: 'Waiting for App to Scan',
+        status_claimed: 'Pairing Complete',
+        status_expired: 'Pairing Expired',
+        pill_waiting: 'Waiting',
+        pill_claimed: 'Scanned',
+        pill_expired: 'Expired',
+        hint_waiting: 'Open the App to scan, or copy the connect token for manual entry.',
+        hint_claimed: 'Pairing complete. You can close this page.',
+        hint_expired: 'This QR code has expired. Please run hermeslink pair again.',
+        expires_locale: 'en-US',
+        langToggle: '\u4E2D\u6587',
+      },
+    };
-    <div class="section">
-      <div class="label">App \u626B\u7801\u5185\u5BB9\uFF08JSON\uFF09</div>
-      <div class="mono" title="\u70B9\u51FB\u590D\u5236" onclick="copyText(this)">${qrPayload.replace(/</g, "&lt;")}</div>
-    </div>
+    let lang = localStorage.getItem('hl-lang') || 'en';
+    let state = ${JSON.stringify(initialState)};
-    <div class="section">
-      <div class="label">Session ID</div>
-      <div class="mono" title="\u70B9\u51FB\u590D\u5236" onclick="copyText(this)">${sessionId}</div>
-    </div>
+    const statusTitleEl = document.querySelector('#statusTitle');
+    const statusPillEl = document.querySelector('#statusPill');
+    const statusHintEl = document.querySelector('#statusHint');
+    const langToggleEl = document.querySelector('#langToggle');
+    const expiresEl = document.querySelector('#expiresValue');
-    <div class="section">
-      <div class="label">Claim Token\uFF08code\uFF09</div>
-      <div class="mono" title="\u70B9\u51FB\u590D\u5236" onclick="copyText(this)">${connectToken}</div>
-    </div>
+    function applyLang() {
+      const s = T[lang];
+      document.documentElement.lang = lang === 'en' ? 'en' : 'zh-CN';
+      document.querySelectorAll('[data-i18n]').forEach(el => {
+        const key = el.dataset.i18n;
+        if (s[key] !== undefined) el.textContent = s[key];
+      });
+      statusTitleEl.textContent = s['status_' + state];
+      statusPillEl.textContent = s['pill_' + state];
+      statusHintEl.textContent = s['hint_' + state];
+      if (expiresEl) {
+        const iso = expiresEl.dataset.iso;
+        const d = new Date(iso);
+        expiresEl.textContent = isFinite(d.getTime())
+          ? d.toLocaleString(s.expires_locale, { hour12: lang === 'en' })
+          : iso;
+      }
+      langToggleEl.textContent = s.langToggle;
+    }
-    <div class="section">
-      <div class="label">\u914D\u5BF9\u63A5\u53E3\uFF08App \u8C03\u7528\uFF09</div>
-      <div class="mono">POST ${baseUrl}/api/v1/pairing/claim</div>
-    </div>
+    langToggleEl.addEventListener('click', () => {
+      lang = lang === 'zh' ? 'en' : 'zh';
+      localStorage.setItem('hl-lang', lang);
+      applyLang();
+    });
-    <hr class="divider" />
+    if (lang === 'zh') applyLang();
-    <div class="label" style="margin-bottom:0.75rem">\u6D4F\u89C8\u5668\u5FEB\u901F\u914D\u5BF9</div>
-    <button id="btn" onclick="pairBrowser()">\u5728\u6B64\u8BBE\u5907\u4E0A\u914D\u5BF9</button>
-    <div class="status" id="status"></div>
-    <div id="results"></div>
-  </div>
+    let refreshTimer = null;
+    const stopPolling = () => { if (refreshTimer !== null) { clearInterval(refreshTimer); refreshTimer = null; } };
-  <script>
-    ${sessionId ? `
-    let pollTimer = setInterval(async () => {
-      try {
-        const res = await fetch('/api/v1/pairing/session?session_id=${sessionId}');
-        const data = await res.json();
-        if (data.ok && data.session?.claimed) {
-          clearInterval(pollTimer);
-          showStatus('success', 'App \u5DF2\u5B8C\u6210\u914D\u5BF9 \u2713');
-        }
-      } catch {}
-    }, 2000);
-    ` : ""}
+    const markClaimed = () => { state = 'claimed'; applyLang(); stopPolling(); };
+    const markExpired = () => { state = 'expired'; applyLang(); stopPolling(); };
-    async function pairBrowser() {
-      const btn = document.getElementById('btn');
-      btn.disabled = true;
-      btn.textContent = '\u914D\u5BF9\u4E2D...';
+    const refresh = async () => {
+      if (Number.isFinite(expiresAtMs) && Date.now() >= expiresAtMs) { markExpired(); return; }
       try {
-        const res = await fetch('/api/v1/auth/device-session', {
-          method: 'POST',
-          headers: { 'Authorization': 'Bearer ${connectToken}', 'Content-Type': 'application/json' },
-          body: JSON.stringify({ device_label: navigator.userAgent.slice(0, 64), device_platform: 'web' })
-        });
-        const data = await res.json();
-        if (res.ok && data.access_token) {
-          btn.textContent = '\u5DF2\u914D\u5BF9';
-          showStatus('success', '\u914D\u5BF9\u6210\u529F\uFF01');
-          const results = document.getElementById('results');
-          results.innerHTML = \`
-            <div class="result-row"><span class="tag">access_token \xB7 2h</span><div class="mono" onclick="copyText(this)">\${data.access_token.token}</div></div>
-            <div class="result-row" style="margin-top:0.5rem"><span class="tag">refresh_token \xB7 90days</span><div class="mono" onclick="copyText(this)">\${data.refresh_token.token}</div></div>
-          \`;
-        } else {
-          throw new Error(data.error?.message || JSON.stringify(data));
-        }
-      } catch (e) {
-        btn.disabled = false;
-        btn.textContent = '\u5728\u6B64\u8BBE\u5907\u4E0A\u914D\u5BF9';
-        showStatus('error', '\u914D\u5BF9\u5931\u8D25: ' + e.message);
-      }
-    }
-    function showStatus(type, msg) {
-      const el = document.getElementById('status');
-      el.className = 'status ' + type;
-      el.textContent = msg;
-    }
+        const response = await fetch('/api/v1/pairing/session?session_id=' + encodeURIComponent(sessionId), { headers: { accept: 'application/json' } });
+        if (response.status === 404) { markExpired(); return; }
+        if (!response.ok) return;
+        const payload = await response.json();
+        if (payload?.session?.claimed) markClaimed();
+      } catch {}
+    };
-    function copyText(el) {
-      navigator.clipboard.writeText(el.textContent.trim()).then(() => {
-        const orig = el.style.borderColor;
-        el.style.borderColor = '#10b981';
-        setTimeout(() => el.style.borderColor = orig, 800);
-      }).catch(() => {});
+    if (!initialClaimed) {
+      refreshTimer = setInterval(refresh, 2000);
     }
   </script>
 </body>

package/dist/cli/index.js CHANGED Viewed

@@ -21,7 +21,7 @@ import {
   saveConfig,
   startLinkService,
   writeJsonFile
-} from "../chunk-ELQBIHDQ.js";
+} from "../chunk-7IVSOP5F.js";
 import "../chunk-NP3Y2NVF.js";
 // src/cli/index.ts
@@ -259,7 +259,10 @@ async function runPairingPreflight(options) {
     display_name: "Hermes Link",
     session_id: sessionId,
     code: token.token,
-    preferred_urls: preferredUrls
+    preferred_urls: preferredUrls,
+    lan_ips: routes?.lanIps ?? [],
+    public_ipv4s: routes?.publicIpv4s ?? [],
+    public_ipv6s: routes?.publicIpv6s ?? []
   };
   const pageUrl = buildLocalPairingPageUrl(preferredUrls[0] ?? `http://127.0.0.1:${options.config.port}`, sessionId, token.token);
   if (options.openBrowser !== false) {
@@ -273,8 +276,8 @@ async function runPairingPreflight(options) {
     preferredUrls
   };
 }
-function buildLocalPairingPageUrl(baseUrl, sessionId, connectToken) {
-  const qs = new URLSearchParams({ session_id: sessionId, connect_token: connectToken });
+function buildLocalPairingPageUrl(baseUrl, sessionId, _connectToken) {
+  const qs = new URLSearchParams({ session_id: sessionId });
   return `${baseUrl}/pair?${qs.toString()}`;
 }
@@ -414,14 +417,16 @@ async function cmdPair(paths) {
   const result = await runPairingPreflight({ identity, config, paths, openBrowser: false });
   process.stdout.write("\n");
   qrcode.generate(result.qrPayload, { small: true });
+  const pageUrls = result.preferredUrls.map((base) => buildLocalPairingPageUrl(base, result.sessionId));
+  const label = "Pairing page:    ";
+  const indent = " ".repeat(label.length);
   process.stdout.write(`
-Pairing page:    ${result.pageUrl}
+${label}${pageUrls.join(`
+${indent}`)}
 `);
   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(`
 App \u626B\u63CF\u4E8C\u7EF4\u7801\u540E\uFF0C\u8C03\u7528\u4EE5\u4E0B\u63A5\u53E3\u5B8C\u6210\u914D\u5BF9\uFF1A

package/dist/http/app.js CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bulolo/hermes-link",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Provides full client API, multi-device auth and conversation management for Hermes Agent, with LAN and internet connectivity.",
   "author": "Bulolo",
   "license": "MIT",
@@ -75,4 +75,4 @@
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   }
-}
+}