bingocode 1.1.62 → 1.1.64

package/src/manager/CliMenuManager.tsx

@@ -285,7 +285,6 @@ export const CliMenuManager: React.FC = () => {
     let mounted = true;
     (async () => {
       if (apiUrl) return;
-
       const entry = path.resolve(import.meta.dir, '../server/index.ts');
       const MAX_RETRIES = 3;
       const RETRY_DELAYS = [0, 2000, 5000]; // 首次无延迟，第2次2秒，第3次5秒

package/src/server/ensureSingletonLocalServer.ts

@@ -1,256 +1,160 @@
-  // server/ensureSingletonLocalServer.ts
-  import { spawn, spawnSync } from 'child_process';
-  import fs from 'fs';
-  import fsp from 'fs/promises';
-  import path from 'path';
-  import os from 'os';
-  import axios from 'axios';
-
-  const LOG_FILE = path.join(os.homedir(), '.claude-cli', 'runtime', 'boot.log');
-  function log(msg: string) {
-    try {
-      const line = `[${new Date().toISOString()}] ${msg}\n`;
-      fs.mkdirSync(path.dirname(LOG_FILE), { recursive: true });
-      fs.appendFileSync(LOG_FILE, line);
-    } catch {}
-  }
-
-  type Handle = {
-    baseUrl: string;
-    stopIfLast: () => Promise<void>;
-    pid?: number;
-  };
-
-  const RUNTIME_DIR = path.join(os.homedir(), '.claude-cli', 'runtime');
-  const LOCK_JSON = path.join(RUNTIME_DIR, 'server.lock.json');
-  const BOOT_LOCK = path.join(RUNTIME_DIR, 'server.boot.lock');
-  const LEASES_DIR = path.join(RUNTIME_DIR, 'leases');
-
-  const DEFAULT_HOST = '127.0.0.1';
-  const DEFAULT_PORT = Number(process.env.SERVER_PORT || 3456);
-  const HEALTH_TIMEOUT_MS = Number(process.env.HEALTH_TIMEOUT_MS || 20000);
-  const HEALTH_RETRY_MS = 300;
-
-  function mkdirp(p: string) { fs.mkdirSync(p, { recursive: true }); }
-  function atomicCreate(p: string): boolean {
-    try { const fd = fs.openSync(p, 'wx'); fs.closeSync(fd); return true; } catch { return false; }
-  }
-  function rmSafe(p: string) { try { fs.rmSync(p, { force: true, recursive: true }); } catch {} }
-  function readJson<T>(p: string): T | null { try { return JSON.parse(fs.readFileSync(p, 'utf-8')) as T; } catch { return null; } }
-  function writeJson(p: string, data: any) { fs.writeFileSync(p, JSON.stringify(data, null, 2), 'utf-8'); }
-  function isPidAlive(pid: number): boolean { try { process.kill(pid, 0); return true; } catch { return false; } }
-  async function waitHealthy(baseUrl: string, timeoutMs: number) {
-    const start = Date.now(); let lastErr: any = null;
-    while (Date.now() - start < timeoutMs) {
-      try {
-        const r = await axios.get(baseUrl.replace(/\/+$/, '') + '/health', { timeout: 1500 });
-        if (r.status === 200 && r.data?.status === 'ok') return;
-      } catch (e) { lastErr = e; }
-      await new Promise(r => setTimeout(r, HEALTH_RETRY_MS));
-    }
-    throw new Error(`健康检查超时：${lastErr?.message || 'unknown'}`);
-  }
-  function resolveBunPath() {
-    const fromEnv = process.env.BUN_PATH;
-    if (fromEnv) return fromEnv;
-    const r = spawnSync('bun', ['--version'], { stdio: 'ignore' });
-    if (r.status === 0) return 'bun';
-    throw new Error('未检测到 bun，请安装 https://bun.sh 或设置 BUN_PATH');
-  }
-
-  async function acquireLease(): Promise<string> {
-    mkdirp(LEASES_DIR);
-    const lease = path.join(LEASES_DIR, `${process.pid}.json`);
-    await fsp.writeFile(lease, JSON.stringify({ pid: process.pid, ts: Date.now() }));
-    const cleanup = () => rmSafe(lease);
-    process.once('exit', cleanup);
-    process.once('SIGINT', () => { cleanup(); process.exit(130); });
-    process.once('SIGTERM', () => { cleanup(); process.exit(143); });
-    return lease;
-  }
-  function countValidLeases(): number {
-    try {
-      const files = fs.readdirSync(LEASES_DIR);
-      let alive = 0;
-      for (const f of files) {
-        const p = path.join(LEASES_DIR, f);
-        const data = readJson<{pid:number, ts:number}>(p);
-        if (data?.pid && isPidAlive(data.pid)) alive++;
-        else rmSafe(p);
-      }
-      return alive;
-    } catch { return 0; }
-  }
-
-  export async function ensureSingletonLocalServer(opts: {
-    serverEntry: string;
-    host?: string;
-    port?: number;
-    baseUrlEnv?: string;
-    passEnv?: Record<string, string>;
-  }): Promise<Handle> {
-    log(`=== ensureSingletonLocalServer 启动 ===`);
-    log(`serverEntry: ${opts.serverEntry}`);
-    log(`serverEntry exists: ${fs.existsSync(opts.serverEntry)}`);
-    log(`process.cwd: ${process.cwd()}`);
-    log(`process.execPath: ${process.execPath}`);
-    log(`platform: ${process.platform} arch: ${process.arch}`);
-    log(`node version: ${process.version}`);
-
-    const preset = (opts.baseUrlEnv || process.env.BASE_API_URL || '').trim();
-    if (preset) {
-      log(`使用预设 baseUrl: ${preset}`);
-      try { await waitHealthy(preset, 3000); } catch {}
-      await acquireLease();
-      return { baseUrl: preset.replace(/\/+$/, ''), stopIfLast: async () => {} };
-    }
-
-    const host = opts.host || DEFAULT_HOST;
-    const port = Number(opts.port ?? DEFAULT_PORT);
-    const baseUrl = `http://${host}:${port}`;
-    log(`目标 baseUrl: ${baseUrl}`);
-    mkdirp(RUNTIME_DIR);
-
-    const lock = readJson<{ pid:number, port:number }>(LOCK_JSON);
-    log(`现有锁文件: ${JSON.stringify(lock)}`);
-    if (lock && lock.port === port) {
-      const healthy = await (async () => { try { await waitHealthy(baseUrl, 1200); return true; } catch { return false; } })();
-      log(`已有锁 pid=${lock.pid} healthy=${healthy} alive=${lock.pid ? isPidAlive(lock.pid) : false}`);
-      if (healthy && isPidAlive(lock.pid)) {
-        await acquireLease();
-        return { baseUrl, stopIfLast: makeStopIfLast(lock.pid, baseUrl), pid: lock.pid };
-      }
-      log(`锁文件无效，清除`);
-      rmSafe(LOCK_JSON);
-    }
-
-    const iAmSpawner = atomicCreate(BOOT_LOCK);
-    log(`iAmSpawner: ${iAmSpawner}`);
-    if (!iAmSpawner) {
-      log(`等待其他进程启动服务...`);
-      try { await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS); } catch {
-        log(`等待超时，清除 boot lock 后重试`);
-        rmSafe(BOOT_LOCK); rmSafe(LOCK_JSON);
-        return await ensureSingletonLocalServer(opts);
-      }
-      await acquireLease();
-      const live = readJson<{pid:number}>(LOCK_JSON);
-      return { baseUrl, stopIfLast: makeStopIfLast(live?.pid || 0, baseUrl), pid: live?.pid };
-    }
-
-    let child: any = null;
-    try {
-      let bun: string;
-      try {
-        bun = resolveBunPath();
-        log(`bun 路径: ${bun}`);
-      } catch (e: any) {
-        log(`resolveBunPath 失败: ${e?.message}`);
-        throw e;
-      }
-
-      // 检查 serverEntry 文件是否存在
-      if (!fs.existsSync(opts.serverEntry)) {
-        log(`错误：serverEntry 文件不存在: ${opts.serverEntry}`);
-        // 尝试列出父目录内容帮助诊断
-        try {
-          const parentDir = path.dirname(opts.serverEntry);
-          log(`父目录 ${parentDir} 存在: ${fs.existsSync(parentDir)}`);
-          if (fs.existsSync(parentDir)) {
-            const files = fs.readdirSync(parentDir);
-            log(`父目录内容: ${files.join(', ')}`);
-          }
-          // 列出祖父目录
-          const grandParentDir = path.dirname(parentDir);
-          log(`祖父目录 ${grandParentDir} 存在: ${fs.existsSync(grandParentDir)}`);
-          if (fs.existsSync(grandParentDir)) {
-            const files2 = fs.readdirSync(grandParentDir);
-            log(`祖父目录内容: ${files2.join(', ')}`);
-          }
-        } catch (dirErr: any) {
-          log(`目录列举失败: ${dirErr?.message}`);
-        }
-        throw new Error(`服务器入口文件不存在: ${opts.serverEntry}`);
-      }
-
-      const spawnArgs = [opts.serverEntry, '--host', host, '--port', String(port)];
-      const spawnEnv = { ...process.env, SERVER_AUTH_REQUIRED: '0', ...(opts.passEnv || {}) };
-      // cwd 设为包根目录（serverEntry 的两级上级：src/server -> src -> 包根），
-      // 确保 bun 能从正确位置查找 node_modules，无论用户在哪个目录启动
-      const serverCwd = path.dirname(path.dirname(path.dirname(opts.serverEntry)));
-      log(`spawn: ${bun} ${spawnArgs.join(' ')}`);
-      log(`spawn cwd: ${serverCwd}`);
-
-      child = spawn(
-        bun,
-        spawnArgs,
-        {
-          env: spawnEnv,
-          cwd: serverCwd,
-          stdio: ['ignore', 'pipe', 'pipe'],
-          detached: false,
-        }
-      );
-
-      log(`子进程 pid: ${child.pid}`);
-
-      // 收集子进程输出用于诊断
-      let childStdout = '';
-      let childStderr = '';
-      child.stdout?.on('data', (d: Buffer) => {
-        const s = d.toString();
-        childStdout += s;
-        log(`[child stdout] ${s.trim()}`);
-      });
-      child.stderr?.on('data', (d: Buffer) => {
-        const s = d.toString();
-        childStderr += s;
-        log(`[child stderr] ${s.trim()}`);
-      });
-      child.on('exit', (code: number | null, signal: string | null) => {
-        log(`子进程退出: code=${code} signal=${signal}`);
-        log(`子进程 stdout 总计: ${childStdout.slice(0, 500)}`);
-        log(`子进程 stderr 总计: ${childStderr.slice(0, 500)}`);
-      });
-      child.on('error', (err: Error) => {
-        log(`子进程 spawn error: ${err.message}`);
-      });
-
-      log(`开始健康检查，超时 ${HEALTH_TIMEOUT_MS}ms`);
-      await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS);
-      log(`健康检查通过`);
-      writeJson(LOCK_JSON, { pid: child.pid, port, startedAt: new Date().toISOString() });
-    } catch (e: any) {
-      log(`启动失败: ${e?.message}`);
-      if (child?.pid) {
-        log(`清理子进程 pid=${child.pid}`);
-        try {
-          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(child.pid), '/T', '/F']);
-          else process.kill(child.pid, 'SIGTERM');
-        } catch {}
-      }
-      throw e;
-    } finally {
-      rmSafe(BOOT_LOCK);
-    }
-
-    await acquireLease();
-    log(`启动完成 pid=${child.pid} baseUrl=${baseUrl}`);
-    return { baseUrl, stopIfLast: makeStopIfLast(child.pid, baseUrl), pid: child.pid };
-  }
-
-  function makeStopIfLast(serverPid: number, baseUrl: string) {
-    return async () => {
-      const rest = countValidLeases();
-      if (rest > 0) return;
-      let healthy = false;
-      try { await waitHealthy(baseUrl, 800); healthy = true; } catch {}
-      if (healthy && serverPid && isPidAlive(serverPid)) {
-        try {
-          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(serverPid), '/T', '/F']);
-          else process.kill(serverPid, 'SIGTERM');
-        } catch {}
-      }
-      rmSafe(LOCK_JSON);
-    };
-  }
+  // server/ensureSingletonLocalServer.ts
+  import { spawn, spawnSync } from 'child_process';
+  import fs from 'fs';
+  import fsp from 'fs/promises';
+  import path from 'path';
+  import os from 'os';
+  import axios from 'axios';
+
+  type Handle = {
+    baseUrl: string;
+    stopIfLast: () => Promise<void>;
+    pid?: number;
+  };
+
+  const RUNTIME_DIR = path.join(os.homedir(), '.claude-cli', 'runtime');
+  const LOCK_JSON = path.join(RUNTIME_DIR, 'server.lock.json');
+  const BOOT_LOCK = path.join(RUNTIME_DIR, 'server.boot.lock');
+  const LEASES_DIR = path.join(RUNTIME_DIR, 'leases');
+
+  const DEFAULT_HOST = '127.0.0.1';
+  const DEFAULT_PORT = Number(process.env.SERVER_PORT || 3456);
+  const HEALTH_TIMEOUT_MS = Number(process.env.HEALTH_TIMEOUT_MS || 20000);
+  const HEALTH_RETRY_MS = 300;
+
+  function mkdirp(p: string) { fs.mkdirSync(p, { recursive: true }); }
+  function atomicCreate(p: string): boolean {
+    try { const fd = fs.openSync(p, 'wx'); fs.closeSync(fd); return true; } catch { return false; }
+  }
+  function rmSafe(p: string) { try { fs.rmSync(p, { force: true, recursive: true }); } catch {} }
+  function readJson<T>(p: string): T | null { try { return JSON.parse(fs.readFileSync(p, 'utf-8')) as T; } catch { return null; } }
+  function writeJson(p: string, data: any) { fs.writeFileSync(p, JSON.stringify(data, null, 2), 'utf-8'); }
+  function isPidAlive(pid: number): boolean { try { process.kill(pid, 0); return true; } catch { return false; } }
+  async function waitHealthy(baseUrl: string, timeoutMs: number) {
+    const start = Date.now(); let lastErr: any = null;
+    while (Date.now() - start < timeoutMs) {
+      try {
+        const r = await axios.get(baseUrl.replace(/\/+$/, '') + '/health', { timeout: 1500 });
+        if (r.status === 200 && r.data?.status === 'ok') return;
+      } catch (e) { lastErr = e; }
+      await new Promise(r => setTimeout(r, HEALTH_RETRY_MS));
+    }
+    throw new Error(`健康检查超时：${lastErr?.message || 'unknown'}`);
+  }
+  function resolveBunPath() {
+    const fromEnv = process.env.BUN_PATH;
+    if (fromEnv) return fromEnv;
+    const r = spawnSync('bun', ['--version'], { stdio: 'ignore' });
+    if (r.status === 0) return 'bun';
+    throw new Error('未检测到 bun，请安装 https://bun.sh 或设置 BUN_PATH');
+  }
+
+  async function acquireLease(): Promise<string> {
+    mkdirp(LEASES_DIR);
+    const lease = path.join(LEASES_DIR, `${process.pid}.json`);
+    await fsp.writeFile(lease, JSON.stringify({ pid: process.pid, ts: Date.now() }));
+    const cleanup = () => rmSafe(lease);
+    process.once('exit', cleanup);
+    process.once('SIGINT', () => { cleanup(); process.exit(130); });
+    process.once('SIGTERM', () => { cleanup(); process.exit(143); });
+    return lease;
+  }
+  function countValidLeases(): number {
+    try {
+      const files = fs.readdirSync(LEASES_DIR);
+      let alive = 0;
+      for (const f of files) {
+        const p = path.join(LEASES_DIR, f);
+        const data = readJson<{pid:number, ts:number}>(p);
+        if (data?.pid && isPidAlive(data.pid)) alive++;
+        else rmSafe(p);
+      }
+      return alive;
+    } catch { return 0; }
+  }
+
+  export async function ensureSingletonLocalServer(opts: {
+    serverEntry: string;
+    host?: string;
+    port?: number;
+    baseUrlEnv?: string;
+    passEnv?: Record<string, string>;
+  }): Promise<Handle> {
+    const preset = (opts.baseUrlEnv || process.env.BASE_API_URL || '').trim();
+    if (preset) {
+      try { await waitHealthy(preset, 3000); } catch {}
+      await acquireLease();
+      return { baseUrl: preset.replace(/\/+$/, ''), stopIfLast: async () => {} };
+    }
+
+    const host = opts.host || DEFAULT_HOST;
+    const port = Number(opts.port ?? DEFAULT_PORT);
+    const baseUrl = `http://${host}:${port}`;
+    mkdirp(RUNTIME_DIR);
+
+    const lock = readJson<{ pid:number, port:number }>(LOCK_JSON);
+    if (lock && lock.port === port) {
+      const healthy = await (async () => { try { await waitHealthy(baseUrl, 1200); return true; } catch { return false; } })();
+      if (healthy && isPidAlive(lock.pid)) {
+        await acquireLease();
+        return { baseUrl, stopIfLast: makeStopIfLast(lock.pid, baseUrl), pid: lock.pid };
+      }
+      rmSafe(LOCK_JSON);
+    }
+
+    const iAmSpawner = atomicCreate(BOOT_LOCK);
+    if (!iAmSpawner) {
+      try { await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS); } catch {
+        rmSafe(BOOT_LOCK); rmSafe(LOCK_JSON);
+        return await ensureSingletonLocalServer(opts);
+      }
+      await acquireLease();
+      const live = readJson<{pid:number}>(LOCK_JSON);
+      return { baseUrl, stopIfLast: makeStopIfLast(live?.pid || 0, baseUrl), pid: live?.pid };
+    }
+
+    let child: any = null;
+    try {
+      const bun = resolveBunPath();
+      child = spawn(
+        bun,
+        [opts.serverEntry, '--host', host, '--port', String(port)],
+        {
+          env: { ...process.env, SERVER_AUTH_REQUIRED: '0', ...(opts.passEnv || {}) },
+          stdio: 'ignore',
+          detached: false,
+        }
+      );
+      await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS);
+      writeJson(LOCK_JSON, { pid: child.pid, port, startedAt: new Date().toISOString() });
+    } catch (e) {
+      if (child?.pid) {
+        try {
+          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(child.pid), '/T', '/F']);
+          else process.kill(child.pid, 'SIGTERM');
+        } catch {}
+      }
+      throw e;
+    } finally {
+      rmSafe(BOOT_LOCK);
+    }
+
+    await acquireLease();
+    return { baseUrl, stopIfLast: makeStopIfLast(child.pid, baseUrl), pid: child.pid };
+  }
+
+  function makeStopIfLast(serverPid: number, baseUrl: string) {
+    return async () => {
+      const rest = countValidLeases();
+      if (rest > 0) return;
+      let healthy = false;
+      try { await waitHealthy(baseUrl, 800); healthy = true; } catch {}
+      if (healthy && serverPid && isPidAlive(serverPid)) {
+        try {
+          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(serverPid), '/T', '/F']);
+          else process.kill(serverPid, 'SIGTERM');
+        } catch {}
+      }
+      rmSafe(LOCK_JSON);
+    };
+  }