botmux 2.75.1 → 2.76.1

package/dist/cli.js

@@ -42,6 +42,7 @@ import { invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
 import { dispatchPrimaryMessage, findStdinAliasAttachment, sendFileAttachments } from './cli/send-dispatch.js';
 import { buildPm2SpawnCommand } from './cli/pm2-command.js';
+import { callDashboard } from './cli/dashboard-endpoint.js';
 import { rejectLikelyWindowsStdinMojibake } from './cli/stdin-encoding.js';
 import { formatBotInfoEntriesForCli, formatChatBotsForCli, } from './cli/bots-list-output.js';
 import { buildFooterAddressing, hasKnownBotMention, knownBotOpenIdsFromCrossRef, orderedFooterRecipients, } from './utils/bot-routing.js';
@@ -1368,47 +1369,18 @@ function cmdUpgrade() {
     }
 }
 /**
- * Call one of the dashboard's loopback HMAC `/__cli/*` endpoints.
- * - `/__cli/rotate` mints a fresh token and returns its URL, invalidating the
- *   previously-issued link.
- * - `/__cli/current` returns the existing token's URL WITHOUT rotating (404 →
- *   no token has ever been minted → `no-active-token`).
- * Returns { ok: true, url } on success, or { ok: false, reason } so callers can
- * decide how to surface the failure (hard error vs soft hint).
+ * Call one of the dashboard's loopback HMAC `/__cli/*` endpoints. Thin wrapper
+ * over {@link callDashboard}, which handles 404 disambiguation and self-heals a
+ * stale `.dashboard-port` that points at the wrong service (e.g. daemon IPC).
+ * See `src/cli/dashboard-endpoint.ts` for the why.
  */
 async function callDashboardEndpoint(path) {
-    const SECRET_PATH = join(CONFIG_DIR, '.dashboard-secret');
-    if (!existsSync(SECRET_PATH))
-        return { ok: false, reason: 'no-secret' };
-    const secret = readFileSync(SECRET_PATH, 'utf8').trim();
-    const ts = Math.floor(Date.now() / 1000).toString();
-    const nonce = randomBytes(8).toString('hex');
-    const sig = createHmac('sha256', secret).update(`${ts}:${nonce}`).digest('base64url');
-    const portFile = join(CONFIG_DIR, '.dashboard-port');
-    const port = (existsSync(portFile) ? readFileSync(portFile, 'utf8').trim() : '')
-        || process.env.BOTMUX_DASHBOARD_PORT
-        || '7891';
-    let res;
-    try {
-        res = await fetch(`http://127.0.0.1:${port}${path}`, {
-            method: 'POST',
-            headers: {
-                'X-Botmux-Cli-Ts': ts,
-                'X-Botmux-Cli-Nonce': nonce,
-                'X-Botmux-Cli-Auth': sig,
-            },
-        });
-    }
-    catch {
-        return { ok: false, reason: 'unreachable' };
-    }
-    if (res.status === 404)
-        return { ok: false, reason: 'no-active-token' };
-    if (!res.ok) {
-        return { ok: false, reason: 'http-error', detail: `${res.status} ${await res.text()}` };
-    }
-    const body = await res.json();
-    return { ok: true, url: body.url };
+    return callDashboard({
+        configDir: CONFIG_DIR,
+        defaultPort: 7891,
+        envPort: process.env.BOTMUX_DASHBOARD_PORT,
+        path,
+    });
 }
 /**
  * Best-effort dashboard hint printed after start/restart. Reads the LIVE link
@@ -1428,8 +1400,10 @@ async function printDashboardHintWithRetry() {
             return;
         }
         // Terminal states — file-backed secret/token won't appear mid-poll, unlike
-        // a not-yet-listening port. Don't spin on them.
-        if (last.reason === 'no-secret' || last.reason === 'no-active-token')
+        // a not-yet-listening port. `wrong-service` means the port file points at a
+        // non-dashboard server and discovery already failed to find it, so retrying
+        // won't help either. Don't spin on any of them.
+        if (last.reason === 'no-secret' || last.reason === 'no-active-token' || last.reason === 'wrong-service')
             break;
         await new Promise(r => setTimeout(r, stepMs));
     }
@@ -1440,6 +1414,9 @@ async function printDashboardHintWithRetry() {
     else if (last?.reason === 'no-secret') {
         console.log('   面板: dashboard 凭证未就绪，启动后可用 `botmux dashboard` 获取链接');
     }
+    else if (last?.reason === 'wrong-service') {
+        console.log('   面板: `botmux dashboard`（端口文件可能已失效，必要时 `botmux restart` 刷新）');
+    }
     else {
         console.log('   面板: `botmux dashboard`（daemon 启动中，稍后可获取链接）');
     }
@@ -1455,15 +1432,24 @@ async function cmdDashboard() {
         console.log(r.url);
         return;
     }
+    const portFile = join(CONFIG_DIR, '.dashboard-port');
+    const recordedPort = (existsSync(portFile) ? readFileSync(portFile, 'utf8').trim() : '')
+        || process.env.BOTMUX_DASHBOARD_PORT
+        || '7891';
     if (r.reason === 'no-secret') {
         console.error('Dashboard not initialised. Run `botmux restart` first.');
     }
     else if (r.reason === 'unreachable') {
-        const portFile = join(CONFIG_DIR, '.dashboard-port');
-        const port = (existsSync(portFile) ? readFileSync(portFile, 'utf8').trim() : '')
-            || process.env.BOTMUX_DASHBOARD_PORT
-            || '7891';
-        console.error(`dashboard process not reachable on 127.0.0.1:${port} — \`botmux restart\` will start it`);
+        console.error(`dashboard process not reachable on 127.0.0.1:${recordedPort} — \`botmux restart\` will start it`);
+    }
+    else if (r.reason === 'wrong-service') {
+        // 127.0.0.1:<port> answered, but it isn't the dashboard (typically the
+        // daemon IPC server holding a port the stale .dashboard-port points at),
+        // and rediscovery across the probe range found no dashboard either.
+        console.error(`127.0.0.1:${recordedPort} 上的服务不是 dashboard（端口文件 ~/.botmux/.dashboard-port 已失效，可能指向了 daemon IPC）。` +
+            '运行 `botmux restart` 重启 dashboard 并刷新端口文件。');
+        if (r.detail)
+            console.error(`  详情: ${r.detail}`);
     }
     else {
         // `no-active-token` can't occur on rotate (it always mints); fall through.