ssh-release 0.5.0 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.7.0 - 2026-06-25
+
+### Added
+
+- 增加发布后远端状态校验，`deploy` 成功后会确认目标目录、`current` 指向和远端锁清理状态，并在结果中输出 `verified` 与 `verification`。
+
+## 0.6.0 - 2026-06-25
+
+### Added
+
+- 增加 `ssh-release deploy --json --progress`，发布时按 NDJSON 输出 `source`、`lock`、`package`、`publish`、`cleanup` 阶段状态，并在最后输出发布结果。
+
 ## 0.5.0 - 2026-06-25
 
 ### Added

package/README.md

@@ -17,6 +17,8 @@
 - `ssh-release rollback [version]`：回滚到上一个版本或指定版本。
 - `ssh-release unlock`：查看远端锁，并在显式确认锁路径后删除锁。
 - `--json`：输出单行 JSON，便于 CI/CD 解析。
+- `deploy --json --progress`：发布时输出 NDJSON 阶段进度，便于 CI/CD 展示实时状态。
+- 发布后远端校验：确认版本目录或目标目录存在、`current` 已指向新版本、远端锁已清理。
 - `release` 模式：上传压缩包、远端解压、切换 `current`、清理旧版本。
 - `overwrite` 模式：直接覆盖发布到目标目录。
 - 远端 `tar` 解压失败时回退逐文件上传。
@@ -187,6 +189,8 @@ ssh-release deploy
 
 `release` 模式发布成功后会输出版本号、版本目录和 `current` 软链接路径。只有压缩包上传和解压完成后才切换 `current`。
 
+发布命令返回成功前会执行远端状态校验。`release` 模式会确认新版本目录存在、`current` 已指向新版本、远端锁已清理；`overwrite` 模式会确认目标目录存在、远端锁已清理。校验失败时发布命令返回失败，不会把结果标记为成功。
+
 如果远端已有 `.ssh-release.lock`，说明同一目标目录可能正在发布或回滚，工具会停止在修改远端状态之前。
 
 查看锁状态：
@@ -231,6 +235,7 @@ ssh-release rollback 20260625-150000
 
 ```bash
 ssh-release deploy --dry-run --json
+ssh-release deploy --json --progress
 ssh-release doctor --json
 ssh-release list --json
 ssh-release rollback --json
@@ -240,7 +245,7 @@ ssh-release unlock --json
 成功时输出单行 JSON：
 
 ```json
-{"ok":true,"command":"deploy","result":{"dryRun":true,"mode":"release"}}
+{"ok":true,"command":"deploy","result":{"mode":"release","version":"20260625-153000","verified":true}}
 ```
 
 命令执行失败时输出：
@@ -249,6 +254,28 @@ ssh-release unlock --json
 {"ok":false,"command":"deploy","error":"错误信息"}
 ```
 
+发布时需要持续读取阶段状态，可以使用：
+
+```bash
+ssh-release deploy --json --progress
+```
+
+该模式会按行输出 NDJSON。进度事件先输出，最终结果最后输出：
+
+```json
+{"ok":true,"command":"deploy","event":"progress","stage":"package","status":"start"}
+{"ok":true,"command":"deploy","event":"progress","stage":"package","status":"success"}
+{"ok":true,"command":"deploy","result":{"mode":"release","version":"20260625-153000","verified":true}}
+```
+
+`stage` 可能是 `source`、`lock`、`package`、`publish`、`cleanup`，`status` 可能是 `start`、`success`、`fail`。失败事件会包含 `error` 字段。
+
+发布结果中的 `verification` 会列出已通过的远端校验项：
+
+```json
+{"verified":true,"verification":[{"name":"当前版本","status":"pass","message":"current 已指向新版本"}]}
+```
+
 `doctor` 检查失败、`unlock` 发现锁但未删除时会返回非零退出码，并在 JSON 的 `result` 中保留检查结果。
 
 ## 安全边界

package/dist/cli.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { CONFIG_FILE_NAME, loadConfigFile, writeConfigTemplate } from './config.js';
 import { runDoctorFromFile } from './doctor.js';
 import { listReleases } from './list.js';
-import { createDeployPlan, deploy } from './release.js';
+import { createDeployPlan, deploy, } from './release.js';
 import { rollback } from './rollback.js';
 import { createRemoteClient } from './ssh.js';
 import { unlock } from './unlock.js';
