cx-viewer 1.0.0 → 1.0.2

package/server.js

@@ -2,7 +2,7 @@ import { createServer } from 'node:http';
 import { createServer as createHttpsServer } from 'node:https';
 import { createConnection } from 'node:net';
 import { randomBytes } from 'node:crypto';
-import { readFileSync, writeFileSync, existsSync, watchFile, unwatchFile, statSync, readdirSync, renameSync, unlinkSync, rmSync, openSync, readSync, closeSync, realpathSync, mkdirSync, createReadStream, cpSync, copyFileSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, watchFile, unwatchFile, statSync, readdirSync, renameSync, unlinkSync, rmSync, openSync, readSync, closeSync, realpathSync, mkdirSync, createReadStream, cpSync, copyFileSync, appendFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, extname, resolve, basename } from 'node:path';
 import { homedir, platform, networkInterfaces } from 'node:os';
@@ -53,6 +53,31 @@ import { countLogEntries, streamRawEntriesAsync, readPagedEntries } from './lib/
 
 // 动态获取 getPrefsFile()（LOG_DIR 可能在运行时被 setLogDir 修改）
 function getPrefsFile() { return join(LOG_DIR, 'preferences.json'); }
+function readPreferences() {
+  let prefs = {};
+  try { if (existsSync(getPrefsFile())) prefs = JSON.parse(readFileSync(getPrefsFile(), 'utf-8')); } catch { }
+  return prefs;
+}
+function writePreferences(prefs) {
+  const prefsFile = getPrefsFile();
+  const prefsDir = dirname(prefsFile);
+  if (!existsSync(prefsDir)) mkdirSync(prefsDir, { recursive: true });
+  writeFileSync(prefsFile, JSON.stringify(prefs, null, 2));
+}
+function normalizePluginFilename(name) {
+  return String(name || '').replace(/.*[/\\]/, '');
+}
+function removeDisabledPluginNames(names) {
+  const targetNames = Array.from(new Set((names || []).filter(Boolean)));
+  if (targetNames.length === 0) return false;
+  const prefs = readPreferences();
+  const disabledPlugins = Array.isArray(prefs.disabledPlugins) ? prefs.disabledPlugins : [];
+  const next = disabledPlugins.filter(name => !targetNames.includes(name));
+  if (next.length === disabledPlugins.length) return false;
+  prefs.disabledPlugins = next;
+  writePreferences(prefs);
+  return true;
+}
 
 // 启动时一次性读取 ~/.codex/settings.json（不 watch）
 let codexSettings = {};
@@ -153,11 +178,73 @@ const ACCESS_TOKEN = randomBytes(16).toString('hex');
 
 let clients = [];
 let server;
+let secondaryServer = null;
 let actualPort = 0;
+let secondaryPort = 0;
 let serverProtocol = 'http';
+let publicAccessProtocol = 'http';
+let publicAccessPort = 0;
+let pluginRoutes = [];
 // Stats Worker 实例
 let statsWorker = null;
 
