@oj-module/cli 0.2.68 → 0.2.71

package/templates/src/oj-market/web/api/defaultClient.ts

@@ -9,7 +9,7 @@
 
 import type {
 	EnableInput,
-	IndexRow,
+	IndexPage,
 	InstallInput,
 	MarketHistory,
 	ReleasePage,
@@ -21,16 +21,16 @@ import type { MarketClient } from "./client";
 import { request } from "@oj-module/runtime";
 import {
 	bindRequest,
-	platformMarketEnablePost,
-	platformMarketHistoryGet,
-	platformMarketInstallPost,
-	platformMarketMetaGet,
-	platformMarketReleasesGet,
-	platformMarketTaskGet,
-	platformMarketTrustPost,
-	platformMarketUninstallImpactGet,
-	platformMarketUninstallPost,
-} from "../../../app/web/_platform/__client";
+	ojMarketEnablePost,
+	ojMarketHistoryGet,
+	ojMarketInstallPost,
+	ojMarketMetaGet,
+	ojMarketReleasesGet,
+	ojMarketTaskGet,
+	ojMarketTrustPost,
+	ojMarketUninstallImpactGet,
+	ojMarketUninstallPost,
+} from "../__client";
 
 // 绑定运行时 request 到生成 client 的模块级单槽（生成 client 是静态单例，必须由某处
 // bindRequest；此处兜底确保市场子应用无论挂载顺序都能拿到请求实例）。与 _platform 模块
@@ -55,8 +55,8 @@ interface OjEnvelope<T> {
 }
 
 // 第一方市场端点：相对前缀（无前导 /），由运行时 request 的 VITE_API_BASE_URL（/api）统一加前缀；
