fix: 修复本地图片上传与发布进程切换

This commit is contained in:
que01 committed 2026-10-13 16:00:42 +08:00
1 parent 7f67f4d685
commit dcf1d76944
7 files changed
+121 -25

No files matched your search

+61 -19
View File
@@ -61,6 +61,7 @@ if (!/^[a-zA-Z0-9.-]+$/.test(traefikHost) || !/^[a-zA-Z0-9.:-]+$/.test(traefikGa
}
const routeFile = path.join(traefikDirectory, "personal-brand-managed.yml");
const adminServiceName = "personal-brand-admin-static.service";
const pm2ServiceName = "personal-brand-pm2.service";
const adminServiceDirectory = path.join(
process.env.XDG_CONFIG_HOME ?? path.join(process.env.HOME ?? "/home/ubuntu", ".config"),
"systemd/user",
@@ -72,6 +73,11 @@ function run(command, args, cwd = root) {
if (result.status !== 0) throw new Error(command + " failed with exit " + result.status);
}
function restartApi(release) {
run("pm2", ["delete", "personal-brand-api"]);
run("pm2", ["start", path.join(release, "deploy/ecosystem.config.cjs"), "--update-env"]);
}
async function installAdminService(release) {
const stopped = spawnSync("systemctl", ["--user", "stop", adminServiceName], {
stdio: "ignore",
@@ -91,6 +97,19 @@ async function installAdminService(release) {
run("systemctl", ["--user", "restart", adminServiceName]);
}
async function installPm2Service() {
const directory = path.dirname(adminServiceFile);
const file = path.join(directory, pm2ServiceName);
await mkdir(directory, { recursive: true });
await writeFile(
file,
`[Unit]\nDescription=Personal Brand API PM2 processes\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nEnvironment=HOME=${process.env.HOME ?? "/home/ubuntu"}\nEnvironment=PATH=${process.env.PATH}\nExecStart=${process.env.HOME ?? "/home/ubuntu"}/.nvm/versions/node/v${process.versions.node}/bin/pm2 resurrect\nExecStop=${process.env.HOME ?? "/home/ubuntu"}/.nvm/versions/node/v${process.versions.node}/bin/pm2 save\n\n[Install]\nWantedBy=default.target\n`,
{ mode: 0o644 },
);
run("systemctl", ["--user", "daemon-reload"]);
run("systemctl", ["--user", "enable", pm2ServiceName]);
}
async function waitForAdminHealth() {
const url = "http://127.0.0.1:" + (process.env.ADMIN_STATIC_PORT ?? "3010") + "/admin/";
for (let attempt = 0; attempt < 20; attempt++) {
@@ -142,19 +161,24 @@ async function backupDatabase(destination) {
);
const output = createWriteStream(temporary, { flags: "wx", mode: 0o600 });
child.stdout.pipe(output);
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);
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) {
@@ -164,6 +188,26 @@ async function pruneBackups(directory) {
.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) {
const releases = (await readdir(directory, { withFileTypes: true }))
.filter((entry) => entry.isDirectory())
.map((entry) => entry.name)
.sort()
.reverse();
const keep = new Set([
path.basename(currentRelease),
path.basename(previousRelease),
...releases.slice(0, 5),
]);
for (const release of releases) {
if (!keep.has(release))
await rm(path.join(directory, release), { recursive: true, force: true });
}
}
async function copyMissingFiles(sourceDirectory, destinationDirectory) {
@@ -333,7 +377,8 @@ try {
await copyMissingFiles(path.join(release, "seed-media"), seedDirectory);
await switchCurrent(release);
switched = true;
run("pm2", ["startOrRestart", path.join(release, "deploy/ecosystem.config.cjs"), "--update-env"]);
restartApi(release);
await installPm2Service();
await installAdminService(release);
await waitForHealth();
await waitForAdminHealth();
@@ -345,6 +390,7 @@ try {
await waitForPublicRelease(release);
await writeFile(path.join(root, "shared/previous-release"), previous + "\n");
run("pm2", ["save"]);
await pruneReleases(path.join(root, "releases"), release, previous);
console.log("release installed: " + manifest.version);
} catch (error) {
if (routeUpdated) {
@@ -354,11 +400,7 @@ try {
if (switched) {
await switchCurrent(previous);
await installAdminService(previous);
run("pm2", [
"startOrRestart",
path.join(source, "deploy/ecosystem.config.cjs"),
"--update-env",
]);
restartApi(path.resolve(root, previous));
await waitForHealth();
await waitForAdminHealth();
console.error(