+function registerPluginRoute(method, path, handler) {
+  const normalizedMethod = String(method || 'GET').toUpperCase();
+  const normalizedPath = String(path || '').trim();
+  if (!normalizedPath.startsWith('/')) {
+    throw new Error('Plugin route path must start with "/"');
+  }
+  if (typeof handler !== 'function') {
+    throw new Error('Plugin route handler must be a function');
+  }
+  const nextRoute = { method: normalizedMethod, path: normalizedPath, handler };
+  const idx = pluginRoutes.findIndex(route => route.method === normalizedMethod && route.path === normalizedPath);
+  if (idx >= 0) pluginRoutes[idx] = nextRoute;
+  else pluginRoutes.push(nextRoute);
+}
+
+async function refreshPluginRuntime() {
+  pluginRoutes = [];
+  if (!server || !actualPort) return;
+  await runParallelHook('serverStarted', {
+    port: actualPort,
+    host: HOST,
+    url: `${serverProtocol}://127.0.0.1:${actualPort}`,
+    ip: getLocalIp(),
+    token: ACCESS_TOKEN,
+    protocol: serverProtocol,
+    httpServer: server,
+    registerRoute: registerPluginRoute,
+  });
+}
+
+function getPublicAccessUrl(ip = getLocalIp()) {
+  const protocol = publicAccessProtocol || serverProtocol;
+  const port = publicAccessPort || actualPort;
+  return `${protocol}://${ip}:${port}?token=${ACCESS_TOKEN}`;
+}
+
+function findAvailablePort(startPort) {
+  return new Promise((resolve) => {
+    function tryPort(port) {
+      if (port > MAX_PORT) {
+        resolve(null);
+        return;
+      }
+      const probe = createConnection({ host: '127.0.0.1', port });
+      probe.on('connect', () => {
+        probe.destroy();
+        tryPort(port + 1);
+      });
+      probe.on('error', () => {
+        probe.destroy();
+        resolve(port);
+      });
+    }
+    tryPort(startPort);
+  });
+}
+
 function startStatsWorker() {
   try {
     statsWorker = new Worker(new URL('./lib/stats-worker.js', import.meta.url));
@@ -270,6 +357,21 @@ async function handleRequest(req, res) {
     }
   }
 
+  const pluginRoute = pluginRoutes.find(route => route.method === method && route.path === url);
+  if (pluginRoute) {
+    try {
+      await pluginRoute.handler(req, res, parsedUrl);
+    } catch (err) {
+      if (!res.headersSent) {
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: err.message }));
+      } else {
+        try { res.end(); } catch {}
+      }
+    }
+    return;
+  }
+
   // OTLP HTTP 接收端点 — 接收 Codex 原生 OTel trace 数据
   if (url === '/v1/traces' && method === 'POST') {
     const buffers = [];
@@ -466,8 +568,7 @@ async function handleRequest(req, res) {
   }
 
   if (url === '/api/preferences' && method === 'GET') {
-    let prefs = {};
-    try { if (existsSync(getPrefsFile())) prefs = JSON.parse(readFileSync(getPrefsFile(), 'utf-8')); } catch { }
+    let prefs = readPreferences();
     prefs.logDir = LOG_DIR; // 始终返回当前运行时的日志目录
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify(prefs));
@@ -484,14 +585,9 @@ async function handleRequest(req, res) {
         if (incoming.logDir && typeof incoming.logDir === 'string') {
           setLogDir(incoming.logDir);
         }
-        let prefs = {};
-        try { if (existsSync(getPrefsFile())) prefs = JSON.parse(readFileSync(getPrefsFile(), 'utf-8')); } catch { }
+        let prefs = readPreferences();
         Object.assign(prefs, incoming);
-        // 确保目录存在
-        const prefsFile = getPrefsFile();
-        const prefsDir = dirname(prefsFile);
-        if (!existsSync(prefsDir)) mkdirSync(prefsDir, { recursive: true });
-        writeFileSync(prefsFile, JSON.stringify(prefs, null, 2));
+        writePreferences(prefs);
         // 主题切换时同步到 Codex Code CLI：发 /theme，监听输出验证结果，不对就再发一次
         if (incoming.themeColor && _writeToPty && _onPtyData) {
           const target = incoming.themeColor === 'light' ? 'light' : 'dark';
@@ -973,6 +1069,17 @@ async function handleRequest(req, res) {
     return;
   }
 
+  if (url === '/api/terminal-history' && method === 'GET') {
+    const { getPtyState, getOutputBuffer, getOutputHistoryId } = await import('./pty-manager.js');
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({
+      ...getPtyState(),
+      historyId: getOutputHistoryId(),
+      data: getOutputBuffer() || '',
+    }));
+    return;
+  }
+
   // 当前版本号
   if (url === '/api/version-info' && method === 'GET') {
     try {
@@ -2263,6 +2370,32 @@ async function handleRequest(req, res) {
     return;
   }
 
+  if (url === '/api/plugins/module' && method === 'GET') {
+    try {
+      const file = normalizePluginFilename(parsedUrl.searchParams.get('file'));
+      if (!file || (extname(file) !== '.js' && extname(file) !== '.mjs')) {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Invalid plugin filename' }));
+        return;
+      }
+      const filePath = join(getPluginsDir(), file);
+      if (!existsSync(filePath) || !statSync(filePath).isFile()) {
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Plugin file not found' }));
+        return;
+      }
+      res.writeHead(200, {
+        'Content-Type': 'application/javascript; charset=utf-8',
+        'Cache-Control': 'no-store',
+      });
+      res.end(readFileSync(filePath, 'utf-8'));
+    } catch (err) {
+      res.writeHead(500, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: err.message }));
+    }
+    return;
+  }
+
   if (url === '/api/plugins' && method === 'DELETE') {
     const file = parsedUrl.searchParams.get('file');
     if (!file || file.includes('..') || file.includes('/') || file.includes('\\')) {
@@ -2277,8 +2410,11 @@ async function handleRequest(req, res) {
         res.end(JSON.stringify({ error: 'File not found' }));
         return;
       }
+      const targetPlugin = getPluginsInfo().find(p => p.file === file);
       unlinkSync(filePath);
+      if (targetPlugin?.name) removeDisabledPluginNames([targetPlugin.name]);
       await loadPlugins();
+      await refreshPluginRuntime();
       const plugins = getPluginsInfo();
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ ok: true, plugins, pluginsDir: getPluginsDir() }));
@@ -2292,6 +2428,7 @@ async function handleRequest(req, res) {
   if (url === '/api/plugins/reload' && method === 'POST') {
     try {
       await loadPlugins();
+      await refreshPluginRuntime();
       const plugins = getPluginsInfo();
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ ok: true, plugins, pluginsDir: getPluginsDir() }));
@@ -2310,7 +2447,15 @@ async function handleRequest(req, res) {
         const { files: fileList } = JSON.parse(body);
         uploadPlugins(getPluginsDir(), fileList);
         await loadPlugins();
-        const plugins = getPluginsInfo();
+        await refreshPluginRuntime();
+        let plugins = getPluginsInfo();
+        const uploadedFiles = new Set((fileList || []).map(file => normalizePluginFilename(file?.name)));
+        const uploadedNames = plugins.filter(plugin => uploadedFiles.has(plugin.file)).map(plugin => plugin.name);
+        if (removeDisabledPluginNames(uploadedNames)) {
+          await loadPlugins();
+          await refreshPluginRuntime();
+          plugins = getPluginsInfo();
+        }
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify({ ok: true, plugins, pluginsDir: getPluginsDir() }));
       } catch (err) {
@@ -2329,9 +2474,16 @@ async function handleRequest(req, res) {
       try {
         const { url: fileUrl } = JSON.parse(body);
         const extractScript = join(__dirname, 'lib', 'extract-plugin-name.mjs');
-        await installPluginFromUrl(getPluginsDir(), fileUrl, extractScript);
+        const { filename } = await installPluginFromUrl(getPluginsDir(), fileUrl, extractScript);
         await loadPlugins();
-        const plugins = getPluginsInfo();
+        await refreshPluginRuntime();
+        let plugins = getPluginsInfo();
+        const installedNames = plugins.filter(plugin => plugin.file === filename).map(plugin => plugin.name);
+        if (removeDisabledPluginNames(installedNames)) {
+          await loadPlugins();
+          await refreshPluginRuntime();
+          plugins = getPluginsInfo();
+        }
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify({ ok: true, plugins, pluginsDir: getPluginsDir() }));
       } catch (err) {
@@ -2346,10 +2498,22 @@ async function handleRequest(req, res) {
   // 返回局域网访问地址
   if (url === '/api/local-url' && method === 'GET') {
     const localIp = getLocalIp();
-    const defaultUrl = `${serverProtocol}://${localIp}:${actualPort}?token=${ACCESS_TOKEN}`;
-    const hookResult = await runWaterfallHook('localUrl', { url: defaultUrl, ip: localIp, port: actualPort, token: ACCESS_TOKEN });
+    const defaultUrl = getPublicAccessUrl(localIp);
+    const hookResult = await runWaterfallHook('localUrl', {
+      url: defaultUrl,
+      ip: localIp,
+      port: publicAccessPort || actualPort,
+      token: ACCESS_TOKEN,
+      protocol: publicAccessProtocol || serverProtocol,
+      httpUrl: actualPort ? `http://${localIp}:${actualPort}?token=${ACCESS_TOKEN}` : null,
+      httpsUrl: secondaryPort ? `https://${localIp}:${secondaryPort}?token=${ACCESS_TOKEN}` : null,
+    });
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ url: hookResult.url }));
+    res.end(JSON.stringify({
+      url: hookResult.url,
+      httpUrl: actualPort ? `http://${localIp}:${actualPort}?token=${ACCESS_TOKEN}` : null,
+      httpsUrl: secondaryPort ? `https://${localIp}:${secondaryPort}?token=${ACCESS_TOKEN}` : null,
+    }));
     return;
   }
 
