termdock 1.4.183 → 1.4.185

package/dist/server/routes/terminal.js

@@ -1,3 +1,5 @@
+import { ensureNodePty } from '../utils/ensureNodePty.js';
+import { PtySpawnBackoff, PtySpawnDeferredError } from '../utils/ptySpawnBackoff.js';
 import { collaborationGroupRoutes } from '../agent/collaborationGroupRoutes.js';
 import { TerminalClientAttachment } from '../utils/terminalClientAttachment.js';
 import { redrawTmuxClient } from '../utils/tmuxClientRedraw.js';
@@ -1423,8 +1425,8 @@ function tryDeliverCollaborationInbox(frontendSessionId) {
         const unavailable = remote.serviceConnected !== true || Date.now() - (remote.serviceCheckedAt ?? 0) > 15_000;
         return { delivered: [], pending: collaborationStore.pendingCount(frontendSessionId),
             serviceUnavailable: unavailable, reason: unavailable
-                ? `服务 ${remote.serviceLabel} 不可达：消息尚未送达，仅保存在待发送队列；请勿等待对方已收到的回复，服务重连且 Mac 客户端运行后重试投递。`
-                : '跨服务消息尚未确认送达，正在等待 Mac 客户端转发。' };
+                ? `服务 ${remote.serviceLabel} 不可达：消息尚未送达，仅保存在待发送队列；请勿等待对方已收到的回复，服务重连且转发客户端恢复运行后重试投递。`
+                : '跨服务消息尚未确认送达，正在等待在线客户端转发。' };
     }
     collaborationDeliveryWorker.wake(frontendSessionId);
     const route = collaborationDeliveryWorker.state(frontendSessionId);
@@ -5034,6 +5036,7 @@ async function getPtyProvider() {
             }
         }
         try {
+            ensureNodePty();
             const nodePty = await import('node-pty');
             console.log('Using node-pty for terminal sessions');
             return { spawn: nodePty.spawn, backend: 'node-pty' };
@@ -7126,6 +7129,7 @@ async function executeTmuxAction(tmuxTarget, action, body, control) {
     }
     return { shouldBroadcastLayout };
 }
