termdock 1.0.2 → 1.0.3

package/dist/server/utils/bootCheck.js

@@ -0,0 +1,299 @@
+/**
+ * Termdock 启动自检 — 确保原生模块和系统依赖在启动时可用
+ *
+ * 设计目标：覆盖 npm 全局安装不跑 postinstall 的缺口。
+ * 每次 CLI 启动时检查，通过后写 marker 避免重复检查。
+ *
+ * 检查项目：
+ *   1. node-pty : 实际 spawn 测试 → 失败则从源码重编译
+ *   2. tmux     : 检测是否安装 → 缺失则尝试自动安装
+ *
+ * —— 如何新增检查项 ——
+ *   在 BootChecks 接口加字段，在 runBootChecks() 加 step，
+ *   在 formatBootCheckReport() 加对应的输出行。
+ */
+import { execSync, spawnSync } from 'child_process';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { createRequire } from 'module';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+const MARKER_FILE = path.join(os.homedir(), '.termdock', '.boot-check-ok');
+function which(bin) {
+    // 先查 PATH
+    try {
+        const result = execSync(`command -v ${bin} 2>/dev/null`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        if (result)
+            return result;
+    }
+    catch { /* not in PATH */ }
+    // macOS non-interactive SSH 的 PATH 不包含 Homebrew 路径，手动检查
+    const extraPaths = [
+        '/opt/homebrew/bin',
+        '/usr/local/bin',
+        '/opt/local/bin', // MacPorts
+    ];
+    for (const dir of extraPaths) {
+        const fullPath = path.join(dir, bin);
+        try {
+            fs.accessSync(fullPath, fs.constants.X_OK);
+            return fullPath;
+        }
+        catch { /* not here */ }
+    }
+    return null;
+}
+function runQuiet(cmd, timeoutMs = 30_000) {
+    try {
+        const r = spawnSync(cmd, [], {
+            shell: true,
+            timeout: timeoutMs,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return { ok: r.status === 0, stdout: r.stdout, stderr: r.stderr };
+    }
+    catch {
+        return { ok: false, stdout: '', stderr: '' };
+    }
+}
+// ---------------------------------------------------------------------------
+// 1. node-pty 验证 + 重建
+// ---------------------------------------------------------------------------
+function checkNodePty() {
+    const result = { ok: false, rebuilt: false };
+    try {
+        const require_ = createRequire(import.meta.url);
+        let ptyPath;
+        try {
+            ptyPath = require_.resolve('node-pty/package.json').replace('/package.json', '');
+        }
+        catch {
+            result.error = 'node-pty not found in module resolution path';
+            return result;
+        }
+        const pty = require_(ptyPath);
+        // 实际 spawn 测试（不仅仅是 require，macOS ARM 预编译包可能 require 成功但 spawn 失败）
+        const proc = pty.spawn(process.env.SHELL || '/bin/bash', [], { name: 'xterm', cols: 80, rows: 24 });
+        proc.kill();
+        result.ok = true;
+        return result;
+    }
+    catch (e) {
+        // require 失败或 spawn 失败 → 尝试重编译
+    }
+    try {
+        const require_ = createRequire(import.meta.url);
+        let ptyPath;
+        try {
+            ptyPath = require_.resolve('node-pty/package.json').replace('/package.json', '');
+        }
+        catch {
+            result.error = 'node-pty not found in module resolution path';
+            return result;
+        }
+        // 清除预编译二进制缓存
+        const prebuildsDir = path.join(ptyPath, 'prebuilds');
+        if (fs.existsSync(prebuildsDir)) {
+            fs.rmSync(prebuildsDir, { recursive: true, force: true });
+        }
+        const rebuild = runQuiet(`cd ${ptyPath} && npx --yes node-gyp rebuild`, 120_000);
+        if (rebuild.ok) {
+            // 重试 spawn
+            try {
+                const pty = require_(ptyPath);
+                const proc = pty.spawn(process.env.SHELL || '/bin/bash', [], { name: 'xterm', cols: 80, rows: 24 });
+                proc.kill();
+                result.ok = true;
+                result.rebuilt = true;
+                return result;
+            }
+            catch {
+                result.error = 'node-pty 重编译成功但 spawn 仍然失败';
+                return result;
+            }
+        }
+        result.error = `node-pty 重编译失败: ${rebuild.stderr.slice(0, 200)}`;
+        return result;
+    }
+    catch (e) {
+        result.error = `node-pty 未找到或无法初始化: ${String(e).slice(0, 200)}`;
+        return result;
+    }
+}
+// ---------------------------------------------------------------------------
+// 2. tmux 检测 + 自动安装
+// ---------------------------------------------------------------------------
+function checkTmux() {
+    const result = { ok: false, installed: false };
+    // 先检查是否已安装
+    const tmuxPath = which('tmux');
+    if (tmuxPath) {
+        try {
+            result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        }
+        catch { /* ignore */ }
+        result.ok = true;
+        result.installed = false; // 没有新安装
+        return result;
+    }
+    // —— 尝试自动安装 ——
+    const platform = process.platform;
+    if (platform === 'darwin') {
+        // macOS: 尝试多个包管理器
+        const brew = which('brew');
+        if (brew) {
+            const r = runQuiet(`${brew} install tmux 2>&1`, 120_000);
+            if (r.ok || which('tmux')) {
+                try {
+                    result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+                }
+                catch { /* ignore */ }
+                result.ok = true;
+                result.installed = true;
+                return result;
+            }
+        }
+        const port = which('port'); // MacPorts
+        if (port) {
+            const r = runQuiet(`${port} install tmux 2>&1`, 120_000);
+            if (r.ok || which('tmux')) {
+                try {
+                    result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+                }
+                catch { /* ignore */ }
+                result.ok = true;
+                result.installed = true;
+                return result;
+            }
+        }
+        const nixEnv = which('nix-env');
+        if (nixEnv) {
+            const r = runQuiet(`${nixEnv} -iA nixpkgs.tmux 2>&1`, 120_000);
+            if (r.ok || which('tmux')) {
+                try {
+                    result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+                }
+                catch { /* ignore */ }
+                result.ok = true;
+                result.installed = true;
+                return result;
+            }
+        }
+        result.error = 'tmux 未安装且未找到包管理器 (brew/port/nix)。请安装 Homebrew: https://brew.sh';
+        return result;
+    }
+    if (platform === 'linux') {
+        // 尝试多种 Linux 包管理器
+        const managers = [
+            { bin: 'apt-get', cmd: 'apt-get install -y tmux' },
+            { bin: 'dnf', cmd: 'dnf install -y tmux' },
+            { bin: 'yum', cmd: 'yum install -y tmux' },
+            { bin: 'apk', cmd: 'apk add tmux' },
+            { bin: 'pacman', cmd: 'pacman -S --noconfirm tmux' },
+            { bin: 'zypper', cmd: 'zypper install -y tmux' },
+        ];
+        for (const m of managers) {
+            if (!which(m.bin))
+                continue;
+            // 需要 root 权限
+            const r = runQuiet(`sudo ${m.cmd} 2>&1`, 120_000);
+            if (r.ok || which('tmux')) {
+                try {
+                    result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+                }
+                catch { /* ignore */ }
+                result.ok = true;
+                result.installed = true;
+                return result;
+            }
+            // 也试一下不用 sudo
+            const r2 = runQuiet(`${m.cmd} 2>&1`, 120_000);
+            if (r2.ok || which('tmux')) {
+                try {
+                    result.version = execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+                }
+                catch { /* ignore */ }
+                result.ok = true;
+                result.installed = true;
+                return result;
+            }
+        }
+        result.error = 'tmux 未安装。请用系统包管理器安装，例如: sudo apt install tmux';
+        return result;
+    }
+    // 其他平台
+    result.error = `不支持在 ${platform} 上自动安装 tmux。请手动安装。`;
+    return result;
+}
+// ---------------------------------------------------------------------------
+// 主入口
+// ---------------------------------------------------------------------------
+let _cachedResult = null;
+export function runBootChecks() {
+    if (_cachedResult)
+        return _cachedResult;
+    // 如果 marker 存在且有效，读取缓存的检查结果
+    if (fs.existsSync(MARKER_FILE)) {
+        try {
+            const cached = JSON.parse(fs.readFileSync(MARKER_FILE, 'utf-8'));
+            if (cached.nodePty?.ok && cached.tmux?.ok) {
+                _cachedResult = {
+                    nodePty: cached.nodePty,
+                    tmux: cached.tmux,
+                };
+                return _cachedResult;
+            }
+            // marker 存在但状态不完整（例如 postinstall 部分失败）→ 重新检查
+        }
+        catch { /* marker 损坏 → 重新检查 */ }
+    }
+    const nodePty = checkNodePty();
+    const tmux = checkTmux();
+    _cachedResult = { nodePty, tmux };
+    // 全部通过则写 marker
+    if (nodePty.ok && tmux.ok) {
+        try {
+            fs.mkdirSync(path.dirname(MARKER_FILE), { recursive: true });
+            fs.writeFileSync(MARKER_FILE, JSON.stringify({ checkedAt: new Date().toISOString(), nodePty, tmux }), 'utf-8');
+        }
+        catch { /* 非关键 */ }
+    }
+    return _cachedResult;
+}
+export function getBootChecks() {
+    return _cachedResult ?? runBootChecks();
+}
+/**
+ * 格式化启动检查报告，用于 CLI 启动时显示给用户。
+ */
+export function formatBootCheckReport(checks, enableColor) {
+    const lines = [];
+    const g = (s) => enableColor ? `\x1b[32m${s}\x1b[0m` : s;
+    const y = (s) => enableColor ? `\x1b[33m${s}\x1b[0m` : s;
+    const r = (s) => enableColor ? `\x1b[31m${s}\x1b[0m` : s;
+    const dim = (s) => enableColor ? `\x1b[2m${s}\x1b[0m` : s;
+    // node-pty
+    if (checks.nodePty.ok) {
+        const tag = checks.nodePty.rebuilt ? ' (rebuilt)' : '';
+        lines.push(`  ${g('✓')} node-pty${dim(tag)}`);
+    }
+    else {
+        lines.push(`  ${r('✗')} node-pty — ${checks.nodePty.error || 'unknown'}`);
+    }
+    // tmux
+    if (checks.tmux.ok) {
+        const detail = checks.tmux.installed
+            ? ' (just installed)'
+            : checks.tmux.version
+                ? ` ${dim(checks.tmux.version)}`
+                : '';
+        lines.push(`  ${g('✓')} tmux${detail}`);
+    }
+    else {
+        lines.push(`  ${y('!')} tmux — ${checks.tmux.error || 'not found'} (shell mode will be used)`);
+    }
+    return lines;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "bin": {

package/scripts/postinstall.mjs

@@ -1,45 +1,73 @@
 #!/usr/bin/env node
 
 /**
- * Termdock postinstall — 确保原生模块编译 + tmux 可用
+ * Termdock postinstall — 确保原生模块可用 + 自动安装 tmux
  *
- * 执行时机：每次 `npm install -g termdock`（含首次安装和更新）
+ * 对于 npm 全局安装 (npm i -g termdock) 的场景，npm 10+ 默认不运行
+ * lifecycle scripts。此时 postinstall 不会执行，但 cli.ts 启动时的
+ * bootCheck 会做同样的检查并写入 marker，确保首次启动时一切就绪。
  */
 
-import { execSync } from 'child_process';
-import { existsSync } from 'fs';
+import { execSync, spawnSync } from 'child_process';
 import { createRequire } from 'module';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 
 const require_ = createRequire(import.meta.url);
+const pkgRoot = new URL('..', import.meta.url).pathname;
 
 function run(cmd, opts = {}) {
   console.log(`  $ ${cmd}`);
   return execSync(cmd, { stdio: 'inherit', ...opts });
 }
 
-function runOk(cmd) {
-  try { run(cmd); return true; } catch { return false; }
+function runOk(cmd, opts = {}) {
+  try { run(cmd, opts); return true; } catch { return false; }
+}
+
+function runQuiet(cmd, timeoutMs = 30_000) {
+  try {
+    const r = spawnSync(cmd, [], { shell: true, timeout: timeoutMs, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+    return { ok: r.status === 0, stdout: r.stdout, stderr: r.stderr };
+  } catch {
+    return { ok: false, stdout: '', stderr: '' };
+  }
 }
 
 function which(bin) {
-  try { execSync(`which ${bin}`, { stdio: 'pipe' }); return true; } catch { return false; }
+  try { execSync(`command -v ${bin} 2>/dev/null`, { stdio: 'pipe' }); return true; } catch { /* not in PATH */ }
+  // macOS non-interactive SSH 的 PATH 不含 Homebrew，手动探测
+  const extraPaths = ['/opt/homebrew/bin', '/usr/local/bin', '/opt/local/bin'];
+  for (const dir of extraPaths) {
+    try { fs.accessSync(path.join(dir, bin), fs.constants.X_OK); return true; } catch { /* not here */ }
+  }
+  return false;
 }
 
-// —— native modules ——
+// —— native modules: 实际 spawn 测试，不只是 require ——
 console.log('\n=== Rebuilding native modules ===');
-const pkgRoot = new URL('..', import.meta.url).pathname;
 
-for (const mod of ['node-pty', '@parcel/watcher']) {
+const PTY_PATH = require_.resolve('node-pty/package.json', { paths: [pkgRoot] }).replace('/package.json', '');
+function testPty() {
   try {
-    require_(`${mod}`);
-    console.log(`  ${mod} already usable, skip rebuild`);
-  } catch {
-    console.log(`  ${mod} needs rebuild...`);
-    const modDir = require_.resolve(`${mod}/package.json`, { paths: [pkgRoot] });
-    const modRoot = modDir.replace('/package.json', '');
-    // 删掉预编译二进制，强制从源码构建
-    runOk(`rm -rf ${modRoot}/prebuilds/*`);
-    run(`cd ${modRoot} && npx --yes node-gyp rebuild`, { timeout: 120_000 });
+    const pty = require_(PTY_PATH);
+    const proc = pty.spawn(process.env.SHELL || '/bin/bash', [], { name: 'xterm', cols: 80, rows: 24 });
+    proc.kill();
+    return true;
+  } catch { return false; }
+}
+
+if (testPty()) {
+  console.log('  node-pty OK');
+} else {
+  console.log('  node-pty needs rebuild (prebuilt binary incompatible with this OS/Node version)...');
+  runOk(`rm -rf ${PTY_PATH}/prebuilds/*`);
+  run(`cd ${PTY_PATH} && npx --yes node-gyp rebuild`, { timeout: 120_000 });
+  if (testPty()) {
+    console.log('  ✓ node-pty rebuilt successfully');
+  } else {
+    console.log('  ⚠ node-pty rebuild failed — terminal shell spawn may not work.');
   }
 }
 
@@ -51,30 +79,70 @@ if (!which('tmux')) {
   let installed = false;
 
   if (platform === 'darwin') {
-    // macOS: try brew first, then fallback message
-    if (which('brew')) {
-      installed = runOk('brew install tmux');
+    // macOS: try brew → macports → nix, in that order
+    const brew = which('brew');
+    if (brew) {
+      installed = runOk('brew install tmux 2>&1', { timeout: 120_000 });
+    } else if (which('port')) {
+      installed = runOk('port install tmux 2>&1', { timeout: 120_000 });
+    } else if (which('nix-env')) {
+      installed = runOk('nix-env -iA nixpkgs.tmux 2>&1', { timeout: 120_000 });
     } else {
-      console.log('  Homebrew not found. Install it: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"');
+      console.log('  No package manager found (brew/port/nix).');
+      console.log('  Install Homebrew: https://brew.sh — then reinstall termdock.');
     }
   } else if (platform === 'linux') {
-    if (runOk('apt-get install -y tmux 2>/dev/null')) {
-      installed = true;
-    } else if (runOk('yum install -y tmux 2>/dev/null')) {
-      installed = true;
-    } else if (runOk('apk add tmux 2>/dev/null')) {
-      installed = true;
+    const managers = [
+      { bin: 'apt-get',  cmd: 'apt-get install -y tmux', sudo: true },
+      { bin: 'dnf',      cmd: 'dnf install -y tmux', sudo: true },
+      { bin: 'yum',      cmd: 'yum install -y tmux', sudo: true },
+      { bin: 'apk',      cmd: 'apk add tmux', sudo: false },
+      { bin: 'pacman',   cmd: 'pacman -S --noconfirm tmux', sudo: true },
+      { bin: 'zypper',   cmd: 'zypper install -y tmux', sudo: true },
+    ];
+    for (const m of managers) {
+      if (!which(m.bin)) continue;
+      const cmd = m.sudo ? `sudo ${m.cmd}` : m.cmd;
+      if (runOk(`${cmd} 2>&1`, { timeout: 120_000 })) {
+        installed = true;
+        break;
+      }
+      // retry without sudo
+      if (m.sudo && runOk(`${m.cmd} 2>&1`, { timeout: 120_000 })) {
+        installed = true;
+        break;
+      }
     }
   }
 
   if (installed) {
-    console.log('  ✓ tmux installed successfully');
-  } else if (!which('tmux')) {
-    console.log('  ⚠ Could not auto-install tmux. Termdock works without it (shell mode will be default).');
-    console.log('    To use tmux features: install tmux then restart termdock.');
+    console.log('  ✓ tmux installed');
+  } else {
+    console.log('  ⚠ tmux not available — shell mode will be used.');
+    console.log('  Termdock will check again on next start and try to fix automatically.');
   }
 } else {
-  console.log(`  ✓ tmux already available: ${execSync('tmux -V', { encoding: 'utf-8' }).trim()}`);
+  const ver = execSync('tmux -V', { encoding: 'utf-8' }).trim();
+  console.log(`  ✓ tmux ${ver}`);
+}
+
+// —— 写入 boot-check marker，避免 CLI 启动时重复检查 ——
+// 只有 node-pty 和 tmux 都就绪才写 marker；否则 CLI 启动时 bootCheck 会补做
+const markerDir = path.join(os.homedir(), '.termdock');
+const markerFile = path.join(markerDir, '.boot-check-ok');
+if (testPty() && which('tmux')) {
+  try {
+    fs.mkdirSync(markerDir, { recursive: true });
+    fs.writeFileSync(markerFile, JSON.stringify({
+      checkedAt: new Date().toISOString(),
+      source: 'postinstall',
+      nodePty: { ok: true, rebuilt: false },
+      tmux: { ok: true, version: execSync('tmux -V', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim() },
+    }), 'utf-8');
+  } catch { /* non-critical */ }
+} else {
+  console.log('  ℹ Boot check marker not written (some checks failed).');
+  console.log('  Termdock will re-check on first CLI start.');
 }
 
 console.log('\n✓ Termdock postinstall complete\n');

package/dist/client/assets/channel-Fzeh-Sl6.js

@@ -1 +0,0 @@
-import{U as a,C as n}from"./mermaid.core-D-e_wdPJ.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/client/assets/classDiagram-OUVF2IWQ-DzF9pacK.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CI7QyRAs.js";import{b as i}from"./mermaid.core-D-e_wdPJ.js";import"./chunk-5VM5RSS4-DliA2ku3.js";import"./chunk-XXDRQBXY-BM9jxTTb.js";import"./chunk-VR4S4FIN-DYQ8EokS.js";import"./chunk-32BRIVSS-CGNuIJuG.js";import"./purify.es-CC4Brkr_.js";import"./index-0d_16SRD.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-EOCWNBFH-DzF9pacK.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CI7QyRAs.js";import{b as i}from"./mermaid.core-D-e_wdPJ.js";import"./chunk-5VM5RSS4-DliA2ku3.js";import"./chunk-XXDRQBXY-BM9jxTTb.js";import"./chunk-VR4S4FIN-DYQ8EokS.js";import"./chunk-32BRIVSS-CGNuIJuG.js";import"./purify.es-CC4Brkr_.js";import"./index-0d_16SRD.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/stateDiagram-v2-6OUMAXLB-Cru4nzfa.js

@@ -1 +0,0 @@
-import{b as r,a as e,s as a,S as i}from"./chunk-EX3LRPZG-DzFXj1M3.js";import{b as s}from"./mermaid.core-D-e_wdPJ.js";import"./chunk-XXDRQBXY-BM9jxTTb.js";import"./chunk-VR4S4FIN-DYQ8EokS.js";import"./chunk-32BRIVSS-CGNuIJuG.js";import"./purify.es-CC4Brkr_.js";import"./index-0d_16SRD.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:a,get db(){return new i(2)},renderer:e,styles:r,init:s(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/swimlanesDiagram-G3AALYLV-DUvRCWFX.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-23GEKE2U-Cz9w-F5K.js";import{b as o}from"./mermaid.core-D-e_wdPJ.js";import"./chunk-5VM5RSS4-DliA2ku3.js";import"./chunk-XXDRQBXY-BM9jxTTb.js";import"./chunk-VR4S4FIN-DYQ8EokS.js";import"./chunk-32BRIVSS-CGNuIJuG.js";import"./purify.es-CC4Brkr_.js";import"./channel-Fzeh-Sl6.js";import"./index-0d_16SRD.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var a=o(t=>`${e(t)}
-  .swimlane.cluster rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),m=a,v=r({defaultLayout:"swimlane",styles:m});export{v as diagram};