@oj-module/cli 0.2.2 → 0.2.5

package/templates/api/src/home/seed.sql

@@ -0,0 +1,70 @@
+-- home 模块种子（P4-1）。按分号朴素切分（S006）。
+-- home_pie：五分类（code 对齐前端 DATA_KEY），幂等 INSERT OR IGNORE。
+INSERT OR IGNORE INTO home_pie (category, value) VALUES ('electronics', 320);
+INSERT OR IGNORE INTO home_pie (category, value) VALUES ('home_goods', 210);
+INSERT OR IGNORE INTO home_pie (category, value) VALUES ('apparel_accessories', 180);
+INSERT OR IGNORE INTO home_pie (category, value) VALUES ('food_beverages', 150);
+INSERT OR IGNORE INTO home_pie (category, value) VALUES ('beauty_skincare', 95);
+
+-- home_line：日窗口序列（day = epoch-day，种子围绕"当前日期"生成，约 60 天窗口）。
+-- 刻意缺 today-30 / today-12 两天，演示"缺哪天补哪天"——handler 在窗口内对缺失日补 0；
+-- 若整个窗口无 seed（seed 随时间变旧），handler 回落确定式趋势兜底（懒补数）。
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20640, 181);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20641, 190);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20642, 199);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20643, 208);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20644, 217);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20645, 226);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20646, 235);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20647, 244);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20648, 253);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20649, 262);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20650, 271);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20651, 280);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20652, 289);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20653, 298);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20654, 100);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20655, 109);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20656, 118);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20657, 127);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20658, 136);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20659, 145);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20660, 154);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20661, 163);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20662, 172);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20663, 181);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20664, 190);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20665, 199);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20666, 208);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20667, 217);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20668, 226);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20669, 235);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20671, 253);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20672, 262);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20673, 271);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20674, 280);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20675, 289);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20676, 298);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20677, 100);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20678, 109);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20679, 118);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20680, 127);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20681, 136);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20682, 145);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20683, 154);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20684, 163);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20685, 172);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20686, 181);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20687, 190);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20689, 208);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20690, 217);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20691, 226);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20692, 235);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20693, 244);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20694, 253);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20695, 262);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20696, 271);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20697, 280);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20698, 289);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20699, 298);
+INSERT OR IGNORE INTO home_line (day, value) VALUES (20700, 100);

package/templates/api/src/system/oplog/api.ts

@@ -1,6 +1,8 @@
 import { respond } from "../../_platform/_shared/respond";
 // GET /api/system/oplog?action=&username=&module=&limit= —— 操作日志查询（AC1-29；D13 admin 可查）。
-import { assertSystemAdmin } from "../../_platform/_shared/service/access";
+// POST /api/system/oplog —— 操作日志写入（C3；登录态即可，解决方案模块记录自身操作）。
+import { assertSystemAdmin, currentAccess } from "../../_platform/_shared/service/access";
+import { recordOp } from "../../_platform/_shared/service/audit";
 import { searchOplog } from "../../_platform/_shared/service/oplog";
 
 async function get() {
@@ -50,4 +52,44 @@ get.response = {
 	},
 };
 
-export default { get };
+// POST /api/system/oplog —— 写操作日志（C3）。登录态即可（审计写入面向当前用户，非仅管理员）；
+// module 由调用方自身模块名传入（脱敏红线：detail 不得含口令/密钥/token）。
+async function post() {
+	await respond(async () => {
+		await currentAccess();
+		const body = (http.body || {}) as Record<string, unknown>;
+		const action = String(body.action ?? "");
+		const module = String(body.module ?? "");
+		if (!action || !module)
+			throw Object.assign(new Error("action and module are required"), { status: 400 });
+		await recordOp({
+			action,
+			module,
+			version: body.version == null ? undefined : String(body.version),
+			target: body.target == null ? undefined : String(body.target),
+			detail: body.detail,
+			level: typeof body.level === "number" ? body.level : undefined,
+		});
+		return { ok: true as const };
+	});
+}
+post.schema = {
+	body: {
+		type: "object",
+		required: ["action", "module"],
+		properties: {
+			action: { type: "string", minLength: 1 },
+			module: { type: "string", minLength: 1 },
+			version: { type: "string" },
+			target: { type: "string" },
+			level: { type: "number" },
+		},
+	},
+};
+post.response = {
+	type: "object",
+	required: ["ok"],
+	properties: { ok: { type: "boolean" } },
+};
+
+export default { get, post };

