@znmin/claude-remote-cli 0.3.2 → 0.4.1

package/src/local/tunnel.js

@@ -1,98 +1,98 @@
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { spawn } from 'node:child_process';
-import { setTimeout as delay } from 'node:timers/promises';
-import { execute, exists, trackChild } from '../system.js';
-import { sshBase } from '../ssh.js';
-
-const ALLOCATED = /^Allocated port (\d+) for remote forward\b/;
-
-// Windows OpenSSH has no connection multiplexing (ControlMaster), so the
-// reverse forward runs in its own connection and the server-chosen port is
-// read from ssh's "Allocated port" message. Other commands then open their own
-// connections, which works because key login is set up before this point.
-export async function openDirectTunnel(config, localPort, { env = process.env, spawnProcess = spawn, timeoutMs = 120000 } = {}) {
-  const child = trackChild(spawnProcess('ssh', [...sshBase(config), '-o', 'ExitOnForwardFailure=yes', '-o', 'LogLevel=INFO',
-    '-N', '-T', '-R', `127.0.0.1:0:127.0.0.1:${localPort}`, config.host],
-  { env, stdio: ['ignore', 'ignore', 'pipe'], windowsHide: true }));
-  let closed = false, errorText = '', spawnError, port, pending = '', announce;
-  const allocated = new Promise(resolve => { announce = resolve; });
-  const done = new Promise(resolve => {
-    child.once('error', error => { spawnError = error; closed = true; resolve(); announce(); });
-    child.once('close', () => { closed = true; resolve(); announce(); });
-  });
-  child.stderr.setEncoding('utf8');
-  child.stderr.on('data', chunk => {
-    const lines = (pending + chunk).split(/\r?\n/);
-    pending = lines.pop();
-    for (const line of lines) {
-      const match = line.match(ALLOCATED);
-      if (match && port === undefined) { port = Number(match[1]); announce(); continue; }
-      errorText = (errorText + line + '\n').slice(-8000);
-      process.stderr.write(line + '\n');
-    }
-  });
-  const stop = async () => {
-    if (closed) return;
-    child.kill('SIGTERM');
-    await Promise.race([done, delay(1000)]);
-    if (!closed) { child.kill('SIGKILL'); await done; }
-  };
-  try {
-    let timer;
-    const expired = new Promise(resolve => { timer = setTimeout(resolve, timeoutMs); });
-    await Promise.race([allocated, expired]);
-    clearTimeout(timer);
-    if (port === undefined) {
-      if (closed) throw new Error('SSH 工具连接失败：' + (spawnError?.message || errorText.trim() || '连接已关闭'));
-      throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
-    }
-    if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
-    return { controlPath: undefined, port, close: stop };
-  } catch (error) { await stop(); throw error; }
-}
-
-export async function openTunnel(config, localPort, { env = process.env, run = execute, platform = process.platform } = {}) {
-  if (platform === 'win32') return openDirectTunnel(config, localPort, { env });
-  // Keep the control socket below the short Unix-domain path limit on macOS.
-  const base = os.tmpdir().length > 55 ? '/tmp' : os.tmpdir();
-  const directory = await fs.mkdtemp(path.join(base, 'ccr-'));
-  const controlPath = path.join(directory, 'ssh');
-  const master = trackChild(spawn('ssh', [...sshBase(config), '-M', '-S', controlPath, '-o', 'ControlPersist=no',
-    '-o', 'ExitOnForwardFailure=yes', '-N', '-T', config.host], { env, stdio: ['ignore', 'ignore', 'pipe'] }));
-  let closed = false, errorText = '', spawnError;
-  const done = new Promise(resolve => {
-    master.once('error', error => { spawnError = error; closed = true; resolve(); });
-    master.once('close', () => { closed = true; resolve(); });
-  });
-  master.stderr.setEncoding('utf8');
-  master.stderr.on('data', chunk => { errorText = (errorText + chunk).slice(-8000); process.stderr.write(chunk); });
-  const stop = async () => {
-    if (!closed) {
-      await run('ssh', [...sshBase(config), '-S', controlPath, '-O', 'exit', config.host],
-        { env, capture: true, timeout: 5000, check: false }).catch(() => {});
-      master.kill('SIGTERM');
-      await Promise.race([done, delay(1000)]);
-      if (!closed) { master.kill('SIGKILL'); await done; }
-    }
-    await fs.rm(directory, { recursive: true, force: true });
-  };
-  const interrupt = () => master.kill('SIGINT');
-  process.on('SIGINT', interrupt);
-  try {
-    const deadline = Date.now() + 120000;
-    while (!await exists(controlPath)) {
-      if (closed) throw new Error('SSH 工具连接失败：' + (spawnError?.message || errorText.trim() || '连接已关闭'));
-      if (Date.now() > deadline) throw new Error('等待 SSH 登录超时。');
-      await delay(100);
-    }
-    const result = await run('ssh', [...sshBase(config), '-S', controlPath, '-O', 'forward',
-      '-o', 'ExitOnForwardFailure=yes', '-R', `127.0.0.1:0:127.0.0.1:${localPort}`, config.host],
-    { env, capture: true, timeout: 15000 });
-    const port = Number(result.stdout.trim());
-    if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
-    return { controlPath, port, close: stop };
-  } catch (error) { await stop(); throw error; }
-  finally { process.off('SIGINT', interrupt); }
-}
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import os from 'node:os';
+import { spawn } from 'node:child_process';
+import { setTimeout as delay } from 'node:timers/promises';
+import { execute, exists, trackChild } from '../system.js';
+import { sshBase } from '../ssh.js';
+
+const ALLOCATED = /^Allocated port (\d+) for remote forward\b/;
+
+// Windows OpenSSH has no connection multiplexing (ControlMaster), so the
+// reverse forward runs in its own connection and the server-chosen port is
+// read from ssh's "Allocated port" message. Other commands then open their own
+// connections, which works because key login is set up before this point.
+export async function openDirectTunnel(config, localPort, { env = process.env, spawnProcess = spawn, timeoutMs = 120000 } = {}) {
+  const child = trackChild(spawnProcess('ssh', [...sshBase(config), '-o', 'ExitOnForwardFailure=yes', '-o', 'LogLevel=INFO',
+    '-N', '-T', '-R', `127.0.0.1:0:127.0.0.1:${localPort}`, config.host],
+  { env, stdio: ['ignore', 'ignore', 'pipe'], windowsHide: true }));
+  let closed = false, errorText = '', spawnError, port, pending = '', announce;
+  const allocated = new Promise(resolve => { announce = resolve; });
+  const done = new Promise(resolve => {
+    child.once('error', error => { spawnError = error; closed = true; resolve(); announce(); });
+    child.once('close', () => { closed = true; resolve(); announce(); });
+  });
+  child.stderr.setEncoding('utf8');
+  child.stderr.on('data', chunk => {
+    const lines = (pending + chunk).split(/\r?\n/);
+    pending = lines.pop();
+    for (const line of lines) {
+      const match = line.match(ALLOCATED);
+      if (match && port === undefined) { port = Number(match[1]); announce(); continue; }
+      errorText = (errorText + line + '\n').slice(-8000);
+      process.stderr.write(line + '\n');
+    }
+  });
+  const stop = async () => {
+    if (closed) return;
+    child.kill('SIGTERM');
+    await Promise.race([done, delay(1000)]);
+    if (!closed) { child.kill('SIGKILL'); await done; }
+  };
+  try {
+    let timer;
+    const expired = new Promise(resolve => { timer = setTimeout(resolve, timeoutMs); });
+    await Promise.race([allocated, expired]);
+    clearTimeout(timer);
+    if (port === undefined) {
+      if (closed) throw new Error('SSH 工具连接失败：' + (spawnError?.message || errorText.trim() || '连接已关闭'));
+      throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
+    }
+    if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
+    return { controlPath: undefined, port, close: stop };
+  } catch (error) { await stop(); throw error; }
+}
+
+export async function openTunnel(config, localPort, { env = process.env, run = execute, platform = process.platform } = {}) {
+  if (platform === 'win32') return openDirectTunnel(config, localPort, { env });
+  // Keep the control socket below the short Unix-domain path limit on macOS.
+  const base = os.tmpdir().length > 55 ? '/tmp' : os.tmpdir();
+  const directory = await fs.mkdtemp(path.join(base, 'ccr-'));
+  const controlPath = path.join(directory, 'ssh');
+  const master = trackChild(spawn('ssh', [...sshBase(config), '-M', '-S', controlPath, '-o', 'ControlPersist=no',
+    '-o', 'ExitOnForwardFailure=yes', '-N', '-T', config.host], { env, stdio: ['ignore', 'ignore', 'pipe'] }));
+  let closed = false, errorText = '', spawnError;
+  const done = new Promise(resolve => {
+    master.once('error', error => { spawnError = error; closed = true; resolve(); });
+    master.once('close', () => { closed = true; resolve(); });
+  });
+  master.stderr.setEncoding('utf8');
+  master.stderr.on('data', chunk => { errorText = (errorText + chunk).slice(-8000); process.stderr.write(chunk); });
+  const stop = async () => {
+    if (!closed) {
+      await run('ssh', [...sshBase(config), '-S', controlPath, '-O', 'exit', config.host],
+        { env, capture: true, timeout: 5000, check: false }).catch(() => {});
+      master.kill('SIGTERM');
+      await Promise.race([done, delay(1000)]);
+      if (!closed) { master.kill('SIGKILL'); await done; }
+    }
+    await fs.rm(directory, { recursive: true, force: true });
+  };
+  const interrupt = () => master.kill('SIGINT');
+  process.on('SIGINT', interrupt);
+  try {
+    const deadline = Date.now() + 120000;
+    while (!await exists(controlPath)) {
+      if (closed) throw new Error('SSH 工具连接失败：' + (spawnError?.message || errorText.trim() || '连接已关闭'));
+      if (Date.now() > deadline) throw new Error('等待 SSH 登录超时。');
+      await delay(100);
+    }
+    const result = await run('ssh', [...sshBase(config), '-S', controlPath, '-O', 'forward',
+      '-o', 'ExitOnForwardFailure=yes', '-R', `127.0.0.1:0:127.0.0.1:${localPort}`, config.host],
+    { env, capture: true, timeout: 15000 });
+    const port = Number(result.stdout.trim());
+    if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error('无法获取 SSH 反向隧道端口。请检查服务器是否允许 TCP 转发。');
+    return { controlPath, port, close: stop };
+  } catch (error) { await stop(); throw error; }
+  finally { process.off('SIGINT', interrupt); }
+}