fix: 上传缓存目录不再污染仓库

miniprogram-ci 的 SummerCompiler 用 path.join("", md5(projectPath + "|summer"))
建编译缓存,得到的是相对路径,会创建在进程工作目录下。上传子进程此前继承
API 进程的工作目录,于是每次上传都在 apps/api 下留下一个 32 位十六进制空目录。

把上传子进程的工作目录固定到 MINIAPP_UPLOAD_WORKSPACE(默认系统临时目录),
缓存随之落在临时目录,仓库保持干净;projectPath 一直是绝对路径,行为不受影响。

用真实 ensureCacheDir 验证目录落在临时工作目录,并断言仓库内不再新增缓存目录。
This commit is contained in:
que01 committed 2026-10-13 22:11:33 +08:00
1 parent ac3f433ee6
commit 53713e5935
4 files changed
+147 -41

No files matched your search

+60 -41
View File
@@ -1,4 +1,7 @@
import { spawn } from "node:child_process";
import { mkdir } from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import { fileURLToPath } from "node:url";
import {
UPLOAD_RESULT_PREFIX,
@@ -9,6 +12,17 @@ import {
const RUNNER_PATH = fileURLToPath(new URL("./miniapp-upload-cli.js", import.meta.url));
const DEFAULT_TIMEOUT_MS = 5 * 60 * 1000;
/**
* miniprogram-ci 的 SummerCompiler 用 `path.join("", md5(projectPath|summer))`
* 建缓存目录,这是相对路径,会落在子进程的工作目录下。若沿用 API 进程的工作目录
* (通常是 `apps/api`),每次上传都会在仓库里留下一个 32 位十六进制目录。
* 因此把上传进程的工作目录固定到系统临时目录。
*/
export function miniappUploadWorkspace(configured = process.env.MINIAPP_UPLOAD_WORKSPACE): string {
const value = configured?.trim();
return value ? path.resolve(value) : path.join(os.tmpdir(), "personal-brand-miniapp-upload");
}
function parseOutcome(stdout: string): MiniAppUploadOutcome | null {
const line = stdout
.split("\n")
@@ -30,48 +44,53 @@ export function runMiniAppUpload(
request: MiniAppUploadRequest,
timeoutMs = DEFAULT_TIMEOUT_MS,
): Promise<Record<string, unknown>> {
return new Promise((resolvePromise, rejectPromise) => {
const child = spawn(process.execPath, [RUNNER_PATH], {
stdio: ["pipe", "pipe", "pipe"],
});
let stdout = "";
let stderr = "";
let settled = false;
const timer = setTimeout(() => {
if (settled) return;
settled = true;
child.kill("SIGKILL");
rejectPromise(new Error("微信代码上传超时,请稍后重试"));
}, timeoutMs);
const finish = (action: () => void) => {
if (settled) return;
settled = true;
clearTimeout(timer);
action();
};
const workspace = miniappUploadWorkspace();
return mkdir(workspace, { recursive: true }).then(
() =>
new Promise<Record<string, unknown>>((resolvePromise, rejectPromise) => {
const child = spawn(process.execPath, [RUNNER_PATH], {
cwd: workspace,
stdio: ["pipe", "pipe", "pipe"],
});
let stdout = "";
let stderr = "";
let settled = false;
const timer = setTimeout(() => {
if (settled) return;
settled = true;
child.kill("SIGKILL");
rejectPromise(new Error("微信代码上传超时,请稍后重试"));
}, timeoutMs);
const finish = (action: () => void) => {
if (settled) return;
settled = true;
clearTimeout(timer);
action();
};
child.stdout.on("data", (chunk: Buffer) => {
stdout += chunk.toString();
});
child.stderr.on("data", (chunk: Buffer) => {
stderr += chunk.toString();
});
child.on("error", () => finish(() => rejectPromise(new Error("微信上传进程启动失败"))));
child.on("close", (code) =>
finish(() => {
const outcome = parseOutcome(stdout);
if (outcome?.ok && outcome.result) return resolvePromise(outcome.result);
const detail = outcome?.message ?? stderr.trim().split("\n").pop() ?? "";
rejectPromise(
new Error(
detail
? `微信代码上传失败:${detail}`
: `微信代码上传失败(上传进程退出码 ${code ?? 1})`,
),
child.stdout.on("data", (chunk: Buffer) => {
stdout += chunk.toString();
});
child.stderr.on("data", (chunk: Buffer) => {
stderr += chunk.toString();
});
child.on("error", () => finish(() => rejectPromise(new Error("微信上传进程启动失败"))));
child.on("close", (code) =>
finish(() => {
const outcome = parseOutcome(stdout);
if (outcome?.ok && outcome.result) return resolvePromise(outcome.result);
const detail = outcome?.message ?? stderr.trim().split("\n").pop() ?? "";
rejectPromise(
new Error(
detail
? `微信代码上传失败:${detail}`
: `微信代码上传失败(上传进程退出码 ${code ?? 1})`,
),
);
}),
);
child.stdin.on("error", () => undefined);
child.stdin.end(JSON.stringify(request));
}),
);
child.stdin.on("error", () => undefined);
child.stdin.end(JSON.stringify(request));
});
);
}