package/templates/api/tests/fixture.ts

@@ -13,6 +13,22 @@ const SRC = join(dirname(fileURLToPath(import.meta.url)), "..", "src");
 
 export const ADMIN = 1;
 
+/**
+ * market_history 同构 DDL：表真源 = 市场方案包自带迁移（oj-market 0002__market_history），
+ * 不属平台迁移（installDb 不回放）——需要断言留痕的用例显式执行；守卫语义（表不存在静默跳过）
+ * 另有专项用例钉住。
+ */
+export const MARKET_HISTORY_DDL = `CREATE TABLE market_history (
+	id INTEGER PRIMARY KEY AUTOINCREMENT,
+	solution TEXT NOT NULL,
+	version TEXT NOT NULL,
+	action TEXT NOT NULL,
+	status TEXT NOT NULL,
+	operator TEXT,
+	message TEXT,
+	created_at INTEGER NOT NULL
+)`;
+
 /** 建内存库 + 注入全局；返回 DatabaseSync 供用例直插数据/断言。 */
 export function installDb(): any {
 	const dbo = new DatabaseSync(":memory:");

package/templates/api/tests/lifecycle/atomic-state.spec.ts

@@ -0,0 +1,183 @@
+// BDD：状态文件原子写 + sidecar 状态存储（D12/D13，P1-4）。
+// atomicWriteText：同目录 tmp + rename 原子替换，一切状态落盘（state.yaml/manifests.yaml/任务文件）的底座。
+// StateStore：.solutions/state.yaml 读写；YAML 为受限子集（两层 map + 标量），
+// 只保证读回自己写出的内容；任何不符格式的字节一律视为损坏 → 空状态，损坏上下文并入
+// 读结果（corruptNote 出口，禁 console——release isolate console 抛 BadResource，Finding A）。
+// fs 依赖经 globalThis.fs 注入（平台 isolate 注入 FsApi；测试注入 node:fs/promises 适配）。
+import type { FsFace } from "../../src/_platform/_lifecycle/atomic";
+import * as fsp from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { atomicWriteText } from "../../src/_platform/_lifecycle/atomic";
+import { createStateStore } from "../../src/_platform/_lifecycle/state";
+
+const g = globalThis as any;
+
+function nodeFsFace(): FsFace {
+	return {
+		writeFile: (path, data) => fsp.writeFile(path, data),
+		readFile: path => fsp.readFile(path),
+		mkdir: (path, opts) => fsp.mkdir(path, opts),
+		remove: (path, opts) => fsp.rm(path, opts),
+		rename: (oldPath, newPath) => fsp.rename(oldPath, newPath),
+		copyFile: (src, dest) => fsp.copyFile(src, dest),
+		readdir: path => fsp.readdir(path),
+	};
+}
+
+let root: string;
+
+beforeEach(async () => {
+	root = await fsp.mkdtemp(join(tmpdir(), "ojm-atomic-state-"));
+	g.fs = nodeFsFace();
+});
+
+afterEach(async () => {
+	g.fs = undefined;
+	await fsp.rm(root, { recursive: true, force: true });
+});
+
+describe("atomicWriteText（D13）", () => {
+	it("写入后读回内容逐字节完整（无半截态）", async () => {
+		const p = join(root, "state.yaml");
+		await atomicWriteText(p, "solutions:\n  demo:\n    version: \"1.0.0\"\n");
+		expect(await fsp.readFile(p, "utf8")).toBe("solutions:\n  demo:\n    version: \"1.0.0\"\n");
+	});
+
+	it("并发双写交错完成后内容完整，无交错字节（最终为其中一份完整内容）", async () => {
+		const p = join(root, "f.yaml");
+		const contentA = `${"A".repeat(5000)}\n`;
+		const contentB = `${"B".repeat(5000)}\n`;
+		await Promise.all([atomicWriteText(p, contentA), atomicWriteText(p, contentB)]);
+		const final = await fsp.readFile(p, "utf8");
+		expect(final === contentA || final === contentB).toBe(true);
+	});
+
+	it("rename 失败（模拟 tmp 源缺失）时旧文件原样保留、tmp 清理、错误上抛", async () => {
+		const p = join(root, "f.yaml");
+		await atomicWriteText(p, "old\n");
+		const base = nodeFsFace();
+		let renameCalls = 0;
+		g.fs = {
+			...base,
+			rename: (oldPath: string, newPath: string) => {
+				renameCalls++;
+				if (renameCalls === 1) {
+					throw new Error("rename 源不存在（模拟）");
+				}
+				return base.rename(oldPath, newPath);
+			},
+		};
+		await expect(atomicWriteText(p, "new\n")).rejects.toThrow(/rename 源不存在/);
+		expect(await fsp.readFile(p, "utf8")).toBe("old\n");
+		expect((await fsp.readdir(root)).sort()).toEqual(["f.yaml"]);
+	});
+
+	it("父目录不存在时自动创建（首装 .solutions/ 场景）", async () => {
+		const p = join(root, ".solutions", "state.yaml");
+		await atomicWriteText(p, "solutions: {}\n");
+		expect(await fsp.readFile(p, "utf8")).toBe("solutions: {}\n");
+	});
+});
+
+describe("stateStore（D12）", () => {
+	it("write 后新实例 read 读回一致（落盘格式 round-trip，含 prerelease 版本与 enabled=false）", async () => {
+		const p = join(root, ".solutions", "state.yaml");
+		const store = await createStateStore(p);
+		await store.write({
+			solutions: {
+				wiki: { version: "1.0.0-beta.1+build.5", enabled: false, installedAt: 1730000000001 },
+				demo: { version: "0.2.0", enabled: true, installedAt: 1730000000000 },
+			},
+		});
+		const again = await createStateStore(p);
+		expect(again.read()).toEqual({
+			solutions: {
+				wiki: { version: "1.0.0-beta.1+build.5", enabled: false, installedAt: 1730000000001 },
+				demo: { version: "0.2.0", enabled: true, installedAt: 1730000000000 },
+			},
+		});
+	});
+
+	it("patch 合并不丢其他方案键", async () => {
+		const p = join(root, ".solutions", "state.yaml");
+		const store = await createStateStore(p);
+		await store.write({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+		await store.write({ solutions: { wiki: { version: "2.0.0", enabled: true, installedAt: 2 } } });
+		expect(store.read()).toEqual({
+			solutions: {
+				demo: { version: "1.0.0", enabled: true, installedAt: 1 },
+				wiki: { version: "2.0.0", enabled: true, installedAt: 2 },
+			},
+		});
+	});
+
+	it("patch 值为 null 删除该方案键（GC/卸载删除出口）", async () => {
+		const p = join(root, ".solutions", "state.yaml");
+		const store = await createStateStore(p);
+		await store.write({
+			solutions: {
+				demo: { version: "1.0.0", enabled: true, installedAt: 1 },
+				wiki: { version: "2.0.0", enabled: true, installedAt: 2 },
+			},
+		});
+		await store.write({ solutions: { demo: null as any } });
+		expect(store.read()).toEqual({ solutions: { wiki: { version: "2.0.0", enabled: true, installedAt: 2 } } });
+		const again = await createStateStore(p);
+		expect(again.read()).toEqual({ solutions: { wiki: { version: "2.0.0", enabled: true, installedAt: 2 } } });
+	});
+
+	it("read 不存在的文件返回空状态不炸", async () => {
+		const store = await createStateStore(join(root, "nope", "state.yaml"));
+		expect(store.read()).toEqual({ solutions: {} });
+	});
+
+	it("read 返回快照：调用方改动不影响 store 后续读数", async () => {
+		const store = await createStateStore(join(root, "state.yaml"));
+		await store.write({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+		const snapshot = store.read();
+		snapshot.solutions.demo.version = "9.9.9";
+		expect(store.read().solutions.demo.version).toBe("1.0.0");
+	});
+
+	it("损坏 yaml 返回空状态，损坏上下文并入读结果 corruptNote（禁 console——release isolate console 抛 BadResource，Finding A）", async () => {
+		const p = join(root, "state.yaml");
+		await fsp.writeFile(p, "solutions:\n  demo:\n    version: [broken\n");
+		const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+		try {
+			const store = await createStateStore(p);
+			expect(store.read()).toEqual({ solutions: {} });
+			expect(store.corruptNote?.()).toContain("不是本模块写出的合法状态文件");
+			expect(store.corruptNote?.()).toContain("条目格式不完整或字段损坏");
+			expect(warn).not.toHaveBeenCalled();
+			// 自愈重写后 note 清零（写成功 = 盘上真身合法）
+			await store.write({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+			expect(store.corruptNote?.()).toBeNull();
+		}
+		finally {
+			warn.mockRestore();
+		}
+	});
+
+	it("盘上内容损坏时 write 以 patch 为基自愈重写（不因坏文件拒写）", async () => {
+		const p = join(root, "state.yaml");
+		await fsp.writeFile(p, "这不是状态文件");
+		const store = await createStateStore(p);
+		await store.write({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+		const again = await createStateStore(p);
+		expect(again.read()).toEqual({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+	});
+
+	it("非法条目（version 含换行）拒绝落盘，旧状态原样保留", async () => {
+		const p = join(root, "state.yaml");
+		const store = await createStateStore(p);
+		await store.write({ solutions: { demo: { version: "1.0.0", enabled: true, installedAt: 1 } } });
+		await expect(store.write({ solutions: { wiki: { version: "2.0.0\nenabled: true", enabled: true, installedAt: 2 } } }))
+			.rejects
+			.toThrow(/version/);
+		expect(store.read().solutions.demo.version).toBe("1.0.0");
+		expect(Object.keys(store.read().solutions)).toEqual(["demo"]);
+	});
+});

package/templates/api/tests/lifecycle/bootstrap.spec.ts

@@ -0,0 +1,116 @@
+// BDD：第一方 bootstrap key（P2-12，G3 双轨第一轨）。
+// ① 播种机制：信任库文件尚不存在且 key 在场 → 播种一次（market 首装免 TOFU）；
+//    key 未回填（null）→ no-op；库文件已存在（含空库 {}）→ 不播种——不与运维吊销对抗（G5）。
+// ② 私钥红线钉测：packages/cli 全树（源码 + 模板）零私钥材料——文件名（*.pem/*private*）
+//    与 PEM 私钥块实体（header 后跟 ≥100 字符 base64 体；tasks.ts redact 正则与测试假体
+//    体长 <100 不误伤）双口径扫描。
+// ③ 集成（market-api.spec）：信任库为空 + bootstrapKey 注入 → cdn 安装直达 done 不落 needs_trust。
+import type { FsFace } from "../../src/_platform/_lifecycle/atomic";
+import * as fsp from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { createTrustStore } from "../../src/_platform/_lifecycle/trust";
+import { BOOTSTRAP_KEY, seedBootstrapKey } from "../../src/_platform/market/bootstrap";
+
+const g = globalThis as any;
+
+const KEY = { key_id: "test.publisher", public_key: "a".repeat(64) };
+
+function nodeFsFace(): FsFace {
+	return {
+		writeFile: (path, data) => fsp.writeFile(path, data),
+		readFile: path => fsp.readFile(path),
+		mkdir: (path, opts) => fsp.mkdir(path, opts),
+		remove: (path, opts) => fsp.rm(path, opts),
+		rename: (oldPath, newPath) => fsp.rename(oldPath, newPath),
+		copyFile: (src, dest) => fsp.copyFile(src, dest),
+		readdir: path => fsp.readdir(path),
+	};
+}
+
+let dir: string;
+
+beforeEach(async () => {
+	g.fs = nodeFsFace();
+	dir = await fsp.mkdtemp(join(tmpdir(), "ojm-bootstrap-"));
+});
+
+afterEach(async () => {
+	g.fs = undefined;
+	await fsp.rm(dir, { recursive: true, force: true });
+});
+
+describe("seedBootstrapKey 播种机制（P2-12：G3 双轨第一轨）", () => {
+	it("key 在场 + 信任库文件不存在 → 播种一次（get 读回同公钥）", async () => {
+		const trustPath = join(dir, "trusted-keys.yaml");
+		await seedBootstrapKey(trustPath, KEY);
+		expect(await createTrustStore(trustPath).get(KEY.key_id)).toBe(KEY.public_key);
+	});
+
+	it("key 为 null（发布时回填前的内置口径）→ no-op，不产生库文件", async () => {
+		const trustPath = join(dir, "trusted-keys.yaml");
+		await seedBootstrapKey(trustPath, null);
+		await expect(fsp.access(trustPath)).rejects.toThrow();
+		// 内置常量在回填前必须为 null（模板只带公钥机制、不带任何具体钥——发布时回填真钥）
+		expect(BOOTSTRAP_KEY).toBeNull();
+	});
+
+	it("信任库文件已存在（含空库 {}）→ 不播种：运维 remove 后不复活（G5）", async () => {
+		const trustPath = join(dir, "trusted-keys.yaml");
+		// 预置空库（已初始化形态）
+		await fsp.writeFile(trustPath, "trusted_keys: {}\n");
+		await seedBootstrapKey(trustPath, KEY);
+		expect(await createTrustStore(trustPath).get(KEY.key_id)).toBeNull();
+		// 预置他 key 库：不播种也不破坏既有内容
+		await fsp.writeFile(trustPath, `trusted_keys:\n  other.pub:\n    public_key: "${"b".repeat(64)}"\n    added_at: 1\n`);
+		await seedBootstrapKey(trustPath, KEY);
+		const store = createTrustStore(trustPath);
+		expect(await store.get(KEY.key_id)).toBeNull();
+		expect(await store.get("other.pub")).toBe("b".repeat(64));
+	});
+});
+
+describe("私钥红线钉测（P2-12：packages/cli 全树零私钥材料）", () => {
+	const CLI_ROOT = join(dirname(fileURLToPath(import.meta.url)), "../../../..");
+
+	async function* walk(root: string): AsyncGenerator<string> {
+		for (const name of await fsp.readdir(root)) {
+			if (name === "node_modules" || name === "dist" || name.startsWith(".")) {
+				continue;
+			}
+			const p = join(root, name);
+			const st = await fsp.stat(p);
+			if (st.isDirectory()) {
+				yield* walk(p);
+			}
+			else {
+				yield p;
+			}
+		}
+	}
+
+	it("无 *.pem / *private* 文件；PEM 私钥块 header 后无真实密钥体（≥100 base64 字符）", async () => {
+		const offenders: string[] = [];
+		for await (const p of walk(CLI_ROOT)) {
+			const base = p.split("/").pop() ?? p;
+			if (/\.pem$/i.test(base) || /private/i.test(base)) {
+				offenders.push(`${p}（文件名命中私钥形态）`);
+				continue;
+			}
+			let text: string;
+			try {
+				text = new TextDecoder().decode(await fsp.readFile(p));
+			}
+			catch {
+				continue; // 二进制等不可解码文件跳过（文件名口径已覆盖）
+			}
+			// 私钥块实体：header 后跟 ≥100 字符连续 base64（redact 正则无体、测试假体 16 字符均不命中）
+			if (/-----BEGIN [A-Z ]*PRIVATE KEY-----\r?\n?[A-Za-z0-9+/=]{100,}/.test(text)) {
+				offenders.push(`${p}（PEM 私钥块实体命中）`);
+			}
+		}
+		expect(offenders).toEqual([]);
+	});
+});