termdock 1.4.184 → 1.4.185

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',