@hyzyn/dsh-tty 0.20.2 → 0.22.0-rc.1

package/lib/probe.d.ts

@@ -5,11 +5,39 @@ export declare const PROBE_TCP_TIMEOUT_MS = 6000;
 export declare const PROBE_AUTH_TIMEOUT_MS = 8000;
 /** 分类结果载荷（HTTP 回传；字段全部可 JSON）。 */
 export interface ProbeResult {
-    /** tcp 阶段：DNS 解析 + TCP 建连。 */
+    /**
+     * tcp 阶段：DNS 解析 + TCP 建连。
+     *
+     * **有跳板机时探的是跳板机那一跳**（目标根本不能直连），标签与它的结论另见 `jump`——
+     * 客户端据此把这一行写成「跳板机 X 通/不通」，而不是让人读成「目标 TCP 可达」。
+     * **走代理命令时这一阶段整个跳过**（`skipped=true`）：连不连得上由那条命令自己决定，
+     * 直连预检探的是目标主机、与本次连接路径无关，报「不可达」纯属误导读者的噪音。
+     */
     tcp: {
         ok: boolean;
         error?: string;
         ms?: number;
+        skipped?: boolean;
+    };
+    /** 跳板机维度（单跳）：标签 + 它那一跳的 TCP 预检结论（与 `tcp` 同一份数据，便于客户端直接渲染）。 */
+    jump?: {
+        label: string;
+        tcp: {
+            ok: boolean;
+            error?: string;
+            ms: number;
+        };
+    };
+    /**
+     * 代理命令维度：配了 `proxyCommand` 时非空。
+     *
+     * `active=false` 表示**配了但闸门关着**（`allowProxyCommand` 未开），本次不会执行任何本机
+     * 命令——探针在这里就返回，把开关路径写清楚（而不是让人读成「目标连不上」）。
+     * **不回显命令原文**（它可能含凭据）。
+     */
+    proxy?: {
+        active: boolean;
+        error?: string;
     };
     /** hostkey 阶段：TOFU 比对（未到握手时为 unknown）。 */
     hostkey: {

package/lib/probe.js

@@ -22,7 +22,7 @@
  */
 import { Client } from 'ssh2';
 import { connect as netConnect } from 'node:net';
-import { buildConnectConfig, classifyError, sshTarget } from './ssh.js';
+import { attachSshTransport, classifyError, jumpTargetLabel, PROXY_COMMAND_DISABLED, PROXY_COMMAND_NOT_GRANTED, proxyCommandAllowedNow, proxyCommandGrantedNow, proxyFailureSuffix, sanitizeProxyCommand, sshTarget } from './ssh.js';
 /** TCP 预检超时（毫秒）：DNS 解析 + 建连。 */
 export const PROBE_TCP_TIMEOUT_MS = 6_000;
 /** ssh2 握手/认证阶段超时（毫秒）；覆盖 buildConnectConfig 的 readyTimeout。 */
@@ -118,16 +118,59 @@ export async function probeSsh(spec, store) {
     };
     const port = spec.port ?? 22;
     const target = sshTarget(spec);
-    // ---- 阶段 1：agent 预检（与 spawnSsh 同款，快速失败） ----
+    /*
+     * ---- 阶段 0：代理命令闸门 ----
+     *
+     * 配了 `proxyCommand` 但开关（`allowProxyCommand`）没开时**在这里就返回**：这一档是
+     * 「本机任意命令执行」，关着的时候真实连接也会明确失败（见 ssh.ts 的 dialProxyCommand），
+     * 所以探针必须报同一件事——否则「试连」会去 TCP 预检目标主机，把用户引到网络排查上。
+     */
+    const proxyCommand = sanitizeProxyCommand(spec.proxyCommand);
+    const proxyActive = proxyCommand !== undefined && proxyCommandAllowedNow();
+    if (proxyCommand !== undefined) {
+        // 未启用分两种：**宿主没授权**（要去设环境变量 + 重启）与**开关关着**（去把开关打开）。
+        // 合成一句话会让用户对着一个点不动的开关反复点。
+        const blocked = proxyCommandGrantedNow() ? PROXY_COMMAND_DISABLED : PROXY_COMMAND_NOT_GRANTED;
+        result.proxy = { active: proxyActive, ...(proxyActive ? {} : { error: blocked }) };
+        if (!proxyActive) {
+            result.tcp = { ok: false, error: blocked, ms: 0 };
+            result.auth = { ok: false, error: blocked };
+            return finish();
+        }
+        /*
+         * 走代理命令时**不做直连 TCP 预检**：连不连得上由那条命令决定，探目标主机与本次路径无关
+         * （典型情况就是目标根本不可直连，报「不可达」纯属误导）。链路结论来自阶段 2 的握手。
+         */
+        result.tcp = { ok: false, skipped: true, ms: 0 };
+    }
+    /*
+     * ---- agent 预检（与 spawnSsh 同款，快速失败） ----
+     *
+     * **位置在代理命令闸门之后**（tty D67，Windows 真机实测纠正过一次顺序）：原先它在闸门之前，于是
+     * 「配了代理命令 + 宿主没授权 + 这台机器又没有 ssh-agent」三件事同时成立时，探针只报
+     * 「agent 认证需要 SSH_AUTH_SOCK」——用户去把 agent 修好、再点一次，才看到真正挡路的那道门。
+     * 策略挡路（要不要放行本机命令执行）优先于环境挡路（本机有没有 agent），
+     * 也与 HTTP 路由「先过门、再干活」一致。macOS 开发机上因为本机有 agent，看不出来。
+     */
     if (spec.auth === 'agent' && (process.env.SSH_AUTH_SOCK === undefined || process.env.SSH_AUTH_SOCK === '')) {
         const message = 'agent 认证需要 SSH_AUTH_SOCK（本机未运行 ssh-agent 或变量未设置）';
         result.tcp = { ok: false, error: message, ms: 0 };
         result.auth = { ok: false, error: message };
         return finish();
     }
-    // ---- 阶段 1：TCP 预检（DNS + 建连） ----
-    const tcpResult = await new Promise((resolve) => {
-        const sock = netConnect({ host: spec.host, port });
+    /*
+     * ---- 阶段 1：TCP 预检（DNS + 建连） ----
+     *
+     * **有跳板机时预检的是跳板机**：目标那一跳根本不能直连，探它只会得到一句「超时」，
+     * 而那正是用户要区分的东西。目标那一跳的结论来自阶段 2（经通道握手），见 result.auth。
+     * **走代理命令时整段跳过**（上面已经把 tcp 标成 skipped）。
+     */
+    const jumpLabel = jumpTargetLabel(spec);
+    const tcpHost = spec.jump !== undefined ? spec.jump.host.trim() : spec.host;
+    const tcpPort = spec.jump !== undefined ? spec.jump.port ?? 22 : port;
+    const tcpPrefix = jumpLabel === '' ? '' : `跳板机 ${jumpLabel} `;
+    const tcpResult = !proxyActive && await new Promise((resolve) => {
+        const sock = netConnect({ host: tcpHost, port: tcpPort });
         const tcpStart = Date.now();
         const done = (ok, error) => {
             try {
@@ -139,30 +182,40 @@ export async function probeSsh(spec, store) {
             resolve({ ok, error, ms: Date.now() - tcpStart });
         };
         sock.setTimeout(PROBE_TCP_TIMEOUT_MS, () => {
-            done(false, 'TCP 连接超时：主机无响应（检查地址 / 防火墙 / 网络）');
+            // 没配跳板机时仍要点出这条最容易被误读的成因（企业内网主机几乎都要过 bastion）
+            const hint = jumpLabel === ''
+                ? '；若该主机只能经跳板机访问，请在这个连接条目里配置跳板机（也可从 ~/.ssh/config 导入，ProxyJump 会被自动带上）'
+                : '';
+            done(false, `${tcpPrefix}TCP 连接超时：无响应（检查地址 / 防火墙 / 网络${hint}）`);
         });
         sock.once('connect', () => done(true));
         sock.once('error', (error) => {
-            done(false, classifyError(error.message));
+            done(false, tcpPrefix + classifyError(error.message));
         });
     });
-    result.tcp = tcpResult;
-    if (!tcpResult.ok) {
-        result.auth = { ok: false, error: tcpResult.error };
-        return finish();
+    if (tcpResult !== false) {
+        result.tcp = tcpResult;
+        if (jumpLabel !== '')
+            result.jump = { label: jumpLabel, tcp: { ...tcpResult, ms: tcpResult.ms } };
+        if (!tcpResult.ok) {
+            result.auth = { ok: false, error: tcpResult.error };
+            return finish();
+        }
     }
     // ---- 阶段 2+3：ssh2 握手（host key 交换 + 认证） ----
+    // 有跳板机时**两跳都用探针的短超时**：否则「跳板机连不上」会把探针拖到 20s
     let connectConfig;
+    let transport;
     try {
-        connectConfig = await buildConnectConfig(spec);
+        const attached = await attachSshTransport({ spec, store, readyTimeoutMs: PROBE_AUTH_TIMEOUT_MS });
+        connectConfig = attached.connectConfig;
+        transport = attached.transport;
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         result.auth = { ok: false, error: classifyError(message) };
         return finish();
     }
-    // 探针专属更短握手超时（buildConnectConfig 默认 20s 对测试太长）
-    connectConfig.readyTimeout = PROBE_AUTH_TIMEOUT_MS;
     const password = spec.auth === 'password' ? connectConfig.password ?? '' : '';
     const tryKeyboard = connectConfig.tryKeyboard === true;
     return new Promise((resolve) => {
@@ -180,6 +233,14 @@ export async function probeSsh(spec, store) {
             catch {
                 /* 已断开 */
             }
+            try {
+                transport.bastion?.end();
+            }
+            catch {
+                /* 已断开 */
+            }
+            // 代理命令是子进程：探针收尾必须杀它（每次试连漏一个常驻进程是很容易漏的地方）
+            transport.proxy?.dispose();
             resolve(finish());
         };
         // hostVerifier 的 onResult 同步回调：把结论收集到 hostkeyState
@@ -199,7 +260,16 @@ export async function probeSsh(spec, store) {
             });
         }
         const authStart = Date.now();
+        /*
+         * **每个回调进来先看 settled**——这不是防御性代码，是修一个真缺陷（2026-09-26 真机验收发现）：
+         * `settle()` 有幂等守卫，但这些 `result.auth = …` **赋值没有**。而 `resolve(finish())` 交出去的
+         * 是**同一个对象**，于是「后到的 close」会把已经定稿的字段覆写掉，调用方看到的是最后那句
+         * ——实测症状是 ssh2 连报两条错（`Connection lost before handshake` 带着代理命令的 stderr、
+         * 随后 `The operation was aborted` 什么线索都没有），文案被后者盖成一句空话。
+         */
         const timer = setTimeout(() => {
+            if (settled)
+                return;
             if (seenHostKey) {
                 result.hostkey = hostkeyState;
                 result.auth = { ok: false, error: '认证/协商超时（服务端在 8s 内未完成认证）', ms: Date.now() - authStart };
@@ -211,11 +281,15 @@ export async function probeSsh(spec, store) {
         }, PROBE_AUTH_TIMEOUT_MS + 1000);
         timer.unref?.();
         conn.on('ready', () => {
+            if (settled)
+                return;
             result.hostkey = hostkeyState;
             result.auth = { ok: true, ms: Date.now() - authStart };
             settle();
         });
         conn.on('error', (error) => {
+            if (settled)
+                return;
             const classified = classifyError(error.message);
             if (error.message === 'Host key verification failed' && hostkeyState.state === 'mismatch') {
                 result.hostkey = hostkeyState;
@@ -224,13 +298,16 @@ export async function probeSsh(spec, store) {
                 return;
             }
             result.hostkey = seenHostKey ? hostkeyState : { state: 'unknown', fingerprint: '' };
-            // TCP 已通：这里只可能是协商 / 认证 / 协议层错误
-            result.auth = { ok: false, error: classified, ms: Date.now() - authStart };
+            // TCP / 传输已通：这里只可能是协商 / 认证 / 协议层错误。
+            // 代理命令死了的话，ssh2 只会报「握手前连接中断」——把那件事补在后面，别把人支到目标主机上
+            result.auth = { ok: false, error: classified + proxyFailureSuffix(transport.proxy), ms: Date.now() - authStart };
             settle();
         });
         conn.on('close', () => {
             // 正常路径（ready / error / 超时）已 settle；未 settle 的 close 兜底
-            result.auth = { ok: false, error: '连接已关闭（服务端主动断开）', ms: Date.now() - authStart };
+            if (settled)
+                return;
+            result.auth = { ok: false, error: `连接已关闭（服务端主动断开）${proxyFailureSuffix(transport.proxy)}`, ms: Date.now() - authStart };
             settle();
         });
         try {
@@ -238,8 +315,10 @@ export async function probeSsh(spec, store) {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            result.auth = { ok: false, error: classifyError(message), ms: Date.now() - authStart };
-            settle();
+            if (!settled) {
+                result.auth = { ok: false, error: classifyError(message), ms: Date.now() - authStart };
+                settle();
+            }
         }
     });
 }

package/lib/probe.js.map

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

package/lib/sftp.js

@@ -6,7 +6,7 @@
  * 下次操作自动重连（不做后台重连循环——SFTP 没有常驻监听需求，与隧道不同；
  * 解析 spec 由调用方每次传入，连接簿凭证热改后天然生效）。
  *
- * 连接建立复用 buildConnectConfig + applyHostKeyPolicy——TOFU 与终端会话、
+ * 连接建立复用 prepareSshConnect（含跳板机）——TOFU 与终端会话、
  * 隧道共用同一 HostKeyStore，指纹变更同样拒绝且文案一致；password 认证挂
  * keyboard-interactive 自动应答（同 spawnSsh，很多服务端只开这个）。
  *
@@ -23,7 +23,7 @@ import { mkdir as fsMkdir, readdir as fsReaddir, rm as fsRm, stat as fsStat } fr
 import { basename, dirname, join as pathJoin } from 'node:path';
 import { PassThrough } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { applyHostKeyPolicy, buildConnectConfig, sshTarget } from './ssh.js';
+import { prepareSshConnect, proxyFailureSuffix, sshTarget } from './ssh.js';
 /** 连接空闲回收阈值：窗口内无任何操作即断开（下次操作自动重连）。 */
 const SFTP_IDLE_MS = 120_000;
 /** 扫描周期。 */
@@ -53,6 +53,22 @@ export function assertRemovableRemotePath(raw) {
 }
 /** OpenSSH 等 server 的 readdir 会带回 '.'/'..'：目录列表与递归删除都要跳过。 */
 const DOT_ENTRIES = new Set(['.', '..']);
+/**
+ * SFTP 失败文案：`<动作> <对象>: <原因>`。
+ *
+ * 为什么必须带对象（D59）：agent 常把 sftp_list 当「这个路径存不存在」的探测用，
+ * 批量调用时只看到「读取目录失败: No such file」根本判断不出是哪一条失败——只能靠
+ * 事件序号回推。path / from→to 就在各调用点作用域里，没有理由不带。
+ *
+ * ssh2 把 SFTP 状态码挂在 `err.code` 上（SFTP.js `err.code = errorCode`）：
+ * NO_SUCH_FILE / PERMISSION_DENIED 单独点明，省得调用方从英文 errno 里猜语义。
+ */
+function sftpFail(action, target, error, note = '') {
+    const code = typeof error === 'object' && error !== null ? error.code : undefined;
+    const reason = error instanceof Error ? error.message : String(error);
+    const detail = code === 2 ? '不存在（NO_SUCH_FILE）' : code === 3 ? '权限不足（PERMISSION_DENIED）' : reason;
+    return new Error(`${action} ${target}: ${detail}${note}`);
+}
 /** 远程路径拼接（POSIX 语义；本机路径拼接用 node:path）。 */
 function joinRemotePath(base, name) {
     return (base.endsWith('/') ? base : base + '/') + name;
@@ -198,7 +214,7 @@ export class SftpManager {
             catch (error) {
                 // 请求的根目录读不到（不存在/权限）→ 明确报错；子目录失败记入 errors 继续
                 if (isRoot)
-                    throw new Error(`读取目录失败: ${error instanceof Error ? error.message : String(error)}`);
+                    throw sftpFail('读取目录失败', dir, error);
                 errors.push({ path: dir, message: error instanceof Error ? error.message : String(error) });
                 return;
             }
@@ -238,7 +254,7 @@ export class SftpManager {
     async rename(spec, from, to) {
         const sftp = await this.acquire(spec);
         await new Promise((resolve, reject) => {
-            sftp.rename(from.trim(), to.trim(), (error) => (error != null ? reject(new Error(`重命名失败: ${error.message}`)) : resolve()));
+            sftp.rename(from.trim(), to.trim(), (error) => (error != null ? reject(sftpFail('重命名失败', `${from.trim()} → ${to.trim()}`, error)) : resolve()));
         });
     }
     /**
@@ -285,7 +301,7 @@ export class SftpManager {
         const target = path.trim();
         if (append) {
             const stream = sftp.createWriteStream(target, { flags: 'a' });
-            const done = this.streamDone(stream, () => { });
+            const done = this.streamDone(stream, () => { }, target);
             done.catch(() => { });
             return { stream, done, writePath: target };
         }
@@ -308,7 +324,7 @@ export class SftpManager {
             stream.on('error', (error) => {
                 settled = true;
                 dropPart();
-                reject(new Error(`上传写入失败: ${error.message}`));
+                reject(sftpFail('上传写入失败', target, error));
             });
             stream.on('close', () => {
                 if (settled)
@@ -364,10 +380,10 @@ export class SftpManager {
         }
     }
     /** WriteStream 的 done Promise（close 即 resolve，error reject）；onClose 钩子供覆盖写路径塞落盘逻辑。 */
-    streamDone(stream, onClose) {
+    streamDone(stream, onClose, target) {
         return new Promise((resolve, reject) => {
             stream.on('error', (error) => {
-                reject(new Error(`上传写入失败: ${error.message}`));
+                reject(sftpFail('上传写入失败', target, error));
             });
             stream.on('close', () => {
                 onClose();
@@ -688,12 +704,19 @@ export class SftpManager {
             existing.lastUsed = Date.now();
             return existing.sftp;
         }
-        const target = sshTarget(spec);
         const conn = new Client();
         let sftp;
+        let bastion = null;
+        let proxy = null;
+        let target = sshTarget(spec);
         try {
-            const connectConfig = await buildConnectConfig(spec);
-            const policy = applyHostKeyPolicy({ connectConfig, spec, store: this.store, logger: this.logger, target });
+            // 与终端/隧道/探针共用同一条准备路径：跳板机 / 代理命令只在 prepareSshConnect 里拨一次
+            const prepared = await prepareSshConnect({ spec, store: this.store, logger: this.logger });
+            const connectConfig = prepared.connectConfig;
+            const policy = prepared.policy;
+            bastion = prepared.bastion;
+            proxy = prepared.proxy;
+            target = prepared.target;
             // password 认证挂 keyboard-interactive 自动应答（同 spawnSsh；
             // tryKeyboard 只在 password 分支置位，见 buildConnectConfig）
             if (connectConfig.tryKeyboard === true) {
@@ -712,17 +735,21 @@ export class SftpManager {
                     if (!settled) {
                         settled = true;
                         const mismatch = policy.mismatchMessage();
-                        reject(new Error(mismatch ?? `SSH 连接失败（${target}）: ${error.message}`));
+                        reject(new Error(mismatch ?? `SSH 连接失败（${target}）: ${error.message}${proxyFailureSuffix(proxy)}`));
                     }
                     else {
                         this.logger.warn(`[dsh-tty] sftp ${target} 连接错误: ${error.message}`);
                     }
                 });
                 conn.on('close', () => {
-                    // 连接断开：丢弃池内条目，下次操作自动重连
+                    // 连接断开：丢弃池内条目，下次操作自动重连。
+                    // **必须走 close(rt) 而不是只 delete**（**D65**）：跳板机 / 代理命令是「另一条连接 / 另一个进程」，
+                    // 只摘池条目会把它们留在原地（前者靠 keepalive 一直挂着、后者变常驻孤儿）。
                     const rt = this.conns.get(signature);
-                    if (rt !== undefined && rt.conn === conn)
+                    if (rt !== undefined && rt.conn === conn) {
                         this.conns.delete(signature);
+                        this.close(rt);
+                    }
                 });
                 try {
                     conn.connect(connectConfig);
@@ -747,10 +774,18 @@ export class SftpManager {
             catch {
                 /* 未建立 */
             }
+            try {
+                bastion?.end();
+            }
+            catch {
+                /* 未建立 */
+            }
+            proxy?.dispose();
+            proxy = null;
             throw error;
         }
         this.logger.info(`[dsh-tty] sftp ${target} 就绪`);
-        const rt = { spec, signature, conn, sftp, lastUsed: Date.now() };
+        const rt = { spec, signature, conn, bastion, proxy, sftp, lastUsed: Date.now() };
         this.conns.set(signature, rt);
         return sftp;
     }
@@ -776,13 +811,22 @@ export class SftpManager {
         catch {
             /* 已断开 */
         }
+        try {
+            rt.bastion?.end();
+        }
+        catch {
+            /* 已断开 */
+        }
+        rt.bastion = null;
+        rt.proxy?.dispose();
+        rt.proxy = null;
     }
     /* -------------------------------------------------------------- */
     /* SFTPWrapper 回调的 Promise 化与递归删除                          */
     /* -------------------------------------------------------------- */
     realpath(sftp, path) {
         return new Promise((resolve, reject) => {
-            sftp.realpath(path, (error, absPath) => (error !== undefined ? reject(new Error(`realpath 失败: ${error.message}`)) : resolve(absPath)));
+            sftp.realpath(path, (error, absPath) => (error !== undefined ? reject(sftpFail('realpath 失败', path, error)) : resolve(absPath)));
         });
     }
     /** stat 的静默版：路径不存在等错误一律回 null（mkdir -p 的逐级探测用）。 */
@@ -793,21 +837,21 @@ export class SftpManager {
     }
     mkdirOne(sftp, path) {
         return new Promise((resolve, reject) => {
-            sftp.mkdir(path, (error) => (error != null ? reject(new Error(`创建目录失败: ${error.message}`)) : resolve()));
+            sftp.mkdir(path, (error) => (error != null ? reject(sftpFail('创建目录失败', path, error)) : resolve()));
         });
     }
     readdir(sftp, path) {
         return new Promise((resolve, reject) => {
-            sftp.readdir(path, (error, list) => (error !== undefined ? reject(new Error(`读取目录失败: ${error.message}`)) : resolve(list)));
+            sftp.readdir(path, (error, list) => (error !== undefined ? reject(sftpFail('读取目录失败', path, error)) : resolve(list)));
         });
     }
     async removeEntry(sftp, path, recursive) {
         const stats = await new Promise((resolve, reject) => {
-            sftp.lstat(path, (error, stats) => (error !== undefined ? reject(new Error(`删除失败: ${error.message}`)) : resolve(stats)));
+            sftp.lstat(path, (error, stats) => (error !== undefined ? reject(sftpFail('删除失败', path, error)) : resolve(stats)));
         });
         if (!stats.isDirectory()) {
             await new Promise((resolve, reject) => {
-                sftp.unlink(path, (error) => (error != null ? reject(new Error(`删除失败: ${error.message}`)) : resolve()));
+                sftp.unlink(path, (error) => (error != null ? reject(sftpFail('删除失败', path, error)) : resolve()));
             });
             return;
         }
@@ -815,7 +859,7 @@ export class SftpManager {
             await new Promise((resolve, reject) => {
                 // 不预设原因：非空与权限拒绝在 SFTP 层都是笼统的 Failure，把两种可能
                 // 一并列出让用户自行分辨（此前一律归因为「非空」误导权限问题）
-                sftp.rmdir(path, (error) => (error != null ? reject(new Error(`删除目录失败: ${error.message}（目录非空时需 recursive:true；若非此原因，多为账号对该目录无写权限）`)) : resolve()));
+                sftp.rmdir(path, (error) => (error != null ? reject(sftpFail('删除目录失败', path, error, '（目录非空时需 recursive:true；若非此原因，多为账号对该目录无写权限）')) : resolve()));
             });
             return;
         }
@@ -827,7 +871,7 @@ export class SftpManager {
             await this.removeEntry(sftp, base + child.filename, true);
         }
         await new Promise((resolve, reject) => {
-            sftp.rmdir(path, (error) => (error != null ? reject(new Error(`删除目录失败: ${error.message}`)) : resolve()));
+            sftp.rmdir(path, (error) => (error != null ? reject(sftpFail('删除目录失败', path, error)) : resolve()));
         });
     }
 }