-// 与生成 client（platformMarket* 用 `_platform/...`）保持一致，避免 /api 叠加成 /api/api/（R29）。
-const MARKET = "_platform/market";
+// 与生成 client（ojMarket* 用 `oj-market/...`）保持一致，避免 /api 叠加成 /api/api/（R29）。
+const MARKET = "oj-market";
 
 /**
  * 503 = 服务端「未配置市场地址（framework.market_cdn_url）」，是**预期空态**而非故障
@@ -70,24 +70,30 @@ function isUnconfigured(e: unknown): boolean {
 export const httpMarketClient: MarketClient = {
 	async meta() {
 		// 生成 client 已解包信封 + DEV 校验；此处仅对齐领域类型。
-		return (await platformMarketMetaGet()) as { apiVersion: string };
+		return (await ojMarketMetaGet()) as { apiVersion: string };
 	},
-	async index() {
+	async index(input: { page?: number, size?: number } = {}) {
 		// 唯一需 silentError 的端点：直连 request 抑制「未配置市场地址」的全局 toast。
+		// v4 §四：分页数据源（{list,total,page,size}）；503（市场地址未配置）归空页——空态由卡片区文案承载。
 		try {
+			const params: Record<string, string> = {};
+			if (input.page != null)
+				params.page = String(input.page);
+			if (input.size != null)
+				params.size = String(input.size);
 			const r = await (request as unknown as HttpGetLike)
-				.get<OjEnvelope<IndexRow[]>>(`${MARKET}/index`, { silentError: true, retry: 0 });
+				.get<OjEnvelope<IndexPage>>(`${MARKET}/index`, { searchParams: params, silentError: true, retry: 0 });
 			const env = await r.json();
 			return env.data!;
 		}
 		catch (e) {
 			if (isUnconfigured(e))
-				return [];
+				return { list: [], total: 0, page: 1, size: 20 };
 			throw e;
 		}
 	},
 	async install(input: InstallInput) {
-		const data = await platformMarketInstallPost({
+		const data = await ojMarketInstallPost({
 			name: input.name,
 			version: input.version ?? null,
 			source: input.source ?? "cdn",
@@ -97,28 +103,28 @@ export const httpMarketClient: MarketClient = {
 	async task(id: string) {
 		// 生成 Data 为空 schema（仅 DEV catchall 校验），经 unknown 桥接领域类型；
 		// 运行时形状由服务端真源 + DEV zod 校验保证，TS 侧以领域类型为准。
-		return (await platformMarketTaskGet({ id })) as unknown as TaskRecord;
+		return (await ojMarketTaskGet({ id })) as unknown as TaskRecord;
 	},
 	async trust(taskId: string) {
 		// 服务端自任务记录重取公钥复算指纹比对（防混淆代理），前端只传 task_id，不传公钥
-		const data = await platformMarketTrustPost({ task_id: taskId });
+		const data = await ojMarketTrustPost({ task_id: taskId });
 		return data as { result: string, key_id: string, fingerprint: string };
 	},
 	async enable(input: EnableInput) {
-		const data = await platformMarketEnablePost({ name: input.name, enabled: input.enabled });
+		const data = await ojMarketEnablePost({ name: input.name, enabled: input.enabled });
 		return data as { ok: boolean, message: string };
 	},
 	async history() {
-		return (await platformMarketHistoryGet()) as unknown as MarketHistory[];
+		return (await ojMarketHistoryGet()) as unknown as MarketHistory[];
 	},
 	async releases(input: { page?: number, limit?: number } = {}) {
-		return (await platformMarketReleasesGet(input as { page: number, limit: number })) as unknown as ReleasePage;
+		return (await ojMarketReleasesGet(input as { page: number, limit: number })) as unknown as ReleasePage;
 	},
 	async uninstallImpact(name: string) {
-		return (await platformMarketUninstallImpactGet({ name })) as unknown as UninstallImpact;
+		return (await ojMarketUninstallImpactGet({ name })) as unknown as UninstallImpact;
 	},
 	async uninstall(name: string) {
-		const data = await platformMarketUninstallPost({ name });
+		const data = await ojMarketUninstallPost({ name });
 		return data as { ok: boolean, message: string };
 	},
 };

package/templates/src/oj-market/web/entry.ts

@@ -5,8 +5,9 @@ import { defineModule, OutsidePageIcon } from "@oj-module/runtime";
 import { createElement } from "react";
 import MarketApp from "./pages/MarketApp";
 import { onInit as publishOnInit, routes as publishRoutes } from "./publish/routes";
+import { onInit as marketOnInit } from "./routes";
 
-// 方案市场前端模块（第一方专用，R29：消费 /api/_platform/market/* 编排面，第三方方案不得仿照此调用面）。
+// 方案市场前端模块（第一方专用，R29：消费 /api/oj-market/* 编排面，第三方方案不得仿照此调用面）。
 // 菜单标题走 i18next 命名空间语法 "<moduleName>:menu.<key>"（i18n 资源在 locales/，安装时随包注册）。
 //
 // **单模单根**（2026-11-05）：菜单只有一个「方案市场」根，下挂三个子页——
@@ -25,7 +26,7 @@ const i18nNamespaces: Record<string, ModuleI18n> = {
 export default defineModule({
 	name: "oj-market",
 	description: "oj 方案市场应用——方案清单 / 发布管理 / 发布历史（第一方专用，R29）",
-	version: "0.1.0",
+	version: "0.2.0",
 	routes: [
 		{
 			path: "/oj-market",
@@ -54,8 +55,9 @@ export default defineModule({
 	},
 	i18nNamespaces,
 	lifecycle: {
-		/** 发布页的契约前缀 /publish + scoped request 在这里接线（与市场自身的 client 互不影响） */
+		/** 市场编排面 client + 发布页契约前缀 /publish 在这里接线（两侧互不影响） */
 		async onInit(ctx: ModuleContext) {
+			marketOnInit(ctx);
 			publishOnInit(ctx);
 		},
 	},

package/templates/src/oj-market/web/hooks/useMarket.ts

@@ -1,4 +1,4 @@
-import type { IndexRow, MarketHistory, TaskRecord } from "../types";
+import type { IndexPage, MarketHistory, TaskRecord } from "../types";
 import { useCallback, useEffect, useState } from "react";
 import { useMarketClient } from "../api/context";
 import { poll } from "../utils/poll";
@@ -8,10 +8,10 @@ import { poll } from "../utils/poll";
 // 故非 ok 变体也声明 data?: undefined（ok 变体 data: T，访问结果为 T | undefined）。
 export type LoadState<T> = { status: "loading", data?: undefined } | { status: "ok", data: T } | { status: "error", error: string, data?: undefined };
 