@@ -57,7 +57,13 @@ export async function runCli(argv = process.argv.slice(2), options = {}) {
             return 0;
         }
         if (command === 'deploy') {
-            const result = await handlers.deploy({ dryRun: parsed.dryRun });
+            const deployOptions = {
+                dryRun: parsed.dryRun,
+            };
+            if (parsed.json && parsed.progress) {
+                deployOptions.onProgress = (event) => printJsonProgress('deploy', event, io);
+            }
+            const result = await handlers.deploy(deployOptions);
             if (parsed.json) {
                 printJsonResult('deploy', result, 0, io);
                 return 0;
@@ -130,6 +136,7 @@ function parseCliArgs(argv) {
     let dryRun = false;
     let help = false;
     let json = false;
+    let progress = false;
     let version = false;
     for (let index = 0; index < argv.length; index += 1) {
         const arg = argv[index];
@@ -145,6 +152,10 @@ function parseCliArgs(argv) {
             json = true;
             continue;
         }
+        if (arg === '--progress') {
+            progress = true;
+            continue;
+        }
         if (arg === '--config' || arg === '-c') {
             const value = argv[index + 1];
             if (!value || value.startsWith('-')) {
@@ -172,6 +183,12 @@ function parseCliArgs(argv) {
         }
         args.push(arg);
     }
+    if (progress && !json) {
+        return createParsedError('--progress 需要配合 --json 使用', configPath, json);
+    }
+    if (progress && args[0] && args[0] !== 'deploy') {
+        return createParsedError('--progress 仅支持 deploy 命令', configPath, json);
+    }
     return {
         args: args.slice(1),
         command: args[0],
@@ -180,6 +197,7 @@ function parseCliArgs(argv) {
         dryRun,
         help,
         json,
+        progress,
         version,
     };
 }
@@ -191,6 +209,7 @@ function createParsedError(error, configPath, json = false) {
         error,
         help: false,
         json,
+        progress: false,
         version: false,
     };
 }
@@ -202,7 +221,9 @@ function createDefaultHandlers(configPath) {
             if (options?.dryRun) {
                 return createDeployPlan(config);
             }
-            return deploy(config, createRemoteClient(config));
+            return deploy(config, createRemoteClient(config), {
+                onProgress: options?.onProgress,
+            });
         },
         rollback: async (version) => {
             const config = await loadConfigFile(configPath);
@@ -247,6 +268,12 @@ function printDeployResult(result, io) {
     if (result.usedFallback) {
         io.log('远端 tar 不可用或解压失败，已使用逐文件上传');
     }
+    if (result.verified) {
+        io.log('远端校验通过');
+        for (const check of result.verification ?? []) {
+            io.log(`校验: ${check.name} - ${check.message}`);
+        }
+    }
     for (const warning of result.warnings) {
         io.log(`警告: ${warning}`);
     }
@@ -298,6 +325,14 @@ function printJsonResult(command, result, exitCode, io) {
         result,
     }));
 }
+function printJsonProgress(command, event, io) {
+    io.log(JSON.stringify({
+        ok: true,
+        command,
+        event: 'progress',
+        ...event,
+    }));
+}
 function printJsonError(command, error, io) {
     io.log(JSON.stringify({
         ok: false,
@@ -322,6 +357,7 @@ function createUsageText() {
   ssh-release doctor [--config <path>]
   ssh-release deploy [--config <path>]
   ssh-release deploy --dry-run [--config <path>]
+  ssh-release deploy --json --progress [--config <path>]
   ssh-release list [--config <path>]
   ssh-release rollback [version] [--config <path>]
   ssh-release unlock [--confirm <lock-path>] [--config <path>]

package/dist/release.js

@@ -1,6 +1,6 @@
 import { access } from 'node:fs/promises';
 import { createReleasePackage, } from './package.js';
-import { acquireRemoteLock } from './lock.js';
+import { acquireRemoteLock, readRemoteLockStatus } from './lock.js';
 import { readRemoteReleaseNames, remoteJoin, shellQuote, } from './remote.js';
 export function createVersionName(date = new Date()) {
     return [
@@ -28,25 +28,25 @@ function pad(value) {
     return value.toString().padStart(2, '0');
 }
 export async function deploy(config, client, options = {}) {
-    await ensureSourceExists(config.source.path);
+    await withDeployProgress(options, 'source', () => ensureSourceExists(config.source.path));
     const versionName = createVersionName(options.now ?? new Date());
     const packageFactory = options.createPackage ?? createReleasePackage;
-    const releaseLock = await acquireRemoteLock(config, client);
+    const releaseLock = await withDeployProgress(options, 'lock', () => acquireRemoteLock(config, client));
     let releasePackage;
     let result;
     let deployError;
     let cleanupError;
     try {
-        releasePackage = await packageFactory({
+        releasePackage = await withDeployProgress(options, 'package', () => packageFactory({
             sourcePath: config.source.path,
             exclude: config.source.exclude,
             versionName,
-        });
+        }));
         if (config.deploy.mode === 'overwrite') {
-            result = await deployOverwrite(config, client, releasePackage, versionName);
+            result = await withDeployProgress(options, 'publish', () => deployOverwrite(config, client, releasePackage, versionName));
             return result;
         }
-        result = await deployRelease(config, client, releasePackage, versionName);
+        result = await withDeployProgress(options, 'publish', () => deployRelease(config, client, releasePackage, versionName));
         return result;
     }
     catch (error) {
@@ -54,29 +54,35 @@ export async function deploy(config, client, options = {}) {
         throw error;
     }
     finally {
-        if (releasePackage) {
+        await withDeployProgress(options, 'cleanup', async () => {
+            if (releasePackage) {
+                try {
+                    await releasePackage.cleanup();
+                }
+                catch (error) {
+                    cleanupError = error;
+                }
+            }
             try {
-                await releasePackage.cleanup();
+                await releaseLock();
             }
             catch (error) {
-                cleanupError = error;
+                const message = `远程发布锁清理失败: ${formatError(error)}`;
+                if (result) {
+                    result.warnings.push(message);
+                }
+                else if (!deployError && !cleanupError) {
+                    cleanupError = error;
+                }
             }
-        }
-        try {
-            await releaseLock();
-        }
-        catch (error) {
-            const message = `远程发布锁清理失败: ${formatError(error)}`;
-            if (result) {
-                result.warnings.push(message);
+            if (result && !deployError && !cleanupError) {
+                result.verification = await verifyDeployResult(config, client, result);
+                result.verified = true;
             }
-            else if (!deployError && !cleanupError) {
-                cleanupError = error;
+            if (cleanupError && !deployError) {
+                throw cleanupError;
             }
-        }
-        if (cleanupError && !deployError) {
-            throw cleanupError;
-        }
+        });
     }
 }
 export async function createDeployPlan(config, options = {}) {
@@ -180,6 +186,64 @@ async function cleanupOldReleases(config, client, releasesPath, currentVersion,
         warnings.push(`旧版本清理失败: ${formatError(error)}`);
     }
 }
+async function verifyDeployResult(config, client, result) {
+    if (result.mode === 'overwrite') {
+        return [
+            await verifyRemoteDirectory(client, result.targetPath, '目标目录', '远端目标目录存在'),
+            await verifyRemoteLockReleased(config, client),
+        ];
+    }
+    if (!result.version || !result.currentSymlink) {
+        throw new Error('release 发布结果缺少版本号或 current 路径，无法校验远端状态');
+    }
+    return [
+        await verifyRemoteDirectory(client, result.targetPath, '版本目录', '远端版本目录存在'),
+        await verifyCurrentSymlink(client, result.currentSymlink, remoteJoin(config.target.releasesDir, result.version)),
+        await verifyRemoteLockReleased(config, client),
+    ];
+}
+async function verifyRemoteDirectory(client, remotePath, name, successMessage) {
+    try {
+        await client.exec(`test -d ${shellQuote(remotePath)}`);
+    }
+    catch (error) {
+        throw new Error(`${name}校验失败: ${formatError(error)}`);
+    }
+    return {
+        name,
+        status: 'pass',
+        message: successMessage,
+    };
+}
+async function verifyCurrentSymlink(client, currentSymlinkPath, expectedTarget) {
+    let actualTarget;
+    try {
+        const result = await client.exec(`readlink ${shellQuote(currentSymlinkPath)}`);
+        actualTarget = result.stdout.trim();
+    }
+    catch (error) {
+        throw new Error(`current 校验失败: ${formatError(error)}`);
+    }
+    if (actualTarget !== expectedTarget) {
+        throw new Error(`current 未指向新版本: 期望 ${expectedTarget}，实际 ${actualTarget || '空'}`);
+    }
+    return {
+        name: '当前版本',
+        status: 'pass',
+        message: 'current 已指向新版本',
+    };
+}
+async function verifyRemoteLockReleased(config, client) {
+    const lockStatus = await readRemoteLockStatus(config, client);
+    if (lockStatus.locked) {
+        throw new Error(`发布锁未清理: ${lockStatus.lockPath}`);
+    }
+    return {
+        name: '远端锁',
+        status: 'pass',
+        message: '发布锁已清理',
+    };
+}
 async function ensureSourceExists(sourcePath) {
     try {
         await access(sourcePath);
@@ -191,3 +255,22 @@ async function ensureSourceExists(sourcePath) {
 function formatError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+async function withDeployProgress(options, stage, run) {
+    await emitDeployProgress(options, { stage, status: 'start' });
+    try {
+        const result = await run();
+        await emitDeployProgress(options, { stage, status: 'success' });
+        return result;
+    }
+    catch (error) {
+        await emitDeployProgress(options, {
+            stage,
+            status: 'fail',
+            error: formatError(error),
+        });
+        throw error;
+    }
+}
+async function emitDeployProgress(options, event) {
+    await options.onProgress?.(event);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh-release",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "A general-purpose SSH file release CLI.",
   "type": "module",
   "bin": {