@mindbase/deploy 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/deploy",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "MindBase 部署工具",
   "type": "module",
   "bin": {

package/src/script/runner.ts

@@ -1,13 +1,37 @@
 import type SftpClient from 'ssh2-sftp-client';
 import spawn from 'cross-spawn';
 import * as clack from '@clack/prompts';
+import { noteBox } from '@mindbase/cli-ui';
 import type { Step, ProjectConfig } from '../config/schema.js';
 import { resolveVariables } from './parser.js';
-import { execRemote } from '../ssh/executor.js';
-import { createLineSink } from '../log.js';
+import { execRemote, ExecError } from '../ssh/executor.js';
+
+/** 本地命令执行错误（同 ExecError 结构，便于上层统一处理） */
+class LocalExecError extends Error {
+  stdout: string;
+  stderr: string;
+  code: number | null;
+  constructor(
+    message: string,
+    opts: { stdout: string; stderr: string; code: number | null },
+  ) {
+    super(message);
+    this.name = 'LocalExecError';
+    this.stdout = opts.stdout;
+    this.stderr = opts.stderr;
+    this.code = opts.code;
+  }
+}
+
+/** 失败时若有 captured 输出，用 noteBox 框出，便于定位；无输出则不展示 */
+function showCommandOutput(err: unknown): void {
+  const e = err as { stdout?: string; stderr?: string };
+  const output = [e?.stdout, e?.stderr].filter(Boolean).join('\n').trim();
+  if (output) noteBox(output, '命令输出');
+}
 
 /**
- * 在本地执行命令
+ * 在本地执行命令（静默累积输出，失败时通过 LocalExecError 透出）
  */
 function runLocal(cmd: string, cwd?: string): Promise<void> {
   return new Promise((resolve, reject) => {
@@ -16,21 +40,31 @@ function runLocal(cmd: string, cwd?: string): Promise<void> {
       detached: false,
       shell: true,
     });
-    const outSink = createLineSink('stdout');
-    const errSink = createLineSink('stderr');
-    if (cp.stdout) cp.stdout.on('data', (data: Buffer) => outSink.push(data.toString()));
-    if (cp.stderr) cp.stderr.on('data', (data: Buffer) => errSink.push(data.toString()));
+    let outStr = '';
+    let errStr = '';
+    if (cp.stdout) cp.stdout.on('data', (data: Buffer) => { outStr += data.toString(); });
+    if (cp.stderr) cp.stderr.on('data', (data: Buffer) => { errStr += data.toString(); });
     cp.on('close', (code) => {
-      outSink.flush();
-      errSink.flush();
       if (code === 0) {
         resolve();
       } else {
-        reject(new Error(`本地命令执行失败 (code=${code}): ${cmd}`));
+        reject(
+          new LocalExecError(`本地命令执行失败 (code=${code}): ${cmd}`, {
+            stdout: outStr,
+            stderr: errStr,
+            code,
+          }),
+        );
       }
     });
     cp.on('error', (err) => {
-      reject(err);
+      reject(
+        new LocalExecError(String(err), {
+          stdout: outStr,
+          stderr: errStr,
+          code: null,
+        }),
+      );
     });
   });
 }
@@ -48,45 +82,87 @@ async function runStep(step: Step, project: ProjectConfig, sftp: SftpClient, now
     case 'local': {
       const cmd = resolveVariables(step.cmd, project, { now });
       const cwd = step.cwd ? resolveVariables(step.cwd, project, { now }) : undefined;
-      await runLocal(cmd, cwd);
+      const spinner = clack.spinner();
+      spinner.start(`本地: ${cmd}`);
+      try {
+        await runLocal(cmd, cwd);
+        spinner.stop(`✓ ${cmd}`);
+      } catch (err) {
+        spinner.stop(`✗ ${cmd}`);
+        showCommandOutput(err);
+        throw err;
+      }
       break;
     }
     case 'remote': {
       const cmd = resolveVariables(step.cmd, project, { now });
-      await execRemote(sftp, cmd);
+      const spinner = clack.spinner();
+      spinner.start(`远程: ${cmd}`);
+      try {
+        await execRemote(sftp, cmd);
+        spinner.stop(`✓ ${cmd}`);
+      } catch (err) {
+        spinner.stop(`✗ ${cmd}`);
+        showCommandOutput(err);
+        throw err;
+      }
       break;
     }
     case 'uploadDir': {
       const local = resolveVariables(step.local, project, { now });
       const remote = resolveVariables(step.remote, project, { now });
-      clack.log.step(`上传目录: ${local} → ${remote}`);
-      await sftp.mkdir(remote, true);
-      await sftp.uploadDir(local, remote, { useFastput: true });
-      clack.log.success('上传目录完成');
+      const spinner = clack.spinner();
+      spinner.start(`上传目录: ${local} → ${remote}`);
+      try {
+        await sftp.mkdir(remote, true);
+        await sftp.uploadDir(local, remote, { useFastput: true });
+        spinner.stop(`✓ ${local} → ${remote}`);
+      } catch (err) {
+        spinner.stop(`✗ ${local} → ${remote}`);
+        throw err;
+      }
       break;
     }
     case 'uploadFile': {
       const local = resolveVariables(step.local, project, { now });
       const remote = resolveVariables(step.remote, project, { now });
-      clack.log.step(`上传文件: ${local} → ${remote}`);
-      await sftp.fastPut(local, remote);
-      clack.log.success('上传文件完成');
+      const spinner = clack.spinner();
+      spinner.start(`上传文件: ${local} → ${remote}`);
+      try {
+        await sftp.fastPut(local, remote);
+        spinner.stop(`✓ ${local} → ${remote}`);
+      } catch (err) {
+        spinner.stop(`✗ ${local} → ${remote}`);
+        throw err;
+      }
       break;
     }
     case 'downloadDir': {
       const remote = resolveVariables(step.remote, project, { now });
       const local = resolveVariables(step.local, project, { now });
-      clack.log.step(`下载目录: ${remote} → ${local}`);
-      await sftp.downloadDir(remote, local);
-      clack.log.success('下载目录完成');
+      const spinner = clack.spinner();
+      spinner.start(`下载目录: ${remote} → ${local}`);
+      try {
+        await sftp.downloadDir(remote, local);
+        spinner.stop(`✓ ${remote} → ${local}`);
+      } catch (err) {
+        spinner.stop(`✗ ${remote} → ${local}`);
+        throw err;
+      }
       break;
     }
     case 'downloadFile': {
       const remote = resolveVariables(step.remote, project, { now });
       const local = resolveVariables(step.local, project, { now });
-      clack.log.step(`下载文件: ${remote} → ${local}`);
-      await sftp.fastGet(remote, local);
-      clack.log.success('下载文件完成');
+      const spinner = clack.spinner();
+      spinner.start(`下载文件: ${remote} → ${local}`);
+      try {
+        await sftp.fastGet(remote, local);
+        spinner.stop(`✓ ${remote} → ${local}`);
+      } catch (err) {
+        spinner.stop(`✗ ${remote} → ${local}`);
+        throw err;
+      }
       break;
     }
   }