+const attachmentSpawnBackoff = new PtySpawnBackoff();
 export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, initialDimensions) {
     const session = terminalSessions.get(sessionId);
     if (!session) {
@@ -7146,6 +7150,7 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, i
     let outputWanted = options.outputActive !== false;
     let clientPaused = false;
     let replayRequest = null;
+    let replayRetryTimer = null;
     let clientCols = session.cols;
     let clientRows = session.rows;
     let initialAttachmentResize = true;
@@ -7158,6 +7163,7 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, i
     if (ownTmux)
         independentTmuxClients.add(ws);
     const attachment = ownTmux ? new TerminalClientAttachment(async (cols, rows) => {
+        attachmentSpawnBackoff.check();
         const provider = await getPtyProvider();
         const tmuxBinary = getTmuxBinary();
         const supportsFeatures = await supportsTmuxClientFeatures(tmuxBinary);
@@ -7171,10 +7177,10 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, i
         const env = buildInteractiveColorEnvironment({ ...process.env, PATH: buildAugmentedPath() });
         delete env.TMUX;
         delete env.TMUX_PANE;
-        return provider.spawn(tmuxBinary, buildTmuxAttachArgs(session.tmuxSessionName, supportsFeatures), {
+        return attachmentSpawnBackoff.spawn(() => provider.spawn(tmuxBinary, buildTmuxAttachArgs(session.tmuxSessionName, supportsFeatures), {
             name: 'xterm-256color', cols, rows, cwd: session.cwd || os.homedir(),
             env: { ...env, TERM: 'xterm-256color', COLORTERM: 'truecolor' },
-        });
+        }));
     }, (data) => {
         if (ws.readyState !== ws.OPEN)
             return;
@@ -7200,6 +7206,8 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, i
         persistAndBroadcastGlobalState();
     }
     const sendReplay = (requestedSince = initialSince, clientEpoch = options.streamEpoch) => {
+        if (replayRetryTimer)
+            return Promise.resolve();
         if (replayRequest)
             return replayRequest;
         const sinceSeq = resolveTerminalReplayCursor(requestedSince, clientEpoch, TERMINAL_STREAM_EPOCH);
@@ -7333,8 +7341,25 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}, i
         })().catch((error) => {
             initialScreen?.cancel();
             initialScreen = null;
-            console.warn(`[ws] replay failed session=${sessionId}: ${getErrorMessage(error)}`);
-            if (ws.readyState === ws.OPEN)
+            if (!(error instanceof PtySpawnDeferredError)) {
+                console.warn(`[ws] replay failed session=${sessionId}: ${getErrorMessage(error)}`);
+            }
+            const retryAfterMs = attachment ? attachmentSpawnBackoff.retryAfterMs : 0;
+            if (retryAfterMs > 0 && ws.readyState === ws.OPEN) {
+                // Hold failed connections through the cooldown, so automatic reconnect
+                // does not itself become a high-frequency handshake loop.
+                const timer = setTimeout(() => {
+                    replayRetryTimer = null;
+                    ws.off('close', cancelRetry);
+                    if (ws.readyState === ws.OPEN)
+                        ws.close(1013, 'PTY temporarily unavailable');
+                }, retryAfterMs);
+                replayRetryTimer = timer;
+                const cancelRetry = () => { clearTimeout(timer); replayRetryTimer = null; };
+                timer.unref();
+                ws.once('close', cancelRetry);
+            }
+            else if (ws.readyState === ws.OPEN)
                 ws.close(1011, 'Replay unavailable');
         }).finally(() => { replayRequest = null; });
         return replayRequest;

package/dist/server/utils/bootCheck.js

@@ -1,3 +1,4 @@
+import { ensureNodePty } from './ensureNodePty.js';
 /**
  * Termdock 启动自检 — 确保原生模块和系统依赖在启动时可用
  *
@@ -253,6 +254,7 @@ function checkTmux() {
 // ---------------------------------------------------------------------------
 let _cachedResult = null;
 export function runBootChecks() {
+    ensureNodePty(); // Must precede the global marker and any native module load.
     if (_cachedResult)
         return _cachedResult;
     // 如果 marker 存在且有效，读取缓存的检查结果

package/dist/server/utils/ensureNodePty.js

@@ -0,0 +1,9 @@
+import { createRequire } from 'node:module';
+// Both src/server/utils and dist/server/utils resolve to the shipped scripts.
+const require = createRequire(import.meta.url);
+export function ensureNodePty() {
+    if (process.platform !== 'darwin')
+        return;
+    const { ensureNodePty: ensure } = require('../../../scripts/ensure-node-pty.cjs');
+    ensure(require.resolve('node-pty/package.json').replace(/[/\\]package\.json$/, ''));
+}

package/dist/server/utils/ptySpawnBackoff.js

@@ -0,0 +1,35 @@
+/** Shared across WebSockets and sessions: PTYs/FDs are process-wide resources. */
+export class PtySpawnDeferredError extends Error {
+    retryAfterMs;
+    constructor(retryAfterMs) {
+        super(`PTY creation cooling down for ${retryAfterMs}ms`);
+        this.retryAfterMs = retryAfterMs;
+    }
+}
+export class PtySpawnBackoff {
+    now;
+    failures = 0;
+    retryAt = 0;
+    constructor(now = Date.now) {
+        this.now = now;
+    }
+    get retryAfterMs() { return Math.max(0, this.retryAt - this.now()); }
+    check() {
+        if (this.retryAfterMs > 0)
+            throw new PtySpawnDeferredError(this.retryAfterMs);
+    }
+    spawn(create) {
+        this.check();
+        try {
+            const result = create();
+            this.failures = 0;
+            this.retryAt = 0;
+            return result;
+        }
+        catch (error) {
+            this.failures = Math.min(this.failures + 1, 6);
+            this.retryAt = this.now() + Math.min(30_000, 1000 * 2 ** (this.failures - 1));
+            throw error; // Preserve errno and the original diagnostic in the real failure log.
+        }
+    }
+}

package/dist/server/utils/publicSecurity.js

@@ -32,12 +32,13 @@ export const securityHeaders = (req, res, next) => {
     const preview = /^\/api\/terminal\/fs(?:\/|$)/i.test(req.path);
     const host = req.get('host') ?? '';
     const shellSource = /^[a-z0-9.\-:\[\]]+$/i.test(host) ? `http://${host}/preview-shell.html https://${host}/preview-shell.html` : "'none'";
+    const workspaceSource = /^[a-z0-9.\-:\[\]]+$/i.test(host) ? `http://${host}/workspace.html https://${host}/workspace.html` : '';
     const shell = req.path === '/preview-shell.html';
     res.setHeader('Content-Security-Policy', shell
         ? "sandbox allow-scripts; default-src 'none'; script-src 'unsafe-inline' 'wasm-unsafe-eval' blob: https: http:; style-src 'unsafe-inline' blob: https:; img-src blob: data: https:; font-src blob: data: https:; media-src blob: data: https:; connect-src blob: https: wss:; worker-src blob:; frame-src 'none'; frame-ancestors 'self'; object-src 'none'; base-uri https://termdock-preview.invalid; form-action 'none'"
         : preview
             ? "sandbox allow-scripts; frame-ancestors 'self'; object-src 'none'; base-uri 'self'"
-            : `script-src 'self' 'wasm-unsafe-eval'; script-src-attr 'none'; worker-src 'self' blob:; frame-src ${shellSource}; frame-ancestors 'self'; object-src 'none'; base-uri 'self'`);
+            : `script-src 'self' 'wasm-unsafe-eval'; script-src-attr 'none'; worker-src 'self' blob:; frame-src ${shellSource} ${workspaceSource}; frame-ancestors 'self'; object-src 'none'; base-uri 'self'`);
     if (getPublicOrigin()) {
         res.setHeader('Strict-Transport-Security', 'max-age=31536000');
         if (!isAuthEnabled()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.183",
+  "version": "1.4.185",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",
@@ -83,7 +83,7 @@
     "mermaid": "^11.17.2",
     "motion": "^12.40.0",
     "multicast-dns": "^7.2.5",
-    "node-pty": "^1.1.0",
+    "node-pty": "1.1.0",
     "qrcode": "^1.5.4",
     "react": "^18.2.0",
     "react-diff-view": "^3.3.3",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.183",
+  "version": "1.4.185",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
-  "dependencyHash": "sha256-kSujny2SLOFnZ1ffxm1FYtli7g1vEN8d3vj1oQeLLdc=",
-  "serverBundleHash": "sha256-//OpMMWFXRg8QzpFFBu/P7z4cA1+K9ZU3DV4Ns/JAwM=",
-  "clientBundleHash": "sha256-UGaJ61xoKrp6tvQ+Ux7cOVgZWkgcERW4ZT/h5DYHbxo=",
+  "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
+  "serverBundleHash": "sha256-ujVeh2byUUue1ZHjY2QYb+f4sO3osPXityEDTuliPD8=",
+  "clientBundleHash": "sha256-ofo9lDUDNVOo2nZLRNKzOfg3EcY+LsalkE4kOBYYbtY=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/scripts/ensure-node-pty.cjs

@@ -0,0 +1,63 @@
+// Pinned node-pty 1.1.0 macOS FD fix. Runs before loading the native addon.
+const fs = require('node:fs');
+const path = require('node:path');
+const { createHash } = require('node:crypto');
+const { spawnSync } = require('node:child_process');
+const hash = data => createHash('sha256').update(data).digest('hex');
+const upstreamHash = '5e1005d6bdcfbe97b486ee415419fe7adae99035047f07340fbad36419e0bae6';
+
+function patchSource(source) {
+  if (hash(source) !== upstreamHash) throw new Error('Unrecognized node-pty source; review the macOS FD patch before upgrading');
+  const start = source.indexOf('static void\npty_posix_spawn(char** argv', source.indexOf('pty_getproc(int fd)'));
+  const end = source.indexOf('\n#endif', start);
+  if (start < 0 || end < 0) throw new Error('node-pty spawn implementation missing');
+  source = source.slice(0, start) + fs.readFileSync(path.join(__dirname, 'node-pty-darwin-spawn.inc'), 'utf8').trimEnd() + source.slice(end);
+  source = source.replace('    int stat_loc;', '    int stat_loc = 0;');
+  source = source.replace('    }\n#else\n    while (true)', '    }\n    if (kq >= 0) close(kq);\n#else\n    while (true)');
+  source = source.replace('throw Napi::Error::New(napiEnv, "posix_spawnp failed.");',
+    'throw Napi::Error::New(napiEnv, std::string("posix_spawnp failed: errno=") + std::to_string(err) + " (" + strerror(err) + ")");');
+  source = source.replace('  if (pty_nonblock(master) == -1) {\n    throw',
+    '  if (pty_nonblock(master) == -1) {\n    close(master);\n    kill(pid, SIGKILL);\n    HANDLE_EINTR(waitpid(pid, NULL, 0));\n    throw');
+  return source;
+}
+
+const checked = new Set();
+function ensureNodePty(ptyRoot = path.dirname(require.resolve('node-pty/package.json'))) {
+  if (process.platform !== 'darwin' || checked.has(ptyRoot)) return;
+  const sourcePath = path.join(ptyRoot, 'src/unix/pty.cc');
+  const backupPath = path.join(ptyRoot, 'src/unix/pty.cc.termdock-original');
+  const markerPath = path.join(ptyRoot, '.termdock-fd-fix.json');
+  const binaryPath = path.join(ptyRoot, 'build/Release/pty.node');
+  const helperPath = path.join(ptyRoot, 'build/Release/spawn-helper');
+  const original = fs.readFileSync(fs.existsSync(backupPath) ? backupPath : sourcePath, 'utf8');
+  const patched = patchSource(original);
+  const sourceHash = hash(patched);
+  try {
+    const marker = JSON.parse(fs.readFileSync(markerPath, 'utf8'));
+    if (marker.source === sourceHash && marker.binary === hash(fs.readFileSync(binaryPath))
+        && hash(fs.readFileSync(sourcePath)) === sourceHash && fs.existsSync(helperPath)) {
+      const helperMode = fs.statSync(helperPath).mode;
+      if ((helperMode & 0o111) !== 0o111) fs.chmodSync(helperPath, helperMode | 0o111);
+      checked.add(ptyRoot);
+      return;
+    }
+  } catch { /* First install or replaced binary: rebuild, never accept a spawn-only probe. */ }
+  fs.writeFileSync(backupPath, original);
+  fs.writeFileSync(sourcePath, patched);
+  fs.rmSync(markerPath, { force: true });
+  // Prevent the native loader from silently falling back to a leaking prebuild.
+  fs.rmSync(path.join(ptyRoot, 'prebuilds', `darwin-${process.arch}`), { recursive: true, force: true });
+  fs.rmSync(path.join(ptyRoot, 'build/Debug'), { recursive: true, force: true });
+  console.log('Rebuilding node-pty with the Termdock macOS FD cleanup fix...');
+  const result = spawnSync('npx', ['--yes', 'node-gyp', 'rebuild'], {
+    cwd: ptyRoot, stdio: 'inherit', timeout: 180_000,
+  });
+  if (result.error || result.status !== 0) {
+    throw new Error('Patched node-pty rebuild failed; install Xcode Command Line Tools and retry. ' + (result.error?.message || ''));
+  }
+  fs.chmodSync(helperPath, fs.statSync(helperPath).mode | 0o111);
+  fs.writeFileSync(markerPath, JSON.stringify({ source: sourceHash, binary: hash(fs.readFileSync(binaryPath)) }));
+  checked.add(ptyRoot);
+}
+module.exports = { ensureNodePty, patchSource };
+if (require.main === module) ensureNodePty(process.argv[2]);

package/scripts/node-pty-darwin-spawn.inc

@@ -0,0 +1,64 @@
+// Termdock: every descriptor is owned until explicitly transferred to JS.
+static void
+pty_posix_spawn(char** argv, char** env,
+                const struct termios *termp,
+                const struct winsize *winp,
+                int* master, pid_t* pid, int* err) {
+  struct OwnedFd {
+    int fd = -1;
+    ~OwnedFd() { if (fd >= 0) close(fd); }
+  } low_fds[3], parent_master, slave;
+  *master = -1;
+  *err = 0;
+  for (size_t i = 0; i < 3; ++i) {
+    low_fds[i].fd = posix_openpt(O_RDWR);
+    if (low_fds[i].fd == -1) { *err = errno; return; }
+    if (low_fds[i].fd >= STDERR_FILENO) break;
+  }
+
+  parent_master.fd = posix_openpt(O_RDWR);
+  if (parent_master.fd == -1) { *err = errno; return; }
+  if (grantpt(parent_master.fd) == -1 || unlockpt(parent_master.fd) == -1) {
+    *err = errno; return;
+  }
+  char name[128];
+  if (ioctl(parent_master.fd, TIOCPTYGNAME, name) == -1) { *err = errno; return; }
+  slave.fd = open(name, O_RDWR | O_NOCTTY);
+  if (slave.fd == -1) { *err = errno; return; }
+  if (termp && tcsetattr(slave.fd, TCSANOW, termp) == -1) { *err = errno; return; }
+  if (winp && ioctl(slave.fd, TIOCSWINSZ, winp) == -1) { *err = errno; return; }
+
+  struct Actions {
+    posix_spawn_file_actions_t value;
+    bool initialized = false;
+    ~Actions() { if (initialized) posix_spawn_file_actions_destroy(&value); }
+  } acts;
+  struct Attributes {
+    posix_spawnattr_t value;
+    bool initialized = false;
+    ~Attributes() { if (initialized) posix_spawnattr_destroy(&value); }
+  } attrs;
+  if ((*err = posix_spawn_file_actions_init(&acts.value)) != 0) return;
+  acts.initialized = true;
+  for (int fd = STDIN_FILENO; fd <= STDERR_FILENO; ++fd) {
+    if ((*err = posix_spawn_file_actions_adddup2(&acts.value, slave.fd, fd)) != 0) return;
+  }
+  if ((*err = posix_spawn_file_actions_addclose(&acts.value, slave.fd)) != 0) return;
+  if ((*err = posix_spawn_file_actions_addclose(&acts.value, parent_master.fd)) != 0) return;
+  if ((*err = posix_spawnattr_init(&attrs.value)) != 0) return;
+  attrs.initialized = true;
+  const int flags = POSIX_SPAWN_CLOEXEC_DEFAULT | POSIX_SPAWN_SETSIGDEF |
+                    POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSID;
+  if ((*err = posix_spawnattr_setflags(&attrs.value, flags)) != 0) return;
+  sigset_t signals;
+  sigfillset(&signals);
+  if ((*err = posix_spawnattr_setsigdefault(&attrs.value, &signals)) != 0) return;
+  sigemptyset(&signals);
+  if ((*err = posix_spawnattr_setsigmask(&attrs.value, &signals)) != 0) return;
+  do {
+    *err = posix_spawn(pid, argv[0], &acts.value, &attrs.value, argv, env);
+  } while (*err == EINTR);
+  if (*err != 0) return;
+  *master = parent_master.fd;
+  parent_master.fd = -1; // JS owns only the master; parent closes slave and low FDs.
+}

package/scripts/postinstall.mjs

@@ -48,8 +48,11 @@ function which(bin) {
 // —— native modules: 实际 spawn 测试，不只是 require ——
 console.log('\n=== Rebuilding native modules ===');
 
+const { ensureNodePty } = require_('./ensure-node-pty.cjs');
 const PTY_PATH = require_.resolve('node-pty/package.json', { paths: [pkgRoot] }).replace('/package.json', '');
 
+ensureNodePty(PTY_PATH);
+
 // Ensure node-pty prebuild spawn-helper binaries have execute permissions.
 // npm may strip +x during install, which causes terminal creation to fail.
 function fixSpawnHelperPermissions() {

package/scripts/prepare-desktop-runtime.mjs

@@ -187,6 +187,9 @@ run(process.platform === 'win32' ? 'npm.cmd' : 'npm', [
   },
 });
 
+// Ship the same repair gate for bundled and subsequently downloaded runtimes.
+fs.cpSync(path.join(root, 'scripts'), path.join(serverDir, 'scripts'), { recursive: true });
+run(runtimeNode, [path.join(serverDir, 'scripts/ensure-node-pty.cjs'), path.join(serverDir, 'node_modules/node-pty')], { cwd: serverDir });
 makeSpawnHelpersExecutable(path.join(serverDir, 'node_modules', 'node-pty'));
 run(runtimeNode, [
   '-e',