@hyzyn/dsh-tty 0.2.0 → 0.5.0

package/lib/tunnels.js

@@ -0,0 +1,327 @@
+/**
+ * @hyzyn/dsh-tty — SSH 端口转发隧道管理（0.5.0）。
+ *
+ * 隧道是宿主自持的一等对象：不依赖终端标签，settings 即真相源，reconcile()
+ * 按配置增/删/改启停；SSH 断开自动指数退避重连（1s→15s 封顶）；连接簿条目
+ * 在每次（重）连接时实时解析——改密码后隧道重连自动用新凭证。
+ *
+ * 两个方向：
+ *   - local（-L，forwardOut）：本地 127.0.0.1:localPort 监听常驻（SSH 掉线
+ *     不释放端口，未就绪的入站连接直接 destroy）；每条入站连接
+ *     forwardOut 到服务端侧 remoteHost:remotePort，Channel 双工 pipe。
+ *   - remote（-R，forwardIn）：SSH ready 后 forwardIn 让服务端监听
+ *     remoteHost:remotePort（缺省 127.0.0.1），'tcp connection' 到来时拨号
+ *     本地 localTargetHost:localTargetPort 双向 pipe；断线后远程监听失效，
+ *     **每次重连 ready 都要重新 forwardIn**；停止时随连接断开自动解绑。
+ *
+ * TOFU：与终端会话共用同一 HostKeyStore——指纹变更同样拒绝，错误文案一致。
+ * 端口转发不计入 maxSessions（不占终端会话名额）。
+ */
+import net from 'node:net';
+import { Client } from 'ssh2';
+import { applyHostKeyPolicy, buildConnectConfig } from './ssh.js';
+const MAX_RETRY_DELAY_MS = 15_000;
+function signatureOf(spec) {
+    return JSON.stringify(spec);
+}
+function ruleOf(spec) {
+    if (spec.direction === 'local') {
+        return `本机:${String(spec.localPort ?? 0)} → ${spec.remoteHost ?? '?'}:${String(spec.remotePort ?? 0)}`;
+    }
+    return `远程:${spec.remoteHost?.trim() || '127.0.0.1'}:${String(spec.remotePort ?? 0)} → 本机:${String(spec.localTargetPort ?? 0)}`;
+}
+export class TunnelManager {
+    logger;
+    store;
+    resolveBook;
+    tunnels = new Map();
+    constructor(logger, store, 
+    /** 按名字解析连接簿条目（实时读取，重连自动用最新凭证） */
+    resolveBook) {
+        this.logger = logger;
+        this.store = store;
+        this.resolveBook = resolveBook;
+    }
+    /** 按配置对齐运行态：新增/删除/规格变更重建，启停切换资源。幂等。 */
+    reconcile(specs) {
+        const wanted = new Map(specs.map((spec) => [spec.name, spec]));
+        for (const [name, rt] of [...this.tunnels.entries()]) {
+            const next = wanted.get(name);
+            if (next === undefined || signatureOf(next) !== rt.signature) {
+                this.stopTunnel(rt);
+                this.tunnels.delete(name);
+            }
+        }
+        for (const spec of wanted.values()) {
+            if (this.tunnels.has(spec.name))
+                continue;
+            const rt = {
+                spec,
+                signature: signatureOf(spec),
+                state: spec.enabled ? 'connecting' : 'stopped',
+                error: null,
+                conn: null,
+                ready: false,
+                server: null,
+                connections: 0,
+                totalConnections: 0,
+                lastForwardError: null,
+                retryTimer: null,
+                retryAttempt: 0,
+                dead: false,
+                fatal: false,
+            };
+            this.tunnels.set(spec.name, rt);
+            if (spec.enabled)
+                this.startTunnel(rt);
+        }
+    }
+    list() {
+        return [...this.tunnels.values()].map((rt) => ({
+            name: rt.spec.name,
+            bookName: rt.spec.bookName,
+            direction: rt.spec.direction,
+            enabled: rt.spec.enabled,
+            state: rt.state,
+            error: rt.error,
+            rule: ruleOf(rt.spec),
+            connections: rt.connections,
+            totalConnections: rt.totalConnections,
+            lastForwardError: rt.lastForwardError,
+        }));
+    }
+    disposeAll() {
+        for (const rt of this.tunnels.values())
+            this.stopTunnel(rt);
+        this.tunnels.clear();
+    }
+    /** ------------------------------------------------------------------ */
+    startTunnel(rt) {
+        rt.dead = false;
+        rt.retryAttempt = 0;
+        if (rt.spec.direction === 'local') {
+            const server = net.createServer((socket) => this.onLocalConnection(rt, socket));
+            server.on('error', (error) => {
+                this.failTunnel(rt, `本地监听 127.0.0.1:${String(rt.spec.localPort ?? 0)} 失败: ${error.message}`);
+            });
+            server.listen(rt.spec.localPort ?? 0, '127.0.0.1', () => {
+                this.logger.info(`[dsh-tty] 隧道 ${rt.spec.name} 监听 127.0.0.1:${String(rt.spec.localPort ?? 0)}`);
+            });
+            rt.server = server;
+        }
+        this.connectTunnel(rt);
+    }
+    stopTunnel(rt) {
+        rt.dead = true;
+        if (rt.retryTimer !== null) {
+            clearTimeout(rt.retryTimer);
+            rt.retryTimer = null;
+        }
+        if (rt.server !== null) {
+            try {
+                rt.server.close();
+            }
+            catch {
+                /* 已关闭 */
+            }
+            rt.server = null;
+        }
+        try {
+            rt.conn?.end();
+        }
+        catch {
+            /* 已断开 */
+        }
+        rt.conn = null;
+        rt.ready = false;
+        rt.connections = 0;
+        rt.lastForwardError = null;
+        rt.state = 'stopped';
+    }
+    connectTunnel(rt) {
+        const spec = rt.spec;
+        const book = this.resolveBook(spec.bookName);
+        if (book === undefined) {
+            this.scheduleRetry(rt, `连接簿中不存在条目: ${spec.bookName}`);
+            return;
+        }
+        const sshSpec = {
+            host: book.host,
+            port: book.port,
+            username: book.username,
+            auth: book.auth,
+            keyPath: book.keyPath,
+            passphrase: book.passphrase,
+            password: book.password,
+        };
+        const target = `${book.username}@${book.host}:${String(book.port)}`;
+        rt.state = 'connecting';
+        let conn;
+        try {
+            // 认证配置可能抛错（keyPath 读不到 / env:VAR 变量缺失）——走重试等待配置修复
+            const connectConfig = buildConnectConfig(sshSpec);
+            const policy = applyHostKeyPolicy({ connectConfig, spec: sshSpec, store: this.store, logger: this.logger, target });
+            conn = new Client();
+            rt.conn = conn;
+            rt.ready = false;
+            conn.on('ready', () => {
+                if (rt.dead || rt.conn !== conn)
+                    return;
+                rt.ready = true;
+                // 人工介入级故障（如本地监听 EACCES）不因 SSH ready 而被掩盖
+                if (!rt.fatal) {
+                    rt.state = 'active';
+                    rt.error = null;
+                }
+                rt.retryAttempt = 0;
+                this.logger.info(`[dsh-tty] 隧道 ${spec.name} → ${target} 已连接`);
+                if (spec.direction === 'remote')
+                    this.bindRemoteListen(rt, conn);
+            });
+            conn.on('tcp connection', (details, accept) => {
+                if (rt.dead || rt.conn !== conn || !rt.ready || spec.direction !== 'remote') {
+                    try {
+                        accept().close();
+                    }
+                    catch {
+                        /* 忽略 */
+                    }
+                    return;
+                }
+                this.onRemoteConnection(rt, accept);
+            });
+            conn.on('error', (error) => {
+                if (rt.dead || rt.conn !== conn)
+                    return;
+                this.scheduleRetry(rt, policy.mismatchMessage() ?? `SSH 连接失败（${target}）: ${error.message}`);
+            });
+            conn.on('close', () => {
+                if (rt.conn !== conn)
+                    return;
+                rt.conn = null;
+                rt.ready = false;
+                rt.connections = 0;
+                if (!rt.dead && rt.spec.enabled && rt.state !== 'error') {
+                    this.scheduleRetry(rt, 'SSH 连接断开');
+                }
+            });
+            conn.connect(connectConfig);
+        }
+        catch (error) {
+            this.scheduleRetry(rt, error instanceof Error ? error.message : String(error));
+        }
+    }
+    /** remote 方向：让服务端监听端口（重连后必须重新调用，断线即失效）。 */
+    bindRemoteListen(rt, conn) {
+        const spec = rt.spec;
+        conn.forwardIn(spec.remoteHost?.trim() || '127.0.0.1', spec.remotePort ?? 0, (error, realPort) => {
+            if (rt.dead || rt.conn !== conn)
+                return;
+            if (error !== undefined && error !== null) {
+                this.failTunnel(rt, `远程监听失败（${spec.remoteHost?.trim() || '127.0.0.1'}:${String(spec.remotePort ?? 0)}）: ${error.message}`);
+                return;
+            }
+            this.logger.info(`[dsh-tty] 隧道 ${spec.name} 远程监听 ${spec.remoteHost?.trim() || '127.0.0.1'}:${String(realPort)} 就绪`);
+        });
+    }
+    onRemoteConnection(rt, accept) {
+        const spec = rt.spec;
+        rt.totalConnections += 1;
+        rt.connections += 1;
+        const stream = accept();
+        const local = net.connect({ host: spec.localTargetHost?.trim() || '127.0.0.1', port: spec.localTargetPort ?? 0 }, () => {
+            stream.pipe(local);
+            local.pipe(stream);
+        });
+        const teardown = () => {
+            rt.connections = Math.max(0, rt.connections - 1);
+            try {
+                stream.end();
+            }
+            catch {
+                /* 已关闭 */
+            }
+            try {
+                local.destroy();
+            }
+            catch {
+                /* 已关闭 */
+            }
+        };
+        stream.on('close', teardown);
+        local.on('close', teardown);
+        const kill = () => teardown();
+        stream.on('error', kill);
+        local.on('error', kill);
+    }
+    onLocalConnection(rt, socket) {
+        const spec = rt.spec;
+        const conn = rt.conn;
+        // SSH 未就绪：端口保持占用但直接拒绝，应用层立刻收到连接重置
+        if (rt.dead || conn === null || !rt.ready) {
+            socket.destroy();
+            return;
+        }
+        rt.totalConnections += 1;
+        rt.connections += 1;
+        conn.forwardOut('127.0.0.1', 0, spec.remoteHost?.trim() ?? '', spec.remotePort ?? 0, (error, stream) => {
+            if (error !== undefined && error !== null) {
+                rt.lastForwardError = `目标 ${spec.remoteHost?.trim() ?? '?'}:${String(spec.remotePort ?? 0)} 拨号失败: ${error.message}`;
+                this.logger.warn(`[dsh-tty] 隧道 ${rt.spec.name} forwardOut 失败: ${error.message}`);
+                socket.destroy();
+                return;
+            }
+            const teardown = () => {
+                rt.connections = Math.max(0, rt.connections - 1);
+            };
+            stream.on('close', teardown);
+            socket.pipe(stream);
+            stream.pipe(socket);
+            const kill = () => {
+                try {
+                    socket.destroy();
+                }
+                catch {
+                    /* 已关闭 */
+                }
+                try {
+                    stream.end();
+                }
+                catch {
+                    /* 已关闭 */
+                }
+            };
+            socket.on('error', kill);
+            stream.on('error', kill);
+        });
+    }
+    /** 失败且不再自动重试（需要人工介入：如远程端口被占、本地监听端口非法/无权限）。 */
+    failTunnel(rt, message) {
+        rt.error = message;
+        rt.state = 'error';
+        rt.fatal = true;
+        this.logger.warn(`[dsh-tty] 隧道 ${rt.spec.name} 错误: ${message}`);
+    }
+    /** 失败后按指数退避重连（1s→15s 封顶）；重连期间保持 error 态供 UI 展示原因。 */
+    scheduleRetry(rt, message) {
+        rt.error = message;
+        rt.state = 'error';
+        rt.fatal = false;
+        rt.conn = null;
+        rt.ready = false;
+        rt.connections = 0;
+        if (rt.dead || rt.retryTimer !== null)
+            return;
+        const delay = Math.min(MAX_RETRY_DELAY_MS, 1000 * 2 ** rt.retryAttempt);
+        rt.retryAttempt += 1;
+        this.logger.warn(`[dsh-tty] 隧道 ${rt.spec.name} 将在 ${String(delay)}ms 后重连（第 ${String(rt.retryAttempt)} 次）：${message}`);
+        const timer = setTimeout(() => {
+            rt.retryTimer = null;
+            if (!rt.dead && rt.spec.enabled)
+                this.connectTunnel(rt);
+        }, delay);
+        timer.unref?.();
+        rt.retryTimer = timer;
+    }
+}
+//# sourceMappingURL=tunnels.js.map

package/lib/tunnels.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tunnels.js","sourceRoot":"","sources":["../src/tunnels.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyzyn/dsh-tty",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "DSH Web GUI 的终端面板插件：侧边栏「终端」大弹窗，xterm.js + PTY 全交互终端（路线1），ssh2 原生 SSH 远程连接（方案 C）。",
   "type": "module",
   "engines": {
@@ -25,14 +25,18 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.7",
     "@deepseek-ai/schemastery": "^3.18.1",
     "@hyzyn/dsh-kit": "^0.1.0",
+    "@xterm/headless": "^5.5.0",
     "ssh2": "^1.17.0",
     "ws": "^8.18.0"
   },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2"
+  },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
     "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.7",
     "@deepseek-ai/dsh-subprocess": "0.1.0-rc.7",
     "@deepseek-ai/dsh-subprocess-local": "0.1.0-rc.7",
@@ -41,6 +45,7 @@
     "@types/ws": "^8.5.12",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/addon-search": "^0.16.0",
+    "@xterm/addon-webgl": "^0.19.0",
     "@xterm/addon-web-links": "^0.12.0",
     "@xterm/xterm": "^5.5.0",
     "esbuild": "^0.24.0",