package/src/ssh/executor.ts

@@ -1,8 +1,27 @@
 import type SftpClient from 'ssh2-sftp-client';
-import { createLineSink } from '../log.js';
+
+/** 命令执行错误（携带完整 stdout/stderr，供上层 noteBox 展示） */
+export class ExecError extends Error {
+  stdout: string;
+  stderr: string;
+  code: number | null;
+  constructor(
+    message: string,
+    opts: { stdout: string; stderr: string; code: number | null },
+  ) {
+    super(message);
+    this.name = 'ExecError';
+    this.stdout = opts.stdout;
+    this.stderr = opts.stderr;
+    this.code = opts.code;
+  }
+}
 
 /**
  * 在远程服务器执行命令
+ *
+ * 静默累积输出，不即时打印；失败时通过 ExecError 透出完整输出，
+ * 由上层决定如何展示（避免成功时刷屏）。
  */
 export async function execRemote(sftp: SftpClient, command: string): Promise<string> {
   // 加载常见 shell 初始化文件与 Node 版本管理器，使远程 PATH 与登录会话一致
@@ -25,37 +44,35 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
     // @ts-ignore: ssh2-sftp-client types don't expose client but it exists at runtime
     const client = (sftp as any).client;
     if (!client) {
-      reject(new Error('SSH 客户端未连接'));
+      reject(new ExecError('SSH 客户端未连接', { stdout: '', stderr: '', code: null }));
       return;
     }
     client.exec(fullCommand, (err: Error | undefined, stream: any) => {
       if (err) {
-        reject(err);
+        reject(new ExecError(String(err), { stdout: '', stderr: '', code: null }));
         return;
       }
       let outStr = '';
       let errStr = '';
-      const outSink = createLineSink('stdout');
-      const errSink = createLineSink('stderr');
       stream
         .on('close', (code: number, signal: string) => {
-          outSink.flush();
-          errSink.flush();
           if (code !== 0) {
-            reject(new Error(`远程命令执行失败 (code=${code}): ${errStr || signal}`));
+            reject(
+              new ExecError(`远程命令执行失败 (code=${code})`, {
+                stdout: outStr,
+                stderr: errStr || signal || '',
+                code,
+              }),
+            );
             return;
           }
           resolve(outStr);
         })
         .on('data', (data: Buffer) => {
-          const str = data.toString();
-          outStr += str;
-          outSink.push(str);
+          outStr += data.toString();
         })
         .stderr.on('data', (data: Buffer) => {
-          const str = data.toString();
-          errStr += str;
-          errSink.push(str);
+          errStr += data.toString();
         });
     });
   });

package/src/log.ts

@@ -1,31 +0,0 @@
-import * as clack from '@clack/prompts';
-
-/**
- * 创建按行缓冲、用 clack 日志输出的 sink。
- * - stdout 行用 clack.log.message（中性竖线）
- * - stderr 行用 clack.log.warn（警告符号，与 stdout 区分）
- *
- * 不完整行（未遇换行）暂存在 buffer，flush 时统一输出。
- */
-export function createLineSink(channel: 'stdout' | 'stderr') {
-  let buffer = '';
-  const emit = (line: string) => {
-    if (!line) return; // 跳过空行，避免每行前缀带来的噪音
-    if (channel === 'stderr') clack.log.warn(line);
-    else clack.log.message(line);
-  };
-  return {
-    push(chunk: string) {
-      buffer += chunk;
-      const lines = buffer.split(/\r?\n/);
-      buffer = lines.pop() ?? ''; // 末尾可能是不完整行
-      for (const line of lines) emit(line);
-    },
-    flush() {
-      if (buffer) {
-        emit(buffer);
-        buffer = '';
-      }
-    },
-  };
-}