ssh-release 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.0 - 2026-06-27
+
+### Added
+
+- 增加真实服务器 dogfood 脚本和文档，固化一次性 `/tmp/ssh-release-dogfood-*` 发布、回滚、校验和清理流程。
+
 ## 1.3.0 - 2026-06-26
 
 ### Added

package/README.md

@@ -422,6 +422,8 @@ npm install -g "$PACK_DIR"/ssh-release-"$VERSION".tgz --prefix "$PACK_DIR/prefix
 
 完整发布步骤见 [docs/release-checklist.md](https://github.com/JackEngineer/ssh-release/blob/main/docs/release-checklist.md)。
 
+真实服务器 dogfood 见 [docs/dogfood.md](https://github.com/JackEngineer/ssh-release/blob/main/docs/dogfood.md)。
+
 GitHub Actions 发布模板见 [docs/github-actions.md](https://github.com/JackEngineer/ssh-release/blob/main/docs/github-actions.md)。
 
 失败恢复指南见 [docs/recovery.md](https://github.com/JackEngineer/ssh-release/blob/main/docs/recovery.md)。

package/dist/exclude.js

@@ -0,0 +1,22 @@
+import path from 'node:path';
+export function toPosixPath(value) {
+    return value.split(path.sep).join(path.posix.sep);
+}
+export function isExcludedPath(relativePath, exclude) {
+    const normalizedPath = toPosixPath(relativePath);
+    const pathSegments = normalizedPath.split('/');
+    return exclude.some((pattern) => {
+        const normalizedPattern = toPosixPath(pattern);
+        if (!normalizedPattern.includes('/')) {
+            return pathSegments.includes(normalizedPattern);
+        }
+        return wildcardMatch(normalizedPath, normalizedPattern)
+            || wildcardMatch(`./${normalizedPath}`, normalizedPattern);
+    });
+}
+function wildcardMatch(value, pattern) {
+    const escapedPattern = pattern
+        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+        .replaceAll('*', '[^/]*');
+    return new RegExp(`^${escapedPattern}$`).test(value);
+}

package/dist/lock.js

@@ -41,9 +41,30 @@ export async function acquireRemoteLock(config, client, options = {}) {
 export async function removeRemoteLock(config, client) {
     await client.exec(`rm -rf ${shellQuote(getRemoteLockPath(config))}`);
 }
+export async function waitForRemoteLockReleased(config, client, options = {}) {
+    const label = options.label ?? '远端锁';
+    const attempts = Math.max(1, options.attempts ?? 4);
+    const delayMs = Math.max(0, options.delayMs ?? 50);
+    let lockStatus = await readRemoteLockStatus(config, client);
+    for (let attempt = 1; attempt < attempts && lockStatus.locked; attempt += 1) {
+        await delay(delayMs);
+        lockStatus = await readRemoteLockStatus(config, client);
+    }
+    if (lockStatus.locked) {
+        throw new Error(`${label}未清理: ${lockStatus.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;
 }
+async function delay(ms) {
+    if (ms === 0) {
+        return;
+    }
+    await new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}

package/dist/manifest.js

@@ -2,6 +2,7 @@ import { createHash } from 'node:crypto';
 import { mkdtemp, readdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import { isExcludedPath, toPosixPath } from './exclude.js';
 export async function createReleaseManifest(options) {
     const sourceStat = await stat(options.sourcePath);
     const files = sourceStat.isDirectory()
@@ -41,7 +42,7 @@ async function collectDirectoryFiles(sourcePath, exclude, relativeDirectory = ''
     const files = [];
     for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
         const relativePath = toPosixPath(path.join(relativeDirectory, entry.name));
-        if (isExcluded(relativePath, exclude)) {
+        if (isExcludedPath(relativePath, exclude)) {
             continue;
         }
         const localPath = path.join(sourcePath, relativePath);
@@ -63,24 +64,3 @@ async function createManifestFileEntry(localPath, relativePath) {
         sha256: createHash('sha256').update(content).digest('hex'),
     };
 }
-function isExcluded(relativePath, exclude) {
-    const normalizedPath = toPosixPath(relativePath);
-    const pathSegments = normalizedPath.split('/');
-    return exclude.some((pattern) => {
-        const normalizedPattern = toPosixPath(pattern);
-        if (!normalizedPattern.includes('/')) {
-            return pathSegments.includes(normalizedPattern);
-        }
-        return wildcardMatch(normalizedPath, normalizedPattern)
-            || wildcardMatch(`./${normalizedPath}`, normalizedPattern);
-    });
-}
-function wildcardMatch(value, pattern) {
-    const escapedPattern = pattern
-        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
-        .replaceAll('*', '[^/]*');
-    return new RegExp(`^${escapedPattern}$`).test(value);
-}
-function toPosixPath(value) {
-    return value.split(path.sep).join(path.posix.sep);
-}

package/dist/release.js

@@ -28,12 +28,28 @@ export function selectReleasesToDelete(releases, currentVersion, keepReleases) {
 function pad(value) {
     return value.toString().padStart(2, '0');
 }
+const maxVersionSuffixAttempts = 1000;
+export async function resolveUniqueReleaseVersion(config, client, baseVersionName) {
+    const releasesPath = remoteJoin(config.target.path, config.target.releasesDir);
+    for (let attempt = 1; attempt <= maxVersionSuffixAttempts; attempt += 1) {
+        const candidate = attempt === 1 ? baseVersionName : `${baseVersionName}-${attempt}`;
+        const candidatePath = remoteJoin(releasesPath, candidate);
+        const result = await client.exec(`test -e ${shellQuote(candidatePath)} && echo exists || true`);
+        if (result.stdout.trim() !== 'exists') {
+            return candidate;
+        }
+    }
+    throw new Error(`无法为版本 ${baseVersionName} 生成唯一目录名，已尝试 ${maxVersionSuffixAttempts} 次`);
+}
 export async function deploy(config, client, options = {}) {
     await withDeployProgress(options, 'source', () => ensureSourceExists(config.source.path));
     const releaseDate = options.now ?? new Date();
-    const versionName = createVersionName(releaseDate);
+    let versionName = createVersionName(releaseDate);
     const packageFactory = options.createPackage ?? createReleasePackage;
     const releaseLock = await withDeployProgress(options, 'lock', () => acquireRemoteLock(config, client));
+    if (config.deploy.mode === 'release') {
+        versionName = await resolveUniqueReleaseVersion(config, client, versionName);
+    }
     let releasePackage;
     let manifest;
     let manifestFile;

package/dist/rollback.js

@@ -1,5 +1,5 @@
 import { readCurrentVersion, readRemoteReleaseNames, remoteJoin, shellQuote, } from './remote.js';
-import { acquireRemoteLock, readRemoteLockStatus } from './lock.js';
+import { acquireRemoteLock, readRemoteLockStatus, waitForRemoteLockReleased } from './lock.js';
 export function selectRollbackTarget(selection) {
     const releases = [...new Set(selection.releases)].sort();
     if (selection.requestedVersion) {
@@ -100,13 +100,14 @@ export async function rollback(config, client, requestedVersion, options = {}) {
         await withRollbackProgress(options, 'cleanup', async () => {
             try {
                 await releaseLock();
+                await waitForRemoteLockReleased(config, client, { label: '回滚锁' });
             }
             catch (error) {
                 const message = `远程回滚锁清理失败: ${formatError(error)}`;
                 if (result) {
                     result.warnings.push(message);
                 }
-                else if (!rollbackError) {
+                if (!rollbackError) {
                     cleanupError = error;
                 }
             }

package/dist/ssh.js

@@ -1,5 +1,6 @@
 import { readdir, stat } from 'node:fs/promises';
 import path from 'node:path';
+import { isExcludedPath, toPosixPath } from './exclude.js';
 import { runProcess } from './process.js';
 import { remoteJoin, shellQuote } from './remote.js';
 export class ShellRemoteClient {
@@ -119,17 +120,18 @@ async function uploadDirectoryContents(client, localPath, remotePath, exclude) {
     }
     await walkDirectory(client, localPath, remotePath, exclude);
 }
-async function walkDirectory(client, localDirectory, remoteDirectory, exclude) {
+export async function walkDirectory(client, localDirectory, remoteDirectory, exclude, relativeDirectory = '') {
     await client.exec(`mkdir -p ${shellQuote(remoteDirectory)}`);
     const entries = await readdir(localDirectory, { withFileTypes: true });
     for (const entry of entries) {
-        if (exclude.includes(entry.name)) {
+        const relativeEntryPath = toPosixPath(path.join(relativeDirectory, entry.name));
+        if (isExcludedPath(relativeEntryPath, exclude)) {
             continue;
         }
         const localEntryPath = path.join(localDirectory, entry.name);
         const remoteEntryPath = remoteJoin(remoteDirectory, entry.name);
         if (entry.isDirectory()) {
-            await walkDirectory(client, localEntryPath, remoteEntryPath, exclude);
+            await walkDirectory(client, localEntryPath, remoteEntryPath, exclude, relativeEntryPath);
             continue;
         }
         if (entry.isFile()) {

package/package.json

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