Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
015947f8fb | ||
|
|
072a1037ac | ||
|
|
447c224fce | ||
|
|
f2fc1e0810 | ||
|
|
12a3bf2f3b | ||
|
|
ca6d1712bd |
No files matched your search
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"scope": "模板完成证据登记,保留命令、日志与产物哈希",
|
"scope": "模板完成证据登记,保留命令、日志与产物哈希",
|
||||||
"generatedAt": "2026-10-23T07:40:54.556Z",
|
"generatedAt": "2026-10-23T09:54:31.191Z",
|
||||||
"templates": {
|
"templates": {
|
||||||
"acheng-campus-food": {
|
"acheng-campus-food": {
|
||||||
"real-manifest-interaction": {
|
"real-manifest-interaction": {
|
||||||
@@ -256,5 +256,5 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sourceTreeHash": "f0bb03d734cf303b75be41bbcab6eea15f5479ac197b16c82f78e1faad71b17e"
|
"sourceTreeHash": "f07ae4270ab0424e283142ebdf72fd9d31a9222323ef677150b59a77f573a50b"
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,12 @@ API_PORT=3001
|
|||||||
API_PREFIX=
|
API_PREFIX=
|
||||||
CORS_ORIGINS=
|
CORS_ORIGINS=
|
||||||
|
|
||||||
|
# 发布备份保留 7 份;定时备份默认保留 14 天
|
||||||
|
BACKUP_RETENTION_DAYS=14
|
||||||
|
# 可选:配置 rsync 目标后,每次定时备份会额外复制一份到异地
|
||||||
|
# 需要预先为 ubuntu 用户配置 SSH key;未配置时备份只保留在本机
|
||||||
|
# BACKUP_OFFSITE_TARGET=backup@example-host:/srv/personal-brand-backups/
|
||||||
|
|
||||||
LOCAL_MEDIA_ROOT=/home/ubuntu/persional-brand/media
|
LOCAL_MEDIA_ROOT=/home/ubuntu/persional-brand/media
|
||||||
LOCAL_MEDIA_BASE_URL=/media
|
LOCAL_MEDIA_BASE_URL=/media
|
||||||
OBJECT_STORAGE_ENDPOINT=
|
OBJECT_STORAGE_ENDPOINT=
|
||||||
|
|||||||
+53
-20
@@ -28,12 +28,20 @@ jobs:
|
|||||||
timeout-minutes: 40
|
timeout-minutes: 40
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: pnpm/action-setup@v4
|
- name: Verify preinstalled toolchain
|
||||||
|
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||||
|
run: |
|
||||||
|
actual_node="$(node -p 'process.versions.node')"
|
||||||
|
actual_pnpm="$(pnpm --version)"
|
||||||
|
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||||
|
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||||
|
- name: Restore Prisma engine cache
|
||||||
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
version: ${{ env.PNPM_VERSION }}
|
path: ~/.cache/prisma
|
||||||
- uses: actions/setup-node@v4
|
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||||
with:
|
restore-keys: |
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||||
- name: Restore Turbo cache
|
- name: Restore Turbo cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
@@ -45,6 +53,7 @@ jobs:
|
|||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
- run: pnpm check
|
- run: pnpm check
|
||||||
- run: pnpm test:api-routes
|
- run: pnpm test:api-routes
|
||||||
|
- run: pnpm test:deploy
|
||||||
- run: pnpm validate:templates
|
- run: pnpm validate:templates
|
||||||
- run: pnpm template:compatibility
|
- run: pnpm template:compatibility
|
||||||
- run: pnpm --filter @personal-brand/api exec tsx --test test/template-preview-matrix.test.ts
|
- run: pnpm --filter @personal-brand/api exec tsx --test test/template-preview-matrix.test.ts
|
||||||
@@ -58,12 +67,20 @@ jobs:
|
|||||||
needs: [static]
|
needs: [static]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: pnpm/action-setup@v4
|
- name: Verify preinstalled toolchain
|
||||||
|
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||||
|
run: |
|
||||||
|
actual_node="$(node -p 'process.versions.node')"
|
||||||
|
actual_pnpm="$(pnpm --version)"
|
||||||
|
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||||
|
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||||
|
- name: Restore Prisma engine cache
|
||||||
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
version: ${{ env.PNPM_VERSION }}
|
path: ~/.cache/prisma
|
||||||
- uses: actions/setup-node@v4
|
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||||
with:
|
restore-keys: |
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||||
- name: Restore Turbo cache
|
- name: Restore Turbo cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
@@ -85,12 +102,20 @@ jobs:
|
|||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: pnpm/action-setup@v4
|
- name: Verify preinstalled toolchain
|
||||||
|
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||||
|
run: |
|
||||||
|
actual_node="$(node -p 'process.versions.node')"
|
||||||
|
actual_pnpm="$(pnpm --version)"
|
||||||
|
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||||
|
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||||
|
- name: Restore Prisma engine cache
|
||||||
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
version: ${{ env.PNPM_VERSION }}
|
path: ~/.cache/prisma
|
||||||
- uses: actions/setup-node@v4
|
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||||
with:
|
restore-keys: |
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Cache Playwright browsers
|
- name: Cache Playwright browsers
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
@@ -126,12 +151,20 @@ jobs:
|
|||||||
SEED_ADMIN_PASSWORD: ci-integration-admin-password
|
SEED_ADMIN_PASSWORD: ci-integration-admin-password
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: pnpm/action-setup@v4
|
- name: Verify preinstalled toolchain
|
||||||
|
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||||
|
run: |
|
||||||
|
actual_node="$(node -p 'process.versions.node')"
|
||||||
|
actual_pnpm="$(pnpm --version)"
|
||||||
|
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||||
|
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||||
|
- name: Restore Prisma engine cache
|
||||||
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
version: ${{ env.PNPM_VERSION }}
|
path: ~/.cache/prisma
|
||||||
- uses: actions/setup-node@v4
|
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||||
with:
|
restore-keys: |
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Prepare API test env
|
- name: Prepare API test env
|
||||||
working-directory: apps/api
|
working-directory: apps/api
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { mkdir, rm } from "node:fs/promises";
|
||||||
|
import path from "node:path";
|
||||||
|
import { spawnSync } from "node:child_process";
|
||||||
|
import {
|
||||||
|
backupPostgresDatabase,
|
||||||
|
pruneBackups,
|
||||||
|
scheduledBackupName,
|
||||||
|
verifyPostgresBackup,
|
||||||
|
} from "./database-backup.mjs";
|
||||||
|
|
||||||
|
const root = process.env.DEPLOY_ROOT;
|
||||||
|
if (!root || !path.isAbsolute(root)) throw new Error("DEPLOY_ROOT must be absolute");
|
||||||
|
process.loadEnvFile(path.join(root, "shared/.env.production"));
|
||||||
|
|
||||||
|
const container = process.env.POSTGRES_CONTAINER;
|
||||||
|
if (!container || !/^[a-zA-Z0-9_.-]+$/.test(container)) {
|
||||||
|
throw new Error("POSTGRES_CONTAINER is required");
|
||||||
|
}
|
||||||
|
const retentionDays = Number(process.env.BACKUP_RETENTION_DAYS ?? "14");
|
||||||
|
if (!Number.isInteger(retentionDays) || retentionDays < 1) {
|
||||||
|
throw new Error("BACKUP_RETENTION_DAYS must be a positive integer");
|
||||||
|
}
|
||||||
|
|
||||||
|
const directory = path.join(root, "shared/backups");
|
||||||
|
await mkdir(directory, { recursive: true });
|
||||||
|
const destination = path.join(directory, scheduledBackupName());
|
||||||
|
|
||||||
|
await backupPostgresDatabase({ container, destination });
|
||||||
|
try {
|
||||||
|
await verifyPostgresBackup({ container, file: destination });
|
||||||
|
} catch (error) {
|
||||||
|
await rm(destination, { force: true });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
await pruneBackups(directory, { retentionDays });
|
||||||
|
|
||||||
|
const offsiteTarget = process.env.BACKUP_OFFSITE_TARGET?.trim();
|
||||||
|
if (offsiteTarget) {
|
||||||
|
if (
|
||||||
|
!/^[a-zA-Z0-9_.@:/-]+$/.test(offsiteTarget) ||
|
||||||
|
offsiteTarget.startsWith("-") ||
|
||||||
|
offsiteTarget.includes("..")
|
||||||
|
) {
|
||||||
|
throw new Error("BACKUP_OFFSITE_TARGET contains unsupported characters");
|
||||||
|
}
|
||||||
|
const result = spawnSync("rsync", ["-a", "--partial", destination, offsiteTarget], {
|
||||||
|
stdio: "inherit",
|
||||||
|
env: process.env,
|
||||||
|
});
|
||||||
|
if (result.status !== 0) throw new Error("Offsite backup copy failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`scheduled backup written: ${destination}`);
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
import { createReadStream, createWriteStream } from "node:fs";
|
||||||
|
import { readdir, rename, rm, stat } from "node:fs/promises";
|
||||||
|
import path from "node:path";
|
||||||
|
import { spawn, spawnSync } from "node:child_process";
|
||||||
|
|
||||||
|
const DAY_MS = 24 * 60 * 60 * 1000;
|
||||||
|
const SCHEDULED_BACKUP = /^scheduled-\d{8}T\d{6}Z-\d+\.dump$/;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 定时备份文件名包含 UTC 秒级时间和进程号,避免同一秒内重复执行时覆盖已有备份。
|
||||||
|
*/
|
||||||
|
export function scheduledBackupName(date = new Date(), pid = process.pid) {
|
||||||
|
const stamp = date
|
||||||
|
.toISOString()
|
||||||
|
.replace(/[-:]/g, "")
|
||||||
|
.replace(/\.\d{3}Z$/, "Z");
|
||||||
|
if (!/^\d{8}T\d{6}Z$/.test(stamp)) throw new Error("Invalid backup timestamp");
|
||||||
|
return `scheduled-${stamp}-${pid}.dump`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 保留策略:
|
||||||
|
* - 发布前备份按文件名保留最近 7 份,保持原有发布回滚能力;
|
||||||
|
* - 定时备份按修改时间保留最近 retentionDays 天;
|
||||||
|
* - 同名临时文件由 pruneBackups 统一清理。
|
||||||
|
*/
|
||||||
|
export function selectExpiredBackups(
|
||||||
|
entries,
|
||||||
|
{ now = Date.now(), retentionDays = 14, keepReleaseBackups = 7 } = {},
|
||||||
|
) {
|
||||||
|
if (!Number.isInteger(retentionDays) || retentionDays < 1) {
|
||||||
|
throw new Error("retentionDays must be a positive integer");
|
||||||
|
}
|
||||||
|
if (!Number.isInteger(keepReleaseBackups) || keepReleaseBackups < 1) {
|
||||||
|
throw new Error("keepReleaseBackups must be a positive integer");
|
||||||
|
}
|
||||||
|
|
||||||
|
const cutoff = now - retentionDays * DAY_MS;
|
||||||
|
const expired = [];
|
||||||
|
const releaseBackups = entries
|
||||||
|
.filter((entry) => entry.name.endsWith(".dump") && !SCHEDULED_BACKUP.test(entry.name))
|
||||||
|
.sort((left, right) => right.name.localeCompare(left.name));
|
||||||
|
|
||||||
|
for (const entry of releaseBackups.slice(keepReleaseBackups)) expired.push(entry.name);
|
||||||
|
for (const entry of entries) {
|
||||||
|
if (SCHEDULED_BACKUP.test(entry.name) && entry.mtimeMs < cutoff) expired.push(entry.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...new Set(expired)];
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function backupPostgresDatabase({
|
||||||
|
container,
|
||||||
|
destination,
|
||||||
|
docker = "docker",
|
||||||
|
env = process.env,
|
||||||
|
}) {
|
||||||
|
const temporary = destination + ".tmp";
|
||||||
|
const child = spawn(
|
||||||
|
docker,
|
||||||
|
["exec", container, "sh", "-c", 'exec pg_dump -Fc -U "$POSTGRES_USER" -d "$POSTGRES_DB"'],
|
||||||
|
{ stdio: ["ignore", "pipe", "inherit"], env },
|
||||||
|
);
|
||||||
|
const output = createWriteStream(temporary, { flags: "wx", mode: 0o600 });
|
||||||
|
child.stdout.pipe(output);
|
||||||
|
try {
|
||||||
|
await Promise.all([
|
||||||
|
new Promise((resolve, reject) => {
|
||||||
|
child.on("error", reject);
|
||||||
|
child.on("exit", (code) =>
|
||||||
|
code === 0 ? resolve() : reject(new Error("Database backup failed")),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
new Promise((resolve, reject) => {
|
||||||
|
output.on("finish", resolve);
|
||||||
|
output.on("error", reject);
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
await rename(temporary, destination);
|
||||||
|
} catch (error) {
|
||||||
|
child.kill("SIGTERM");
|
||||||
|
output.destroy();
|
||||||
|
await rm(temporary, { force: true });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function verifyPostgresBackup({
|
||||||
|
container,
|
||||||
|
file,
|
||||||
|
docker = "docker",
|
||||||
|
env = process.env,
|
||||||
|
}) {
|
||||||
|
const child = spawn(docker, ["exec", "-i", container, "pg_restore", "-l"], {
|
||||||
|
stdio: ["pipe", "ignore", "pipe"],
|
||||||
|
env,
|
||||||
|
});
|
||||||
|
const input = createReadStream(file);
|
||||||
|
let stderr = "";
|
||||||
|
child.stderr.setEncoding("utf8");
|
||||||
|
child.stderr.on("data", (chunk) => {
|
||||||
|
stderr += chunk;
|
||||||
|
});
|
||||||
|
input.pipe(child.stdin);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await new Promise((resolve, reject) => {
|
||||||
|
child.on("error", reject);
|
||||||
|
input.on("error", reject);
|
||||||
|
child.stdin.on("error", (error) => {
|
||||||
|
if (error.code !== "EPIPE") reject(error);
|
||||||
|
});
|
||||||
|
child.on("exit", (code) => {
|
||||||
|
if (code === 0) resolve();
|
||||||
|
else reject(new Error(`Backup is not readable: ${stderr.trim() || "pg_restore failed"}`));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
input.destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function pruneBackups(directory, options = {}) {
|
||||||
|
const entries = await readdir(directory);
|
||||||
|
const withStats = [];
|
||||||
|
for (const name of entries) {
|
||||||
|
const info = await stat(path.join(directory, name));
|
||||||
|
if (!info.isFile()) continue;
|
||||||
|
withStats.push({ name, mtimeMs: info.mtimeMs });
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const name of selectExpiredBackups(withStats, options)) {
|
||||||
|
await rm(path.join(directory, name));
|
||||||
|
}
|
||||||
|
for (const name of entries) {
|
||||||
|
if (name.endsWith(".dump.tmp")) await rm(path.join(directory, name), { force: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { chmod, mkdtemp, readFile, rm, stat, utimes, writeFile } from "node:fs/promises";
|
||||||
|
import os from "node:os";
|
||||||
|
import path from "node:path";
|
||||||
|
import test from "node:test";
|
||||||
|
import {
|
||||||
|
backupPostgresDatabase,
|
||||||
|
pruneBackups,
|
||||||
|
scheduledBackupName,
|
||||||
|
selectExpiredBackups,
|
||||||
|
verifyPostgresBackup,
|
||||||
|
} from "./database-backup.mjs";
|
||||||
|
|
||||||
|
test("定时备份文件名使用 UTC 时间和进程号", () => {
|
||||||
|
assert.equal(
|
||||||
|
scheduledBackupName(new Date("2026-10-23T09:45:00.123Z"), 42),
|
||||||
|
"scheduled-20261023T094500Z-42.dump",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("发布备份只保留最近 7 份,定时备份按保留天数清理", () => {
|
||||||
|
const now = Date.parse("2026-10-23T12:00:00Z");
|
||||||
|
const day = 24 * 60 * 60 * 1000;
|
||||||
|
const entries = [
|
||||||
|
...Array.from({ length: 8 }, (_, index) => ({
|
||||||
|
name: `2026100${index + 1}000000-release${index}.dump`,
|
||||||
|
mtimeMs: now,
|
||||||
|
})),
|
||||||
|
{ name: "scheduled-20261001T000000Z-1.dump", mtimeMs: now - 30 * day },
|
||||||
|
{ name: "scheduled-20261020T000000Z-2.dump", mtimeMs: now - 3 * day },
|
||||||
|
];
|
||||||
|
|
||||||
|
assert.deepEqual(selectExpiredBackups(entries, { now, retentionDays: 14 }), [
|
||||||
|
"20261001000000-release0.dump",
|
||||||
|
"scheduled-20261001T000000Z-1.dump",
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("非法保留天数会被拒绝", () => {
|
||||||
|
assert.throws(() => selectExpiredBackups([], { retentionDays: 0 }), /positive integer/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("pruneBackups 删除过期备份和残留临时文件", async () => {
|
||||||
|
const directory = await mkdtemp(path.join(os.tmpdir(), "personal-brand-backup-"));
|
||||||
|
const old = path.join(directory, "scheduled-20260101T000000Z-1.dump");
|
||||||
|
const current = path.join(directory, "scheduled-20261023T000000Z-2.dump");
|
||||||
|
const temporary = path.join(directory, "scheduled-20261023T000000Z-3.dump.tmp");
|
||||||
|
try {
|
||||||
|
await writeFile(old, "old");
|
||||||
|
await writeFile(current, "current");
|
||||||
|
await writeFile(temporary, "partial");
|
||||||
|
const oldTime = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
|
||||||
|
await utimes(old, oldTime, oldTime);
|
||||||
|
|
||||||
|
await pruneBackups(directory, { retentionDays: 14 });
|
||||||
|
|
||||||
|
await assert.rejects(stat(old), { code: "ENOENT" });
|
||||||
|
await assert.rejects(stat(temporary), { code: "ENOENT" });
|
||||||
|
assert.equal((await stat(current)).size, 7);
|
||||||
|
} finally {
|
||||||
|
await rm(directory, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function writeFakeDocker(directory, body) {
|
||||||
|
const file = path.join(directory, "docker");
|
||||||
|
await writeFile(file, "#!/bin/sh\n" + body, { mode: 0o755 });
|
||||||
|
await chmod(file, 0o755);
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("备份写入权限受限的 dump 文件并清理临时文件", async () => {
|
||||||
|
const directory = await mkdtemp(path.join(os.tmpdir(), "personal-brand-dump-"));
|
||||||
|
const destination = path.join(directory, "release.dump");
|
||||||
|
try {
|
||||||
|
const docker = await writeFakeDocker(directory, "printf 'dump-bytes'\n");
|
||||||
|
await backupPostgresDatabase({ container: "postgres", destination, docker });
|
||||||
|
|
||||||
|
assert.equal(await readFile(destination, "utf8"), "dump-bytes");
|
||||||
|
assert.equal((await stat(destination)).mode & 0o777, 0o600);
|
||||||
|
await assert.rejects(stat(destination + ".tmp"), { code: "ENOENT" });
|
||||||
|
} finally {
|
||||||
|
await rm(directory, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("pg_dump 失败时删除半成品备份", async () => {
|
||||||
|
const directory = await mkdtemp(path.join(os.tmpdir(), "personal-brand-dump-"));
|
||||||
|
const destination = path.join(directory, "release.dump");
|
||||||
|
try {
|
||||||
|
const docker = await writeFakeDocker(directory, "printf 'partial'; exit 1\n");
|
||||||
|
await assert.rejects(
|
||||||
|
backupPostgresDatabase({ container: "postgres", destination, docker }),
|
||||||
|
/Database backup failed/,
|
||||||
|
);
|
||||||
|
|
||||||
|
await assert.rejects(stat(destination), { code: "ENOENT" });
|
||||||
|
await assert.rejects(stat(destination + ".tmp"), { code: "ENOENT" });
|
||||||
|
} finally {
|
||||||
|
await rm(directory, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("备份可被 pg_restore 读取校验", async () => {
|
||||||
|
const directory = await mkdtemp(path.join(os.tmpdir(), "personal-brand-verify-"));
|
||||||
|
const file = path.join(directory, "release.dump");
|
||||||
|
try {
|
||||||
|
await writeFile(file, "dump-bytes");
|
||||||
|
const docker = await writeFakeDocker(directory, "cat >/dev/null; exit 0\n");
|
||||||
|
await verifyPostgresBackup({ container: "postgres", file, docker });
|
||||||
|
} finally {
|
||||||
|
await rm(directory, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("pg_restore 校验失败时报告不可读", async () => {
|
||||||
|
const directory = await mkdtemp(path.join(os.tmpdir(), "personal-brand-verify-"));
|
||||||
|
const file = path.join(directory, "release.dump");
|
||||||
|
try {
|
||||||
|
await writeFile(file, "broken");
|
||||||
|
const docker = await writeFakeDocker(
|
||||||
|
directory,
|
||||||
|
"cat >/dev/null; echo 'invalid header' >&2; exit 1\n",
|
||||||
|
);
|
||||||
|
await assert.rejects(
|
||||||
|
verifyPostgresBackup({ container: "postgres", file, docker }),
|
||||||
|
/invalid header/,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
await rm(directory, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
+39
-51
@@ -1,4 +1,3 @@
|
|||||||
import { createWriteStream } from "node:fs";
|
|
||||||
import {
|
import {
|
||||||
copyFile,
|
copyFile,
|
||||||
cp,
|
cp,
|
||||||
@@ -14,9 +13,10 @@ import {
|
|||||||
writeFile,
|
writeFile,
|
||||||
} from "node:fs/promises";
|
} from "node:fs/promises";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { spawn, spawnSync } from "node:child_process";
|
import { spawnSync } from "node:child_process";
|
||||||
import { checkPackage } from "../scripts/deploy/check-package.mjs";
|
import { checkPackage } from "../scripts/deploy/check-package.mjs";
|
||||||
import { assertReleaseEnvironment } from "./release-environment.mjs";
|
import { assertReleaseEnvironment } from "./release-environment.mjs";
|
||||||
|
import { backupPostgresDatabase, pruneBackups, verifyPostgresBackup } from "./database-backup.mjs";
|
||||||
|
|
||||||
const root = process.env.DEPLOY_ROOT;
|
const root = process.env.DEPLOY_ROOT;
|
||||||
if (!root || !path.isAbsolute(root)) throw new Error("DEPLOY_ROOT must be absolute");
|
if (!root || !path.isAbsolute(root)) throw new Error("DEPLOY_ROOT must be absolute");
|
||||||
@@ -98,6 +98,37 @@ async function installPm2Service() {
|
|||||||
run("systemctl", ["--user", "enable", pm2ServiceName]);
|
run("systemctl", ["--user", "enable", pm2ServiceName]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const backupTimerName = "personal-brand-backup.timer";
|
||||||
|
|
||||||
|
async function installBackupTimer(release) {
|
||||||
|
const directory = path.dirname(adminServiceFile);
|
||||||
|
const serviceFile = path.join(directory, "personal-brand-backup.service");
|
||||||
|
const timerFile = path.join(directory, backupTimerName);
|
||||||
|
await mkdir(directory, { recursive: true });
|
||||||
|
// 定时任务从 shared 读取稳定副本;发布回滚后 current 变了,备份任务仍然可用。
|
||||||
|
await copyFile(
|
||||||
|
path.join(release, "deploy/backup-db.mjs"),
|
||||||
|
path.join(root, "shared/backup-db.mjs"),
|
||||||
|
);
|
||||||
|
await copyFile(
|
||||||
|
path.join(release, "deploy/database-backup.mjs"),
|
||||||
|
path.join(root, "shared/database-backup.mjs"),
|
||||||
|
);
|
||||||
|
await writeFile(
|
||||||
|
serviceFile,
|
||||||
|
`[Unit]\nDescription=Personal Brand daily database backup\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=oneshot\nEnvironment=DEPLOY_ROOT=${root}\nEnvironment=HOME=${process.env.HOME ?? "/home/ubuntu"}\nEnvironment=PATH=${process.env.PATH}\nExecStart=${process.execPath} ${root}/shared/backup-db.mjs\n`,
|
||||||
|
{ mode: 0o644 },
|
||||||
|
);
|
||||||
|
await writeFile(
|
||||||
|
timerFile,
|
||||||
|
`[Unit]\nDescription=Daily Personal Brand database backup\n\n[Timer]\nOnCalendar=*-*-* 03:30:00\nPersistent=true\nRandomizedDelaySec=10m\n\n[Install]\nWantedBy=timers.target\n`,
|
||||||
|
{ mode: 0o644 },
|
||||||
|
);
|
||||||
|
run("systemctl", ["--user", "daemon-reload"]);
|
||||||
|
run("systemctl", ["--user", "enable", "--now", backupTimerName]);
|
||||||
|
run("systemctl", ["--user", "restart", backupTimerName]);
|
||||||
|
}
|
||||||
|
|
||||||
async function waitForAdminHealth() {
|
async function waitForAdminHealth() {
|
||||||
const url = "http://127.0.0.1:" + (process.env.ADMIN_STATIC_PORT ?? "3010") + "/admin/";
|
const url = "http://127.0.0.1:" + (process.env.ADMIN_STATIC_PORT ?? "3010") + "/admin/";
|
||||||
for (let attempt = 0; attempt < 20; attempt++) {
|
for (let attempt = 0; attempt < 20; attempt++) {
|
||||||
@@ -134,53 +165,6 @@ async function switchCurrent(target) {
|
|||||||
await rename(temporary, current);
|
await rename(temporary, current);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function backupDatabase(destination) {
|
|
||||||
const temporary = destination + ".tmp";
|
|
||||||
const child = spawn(
|
|
||||||
"docker",
|
|
||||||
[
|
|
||||||
"exec",
|
|
||||||
postgresContainer,
|
|
||||||
"sh",
|
|
||||||
"-c",
|
|
||||||
'exec pg_dump -Fc -U "$POSTGRES_USER" -d "$POSTGRES_DB"',
|
|
||||||
],
|
|
||||||
{ stdio: ["ignore", "pipe", "inherit"] },
|
|
||||||
);
|
|
||||||
const output = createWriteStream(temporary, { flags: "wx", mode: 0o600 });
|
|
||||||
child.stdout.pipe(output);
|
|
||||||
try {
|
|
||||||
await Promise.all([
|
|
||||||
new Promise((resolve, reject) => {
|
|
||||||
child.on("error", reject);
|
|
||||||
child.on("exit", (code) =>
|
|
||||||
code === 0 ? resolve() : reject(new Error("Database backup failed")),
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
new Promise((resolve, reject) => {
|
|
||||||
output.on("finish", resolve);
|
|
||||||
output.on("error", reject);
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
await rename(temporary, destination);
|
|
||||||
} catch (error) {
|
|
||||||
await rm(temporary, { force: true });
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function pruneBackups(directory) {
|
|
||||||
const backups = (await readdir(directory, { withFileTypes: true }))
|
|
||||||
.filter((entry) => entry.isFile() && entry.name.endsWith(".dump"))
|
|
||||||
.map((entry) => entry.name)
|
|
||||||
.sort()
|
|
||||||
.reverse();
|
|
||||||
for (const backup of backups.slice(7)) await rm(path.join(directory, backup));
|
|
||||||
for (const entry of await readdir(directory)) {
|
|
||||||
if (entry.endsWith(".dump.tmp")) await rm(path.join(directory, entry), { force: true });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function pruneReleases(directory, currentRelease, previousRelease) {
|
async function pruneReleases(directory, currentRelease, previousRelease) {
|
||||||
const releases = (await readdir(directory, { withFileTypes: true }))
|
const releases = (await readdir(directory, { withFileTypes: true }))
|
||||||
.filter((entry) => entry.isDirectory())
|
.filter((entry) => entry.isDirectory())
|
||||||
@@ -367,8 +351,11 @@ try {
|
|||||||
release,
|
release,
|
||||||
);
|
);
|
||||||
run("pnpm", ["--filter", "@personal-brand/api", "exec", "prisma", "generate"], release);
|
run("pnpm", ["--filter", "@personal-brand/api", "exec", "prisma", "generate"], release);
|
||||||
await backupDatabase(path.join(root, "shared/backups", manifest.version + ".dump"));
|
const backupDirectory = path.join(root, "shared/backups");
|
||||||
await pruneBackups(path.join(root, "shared/backups"));
|
const releaseBackup = path.join(backupDirectory, manifest.version + ".dump");
|
||||||
|
await backupPostgresDatabase({ container: postgresContainer, destination: releaseBackup });
|
||||||
|
await verifyPostgresBackup({ container: postgresContainer, file: releaseBackup });
|
||||||
|
await pruneBackups(backupDirectory);
|
||||||
// 旧数据的模板包声明必须先收敛,migration 才能安全地删除兼容字段。
|
// 旧数据的模板包声明必须先收敛,migration 才能安全地删除兼容字段。
|
||||||
run(process.execPath, ["deploy/prepare-template-contract.mjs", ".", "--apply"], release);
|
run(process.execPath, ["deploy/prepare-template-contract.mjs", ".", "--apply"], release);
|
||||||
run("pnpm", ["--filter", "@personal-brand/api", "exec", "prisma", "migrate", "deploy"], release);
|
run("pnpm", ["--filter", "@personal-brand/api", "exec", "prisma", "migrate", "deploy"], release);
|
||||||
@@ -390,6 +377,7 @@ try {
|
|||||||
await writeFile(path.join(root, "shared/previous-release"), previous + "\n");
|
await writeFile(path.join(root, "shared/previous-release"), previous + "\n");
|
||||||
run("pm2", ["save"]);
|
run("pm2", ["save"]);
|
||||||
await pruneReleases(path.join(root, "releases"), release, previous);
|
await pruneReleases(path.join(root, "releases"), release, previous);
|
||||||
|
await installBackupTimer(release);
|
||||||
console.log("release installed: " + manifest.version);
|
console.log("release installed: " + manifest.version);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (routeUpdated) {
|
if (routeUpdated) {
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ FROM node:24-bookworm
|
|||||||
|
|
||||||
ARG PNPM_VERSION=9.15.0
|
ARG PNPM_VERSION=9.15.0
|
||||||
ARG PLAYWRIGHT_VERSION=1.58.2
|
ARG PLAYWRIGHT_VERSION=1.58.2
|
||||||
|
# 必须与 pnpm-lock.yaml 中解析出的 Prisma 版本一致;升级 Prisma 后同步修改并重建镜像。
|
||||||
|
ARG PRISMA_VERSION=6.19.3
|
||||||
|
|
||||||
ENV PNPM_HOME=/usr/local/share/pnpm
|
ENV PNPM_HOME=/usr/local/share/pnpm
|
||||||
ENV PATH=${PNPM_HOME}:${PATH}
|
ENV PATH=${PNPM_HOME}:${PATH}
|
||||||
@@ -22,4 +24,12 @@ RUN corepack enable \
|
|||||||
RUN npx --yes playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium \
|
RUN npx --yes playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# 预热 Prisma engines 到 /root/.cache/prisma。CI job 每次都是新容器,若不预热,
|
||||||
|
# 每个 job 的 prisma generate 都会重新访问 binaries.prisma.sh,网络抖动会直接拖垮 CI。
|
||||||
|
COPY apps/api/prisma/schema.prisma /tmp/prisma-warmup/schema.prisma
|
||||||
|
RUN printf '%s\n' '{"name":"prisma-warmup","private":true}' > /tmp/prisma-warmup/package.json \
|
||||||
|
&& cd /tmp/prisma-warmup \
|
||||||
|
&& DATABASE_URL=postgresql://warmup:warmup@127.0.0.1:5432/warmup npx --yes prisma@${PRISMA_VERSION} generate --schema schema.prisma \
|
||||||
|
&& rm -rf /tmp/prisma-warmup /root/.npm
|
||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
@@ -33,6 +33,12 @@ journalctl --user -u gitea-runner -n 100 --no-pager
|
|||||||
|
|
||||||
Runner 与本地开发工作共用 `Elitebook` 主机,不再与生产 API 共用资源。任务容器限制 4 CPU / 8 GB、并发 2;本地机器关机或休眠时 CI 会排队,required checks 不会自动完成。
|
Runner 与本地开发工作共用 `Elitebook` 主机,不再与生产 API 共用资源。任务容器限制 4 CPU / 8 GB、并发 2;本地机器关机或休眠时 CI 会排队,required checks 不会自动完成。
|
||||||
|
|
||||||
|
## 工具链与外部下载
|
||||||
|
|
||||||
|
任务镜像 `personal-brand-ci:node24` 已内置 Node 24 和 pnpm 9.15.0;workflow 不再调用 `actions/setup-node` 或 `pnpm/action-setup`,而是在每个 job 开头执行 `Verify preinstalled toolchain`。这样不会因为 nodejs.org 下载缓慢或中断而把 job 卡到超时。
|
||||||
|
|
||||||
|
Prisma engines 在构建镜像时预热到 `/root/.cache/prisma`,job 内 `pnpm install` 触发的 `prisma generate` 直接命中缓存,不再访问 `binaries.prisma.sh`。workflow 仍用 `actions/cache` 缓存该目录,作为更换镜像或镜像未预热时的兜底。升级 Prisma 后必须同步 `deploy/runner/Dockerfile` 的 `PRISMA_VERSION` 并重建镜像。
|
||||||
|
|
||||||
## 缓存
|
## 缓存
|
||||||
|
|
||||||
Runner 内置 cache server(`cache.host=172.17.0.1`、`cache.port=8193`、`cache.dir=~/gitea-runner/cache-data`),供 `actions/cache` 使用(Turbo 缓存等)。
|
Runner 内置 cache server(`cache.host=172.17.0.1`、`cache.port=8193`、`cache.dir=~/gitea-runner/cache-data`),供 `actions/cache` 使用(Turbo 缓存等)。
|
||||||
|
|||||||
+9
-2
@@ -30,9 +30,16 @@ DEPLOY_TARGET=oracle_arm PUBLIC_BASE_URL=https://wechat.app.que01.top pnpm deplo
|
|||||||
pnpm deploy:status
|
pnpm deploy:status
|
||||||
```
|
```
|
||||||
|
|
||||||
数据库备份自动保留最近 7 份;备份归档在状态检查中通过 `pg_restore -l` 校验可读性。备份失败会清理未完成的临时文件,不自动删除数据库数据。发布成功后保留当前版本、上一版本和最近 5 个发布目录。状态检查同时报告 PM2 自启、磁盘空间、备份时间/可读性及发布目录数量。
|
数据库备份分两类:
|
||||||
|
|
||||||
备份当前仍在同一台 VPS 上,不等同于灾难恢复副本。应将 `shared/backups/*.dump` 定期复制到独立主机或对象存储,并至少每季度在隔离数据库执行一次恢复演练;不得在生产数据库上测试恢复。整机重启演练需在维护窗口执行,确认 Admin、API、PostgreSQL 和公网路由恢复后再结束维护。
|
- 发布备份:每次 `pnpm deploy:release` 在 migration 前创建,按版本名保留最近 7 份。
|
||||||
|
- 定时备份:由 user-level `personal-brand-backup.timer` 每天 03:30(VPS 本地时区)执行,写入 `shared/backups/scheduled-*.dump`,默认保留 14 天。
|
||||||
|
|
||||||
|
定时任务的脚本副本位于 `shared/backup-db.mjs` 和 `shared/database-backup.mjs`,不依赖当前 release 目录,回滚后仍可运行。每次备份先用 `pg_dump -Fc` 写入临时文件,再用 `pg_restore -l` 校验;校验失败会删除损坏文件并让本次任务失败。备份失败会清理未完成的临时文件,不自动删除数据库数据。发布成功后保留当前版本、上一版本和最近 5 个发布目录。
|
||||||
|
|
||||||
|
状态检查会验证备份定时器处于 active、最新备份不超过 36 小时(可用 `BACKUP_MAX_AGE_HOURS` 调整),并通过 `pg_restore -l` 校验可读性。状态检查同时报告 PM2 自启、磁盘空间、备份时间和发布目录数量。
|
||||||
|
|
||||||
|
如需异地副本,在 `shared/.env.production` 配置 `BACKUP_OFFSITE_TARGET`(`rsync` 目标,例如 `backup@example-host:/srv/personal-brand-backups/`),并为 `ubuntu` 用户预先配置 SSH key。未配置时备份只保留在同一台 VPS 上,不等同于灾难恢复副本。至少每季度应在隔离数据库执行一次恢复演练,不得在生产数据库上测试恢复;整机重启演练需在维护窗口执行,确认 Admin、API、PostgreSQL 和公网路由恢复后再结束维护。
|
||||||
|
|
||||||
## Nginx 反向代理
|
## Nginx 反向代理
|
||||||
|
|
||||||
|
|||||||
@@ -44,9 +44,11 @@ SKIP_LINGER=1 \
|
|||||||
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
||||||
```
|
```
|
||||||
|
|
||||||
镜像包含 Node 24、pnpm 9.15.0、git/curl/jq/unzip,以及 Playwright 1.58.2 的 Chromium、headless shell、FFmpeg 和系统依赖。构建产物是本机 amd64 镜像(约 3 GB),不推送到 registry。
|
镜像包含 Node 24、pnpm 9.15.0、git/curl/jq/unzip,以及 Playwright 1.58.2 的 Chromium、headless shell、FFmpeg 和系统依赖;构建时还会预热 Prisma engines 到 `/root/.cache/prisma`。构建产物是本机 amd64 镜像(约 3 GB),不推送到 registry。
|
||||||
|
|
||||||
`apps/taro/package.json` 升级 Playwright 后,同步修改 `deploy/runner/Dockerfile` 的 `PLAYWRIGHT_VERSION`,重建镜像并重启 runner:
|
workflow 不再使用 `actions/setup-node` 或 `pnpm/action-setup`,而是直接校验镜像内置的 Node/pnpm 版本。因此替换 `RUNNER_IMAGE` 时必须保证镜像内已有 Node 24 和 pnpm 9.15.0,否则 job 会在 `Verify preinstalled toolchain` 步骤失败。
|
||||||
|
|
||||||
|
`apps/taro/package.json` 升级 Playwright 后,同步修改 `deploy/runner/Dockerfile` 的 `PLAYWRIGHT_VERSION`;升级 Prisma 后,同步修改 `PRISMA_VERSION`。然后重建镜像并重启 runner:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
||||||
@@ -69,7 +71,7 @@ du -sh ~/gitea-runner/cache-data ~/gitea-runner/pnpm-store
|
|||||||
|
|
||||||
`pnpm-store` 会持续增长。确认没有 job 运行时,可以执行 `pnpm store prune` 清理未被引用的包(在任意任务容器里对 `/workspace/.pnpm-store` 执行,或直接删除旧目录后让下一次 job 重新填充)。
|
`pnpm-store` 会持续增长。确认没有 job 运行时,可以执行 `pnpm store prune` 清理未被引用的包(在任意任务容器里对 `/workspace/.pnpm-store` 执行,或直接删除旧目录后让下一次 job 重新填充)。
|
||||||
|
|
||||||
仓库侧 `pnpm deploy:status` 也会打印 `ci-runner=` 一行。
|
`pnpm deploy:status` 只检查 VPS 服务、备份和公网路由,不再把 CI runner 当作生产健康条件。runner 已迁到本地工作站,脚本会额外打印非阻断的 `ci-runner-local=`,也可以直接用上面的 `systemctl --user status gitea-runner.service` 检查。
|
||||||
|
|
||||||
## 排障
|
## 排障
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
>
|
>
|
||||||
> 架构决策:ADR 0029:模板管理、导入与分发边界
|
> 架构决策:ADR 0029:模板管理、导入与分发边界
|
||||||
|
|
||||||
|
> 状态校正(2026-10-23):当前 `pnpm template:doctor` 对 `acheng-campus-food`、`atelier-solopreneur`、`linjing-editorial` 均返回 `staticStatus=pass`、`completionStatus=complete`、`unresolvedIssues=0`。下方 2026-10-17/18 记录中的 `unverified` 是历史证据,不代表当前状态。该报告只证明自动化证据齐全,不替代 Phase 8 的真实品牌操作、微信外部验证和运营审阅。
|
||||||
|
|
||||||
本文档把模板从本地开发、导出、线上导入、校验、预览、安装到小程序发布的完整工作固化为一个可追踪任务。后续代码、迁移、接口、后台页面、测试证据和已知缺口都必须回到本文登记。本文描述的是目标和实施门禁;没有对应代码、测试和运行证据的条目不能标记为完成。
|
本文档把模板从本地开发、导出、线上导入、校验、预览、安装到小程序发布的完整工作固化为一个可追踪任务。后续代码、迁移、接口、后台页面、测试证据和已知缺口都必须回到本文登记。本文描述的是目标和实施门禁;没有对应代码、测试和运行证据的条目不能标记为完成。
|
||||||
|
|
||||||
## 1. 背景和目标
|
## 1. 背景和目标
|
||||||
|
|||||||
@@ -75,4 +75,4 @@ Admin 直接复用 Taro renderer,模板原始 CSS 按 750 设计宽度转换
|
|||||||
|
|
||||||
## 本轮边界
|
## 本轮边界
|
||||||
|
|
||||||
本次先制定计划,功能实施尚未开始。聚焦内容编辑,不做任意拖拽布局或 HTML 入库。保留模板视觉和 H5 回退;不重置数据库或 seed,必要结构调整先制定兼容迁移。
|
截至 2026-10-23,`.codex-tasks/visual-editor-closure/SUBTASKS.csv` 中的 5 个子任务均已标记 `DONE`;本文保留为实现范围、验收标准和后续回归依据,当前状态以该 CSV 和实际验证记录为准。本轮仍聚焦内容编辑,不做任意拖拽布局或 HTML 入库。保留模板视觉和 H5 回退;不重置数据库或 seed,必要结构调整先制定兼容迁移。
|
||||||
+67
-36
@@ -1,9 +1,10 @@
|
|||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import { spawnSync } from "node:child_process";
|
import { spawnSync } from "node:child_process";
|
||||||
import { fileURLToPath } from "node:url";
|
import { fileURLToPath, pathToFileURL } from "node:url";
|
||||||
|
|
||||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
|
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
|
||||||
const target = process.env.DEPLOY_TARGET ?? "oracle_arm";
|
const target = process.env.DEPLOY_TARGET ?? "oracle_arm";
|
||||||
|
const deployRoot = process.env.DEPLOY_ROOT ?? "/home/ubuntu/persional-brand";
|
||||||
const publicBaseUrl = (process.env.PUBLIC_BASE_URL ?? "https://wechat.app.que01.top").replace(
|
const publicBaseUrl = (process.env.PUBLIC_BASE_URL ?? "https://wechat.app.que01.top").replace(
|
||||||
/\/$/,
|
/\/$/,
|
||||||
"",
|
"",
|
||||||
@@ -21,41 +22,71 @@ function shellQuote(value) {
|
|||||||
return "'" + value.replace(/'/g, "'\\''") + "'";
|
return "'" + value.replace(/'/g, "'\\''") + "'";
|
||||||
}
|
}
|
||||||
|
|
||||||
const remoteScript = [
|
/**
|
||||||
"set -euo pipefail",
|
* 生产状态检查只覆盖 VPS 上的服务和公网路由。
|
||||||
'source "$HOME/.nvm/nvm.sh"',
|
* CI runner 已迁到本地工作站,不能再把远端 gitea-runner.service 当成生产健康条件。
|
||||||
"export DEPLOY_ROOT=/home/ubuntu/persional-brand",
|
*/
|
||||||
'printf "current=%s\\n" "$(readlink /home/ubuntu/persional-brand/current)"',
|
export function buildRemoteStatusScript({ deployRoot: rootPath = deployRoot } = {}) {
|
||||||
'printf "api="; test "$(pm2 pid personal-brand-api)" != "0"; echo online',
|
if (!/^\/[a-zA-Z0-9_./-]+$/.test(rootPath)) throw new Error("Invalid deployment root");
|
||||||
'printf "pm2-autostart="; systemctl --user is-enabled personal-brand-pm2.service',
|
|
||||||
'printf "admin="; systemctl --user is-active personal-brand-admin-static.service',
|
|
||||||
'printf "database="; docker inspect -f "{{.State.Status}}" personal-brand-postgres-1',
|
|
||||||
'printf "ci-runner="; systemctl --user is-active gitea-runner.service',
|
|
||||||
'printf "backups="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -name "*.dump" | wc -l',
|
|
||||||
'printf "latest-backup="; newest=$(find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
|
||||||
'printf "backup-temp-files="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
|
||||||
'printf "disk="; df -h / | awk \'NR==2 {print $5 " used, " $4 " free"}\'',
|
|
||||||
'printf "release-count="; find /home/ubuntu/persional-brand/releases -mindepth 1 -maxdepth 1 -type d | wc -l',
|
|
||||||
].join("; ");
|
|
||||||
|
|
||||||
run("ssh", [target, "bash -lc " + shellQuote(remoteScript)]);
|
return [
|
||||||
|
"set -euo pipefail",
|
||||||
|
'source "$HOME/.nvm/nvm.sh"',
|
||||||
|
`export DEPLOY_ROOT=${shellQuote(rootPath)}`,
|
||||||
|
'printf "current=%s\\n" "$(readlink "$DEPLOY_ROOT/current")"',
|
||||||
|
'printf "api="; test "$(pm2 pid personal-brand-api)" != "0"; echo online',
|
||||||
|
'printf "pm2-autostart="; systemctl --user is-enabled personal-brand-pm2.service',
|
||||||
|
'printf "admin="; systemctl --user is-active personal-brand-admin-static.service',
|
||||||
|
'printf "database="; docker inspect -f "{{.State.Status}}" personal-brand-postgres-1',
|
||||||
|
'printf "backups="; find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -name "*.dump" | wc -l',
|
||||||
|
'printf "latest-backup="; newest=$(find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
||||||
|
'printf "backup-timer="; systemctl --user is-active personal-brand-backup.timer',
|
||||||
|
'printf "backup-age-hours="; newest=$(find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); age=$(( ( $(date +%s) - $(stat -c %Y "$newest") ) / 3600 )); echo "$age"; test "$age" -le "${BACKUP_MAX_AGE_HOURS:-36}"',
|
||||||
|
'printf "backup-temp-files="; find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
||||||
|
'printf "disk="; df -h / | awk \'NR==2 {print $5 " used, " $4 " free"}\'',
|
||||||
|
'printf "release-count="; find "$DEPLOY_ROOT/releases" -mindepth 1 -maxdepth 1 -type d | wc -l',
|
||||||
|
].join("; ");
|
||||||
|
}
|
||||||
|
|
||||||
for (const route of [
|
/**
|
||||||
"/admin/",
|
* CI runner 与生产状态是两件事。这里只做本地提示,runner 不活跃不应阻断部署状态检查。
|
||||||
"/template-preview/",
|
*/
|
||||||
"/api/health",
|
function printLocalRunnerStatus() {
|
||||||
"/media/seed/food-package-02.jpg",
|
const result = spawnSync("systemctl", ["--user", "is-active", "gitea-runner.service"], {
|
||||||
]) {
|
encoding: "utf8",
|
||||||
run("curl", [
|
});
|
||||||
"--fail",
|
const state = (result.stdout || "").trim();
|
||||||
"--silent",
|
process.stdout.write(`ci-runner-local=${state || "unknown"}\n`);
|
||||||
"--show-error",
|
}
|
||||||
"--max-time",
|
|
||||||
"10",
|
function main() {
|
||||||
"-o",
|
if (!/^[a-zA-Z0-9_.@:-]+$/.test(target)) throw new Error("Invalid deployment SSH target");
|
||||||
"/dev/null",
|
if (!/^\/[a-zA-Z0-9_./-]+$/.test(deployRoot)) throw new Error("Invalid deployment root");
|
||||||
"-w",
|
|
||||||
route + " %{http_code}\\n",
|
run("ssh", [target, "bash -lc " + shellQuote(buildRemoteStatusScript())]);
|
||||||
publicBaseUrl + route,
|
printLocalRunnerStatus();
|
||||||
]);
|
|
||||||
|
for (const route of [
|
||||||
|
"/admin/",
|
||||||
|
"/template-preview/",
|
||||||
|
"/api/health",
|
||||||
|
"/media/seed/food-package-02.jpg",
|
||||||
|
]) {
|
||||||
|
run("curl", [
|
||||||
|
"--fail",
|
||||||
|
"--silent",
|
||||||
|
"--show-error",
|
||||||
|
"--max-time",
|
||||||
|
"10",
|
||||||
|
"-o",
|
||||||
|
"/dev/null",
|
||||||
|
"-w",
|
||||||
|
route + " %{http_code}\\n",
|
||||||
|
publicBaseUrl + route,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
|
||||||
|
main();
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { spawnSync } from "node:child_process";
|
||||||
|
import test from "node:test";
|
||||||
|
import { buildRemoteStatusScript } from "./status.mjs";
|
||||||
|
|
||||||
|
test("生产状态脚本不再要求 VPS 上运行 CI runner", () => {
|
||||||
|
const script = buildRemoteStatusScript();
|
||||||
|
|
||||||
|
assert.doesNotMatch(script, /gitea-runner/);
|
||||||
|
assert.match(script, /pm2 pid personal-brand-api/);
|
||||||
|
assert.match(script, /pg_restore -l/);
|
||||||
|
assert.match(script, /personal-brand-backup\.timer/);
|
||||||
|
assert.match(script, /backup-age-hours/);
|
||||||
|
assert.match(script, /BACKUP_MAX_AGE_HOURS/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("生产状态脚本语法有效", () => {
|
||||||
|
const result = spawnSync("bash", ["-n"], {
|
||||||
|
input: buildRemoteStatusScript(),
|
||||||
|
encoding: "utf8",
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(result.status, 0, result.stderr);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("生产状态脚本使用调用方指定的部署目录", () => {
|
||||||
|
const script = buildRemoteStatusScript({ deployRoot: "/srv/personal-brand" });
|
||||||
|
|
||||||
|
assert.match(script, /DEPLOY_ROOT='\/srv\/personal-brand'/);
|
||||||
|
assert.match(script, /"\$DEPLOY_ROOT\/current"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("非法部署目录会被拒绝", () => {
|
||||||
|
assert.throws(() => buildRemoteStatusScript({ deployRoot: "/srv/personal brand" }), /Invalid/);
|
||||||
|
});
|
||||||
Reference in new issue
Block a user