-/** 卡片索引加载（含重试）；消费 GET /_platform/market/index */
-export function useMarketIndex(): LoadState<IndexRow[]> & { retry: () => void } {
+/** 卡片索引加载（含重试）；消费 GET /oj-market/index（v4 §四 DB 目录分页） */
+export function useMarketIndex(page = 1, size = 20): LoadState<IndexPage> & { retry: () => void } {
 	const client = useMarketClient();
-	const [state, setState] = useState<LoadState<IndexRow[]>>({ status: "loading" });
+	const [state, setState] = useState<LoadState<IndexPage>>({ status: "loading" });
 	// 重试不复跑「先同步 set loading 再拉取」的加载函数（effect 内同步 set 触发
 	// react/set-state-in-effect），改为事件里置 loading + 递增 nonce 驱动 effect 重跑。
 	const [nonce, setNonce] = useState(0);
@@ -19,13 +19,13 @@ export function useMarketIndex(): LoadState<IndexRow[]> & { retry: () => void }
 	useEffect(() => {
 		let active = true;
 		client
-			.index()
+			.index({ page, size })
 			.then(data => active && setState({ status: "ok", data }))
 			.catch(e => active && setState({ status: "error", error: e instanceof Error ? e.message : String(e) }));
 		return () => {
 			active = false;
 		};
-	}, [client, nonce]);
+	}, [client, nonce, page, size]);
 
 	const retry = useCallback(() => {
 		setState({ status: "loading" });

package/templates/src/oj-market/web/pages/MarketApp.tsx

@@ -1,6 +1,6 @@
 import type { IndexRow, TaskRecord } from "../types";
 import { useUserStore } from "@oj-module/runtime";
-import { Alert, Typography } from "antd";
+import { Alert, Pagination, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useMarketClient } from "../api/context";
@@ -16,7 +16,9 @@ import { useMarketIndex } from "../hooks/useMarket";
 export default function MarketApp() {
 	const { t } = useTranslation();
 	const client = useMarketClient();
-	const index = useMarketIndex();
+	const [page, setPage] = useState(1);
+	const [pageSize, setPageSize] = useState(20);
+	const index = useMarketIndex(page, pageSize);
 	// 管理权限 = superadmin（与后端 assertSuperAdmin 口径一致）。仅屏蔽写操作，浏览（详情/历史）对所有登录用户开放。
 	const roles = useUserStore(s => s.roles);
 	const canManage = roles.includes("superadmin");
@@ -30,7 +32,8 @@ export default function MarketApp() {
 	const [historyRow, setHistoryRow] = useState<IndexRow | null>(null);
 	const [busyName, setBusyName] = useState<string | null>(null);
 
-	const rows = index.status === "ok" ? index.data : [];
+	const pageData = index.status === "ok" ? index.data : null;
+	const rows = pageData?.list ?? [];
 
 	// 安装/升级：目标版本缺省（取 latest）；已装视为升级
 	const handleInstall = (row: IndexRow) => {
@@ -109,6 +112,20 @@ export default function MarketApp() {
 				onRetry={index.retry}
 			/>
 
+			{pageData != null && pageData.total > pageSize && (
+				<Pagination
+					style={{ marginTop: 16, textAlign: "right" }}
+					current={page}
+					pageSize={pageSize}
+					total={pageData.total}
+					onChange={(p, ps) => {
+						setPage(ps !== pageSize ? 1 : p);
+						setPageSize(ps);
+					}}
+					showSizeChanger
+				/>
+			)}
+
 			<DetailDrawer
 				row={detailRow}
 				open={detailRow != null}

package/templates/src/oj-market/web/publish/locales/en-US.json

@@ -8,7 +8,7 @@
 		"subtitle": "Every release recorded in the signed index, newest first. Product, version and publisher all come from the index itself.",
 		"empty": "No releases yet",
 		"syncFailed": "The market index is temporarily unreachable; showing records already stored",
-		"indexTime": "index time",
+		"backfillTime": "backfilled",
 		"publishedAtHint": "Uses the CDN file's Last-Modified when available; otherwise falls back to the index build time, tagged “index time”",
 		"total": "{{total}} in total",
 		"columns": {

package/templates/src/oj-market/web/publish/locales/zh-CN.json

@@ -8,7 +8,7 @@
 		"subtitle": "签名索引里出现过的每一次发版：产品、版本与发布身份都来自索引本身，按发布时间倒序。",
 		"empty": "还没有发布记录",
 		"syncFailed": "暂时读不到市场索引，下面是已入库的历史记录",
-		"indexTime": "索引时间",
+		"backfillTime": "回填时间",
 		"publishedAtHint": "优先取分发包落 CDN 的时间（Last-Modified）；源不提供时用索引生成时间，会标注「索引时间」",
 		"total": "共 {{total}} 条",
 		"columns": {

package/templates/src/oj-market/web/publish/pages/history.tsx

@@ -1,6 +1,6 @@
 import type { ReleaseRow } from "../../types";
 import { useQuery } from "@tanstack/react-query";
-import { Alert, Space, Table, Tag, Tooltip, Typography } from "antd";
+import { Space, Table, Tag, Tooltip, Typography } from "antd";
 import dayjs from "dayjs";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -54,7 +54,7 @@ export default function ReleaseHistoryPage() {
 			render: (value: number, row: ReleaseRow) => (
 				<Space size={4}>
 					<span>{formatSecs(value)}</span>
-					{row.published_at_source === "index" && <Tag color="default">{t("publish:history.indexTime")}</Tag>}
+					{row.published_at_source === "file" && <Tag color="default">{t("publish:history.backfillTime")}</Tag>}
 				</Space>
 			),
 		},
@@ -78,15 +78,6 @@ export default function ReleaseHistoryPage() {
 				<Typography.Text type="secondary">{t("publish:history.subtitle")}</Typography.Text>
 			</Space>
 
-			{query.data?.syncError != null && (
-				<Alert
-					type="warning"
-					showIcon
-					message={t("publish:history.syncFailed")}
-					description={query.data.syncError}
-				/>
-			)}
-
 			<Table<ReleaseRow>
 				rowKey="id"
 				size="middle"

package/templates/src/oj-market/web/routes.ts

@@ -0,0 +1,12 @@
+import type { ModuleContext } from "@oj-module/runtime";
+
+import { createOjMarketClient } from "./__client";
+
+/**
+ * 市场编排面（/api/oj-market/*）client 接线：entry 的 onInit 里一行创建——
+ * 登记契约前缀 /oj-market + 绑定 scoped request。页面/子应用经 web/api/client.ts
+ * 的领域接口消费（内部委托本 __client 的静态函数）。
+ */
+export function onInit(ctx: ModuleContext): void {
+	createOjMarketClient(ctx);
+}

package/templates/src/oj-market/web/types.ts

@@ -52,7 +52,7 @@ export interface TaskRecord {
 	appliedSeq?: number
 }
 
-/** 卡片数据源行（GET /_platform/market/index）：CDN 三级索引（catalog + shards）⊕ 本地 sidecar state */
+/** 卡片数据源行（GET /oj-market/index）：DB 目录聚合 ⊕ 本地 sidecar state（v4 §四） */
 export interface IndexRow {
 	name: string
 	latest: string | null
@@ -69,14 +69,14 @@ export interface IndexRow {
 	description?: string | null
 }
 
-/** 安装输入（POST /_platform/market/install） */
+/** 安装输入（POST /oj-market/install） */
 export interface InstallInput {
 	name: string
 	version?: string | null
 	source?: "cdn" | "file"
 }
 
-/** 启用/停用输入（POST /_platform/market/enable） */
+/** 启用/停用输入（POST /oj-market/enable） */
 export interface EnableInput {
 	name: string
 	enabled: boolean
@@ -104,7 +104,7 @@ export interface UninstallImpact {
 	affectedUsers: number
 }
 
-/** 发布历史一行（`market_release`；来源是签名索引，追加式记录） */
+/** 发布历史一行（`market_release` 上传写入行；v4 §四 DB 目录化后索引 syncReleases 退役） */
 export interface ReleaseRow {
 	id: number
 	product: string
@@ -113,8 +113,8 @@ export interface ReleaseRow {
 	sha256: string | null
 	size: number | null
 	published_at: number
-	/** file = 分发包 Last-Modified；index = 索引生成时间兜底 */
-	published_at_source: "file" | "index"
+	/** file = 回填扫描读 tgz mtime；upload = 上传端点接收时刻（DB 目录化后唯一真源口径） */
+	published_at_source: "file" | "upload"
 	yanked: number
 }
 
@@ -124,6 +124,12 @@ export interface ReleasePage {
 	total: number
 	page: number
 	size: number
-	/** 本次同步索引失败的人话（页面照常显示已入库历史） */
-	syncError: string | null
+}
+
+/** 卡片索引分页结果（v4 §四：indexBody 改 DB 目录分页数据源，展示字段不变） */
+export interface IndexPage {
+	list: IndexRow[]
+	total: number
+	page: number
+	size: number
 }

package/templates/tests/lifecycle/anonymous-wiring.spec.ts

@@ -0,0 +1,65 @@
+// BDD：市场匿名面接线（计划 v4 §五——签名推送不经账号口令，企微用户无障碍）。
+// auth.anonymous_paths 与 tenant.anonymous_paths 双列（去 base 前缀形态）：
+//   /oj-market/catalog/**  目录匿名读（站点身份发现面 + CLI 2×2 矩阵探测：旧站点 404 → 人话）
+//   /oj-market/cdn/upload  签名推送端点（X-OJM-Key-Id/X-OJM-Signature 即凭证，不经 Bearer）
+//   /oj-market/yank        签名下线端点（全分支终审 C1：不经匿名列表则 oj-auth 守卫在
+//                          handler 前硬 401——文档承诺的签名制 yank 永远无法到达处理器）
+// 匹配语义（oj-auth v0.1.20，../oj-bin 只读核实）：字面精确；`*` 恰一段；`**` 跨段（≥0 段）——
+// `/oj-market/catalog/**` 同条覆盖 catalog 与 catalog/detail。
+// 生效口径：config.yaml 是启动冻结段，改后须重启（restart_pending），发版说明提醒。
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import { parse } from "yaml";
+
+const TEMPLATES = join(dirname(fileURLToPath(import.meta.url)), "../..");
+const REQUIRED = ["/oj-market/catalog/**", "/oj-market/cdn/upload", "/oj-market/yank"];
+
+function section(config: Record<string, unknown>, key: "auth" | "tenant"): string[] {
+	const anon = (config[key] as Record<string, unknown>)?.anonymous_paths;
+	return Array.isArray(anon) ? anon.filter((p): p is string => typeof p === "string") : [];
+}
+
+describe("场景：匿名接线（templates config.yaml 双列齐了市场匿名面）", () => {
+	const config = parse(readFileSync(join(TEMPLATES, "config.yaml"), "utf-8")) as Record<string, unknown>;
+
+	it("当 未登录访问目录/上传，则 auth.anonymous_paths 放行 catalog 两条 GET 与 upload", () => {
+		const anon = section(config, "auth");
+		for (const p of REQUIRED)
+			expect(anon, `auth.anonymous_paths 缺 ${p}`).toContain(p);
+	});
+
+	it("当 CLI 裸 fetch 不带租户头推送，则 tenant.anonymous_paths 同列（缺头不 400）", () => {
+		const anon = section(config, "tenant");
+		for (const p of REQUIRED)
+			expect(anon, `tenant.anonymous_paths 缺 ${p}`).toContain(p);
+	});
+
+	it("数据表 通配语义：catalog/** 覆盖 catalog 与 catalog/detail 两级（`**` 跨段 ≥0 段）", () => {
+		// oj-auth v0.1.20 segments_match：`/` 分段后 `**` 匹配任意剩余段（含零段）。
+		// 此处按同语义做分段模拟，钉死「一条覆盖两条 GET」的写法不因收紧而静默漏 detail。
+		const match = (pattern: string, path: string): boolean => {
+			const seg = (s: string) => s.split("/").filter(Boolean);
+			const pat = seg(pattern);
+			const p = seg(path);
+			const rec = (i: number, j: number): boolean => {
+				if (i === pat.length)
+					return j === p.length;
+				if (pat[i] === "**") {
+					for (let k = j; k <= p.length; k++) {
+						if (rec(i + 1, k))
+							return true;
+					}
+					return false;
+				}
+				return j < p.length && (pat[i] === "*" || pat[i] === p[j]) && rec(i + 1, j + 1);
+			};
+			return rec(0, 0);
+		};
+		const pat = REQUIRED[0]!;
+		expect(match(pat, "/oj-market/catalog")).toBe(true);
+		expect(match(pat, "/oj-market/catalog/detail")).toBe(true);
+		expect(match(pat, "/oj-market/index")).toBe(false);
+	});
+});