merge: integrate WP5-05 and WP5-06 baseline
# Conflicts: # package.json
This commit is contained in:
@@ -26,12 +26,15 @@ export const frozenPackages = {
|
||||
},
|
||||
"apps/api/package.json": {
|
||||
dependencies: {
|
||||
"@dada/asset-release-manifest": "workspace:*",
|
||||
"@dada/static-sticker-catalog": "workspace:*",
|
||||
"@fastify/multipart": "10.1.0",
|
||||
"@fastify/swagger": "9.8.1",
|
||||
"@sinclair/typebox": "0.34.52",
|
||||
"better-sqlite3": "13.0.1",
|
||||
"drizzle-orm": "0.45.2",
|
||||
fastify: "5.10.0",
|
||||
sharp: "0.35.3",
|
||||
},
|
||||
devDependencies: {
|
||||
typescript: "7.0.2",
|
||||
@@ -46,6 +49,12 @@ export const frozenPackages = {
|
||||
typescript: "7.0.2",
|
||||
},
|
||||
},
|
||||
"packages/asset-release-manifest/package.json": {
|
||||
devDependencies: {
|
||||
"@types/node": "24.13.3",
|
||||
typescript: "7.0.2",
|
||||
},
|
||||
},
|
||||
"packages/shared-contracts/package.json": {
|
||||
dependencies: {
|
||||
"@sinclair/typebox": "0.34.52",
|
||||
|
||||
@@ -13,8 +13,7 @@ function runPnpm(args) {
|
||||
}
|
||||
|
||||
export function buildApiContracts() {
|
||||
runPnpm(["--filter", "@dada/shared-contracts", "build"]);
|
||||
runPnpm(["--filter", "@dada/api", "build"]);
|
||||
runPnpm(["--filter", "@dada/api...", "build"]);
|
||||
}
|
||||
|
||||
export async function createOpenApiDocument() {
|
||||
|
||||
@@ -98,7 +98,11 @@ function copyRuntimeDependencies(sourceRoot, destinationRoot, rootNames) {
|
||||
try {
|
||||
entry = requireFrom.resolve(name);
|
||||
} catch (error) {
|
||||
throw new Error(`Runtime dependency ${name} is unavailable from ${sourceRoot}.`, { cause: error });
|
||||
try {
|
||||
entry = requireFrom.resolve(`${name}/package`);
|
||||
} catch {
|
||||
throw new Error(`Runtime dependency ${name} is unavailable from ${sourceRoot}.`, { cause: error });
|
||||
}
|
||||
}
|
||||
const root = packageRootFromEntry(entry, name);
|
||||
const manifest = json(join(root, "package.json"));
|
||||
@@ -117,6 +121,14 @@ function copyRuntimeDependencies(sourceRoot, destinationRoot, rootNames) {
|
||||
for (const dependency of Object.keys(manifest.dependencies ?? {})) {
|
||||
copyResolved(dependency, nestedRequire, join(destination, "node_modules"), nestedAncestors);
|
||||
}
|
||||
for (const dependency of Object.keys(manifest.optionalDependencies ?? {})) {
|
||||
try {
|
||||
copyResolved(dependency, nestedRequire, join(destination, "node_modules"), nestedAncestors);
|
||||
} catch (error) {
|
||||
if (error?.cause?.code !== "MODULE_NOT_FOUND") throw error;
|
||||
debug(`skip unavailable optional dependency ${dependency}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
const rootRequire = createRequire(join(sourceRoot, "package.json"));
|
||||
for (const name of rootNames) copyResolved(name, rootRequire, join(destinationRoot, "node_modules"), new Set());
|
||||
@@ -306,7 +318,7 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
||||
|
||||
const serverRoot = join(packageDirectory, "server");
|
||||
debug("copy API application");
|
||||
const apiDependencies = copyApplication(join(repositoryRoot, "apps", "api"), join(serverRoot, "api"), ["@fastify/multipart", "@fastify/swagger", "@sinclair/typebox", "better-sqlite3", "fastify"]);
|
||||
const apiDependencies = copyApplication(join(repositoryRoot, "apps", "api"), join(serverRoot, "api"), ["@fastify/multipart", "@fastify/swagger", "@sinclair/typebox", "better-sqlite3", "fastify", "sharp"]);
|
||||
debug("copy Worker application");
|
||||
const workerDependencies = copyApplication(join(repositoryRoot, "apps", "worker"), join(serverRoot, "worker"), ["better-sqlite3"]);
|
||||
const sharedDestination = join(serverRoot, "api", "node_modules", "@dada", "shared-contracts");
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
import { createHash } from "node:crypto";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
|
||||
import { resolve } from "node:path";
|
||||
|
||||
const phaseIndex = process.argv.indexOf("--phase");
|
||||
const phase = phaseIndex >= 0 ? process.argv[phaseIndex + 1] : "green";
|
||||
if (!["red", "green"].includes(phase)) throw new Error(`Unsupported phase: ${phase}`);
|
||||
const runId = process.env.DADA_TDD_RUN_ID ?? `wp5-04-${phase}-${new Date().toISOString().replace(/[^0-9]/g, "")}`;
|
||||
const runDirectory = resolve("artifacts", "tdd", runId);
|
||||
const casesDirectory = resolve(runDirectory, "cases");
|
||||
if (existsSync(runDirectory)) throw new Error(`Evidence run already exists: ${runId}`);
|
||||
|
||||
const cases = [
|
||||
{
|
||||
acceptance_criteria: ["AC-42", "AC-48"],
|
||||
evidence: ["response.json", "headers.json", "cache-enumeration.json", "trace.zip"],
|
||||
id: "TDD-WP5-RES-001-three-access-classes",
|
||||
red_reason: "公开 manifest 暴露 internal/private、路径可推导或缓存策略混用",
|
||||
requirements: ["PRIV-02", "PRIV-05"],
|
||||
},
|
||||
{
|
||||
acceptance_criteria: ["AC-46", "AC-48"],
|
||||
evidence: ["cache-enumeration.json", "service-worker.json", "trace.zip"],
|
||||
id: "TDD-WP5-CACHE-001-no-private-client-state",
|
||||
red_reason: "SW 拦截 internal/private 或 IndexedDB 保存私有字段",
|
||||
requirements: ["NFR-07", "PRIV-02"],
|
||||
},
|
||||
];
|
||||
for (const item of cases) mkdirSync(resolve(casesDirectory, item.id), { recursive: true });
|
||||
|
||||
const resourceDirectory = resolve(casesDirectory, cases[0].id);
|
||||
const cacheDirectory = resolve(casesDirectory, cases[1].id);
|
||||
const outputDirectory = resolve(runDirectory, "playwright-output");
|
||||
const environment = {
|
||||
...process.env,
|
||||
DADA_EVIDENCE_DIR_WP5_CACHE: cacheDirectory,
|
||||
DADA_EVIDENCE_DIR_WP5_RES: resourceDirectory,
|
||||
DADA_PLAYWRIGHT_OUTPUT_DIR: outputDirectory,
|
||||
};
|
||||
const commands = phase === "red"
|
||||
? [["red-focused", "pnpm --filter @dada/shared-contracts build && pnpm exec vitest run tests/unit/wp5-04-asset-release-manifest.test.ts tests/api/wp5-04-asset-access.test.ts"]]
|
||||
: [
|
||||
["build-manifest", "pnpm --filter @dada/asset-release-manifest build"],
|
||||
["unit", "pnpm test:unit"],
|
||||
["api", "pnpm test:api"],
|
||||
["e2e", "pnpm test:e2e"],
|
||||
["security", "pnpm test:security"],
|
||||
["package", "pnpm test:package"],
|
||||
["tdd-trace", "pnpm validate:tdd-trace"],
|
||||
];
|
||||
const commandResults = [];
|
||||
for (const [name, command] of commands) {
|
||||
const started_at = new Date().toISOString();
|
||||
const result = spawnSync(process.env.ComSpec ?? "cmd.exe", ["/d", "/s", "/c", command], {
|
||||
encoding: "utf8", env: environment, maxBuffer: 40 * 1024 * 1024,
|
||||
});
|
||||
if (result.stdout) process.stdout.write(result.stdout);
|
||||
if (result.stderr) process.stderr.write(result.stderr);
|
||||
commandResults.push({ command, exit_code: result.status ?? 1, finished_at: new Date().toISOString(), name, started_at });
|
||||
if (phase === "green" && (result.status ?? 1) !== 0) break;
|
||||
}
|
||||
|
||||
function findFiles(directory, name) {
|
||||
const matches = [];
|
||||
if (!existsSync(directory)) return matches;
|
||||
for (const entry of readdirSync(directory, { withFileTypes: true })) {
|
||||
const path = resolve(directory, entry.name);
|
||||
if (entry.isDirectory()) matches.push(...findFiles(path, name));
|
||||
else if (entry.name === name) matches.push(path);
|
||||
}
|
||||
return matches;
|
||||
}
|
||||
|
||||
if (phase === "green") {
|
||||
const trace = findFiles(outputDirectory, "trace.zip").find((path) => path.toLowerCase().includes("wp5-04"));
|
||||
if (trace) {
|
||||
copyFileSync(trace, resolve(resourceDirectory, "trace.zip"));
|
||||
copyFileSync(trace, resolve(cacheDirectory, "trace.zip"));
|
||||
}
|
||||
}
|
||||
|
||||
const redConfirmed = phase === "red" && commandResults.length === 1 && commandResults[0].exit_code !== 0;
|
||||
if (phase === "red") {
|
||||
for (const item of cases) {
|
||||
writeFileSync(resolve(casesDirectory, item.id, "red-observation.json"), `${JSON.stringify({
|
||||
expected_failure: item.red_reason,
|
||||
observed_command: commandResults[0].command,
|
||||
observed_exit_code: commandResults[0].exit_code,
|
||||
status: redConfirmed ? "red_confirmed" : "failed",
|
||||
}, null, 2)}\n`);
|
||||
}
|
||||
}
|
||||
|
||||
const commandState = phase === "red" ? redConfirmed : commandResults.length === commands.length && commandResults.every((result) => result.exit_code === 0);
|
||||
const manifest = { path: "tasks.manifest.json", sha256: createHash("sha256").update(readFileSync("tasks.manifest.json")).digest("hex").toUpperCase() };
|
||||
const commit = spawnSync("git", ["rev-parse", "--short", "HEAD"], { encoding: "utf8" }).stdout.trim();
|
||||
const dirty = spawnSync("git", ["status", "--porcelain"], { encoding: "utf8" }).stdout.trim().length > 0;
|
||||
const summaries = [];
|
||||
for (const item of cases) {
|
||||
const directory = resolve(casesDirectory, item.id);
|
||||
const evidenceRefs = phase === "red" ? ["red-observation.json"] : item.evidence;
|
||||
const missingEvidence = evidenceRefs.filter((file) => !existsSync(resolve(directory, file)));
|
||||
const status = commandState && missingEvidence.length === 0 ? phase === "red" ? "red_confirmed" : "passed" : "failed";
|
||||
writeFileSync(resolve(directory, "commands.json"), `${JSON.stringify({ commands: commandResults, phase, run_id: runId }, null, 2)}\n`);
|
||||
writeFileSync(resolve(directory, "result.json"), `${JSON.stringify({
|
||||
acceptance_criteria: item.acceptance_criteria,
|
||||
automation: ["automated"],
|
||||
commit,
|
||||
evidence_refs: evidenceRefs,
|
||||
layer: ["UNIT", "API", "E2E", "PKG-SEC"],
|
||||
manifest,
|
||||
missing_evidence: missingEvidence,
|
||||
phase,
|
||||
red_reason: item.red_reason,
|
||||
requirements: item.requirements,
|
||||
run_id: runId,
|
||||
status,
|
||||
task_id: "TASK-WP5-04",
|
||||
test_id: item.id,
|
||||
work_package: "WP-5",
|
||||
worktree_under_test: dirty ? "uncommitted implementation" : "clean committed implementation",
|
||||
}, null, 2)}\n`);
|
||||
summaries.push({ missing_evidence: missingEvidence, status, test_id: item.id });
|
||||
}
|
||||
const status = summaries.every((item) => item.status === (phase === "red" ? "red_confirmed" : "passed"))
|
||||
? phase === "red" ? "red_confirmed" : "passed"
|
||||
: "failed";
|
||||
writeFileSync(resolve(runDirectory, "commands.json"), `${JSON.stringify({ commands: commandResults, phase, run_id: runId }, null, 2)}\n`);
|
||||
writeFileSync(resolve(runDirectory, "evidence.json"), `${JSON.stringify({ cases: summaries, phase, run_id: runId, status }, null, 2)}\n`);
|
||||
console.log(JSON.stringify({ cases: summaries, phase, run_id: runId, status }, null, 2));
|
||||
if (status === "failed") process.exit(1);
|
||||
@@ -0,0 +1,63 @@
|
||||
import { createHash } from "node:crypto";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
||||
import { resolve } from "node:path";
|
||||
|
||||
const phaseIndex = process.argv.indexOf("--phase");
|
||||
const phase = phaseIndex >= 0 ? process.argv[phaseIndex + 1] : "green";
|
||||
if (!new Set(["red", "green"]).has(phase)) throw new Error(`Unsupported phase: ${phase}`);
|
||||
const runId = process.env.DADA_TDD_RUN_ID ?? `wp5-05-${phase}-${new Date().toISOString().replace(/[^0-9]/g, "")}`;
|
||||
const runDirectory = resolve("artifacts", "tdd", runId);
|
||||
const caseDirectory = resolve(runDirectory, "cases", "TDD-WP5-UPL-001-upload-metering");
|
||||
if (existsSync(runDirectory)) throw new Error(`Evidence run already exists: ${runId}`);
|
||||
mkdirSync(caseDirectory, { recursive: true });
|
||||
|
||||
const commands = phase === "red"
|
||||
? [["red-focused", "pnpm --filter @dada/shared-contracts build && pnpm exec vitest run tests/integration/wp5-05-sticker-release.test.ts tests/api/wp5-05-sticker-upload.test.ts"]]
|
||||
: [
|
||||
["unit", "pnpm test:unit"],
|
||||
["integration", "pnpm test:integration"],
|
||||
["api", "pnpm test:api"],
|
||||
["e2e", "pnpm test:e2e"],
|
||||
["security", "pnpm test:security"],
|
||||
["tdd-trace", "pnpm validate:tdd-trace"],
|
||||
];
|
||||
const results = [];
|
||||
for (const [name, command] of commands) {
|
||||
const started_at = new Date().toISOString();
|
||||
const result = spawnSync(process.env.ComSpec ?? "cmd.exe", ["/d", "/s", "/c", command], {
|
||||
encoding: "utf8", env: { ...process.env, DADA_EVIDENCE_DIR_WP5_UPL: caseDirectory }, maxBuffer: 40 * 1024 * 1024,
|
||||
});
|
||||
if (result.stdout) process.stdout.write(result.stdout);
|
||||
if (result.stderr) process.stderr.write(result.stderr);
|
||||
results.push({ command, exit_code: result.status ?? 1, finished_at: new Date().toISOString(), name, started_at });
|
||||
if (phase === "green" && (result.status ?? 1) !== 0) break;
|
||||
}
|
||||
|
||||
const redConfirmed = phase === "red" && results.length === 1 && results[0].exit_code !== 0;
|
||||
if (phase === "red") writeFileSync(resolve(caseDirectory, "red-observation.json"), `${JSON.stringify({
|
||||
expected_failure: "后台上传未流式校验、原图/缩略图漏计量或 full 仍写入",
|
||||
observed_command: results[0].command,
|
||||
observed_exit_code: results[0].exit_code,
|
||||
status: redConfirmed ? "red_confirmed" : "failed",
|
||||
}, null, 2)}\n`);
|
||||
const evidenceRefs = phase === "red" ? ["red-observation.json"] : ["response.json", "db-diff.json", "fs-before.json", "fs-after.json"];
|
||||
const missingEvidence = evidenceRefs.filter((name) => !existsSync(resolve(caseDirectory, name)));
|
||||
const commandState = phase === "red" ? redConfirmed : results.length === commands.length && results.every((item) => item.exit_code === 0);
|
||||
const status = commandState && missingEvidence.length === 0 ? phase === "red" ? "red_confirmed" : "passed" : "failed";
|
||||
const manifest = { path: "tasks.manifest.json", sha256: createHash("sha256").update(readFileSync("tasks.manifest.json")).digest("hex").toUpperCase() };
|
||||
const commit = spawnSync("git", ["rev-parse", "--short", "HEAD"], { encoding: "utf8" }).stdout.trim();
|
||||
const dirty = spawnSync("git", ["status", "--porcelain"], { encoding: "utf8" }).stdout.trim().length > 0;
|
||||
writeFileSync(resolve(caseDirectory, "commands.json"), `${JSON.stringify({ commands: results, phase, run_id: runId }, null, 2)}\n`);
|
||||
writeFileSync(resolve(caseDirectory, "result.json"), `${JSON.stringify({
|
||||
acceptance_criteria: ["AC-31", "AC-55"], automation: ["automated"], commit,
|
||||
evidence_refs: evidenceRefs, layer: ["INTEGRATION", "API", "E2E", "PKG-SEC"], manifest,
|
||||
missing_evidence: missingEvidence, phase, red_reason: "后台上传未流式校验、原图/缩略图漏计量或 full 仍写入",
|
||||
requirements: ["ADMIN-06"], run_id: runId, status, task_id: "TASK-WP5-05",
|
||||
test_id: "TDD-WP5-UPL-001-upload-metering", work_package: "WP-5",
|
||||
worktree_under_test: dirty ? "uncommitted implementation" : "clean committed implementation",
|
||||
}, null, 2)}\n`);
|
||||
writeFileSync(resolve(runDirectory, "commands.json"), `${JSON.stringify({ commands: results, phase, run_id: runId }, null, 2)}\n`);
|
||||
writeFileSync(resolve(runDirectory, "evidence.json"), `${JSON.stringify({ cases: [{ missing_evidence: missingEvidence, status, test_id: "TDD-WP5-UPL-001-upload-metering" }], phase, run_id: runId, status }, null, 2)}\n`);
|
||||
console.log(JSON.stringify({ phase, run_id: runId, status }, null, 2));
|
||||
if (status === "failed") process.exit(1);
|
||||
Reference in New Issue
Block a user