@mindbase/deploy 1.1.2 → 1.1.5

package/package.json

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

package/src/log.ts

@@ -0,0 +1,31 @@
+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 = '';
+      }
+    },
+  };
+}

package/src/script/runner.ts

@@ -1,8 +1,10 @@
 import type SftpClient from 'ssh2-sftp-client';
 import spawn from 'cross-spawn';
+import * as clack from '@clack/prompts';
 import type { Step, ProjectConfig } from '../config/schema.js';
 import { resolveVariables } from './parser.js';
 import { execRemote } from '../ssh/executor.js';
+import { createLineSink } from '../log.js';
 
 /**
  * 在本地执行命令
@@ -14,9 +16,13 @@ function runLocal(cmd: string, cwd?: string): Promise<void> {
       detached: false,
       shell: true,
     });
-    if (cp.stdout) cp.stdout.pipe(process.stdout);
-    if (cp.stderr) cp.stderr.pipe(process.stderr);
+    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()));
     cp.on('close', (code) => {
+      outSink.flush();
+      errSink.flush();
       if (code === 0) {
         resolve();
       } else {
@@ -36,7 +42,7 @@ async function runStep(step: Step, project: ProjectConfig, sftp: SftpClient): Pr
   switch (step.type) {
     case 'log': {
       const msg = resolveVariables(step.message, project);
-      console.log(msg);
+      clack.log.message(msg);
       break;
     }
     case 'local': {
@@ -53,26 +59,34 @@ async function runStep(step: Step, project: ProjectConfig, sftp: SftpClient): Pr
     case 'uploadDir': {
       const local = resolveVariables(step.local, project);
       const remote = resolveVariables(step.remote, project);
+      clack.log.step(`上传目录: ${local} → ${remote}`);
       await sftp.mkdir(remote, true);
       await sftp.uploadDir(local, remote, { useFastput: true });
+      clack.log.success('上传目录完成');
       break;
     }
     case 'uploadFile': {
       const local = resolveVariables(step.local, project);
       const remote = resolveVariables(step.remote, project);
+      clack.log.step(`上传文件: ${local} → ${remote}`);
       await sftp.fastPut(local, remote);
+      clack.log.success('上传文件完成');
       break;
     }
     case 'downloadDir': {
       const remote = resolveVariables(step.remote, project);
       const local = resolveVariables(step.local, project);
+      clack.log.step(`下载目录: ${remote} → ${local}`);
       await sftp.downloadDir(remote, local);
+      clack.log.success('下载目录完成');
       break;
     }
     case 'downloadFile': {
       const remote = resolveVariables(step.remote, project);
       const local = resolveVariables(step.local, project);
+      clack.log.step(`下载文件: ${remote} → ${local}`);
       await sftp.fastGet(remote, local);
+      clack.log.success('下载文件完成');
       break;
     }
   }

package/src/ssh/executor.ts

@@ -1,11 +1,26 @@
 import type SftpClient from 'ssh2-sftp-client';
+import { createLineSink } from '../log.js';
 
 /**
  * 在远程服务器执行命令
  */
 export async function execRemote(sftp: SftpClient, command: string): Promise<string> {
-  // 尝试加载环境变量，如果文件不存在则忽略错误
-  const fullCommand = `[ -f /etc/profile ] && source /etc/profile; ${command}`;
+  // 加载常见 shell 初始化文件与 Node 版本管理器，使远程 PATH 与登录会话一致
+  const fullCommand = [
+    '[ -f /etc/profile ] && source /etc/profile',
+    '[ -f ~/.bash_profile ] && source ~/.bash_profile',
+    '[ -f ~/.bash_login ] && source ~/.bash_login',
+    '[ -f ~/.profile ] && source ~/.profile',
+    // bashrc 顶部常见 `[ -z "$PS1" ] && return` 防御代码会让非交互 shell 直接退出，
+    // 注入占位 PS1 让判断失效，bashrc 内部随后会覆盖它
+    '[ -f ~/.bashrc ] && { PS1="${PS1:-deploy}"; source ~/.bashrc; }',
+    '[ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"',
+    '[ -s "$HOME/.nvm/nvm.sh" ] && source "$HOME/.nvm/nvm.sh"',
+    '[ -s "$HOME/.fnm/env.sh" ] && source "$HOME/.fnm/env.sh"',
+    '[ -d "$HOME/.local/bin" ] && export PATH="$HOME/.local/bin:$PATH"',
+    '[ -d "$HOME/bin" ] && export PATH="$HOME/bin:$PATH"',
+    command,
+  ].join('; ');
   return new Promise((resolve, reject) => {
     // @ts-ignore: ssh2-sftp-client types don't expose client but it exists at runtime
     const client = (sftp as any).client;
@@ -20,8 +35,12 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
       }
       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}`));
             return;
@@ -31,12 +50,12 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
         .on('data', (data: Buffer) => {
           const str = data.toString();
           outStr += str;
-          process.stdout.write(str);
+          outSink.push(str);
         })
         .stderr.on('data', (data: Buffer) => {
           const str = data.toString();
           errStr += str;
-          process.stderr.write(str);
+          errSink.push(str);
         });
     });
   });