@noahyu/cd-cli 1.0.1 → 1.1.1

package/README.md

@@ -110,7 +110,7 @@ export default {
     /** 私钥 */
     privateKey: '-----BEGIN OPENSSH PRIVATE KEY-----\n...\n-----END OPENSSH PRIVATE KEY-----',
     /** 私钥文件路径 */
-    privateKeyPath: '~/.ssh/id_rsa',
+    privateKeyPath: '/home/user/.ssh/id_rsa',
     /** 密码 */
     password: 'your-password',
     /** 部署目录 */
@@ -169,16 +169,12 @@ export default {
   server: {
     host: '192.168.1.100',
     username: 'root',
-    privateKeyPath: '~/.ssh/id_rsa',
+    privateKeyPath: '/home/user/.ssh/id_rsa',
     deployPath: '/var/www/app',
   },
 }
 ```
 
-- `~/.ssh/id_rsa` - 用户主目录下的私钥
-- `/home/user/.ssh/id_ed25519` - 绝对路径
-- `./keys/deploy_key` - 相对路径
-
 ### 方式三：密码认证
 
 适用于简单测试环境（生产环境不推荐）：
@@ -212,23 +208,23 @@ export default {
 
 ## 配置选项
 
-| 选项                    | 类型     | 必填 | 说明                               |
-| ----------------------- | -------- | ---- | ---------------------------------- |
-| `buildCommand`          | string   | 否   | 构建命令，如 "npm run build"       |
-| `buildDir`              | string   | 是   | 构建输出目录，如 ".output"         |
-| `version`               | string   | 否   | 版本号，不指定会在部署时询问       |
-| `server.host`           | string   | 是   | 服务器地址                         |
-| `server.port`           | number   | 否   | SSH 端口，默认 22                  |
-| `server.username`       | string   | 是   | 用户名                             |
-| `server.password`       | string   | 否   | SSH 密码                           |
-| `server.privateKey`     | string   | 否   | SSH 私钥内容（字符串），优先级最高 |
-| `server.privateKeyPath` | string   | 否   | SSH 私钥文件路径                   |
-| `server.deployPath`     | string   | 是   | 服务器部署路径                     |
-| `pm2.appName`           | string   | 否   | PM2 应用名称                       |
-| `pm2.restart`           | boolean  | 否   | 是否重启 PM2 应用                  |
-| `excludeFiles`          | string[] | 否   | 排除的文件模式（相对于构建目录）   |
-| `beforeDeploy`          | string[] | 否   | 部署前执行的命令                   |
-| `afterDeploy`           | string[] | 否   | 部署后执行的命令                   |
+| 选项                    | 类型     | 必填 | 说明                             |
+| ----------------------- | -------- | ---- | -------------------------------- |
+| `buildCommand`          | string   | 否   | 构建命令，如 "npm run build"     |
+| `buildDir`              | string   | 是   | 构建输出目录，如 ".output"       |
+| `version`               | string   | 否   | 版本号，不指定会在部署时询问     |
+| `server.host`           | string   | 是   | 服务器地址                       |
+| `server.port`           | number   | 否   | SSH 端口，默认 22                |
+| `server.username`       | string   | 是   | 用户名                           |
+| `server.password`       | string   | 否   | SSH 密码                         |
+| `server.privateKey`     | string   | 否   | SSH 私钥内容，优先级最高         |
+| `server.privateKeyPath` | string   | 否   | SSH 私钥文件路径                 |
+| `server.deployPath`     | string   | 是   | 服务器部署路径                   |
+| `pm2.appName`           | string   | 否   | PM2 应用名称                     |
+| `pm2.restart`           | boolean  | 否   | 是否重启 PM2 应用                |
+| `excludeFiles`          | string[] | 否   | 排除的文件模式（相对于构建目录） |
+| `beforeDeploy`          | string[] | 否   | 部署前执行的命令                 |
+| `afterDeploy`           | string[] | 否   | 部署后执行的命令                 |
 
 ## 命令详解
 
@@ -278,63 +274,6 @@ Options:
 pcli-cd init
 ```
 
-## 使用场景
-
-### 1. Nuxt 3 项目部署
-
-```javascript
-// Nuxt.js 项目配置
-export default {
-  buildCommand: 'npm run build',
-  buildDir: '.output',
-  server: {
-    host: 'your-server.com',
-    username: 'root',
-    privateKeyPath: '~/.ssh/id_rsa', // 推荐使用私钥认证
-    deployPath: '/var/www/nuxt-app',
-  },
-  pm2: {
-    appName: 'nuxt-app',
-    restart: true,
-  },
-  excludeFiles: [
-    // 注意：以下路径相对于 .output 目录
-    // 请根据实际构建产物内容调整
-    'src/**', // 如果源码被复制到输出目录
-    '**/.DS_Store', // macOS 系统文件
-  ],
-}
-```
-
-### 2. Node.js API 项目部署
-
-```javascript
-// Node.js API 项目配置
-export default {
-  buildCommand: 'npm run build',
-  buildDir: 'dist',
-  server: {
-    host: 'your-server.com',
-    username: 'root',
-    privateKey: '~/.ssh/id_rsa',
-    deployPath: '/var/www/api'
-  },
-  pm2: {
-    appName: 'api-server',
-    restart: true
-  },
-  excludeFiles: [
-    // 注意：以下路径相对于 dist 目录
-    // 请根据实际构建产物内容调整
-    'src/**',         // 如果源码被复制到输出目录
-    '**/.DS_Store', // macOS 系统文件
-  ]
-  afterDeploy: [
-    'npm install --production'
-  ]
-}
-```
-
 ## excludeFiles 配置说明
 
 ⚠️ **重要提醒**：`excludeFiles` 作用于**构建产物目录**（如 `dist/`、`.output/` 等），不是项目根目录。
@@ -450,17 +389,17 @@ pcli-cd init
 
 ```bash
 # 检查私钥文件是否存在
-ls -la ~/.ssh/id_rsa
+ls -la /home/user/.ssh/id_rsa
 
 # 检查私钥文件权限
-chmod 600 ~/.ssh/id_rsa
+chmod 600 /home/user/.ssh/id_rsa
 ```
 
 **2. 私钥格式错误**
 
 ```bash
 # 检查私钥格式（应该以此开头）
-head -1 ~/.ssh/id_rsa
+head -1 /home/user/.ssh/id_rsa
 # RSA: -----BEGIN RSA PRIVATE KEY-----
 # OpenSSH: -----BEGIN OPENSSH PRIVATE KEY-----
 # ECDSA: -----BEGIN EC PRIVATE KEY-----
@@ -479,7 +418,7 @@ head -1 ~/.ssh/id_rsa
 ssh -p 22 root@your-server.com
 
 # 测试指定私钥连接
-ssh -i ~/.ssh/id_rsa -p 22 root@your-server.com
+ssh -i /home/user/.ssh/id_rsa -p 22 root@your-server.com
 ```
 
 ## License

package/dist/src/index.js

@@ -73,6 +73,12 @@ async function deploy(config) {
         spinner.start('正在连接服务器...');
         const ssh = await createSSHConnection(config.server);
         spinner.succeed('服务器连接成功');
+        await cleanTempLinks(ssh, config.server.deployPath, buildDirName);
+        spinner.start('检查部署环境...');
+        await handleExistingDeployDir(ssh, config.server.deployPath, buildDirName, spinner);
+        if (spinner.isSpinning) {
+            spinner.succeed('部署环境检查完成');
+        }
         const versionDirName = `${buildDirName}-${version}`;
         const versionPath = join(config.server.deployPath, versionDirName);
         const currentLinkPath = join(config.server.deployPath, buildDirName);
@@ -104,9 +110,22 @@ async function deploy(config) {
         }
         spinner.start(`正在切换到新版本 ${version}...`);
         const tempLinkPath = `${currentLinkPath}.tmp.${Date.now()}`;
-        await ssh.execCommand(`ln -sfn ${versionPath} ${tempLinkPath}`);
-        await ssh.execCommand(`mv ${tempLinkPath} ${currentLinkPath}`);
-        spinner.succeed(`版本切换完成: ${buildDirName} -> ${versionDirName}`);
+        try {
+            const linkResult = await ssh.execCommand(`ln -sfn ${versionPath} ${tempLinkPath}`);
+            if (linkResult.code !== 0) {
+                throw new Error(`创建临时软链接失败: ${linkResult.stderr}`);
+            }
+            const moveResult = await ssh.execCommand(`mv ${tempLinkPath} ${currentLinkPath}`);
+            if (moveResult.code !== 0) {
+                await ssh.execCommand(`rm -f ${tempLinkPath}`);
+                throw new Error(`切换软链接失败: ${moveResult.stderr}`);
+            }
+            spinner.succeed(`版本切换完成: ${buildDirName} -> ${versionDirName}`);
+        }
+        catch (error) {
+            await ssh.execCommand(`rm -f ${tempLinkPath}`);
+            throw error;
+        }
         if (config.pm2) {
             spinner.start('正在重启 PM2 应用...');
             const { appName, restart = true } = config.pm2;
@@ -391,9 +410,22 @@ async function performRollback(config, targetVersion, buildDirName) {
         spinner.succeed('目标版本检查通过');
         spinner.start(`正在回滚到版本 ${targetVersion}...`);
         const tempLinkPath = `${currentLinkPath}.tmp.${Date.now()}`;
-        await ssh.execCommand(`ln -sfn ${versionPath} ${tempLinkPath}`);
-        await ssh.execCommand(`mv ${tempLinkPath} ${currentLinkPath}`);
-        spinner.succeed(`回滚完成: ${buildDirName} -> ${versionDirName}`);
+        try {
+            const linkResult = await ssh.execCommand(`ln -sfn ${versionPath} ${tempLinkPath}`);
+            if (linkResult.code !== 0) {
+                throw new Error(`创建临时软链接失败: ${linkResult.stderr}`);
+            }
+            const moveResult = await ssh.execCommand(`mv ${tempLinkPath} ${currentLinkPath}`);
+            if (moveResult.code !== 0) {
+                await ssh.execCommand(`rm -f ${tempLinkPath}`);
+                throw new Error(`切换软链接失败: ${moveResult.stderr}`);
+            }
+            spinner.succeed(`回滚完成: ${buildDirName} -> ${versionDirName}`);
+        }
+        catch (error) {
+            await ssh.execCommand(`rm -f ${tempLinkPath}`);
+            throw error;
+        }
         if (config.pm2) {
             spinner.start('正在重启 PM2 应用...');
             const { appName } = config.pm2;
@@ -448,5 +480,63 @@ async function createSSHConnection(server) {
         throw new Error(`SSH 连接失败: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
+async function cleanTempLinks(ssh, deployPath, buildDirName) {
+    try {
+        await ssh.execCommand(`find ${deployPath} -name "${buildDirName}.tmp.*" -type l -delete`);
+    }
+    catch (error) {
+        console.warn(chalk.yellow(`⚠️ 清理临时链接时出现警告: ${error}`));
+    }
+}
+async function handleExistingDeployDir(ssh, deployPath, buildDirName, spinner) {
+    const currentLinkPath = join(deployPath, buildDirName);
+    const checkResult = await ssh.execCommand(`test -e ${currentLinkPath}`);
+    if (checkResult.code !== 0) {
+        return;
+    }
+    const linkCheckResult = await ssh.execCommand(`test -L ${currentLinkPath}`);
+    if (linkCheckResult.code === 0) {
+        return;
+    }
+    const typeResult = await ssh.execCommand(`stat -c %F ${currentLinkPath} 2>/dev/null || file -b ${currentLinkPath}`);
+    const fileType = typeResult.stdout.trim();
+    if (fileType.includes('directory') || fileType === 'directory') {
+        const backupPath = `${currentLinkPath}.backup.${Date.now()}`;
+        spinner.stop();
+        console.log(chalk.yellow(`⚠️ 检测到已存在的目录: ${currentLinkPath}`));
+        console.log(chalk.blue(`📁 将备份到: ${backupPath}`));
+        const answers = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'proceed',
+                message: '是否继续部署？（已存在的目录将被备份）',
+                default: true,
+            },
+        ]);
+        if (!answers.proceed) {
+            throw new Error('用户取消部署');
+        }
+        spinner.start('正在备份已存在的目录...');
+        const backupResult = await ssh.execCommand(`mv ${currentLinkPath} ${backupPath}`);
+        if (backupResult.code !== 0) {
+            throw new Error(`备份目录失败: ${backupResult.stderr}`);
+        }
+        spinner.stop();
+        console.log(chalk.green(`✅ 目录已备份到: ${backupPath}`));
+    }
+    else {
+        const backupPath = `${currentLinkPath}.backup.${Date.now()}`;
+        spinner.stop();
+        console.log(chalk.yellow(`⚠️ 检测到已存在的文件: ${currentLinkPath}`));
+        console.log(chalk.blue(`📁 将备份到: ${backupPath}`));
+        spinner.start('正在备份已存在的文件...');
+        const backupResult = await ssh.execCommand(`mv ${currentLinkPath} ${backupPath}`);
+        if (backupResult.code !== 0) {
+            throw new Error(`备份文件失败: ${backupResult.stderr}`);
+        }
+        spinner.stop();
+        console.log(chalk.green(`✅ 文件已备份到: ${backupPath}`));
+    }
+}
 
 export { deployCommand, initConfig, listVersions, rollbackVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahyu/cd-cli",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "Global CLI tool for simple project deployment with version management",
   "type": "module",
   "main": "./dist/bin/cli.js",