ssh-release 0.2.0 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.0 - 2026-06-25
+
+### Added
+
+- 增加 `ssh-release doctor` 远端锁状态检查，无锁时通过，有锁时提示锁路径、pid、创建时间和安全清理条件。
+
 ## 0.2.0 - 2026-06-25
 
 ### Added

package/README.md

@@ -11,7 +11,7 @@
 已实现：
 
 - `ssh-release init`：生成 `ssh-release.config.ts` 配置模板。
-- `ssh-release doctor`：检查配置、本地源路径、SSH 连接、远程目录和远端 `tar`。
+- `ssh-release doctor`：检查配置、本地源路径、SSH 连接、远程目录、远端锁和远端 `tar`。
 - `ssh-release deploy`：发布本地文件或目录。
 - `ssh-release list`：查看远程版本和当前版本。
 - `ssh-release rollback [version]`：回滚到上一个版本或指定版本。
@@ -168,6 +168,8 @@ source files -> package -> upload -> release -> activate -> rollback
 ssh-release doctor
 ```
 
+`doctor` 会检查 `.ssh-release.lock`。没有锁时正常通过；如果发现锁，会以 `warn` 显示锁路径、pid、创建时间和安全清理提示。
+
 需要先查看发布计划但不修改服务器时：
 
 ```bash
@@ -347,6 +349,7 @@ docs/
 - macOS AppleDouble 元数据排除。
 - `release` 和 `overwrite` 发布流程。
 - 发布和回滚锁获取、释放和锁冲突拦截。
+- `doctor` 远端锁状态检查和安全清理提示。
 - 远端 `tar` 失败后的逐文件上传回退。
 - 远程版本列表读取和当前版本标记。
 - `doctor` 检查结果。

package/dist/doctor.js

@@ -1,5 +1,6 @@
 import { access } from 'node:fs/promises';
 import { loadConfigFile } from './config.js';
+import { readRemoteLockStatus } from './lock.js';
 import { shellQuote } from './remote.js';
 export async function runDoctorFromFile(configPath, createClient) {
     let config;
@@ -33,6 +34,7 @@ export async function runDoctor(config, client, options = {}) {
     await addSourcePathCheck(checks, config.source.path);
     await addRemoteCheck(checks, 'SSH 连接', () => client.exec('true'), 'SSH 可连接');
     await addRemoteCheck(checks, '远程目录', () => client.exec(`mkdir -p ${shellQuote(config.target.path)} && test -w ${shellQuote(config.target.path)}`), '远程目录可创建且可写');
+    await addRemoteLockCheck(checks, config, client);
     try {
         await client.exec('command -v tar');
         checks.push({
@@ -78,6 +80,36 @@ async function addConfigFileCheck(checks, configPath) {
         });
     }
 }
+async function addRemoteLockCheck(checks, config, client) {
+    try {
+        const lockStatus = await readRemoteLockStatus(config, client);
+        if (!lockStatus.locked) {
+            checks.push({
+                name: '远端锁',
+                status: 'pass',
+                message: '没有发现发布或回滚锁',
+            });
+            return;
+        }
+        checks.push({
+            name: '远端锁',
+            status: 'warn',
+            message: [
+                `发现远端锁: ${lockStatus.lockPath}`,
+                `pid: ${lockStatus.pid ?? '未知'}`,
+                `创建时间: ${lockStatus.createdAt ?? '未知'}`,
+                '确认没有发布或回滚任务后再手动删除该目录',
+            ].join('；'),
+        });
+    }
+    catch (error) {
+        checks.push({
+            name: '远端锁',
+            status: 'fail',
+            message: error instanceof Error ? error.message : String(error),
+        });
+    }
+}
 async function addSourcePathCheck(checks, sourcePath) {
     try {
         await access(sourcePath);

package/dist/lock.js

@@ -3,6 +3,25 @@ const remoteLockDir = '.ssh-release.lock';
 export function getRemoteLockPath(config) {
     return remoteJoin(config.target.path, remoteLockDir);
 }
+export async function readRemoteLockStatus(config, client) {
+    const lockPath = getRemoteLockPath(config);
+    const pidPath = remoteJoin(lockPath, 'pid');
+    const createdAtPath = remoteJoin(lockPath, 'created_at');
+    const result = await client.exec(`if [ -d ${shellQuote(lockPath)} ]; then echo locked; printf 'pid='; cat ${shellQuote(pidPath)} 2>/dev/null || true; printf '\\ncreated_at='; cat ${shellQuote(createdAtPath)} 2>/dev/null || true; printf '\\n'; else echo unlocked; fi`);
+    const lines = result.stdout.split('\n').map((line) => line.trim());
+    if (lines[0] !== 'locked') {
+        return {
+            locked: false,
+            lockPath,
+        };
+    }
+    return {
+        locked: true,
+        lockPath,
+        pid: parseRemoteLockValue(lines, 'pid'),
+        createdAt: parseRemoteLockValue(lines, 'created_at'),
+    };
+}
 export async function acquireRemoteLock(config, client, options = {}) {
     const createTargetPath = options.createTargetPath ?? true;
     const lockPath = getRemoteLockPath(config);
@@ -19,3 +38,9 @@ export async function acquireRemoteLock(config, client, options = {}) {
         await client.exec(`rm -rf ${shellQuote(lockPath)}`);
     };
 }
+function parseRemoteLockValue(lines, fieldName) {
+    const prefix = `${fieldName}=`;
+    const line = lines.find((entry) => entry.startsWith(prefix));
+    const value = line?.slice(prefix.length).trim();
+    return value || undefined;
+}

package/package.json

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