@@ -2715,22 +2879,68 @@ async function handleRequest(req, res) {
 }
 
 export async function startViewer() {
+  pluginRoutes = [];
+  secondaryServer = null;
+  secondaryPort = 0;
+  publicAccessProtocol = 'http';
+  publicAccessPort = 0;
   // 加载插件（需要在创建服务器之前，以便通过 hook 获取 HTTPS 证书）
   await loadPlugins();
 
   // 通过插件 hook 获取 HTTPS 证书选项
   let httpsOptions = null;
+  let httpsFromPlugin = false;
   try {
     const httpsResult = await runWaterfallHook('httpsOptions', {});
     httpsOptions = (httpsResult.pfx || httpsResult.cert) ? httpsResult : null;
+    httpsFromPlugin = !!httpsOptions;
   } catch (err) {
     console.error('[CX Viewer] httpsOptions hook error:', err.message);
   }
 
-  const useHttps = !!httpsOptions;
+  // 自动生成自签证书，供 HTTPS 访问使用。
+  // CLI 模式下会保留 HTTP 主入口，同时额外起一个 HTTPS 入口用于二维码和局域网麦克风访问。
+  if (!httpsOptions) {
+    try {
+      const { generateKeyPairSync, createSign, X509Certificate } = await import('node:crypto');
+      const { privateKey, publicKey } = generateKeyPairSync('rsa', {
+        modulusLength: 2048,
+        publicKeyEncoding: { type: 'spki', format: 'pem' },
+        privateKeyEncoding: { type: 'pkcs8', format: 'pem' },
+      });
+      // 用 node:tls 的 createSecureContext 验证 key 可用性
+      // 生成自签名证书（简化版：直接用 key + cert）
+      const { execSync: _execSync } = await import('node:child_process');
+      const certDir = join(homedir(), '.codex', 'cx-viewer');
+      const keyPath = join(certDir, 'selfsigned.key');
+      const certPath = join(certDir, 'selfsigned.crt');
+      // 检查已有证书是否过期或不存在
+      let needGen = !existsSync(keyPath) || !existsSync(certPath);
+      if (!needGen) {
+        try {
+          const certPem = readFileSync(certPath, 'utf-8');
+          const x509 = new X509Certificate(certPem);
+          needGen = new Date(x509.validTo) < new Date();
+        } catch { needGen = true; }
+      }
+      if (needGen) {
+        mkdirSync(certDir, { recursive: true });
+        _execSync(`openssl req -x509 -newkey rsa:2048 -keyout "${keyPath}" -out "${certPath}" -days 365 -nodes -subj "/CN=localhost"`, { stdio: 'ignore', timeout: 10000 });
+      }
+      if (existsSync(keyPath) && existsSync(certPath)) {
+        httpsOptions = { key: readFileSync(keyPath), cert: readFileSync(certPath) };
+      }
+    } catch (err) {
+      // openssl 不可用或生成失败，继续用 HTTP
+      if (process.env.CXV_DEBUG) console.error('[CX Viewer] Self-signed cert generation failed:', err.message);
+    }
+  }
+
+  const useHttps = !!httpsOptions && !isCliMode;
   const protocol = useHttps ? 'https' : 'http';
   serverProtocol = protocol;
-  if (useHttps) console.error('[CX Viewer] HTTPS mode enabled via plugin hook');
+  publicAccessProtocol = protocol;
+  if (useHttps) console.error(httpsFromPlugin ? '[CX Viewer] HTTPS mode enabled via plugin hook' : '[CX Viewer] HTTPS mode enabled via self-signed certificate');
 
   return new Promise((resolve, reject) => {
     function tryListen(port) {
@@ -2765,7 +2975,38 @@ export async function startViewer() {
         currentServer.listen(port, HOST, async () => {
           server = currentServer;
           actualPort = port;
+          publicAccessPort = port;
           const url = `${serverProtocol}://127.0.0.1:${port}`;
+          if (isCliMode && httpsOptions) {
+            const httpsPort = await findAvailablePort(port + 1);
+            if (httpsPort) {
+              try {
+                secondaryServer = createHttpsServer(httpsOptions, handleRequest);
+                await new Promise((resolveSecondary, rejectSecondary) => {
+                  secondaryServer.once('error', rejectSecondary);
+                  secondaryServer.listen(httpsPort, HOST, () => {
+                    secondaryServer.off('error', rejectSecondary);
+                    resolveSecondary();
+                  });
+                });
+                secondaryPort = httpsPort;
+                publicAccessProtocol = 'https';
+                publicAccessPort = httpsPort;
+                console.error('[CX Viewer] Secondary HTTPS access enabled for QR/remote browser');
+                console.error(`  ➜ HTTPS:   https://127.0.0.1:${httpsPort}`);
+                const _ips = getAllLocalIps();
+                for (const _ip of _ips) {
+                  console.error(`  ➜ HTTPS:   https://${_ip}:${httpsPort}?token=${ACCESS_TOKEN}`);
+                }
+              } catch (err) {
+                secondaryServer = null;
+                secondaryPort = 0;
+                publicAccessProtocol = serverProtocol;
+                publicAccessPort = port;
+                console.error('[CX Viewer] Secondary HTTPS server creation failed:', err.message);
+              }
+            }
+          }
           if (!isCliMode) {
             console.error(t('server.started'));
             console.error(t('server.startedLocal', { protocol: serverProtocol, port }));
@@ -2773,17 +3014,23 @@ export async function startViewer() {
             for (const _ip of _ips) {
               console.error(t('server.startedNetwork', { protocol: serverProtocol, ip: _ip, port, token: ACCESS_TOKEN }));
             }
+          } else if (secondaryPort) {
+            console.error(t('server.started'));
+            console.error(t('server.startedLocal', { protocol: serverProtocol, port }));
+            console.error(t('server.startedNetwork', { protocol: 'https', ip: getLocalIp(), port: secondaryPort, token: ACCESS_TOKEN }));
           }
           // v2.0.69 之前的版本会清空控制台，自动打开浏览器确保用户能看到界面
-          try {
-            const ccPkgPath = join(__dirname, '..', '@openai', 'codex', 'package.json');
-            const ccVer = JSON.parse(readFileSync(ccPkgPath, 'utf-8')).version;
-            const [maj, min, pat] = ccVer.split('.').map(Number);
-            if (maj < 2 || (maj === 2 && min === 0 && pat < 69)) {
-              const cmd = platform() === 'darwin' ? 'open' : platform() === 'win32' ? 'start' : 'xdg-open';
-              execAsync(`${cmd} ${url}`, { timeout: 5000 }).catch(() => {});
-            }
-          } catch { }
+          if (!isCliMode) {
+            try {
+              const ccPkgPath = join(__dirname, '..', '@openai', 'codex', 'package.json');
+              const ccVer = JSON.parse(readFileSync(ccPkgPath, 'utf-8')).version;
+              const [maj, min, pat] = ccVer.split('.').map(Number);
+              if (maj < 2 || (maj === 2 && min === 0 && pat < 69)) {
+                const cmd = platform() === 'darwin' ? 'open' : platform() === 'win32' ? 'start' : 'xdg-open';
+                execAsync(`${cmd} ${url}`, { timeout: 5000 }).catch(() => {});
+              }
+            } catch { }
+          }
           // 工作区模式下延迟到选择工作区后再启动监听
           if (!isWorkspaceMode) {
             readModelContextSize(); // Cache model→size mapping at startup
@@ -2794,9 +3041,12 @@ export async function startViewer() {
           // CLI 模式下启动 WebSocket 服务 (必须 await，否则插件 hook 拿不到 upgrade listeners)
           if (isCliMode) {
             await setupTerminalWebSocket(currentServer);
+            if (secondaryServer) {
+              await setupTerminalWebSocket(secondaryServer);
+            }
           }
           // 通知插件服务器已启动
-          runParallelHook('serverStarted', { port, host: HOST, url, ip: getLocalIp(), token: ACCESS_TOKEN, protocol: serverProtocol, httpServer: currentServer })
+          refreshPluginRuntime()
             .catch(err => console.error('[CX Viewer] Plugin serverStarted hook error:', err.message));
           resolve(server);
         });
@@ -2818,7 +3068,7 @@ export async function startViewer() {
 async function setupTerminalWebSocket(httpServer) {
   try {
     const { WebSocketServer } = await import('ws');
-    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getOutputBuffer, getCurrentWorkspace, spawnShell } = await import('./pty-manager.js');
+    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getOutputBuffer, getOutputHistoryId, getCurrentWorkspace, spawnShell } = await import('./pty-manager.js');
     _writeToPty = writeToPty;
     _onPtyData = onPtyData;
     const wss = new WebSocketServer({ noServer: true });
@@ -2854,15 +3104,25 @@ async function setupTerminalWebSocket(httpServer) {
       }
     });
 
-    wss.on('connection', (ws) => {
+    wss.on('connection', (ws, req) => {
+      const sendReplayData = (data) => {
+        const CHUNK_SIZE = 64 * 1024;
+        for (let i = 0; i < data.length; i += CHUNK_SIZE) {
+          if (ws.readyState !== 1) break;
+          ws.send(JSON.stringify({ type: 'data', data: data.slice(i, i + CHUNK_SIZE) }));
+        }
+      };
+
       // 发送当前 PTY 状态
       const state = getPtyState();
-      ws.send(JSON.stringify({ type: 'state', ...state }));
+      const historyId = getOutputHistoryId();
+      ws.send(JSON.stringify({ type: 'state', ...state, historyId }));
 
       // 发送历史输出缓冲
+      const clientHistoryId = new URL(req.url, `${serverProtocol}://${req.headers.host}`).searchParams.get('historyId');
       const buffer = getOutputBuffer();
-      if (buffer) {
-        ws.send(JSON.stringify({ type: 'data', data: buffer }));
+      if (buffer && historyId !== clientHistoryId) {
+        sendReplayData(buffer);
       }
 
       // PTY 输出 → WebSocket
@@ -3112,6 +3372,7 @@ export function stopViewer() {
 }
 async function _doStop() {
   try { await Promise.race([runParallelHook('serverStopping'), new Promise(r => setTimeout(r, 3000))]); } catch { }
+  pluginRoutes = [];
   // 如果用户未做选择，将临时文件转为正式文件
   if (_resumeState && _resumeState.tempFile) {
     try {
@@ -3154,8 +3415,14 @@ async function _doStop() {
 
 // ─── SDK Mode Exports ──────────────────────────────────────────
 
-/** Push a JSONL entry to all SSE clients (for SDK mode). */
+/** Push a JSONL entry to the active log and all SSE clients (for SDK mode). */
 export function pushSdkEntry(entry) {
+  if (entry && LOG_FILE) {
+    try {
+      appendFileSync(LOG_FILE, JSON.stringify(entry) + '\n---\n');
+      notifyStatsWorker(LOG_FILE);
+    } catch {}
+  }
   if (sendToClients) sendToClients(clients, entry);
 }