@oj-module/cli 0.2.66 → 0.2.67

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

@@ -0,0 +1,112 @@
+import type { ReleaseRow } from "../../types";
+import { useQuery } from "@tanstack/react-query";
+import { Alert, Space, Table, Tag, Tooltip, Typography } from "antd";
+import dayjs from "dayjs";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useMarketClient } from "../../api/context";
+
+const DEFAULT_PAGE_SIZE = 20;
+const PAGE_SIZE_OPTIONS = [20, 50, 100];
+
+/** 秒级 epoch（服务端统一存秒）→ 本地时间；缺值显示 - */
+function formatSecs(secs: number | null | undefined): string {
+	return secs == null ? "-" : dayjs.unix(secs).format("YYYY-MM-DD HH:mm");
+}
+
+/**
+ * 发布历史页。
+ *
+ * 数据真相在服务端：每次打开都由后端先与签名索引对账（新版本补进来，已入库行不改时间），
+ * 前端只做分页展示——不在浏览器里重算「谁先谁后」，避免两处排序口径分叉。
+ *
+ * 发布时间优先取分发包落 CDN 的 Last-Modified；源不提供时回落索引生成时间，
+ * 这种情况标一个「索引时间」，让读者知道它不是精确落包时刻。
+ */
+export default function ReleaseHistoryPage() {
+	const { t } = useTranslation();
+	const client = useMarketClient();
+	const [page, setPage] = useState(1);
+	const [size, setSize] = useState(DEFAULT_PAGE_SIZE);
+
+	const query = useQuery({
+		queryKey: ["market", "releases", page, size],
+		queryFn: () => client.releases({ page, limit: size }),
+	});
+
+	const rows = query.data?.list ?? [];
+
+	const columns = [
+		{ title: t("publish:history.columns.product"), dataIndex: "product" },
+		{ title: t("publish:history.columns.version"), dataIndex: "version" },
+		{
+			title: t("publish:history.columns.publisher"),
+			dataIndex: "key_id",
+			render: (value: string | null) => value ?? "-",
+		},
+		{
+			title: (
+				<Tooltip title={t("publish:history.publishedAtHint")}>
+					<span>{t("publish:history.columns.publishedAt")}</span>
+				</Tooltip>
+			),
+			dataIndex: "published_at",
+			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>}
+				</Space>
+			),
+		},
+		{
+			title: t("publish:history.columns.status"),
+			dataIndex: "yanked",
+			render: (value: number) => (
+				<Tag color={value === 1 ? "default" : "green"}>
+					{value === 1 ? t("publish:history.status.yanked") : t("publish:history.status.active")}
+				</Tag>
+			),
+		},
+	];
+
+	return (
+		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }} size="middle">
+			<Space direction="vertical" size={4}>
+				<Typography.Title level={4} style={{ margin: 0 }}>
+					{t("publish:history.title")}
+				</Typography.Title>
+				<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"
+				columns={columns}
+				dataSource={rows}
+				loading={query.isLoading}
+				locale={{ emptyText: t("publish:history.empty") }}
+				pagination={{
+					current: page,
+					pageSize: size,
+					total: query.data?.total ?? 0,
+					showSizeChanger: true,
+					pageSizeOptions: PAGE_SIZE_OPTIONS,
+					showTotal: total => t("publish:history.total", { total }),
+					onChange: (nextPage, nextSize) => {
+						setPage(nextPage);
+						setSize(nextSize);
+					},
+				}}
+			/>
+		</Space>
+	);
+}

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

@@ -0,0 +1,196 @@
+import type { PublishCredentialGetData } from "../__client";
+import type { CredentialStatus } from "./model";
+import type { IssuedCredential } from "./token-modal";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { App, Button, Form, Input, Modal, Popconfirm, Space, Table, Tag, Tooltip, Typography } from "antd";
+
+import dayjs from "dayjs";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { publishCredentialGet, publishCredentialPost, publishCredentialRevokePost } from "../__client";
+import { canRevoke, errorText, statusColor } from "./model";
+import { TokenModal } from "./token-modal";
+
+type CredentialRow = PublishCredentialGetData["list"][number];
+
+const DEFAULT_PAGE_SIZE = 20;
+const PAGE_SIZE_OPTIONS = [20, 50, 100];
+
+/** 秒级 epoch（后端统一存秒，不是毫秒——故用 dayjs.unix 而非 dayjs()） */
+function formatSecs(secs: number | null | undefined): string {
+	return secs == null ? "-" : dayjs.unix(secs).format("YYYY-MM-DD HH:mm");
+}
+
+/**
+ * 发布管理页。
+ *
+ * 页面的职责只有三件事：列凭证、申请、撤销。所有推导都留在服务端
+ * （`key_id` 在申请时算好、`status` 由 used/revoked/expiry 三列统一判定），
+ * 前端不重复算——否则「页面显示已过期、后端仍可兑换」这类分叉迟早出现。
+ *
+ * 可见范围同样由服务端决定：普通用户只拿到自己的；超管拿到全部，响应里多一个
+ * `owner_tenant` 字段。前端据「数据里有没有这个字段」决定是否显示租户列与租户筛选，
+ * 不去单独查一次「我是谁」——少一个请求，也少一处会过期的判断。
+ */
+export default function PublishPage() {
+	const { t } = useTranslation();
+	const { message } = App.useApp();
+	const queryClient = useQueryClient();
+	const [page, setPage] = useState(1);
+	const [size, setSize] = useState(DEFAULT_PAGE_SIZE);
+	const [tenant, setTenant] = useState("");
+	const [tenantInput, setTenantInput] = useState("");
+	const [applyOpen, setApplyOpen] = useState(false);
+	const [issued, setIssued] = useState<IssuedCredential | null>(null);
+	const [form] = Form.useForm<{ product: string }>();
+
+	const query = useQuery({
+		queryKey: ["publish", "credential", page, size, tenant],
+		queryFn: () => publishCredentialGet({ page, limit: size, tenant: tenant || undefined }),
+	});
+
+	const apply = useMutation({
+		mutationFn: (product: string) => publishCredentialPost({ product }),
+		onSuccess: (r) => {
+			setApplyOpen(false);
+			form.resetFields();
+			// 明文只在响应里：先落进弹窗，再刷新列表（刷新失败也不该丢掉用户手里这张凭证）
+			setIssued(r);
+			void queryClient.invalidateQueries({ queryKey: ["publish", "credential"] });
+		},
+		onError: e => message.error(errorText(e)),
+	});
+
+	const revoke = useMutation({
+		mutationFn: (id: number) => publishCredentialRevokePost({ id }),
+		onSuccess: () => {
+			message.success(t("publish:revoke.done"));
+			void queryClient.invalidateQueries({ queryKey: ["publish", "credential"] });
+		},
+		onError: e => message.error(errorText(e)),
+	});
+
+	const rows = query.data?.list ?? [];
+	// 超管专属字段出现即说明当前账号看得见全部租户；已在筛选时也保持入口可见（否则无法清空筛选）
+	const seesTenants = tenant !== "" || rows.some(row => row.owner_tenant != null);
+
+	const columns = [
+		{ title: t("publish:columns.product"), dataIndex: "product" },
+		{
+			title: t("publish:columns.keyId"),
+			dataIndex: "key_id",
+			ellipsis: { showTitle: false },
+			render: (keyId: string) => <Tooltip title={keyId}>{keyId}</Tooltip>,
+		},
+		{
+			title: t("publish:columns.applicant"),
+			dataIndex: "username",
+			render: (username: string, row: CredentialRow) => (row.display_name ? `${row.display_name}（${username}）` : username),
+		},
+		{
+			title: t("publish:columns.tokenHint"),
+			dataIndex: "token_hint",
+			render: (hint: string) => (
+				<Typography.Text code>
+					{hint}
+					…
+				</Typography.Text>
+			),
+		},
+		{
+			title: t("publish:columns.status"),
+			dataIndex: "status",
+			render: (status: CredentialStatus) => <Tag color={statusColor(status)}>{t(`publish:status.${status}`)}</Tag>,
+		},
+		{ title: t("publish:columns.createdAt"), dataIndex: "created_at", render: (v: number) => formatSecs(v) },
+		{ title: t("publish:columns.usedAt"), dataIndex: "used_at", render: (v: number | null) => formatSecs(v) },
+		{ title: t("publish:columns.expiresAt"), dataIndex: "expires_at", render: (v: number) => formatSecs(v) },
+		...(seesTenants ? [{ title: t("publish:columns.tenant"), dataIndex: "owner_tenant" }] : []),
+		{
+			title: t("publish:columns.actions"),
+			dataIndex: "id",
+			render: (_: number, row: CredentialRow) => (canRevoke(row.status)
+				? (
+					<Popconfirm title={t("publish:revoke.confirm")} okText={t("publish:revoke.ok")} onConfirm={() => revoke.mutate(row.id)}>
+						<Button type="link" danger size="small" loading={revoke.isPending}>{t("publish:revoke.action")}</Button>
+					</Popconfirm>
+				)
+				: <Typography.Text type="secondary">-</Typography.Text>),
+		},
+	];
+
+	return (
+		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
+			<Space style={{ width: "100%", justifyContent: "space-between" }} wrap>
+				<Typography.Text type="secondary">{t("publish:page.subtitle")}</Typography.Text>
+				<Space>
+					{seesTenants && (
+						<Input.Search
+							data-testid="publish-tenant-filter"
+							allowClear
+							placeholder={t("publish:filter.tenantPlaceholder")}
+							value={tenantInput}
+							onChange={e => setTenantInput(e.target.value)}
+							onSearch={(value) => {
+								setTenant(value.trim());
+								setPage(1);
+							}}
+							style={{ width: 240 }}
+						/>
+					)}
+					<Button type="primary" data-testid="publish-apply" onClick={() => setApplyOpen(true)}>{t("publish:page.apply")}</Button>
+				</Space>
+			</Space>
+			<Table
+				rowKey="id"
+				loading={query.isLoading}
+				dataSource={rows}
+				columns={columns}
+				locale={{ emptyText: t("publish:page.empty") }}
+				pagination={{
+					current: page,
+					pageSize: size,
+					total: query.data?.total ?? 0,
+					showSizeChanger: true,
+					pageSizeOptions: PAGE_SIZE_OPTIONS,
+					showTotal: total => t("publish:page.total", { total }),
+					onChange: (nextPage, nextSize) => {
+						// 改每页条数后原页码可能越界：统一回第 1 页（与操作日志页同口径）
+						if (nextSize !== size) {
+							setSize(nextSize);
+							setPage(1);
+							return;
+						}
+						setPage(nextPage);
+					},
+				}}
+			/>
+
+			<Modal
+				open={applyOpen}
+				title={t("publish:apply.title")}
+				confirmLoading={apply.isPending}
+				okText={t("publish:apply.ok")}
+				cancelText={t("publish:apply.cancel")}
+				onCancel={() => setApplyOpen(false)}
+				onOk={() => form.submit()}
+			>
+				<Form form={form} layout="vertical" onFinish={v => apply.mutate(v.product)}>
+					<Form.Item
+						name="product"
+						label={t("publish:apply.product")}
+						extra={t("publish:apply.productExtra")}
+						rules={[{ required: true, message: t("publish:apply.productRequired") }]}
+					>
+						<Input data-testid="publish-product" placeholder="demo-solution" autoFocus />
+					</Form.Item>
+				</Form>
+			</Modal>
+
+			<TokenModal
+				issued={issued}
+				onClose={() => setIssued(null)}
+			/>
+		</Space>
+	);
+}

package/templates/src/oj-market/web/publish/pages/model.ts

@@ -0,0 +1,52 @@
+// 「发布管理」页的纯逻辑（无 React、无 IO）——状态颜色、可撤销判定、给用户的命令行。
+// 抽出来的唯一理由：这三件事是页面里最该被钉死的口径，且都必须能脱离 antd 断言。
+
+export type CredentialStatus = "active" | "used" | "revoked" | "expired";
+
+/** 状态 → antd Tag 颜色。Record 全量约束：新增状态时这里编译期就缺键。 */
+const STATUS_COLOR: Record<CredentialStatus, string> = {
+	active: "processing",
+	used: "success",
+	revoked: "default",
+	expired: "warning",
+};
+
+export function statusColor(status: CredentialStatus): string {
+	return STATUS_COLOR[status];
+}
+
+/**
+ * 能否撤销：只有「待兑换」可以。
+ *
+ * 兑换只下发 key_id，公钥是发布方本机生成的——站点手里没有那把钥匙，也就没有「撤回」可言；
+ * 撤回一条已兑换的凭证只会制造「以为撤了其实没撤」的错觉（后端的 400 文案就是这个意思，
+ * 真要停用只能到宿主信任库移除对应公钥）。按钮仍要渲染（禁用态），不用隐藏：
+ * 隐藏会让用户以为页面没做完。
+ */
+export function canRevoke(status: string): boolean {
+	return status === "active";
+}
+
+/**
+ * 复制给用户的一行命令。
+ *
+ * 只带凭证，不带 `--site`：站点地址由 CLI 从本机配置或上次发布记录里取，
+ * 页面拼一个 origin 反而在反代/多域名部署下更容易错。
+ */
+export function buildKeygenCommand(token: string): string {
+	return `ojm keygen --credential ${token}`;
+}
+
+/**
+ * 统一信封错误 → 人话。后端 fail(status, message) 的文案本身就是给用户看的，
+ * 故优先取 `msg`（ContractApiError），其次 Error.message。
+ *
+ * 与 system/pages/errors.ts 的 errMsg 同构但不互相 import：那是系统管理根内部模块，
+ * 让「发布管理」依赖它会把两个根的加载顺序绑在一起（多根聚合下互不依赖是硬约定）。
+ */
+export function errorText(e: unknown): string {
+	const msg = (e as { msg?: unknown } | null)?.msg;
+	if (typeof msg === "string" && msg !== "")
+		return msg;
+	return e instanceof Error ? e.message : String(e);
+}

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

@@ -0,0 +1,82 @@
+import { Alert, Button, Input, Modal, Space, Typography } from "antd";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { buildKeygenCommand } from "./model";
+
+/** 申请成功的返回值：明文只在这一刻存在 */
+export interface IssuedCredential {
+	token: string
+	key_id: string
+	product: string
+	token_hint?: string
+	expires_at: number
+}
+
+/** 复制到剪贴板：非 https / 无权限时静默失败（输入框里的文本本来就能手动选中） */
+async function copy(text: string): Promise<void> {
+	try {
+		await navigator.clipboard.writeText(text);
+	}
+	catch {
+		// 不打断流程：用户可直接在只读输入框里选中复制
+	}
+}
+
+/**
+ * 一次性明文弹窗。
+ *
+ * 三条不可退让的约束：
+ *   · 不渲染 = 没有。`issued` 为 null 时整个 Modal 不挂载，关闭后 DOM 里不再有明文
+ *     （服务端只存 sha256，关掉就真的找不回来——所以文案必须先说清楚）。
+ *   · 不可点遮罩/ESC 关闭：误触的代价是重新申请一张凭证。
+ *   · 凭证与命令都是只读输入框 + 复制按钮：64 位 hex 手抄必错。
+ */
+export function TokenModal({ issued, onClose }: { issued: IssuedCredential | null, onClose: () => void }) {
+	const { t } = useTranslation();
+	const [copied, setCopied] = useState<string | null>(null);
+	if (!issued)
+		return null;
+	const command = buildKeygenCommand(issued.token);
+	const copyRow = (testId: string, value: string) => (
+		<Space.Compact style={{ width: "100%", marginBottom: 16 }}>
+			<Input readOnly value={value} data-testid={testId} />
+			<Button
+				onClick={() => {
+					void copy(value);
+					setCopied(testId);
+				}}
+			>
+				{copied === testId ? t("publish:issued.copied") : t("publish:issued.copy")}
+			</Button>
+		</Space.Compact>
+	);
+
+	return (
+		<Modal
+			open
+			closable={false}
+			maskClosable={false}
+			keyboard={false}
+			title={t("publish:issued.title")}
+			footer={<Button type="primary" onClick={onClose}>{t("publish:issued.done")}</Button>}
+		>
+			<div data-testid="publish-issued">
+				<Alert type="warning" showIcon message={t("publish:issued.warning")} style={{ marginBottom: 16 }} />
+				<Typography.Paragraph>
+					<Typography.Text type="secondary">{t("publish:issued.identity")}</Typography.Text>
+					<br />
+					<Typography.Text copyable={{ text: issued.key_id }} code>{issued.key_id}</Typography.Text>
+				</Typography.Paragraph>
+				<Typography.Paragraph style={{ marginBottom: 4 }}>
+					<Typography.Text type="secondary">{t("publish:issued.token")}</Typography.Text>
+				</Typography.Paragraph>
+				{copyRow("publish-token", issued.token)}
+				<Typography.Paragraph style={{ marginBottom: 4 }}>
+					<Typography.Text type="secondary">{t("publish:issued.command")}</Typography.Text>
+				</Typography.Paragraph>
+				{copyRow("publish-command", command)}
+			</div>
+		</Modal>
+	);
+}

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

@@ -0,0 +1,41 @@
+import type { AppRouteRecordRaw, ModuleContext } from "@oj-module/runtime";
+
+import { HistoryOutlined, KeyOutlined } from "@ant-design/icons";
+
+import { createElement, lazy } from "react";
+
+import { createPublishClient } from "./__client";
+
+const PublishPage = lazy(() => import("./pages"));
+const ReleaseHistoryPage = lazy(() => import("./pages/history"));
+
+/**
+ * 「方案市场」下的两个子页（单模单根：菜单只有 `/oj-market` 一个根）。
+ *
+ * 路径是**相对父路由**声明的：`publish` → `/oj-market/publish`，`history` → `/oj-market/history`。
+ * 发布管理不挂 handle.roles：申请发布凭证是普通登录用户的能力，超管多出来的只是
+ * 「看到所有租户的凭证」，由后端按角色决定返回范围，前端不重复判权。
+ */
+export const routes: AppRouteRecordRaw[] = [
+	{
+		path: "publish",
+		Component: PublishPage,
+		handle: {
+			title: "publish:menu.publish",
+			icon: createElement(KeyOutlined),
+		},
+	},
+	{
+		path: "history",
+		Component: ReleaseHistoryPage,
+		handle: {
+			title: "publish:menu.history",
+			icon: createElement(HistoryOutlined),
+		},
+	},
+];
+
+/** 构造即接线：登记契约前缀 /publish + 绑定 scoped request，页面直接 import 的函数才有通道 */
+export function onInit(ctx: ModuleContext): void {
+	createPublishClient(ctx);
+}

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

@@ -61,6 +61,12 @@ export interface IndexRow {
 	upgradable: boolean
 	/** 最新版许可（SPDX 简化式，来自分片条目的 manifest.license；未声明 → null） */
 	license?: string | null
+	/** 发布者（分片条目 archive.signature.key_id，经验签的签名身份；与后端 trust_state/key_id 同用 snake_case） */
+	publisher_key?: string | null
+	/** 方案简介（manifest.summary，C2-04 单行 1..200；索引未带该字段 → undefined/null） */
+	summary?: string | null
+	/** 方案详细描述（manifest.description，C2-05 ≤2000；索引未带该字段 → undefined/null） */
+	description?: string | null
 }
 
 /** 安装输入（POST /_platform/market/install） */
@@ -97,3 +103,27 @@ export interface UninstallImpact {
 	affectedRoles: number
 	affectedUsers: number
 }
+
+/** 发布历史一行（`market_release`；来源是签名索引，追加式记录） */
+export interface ReleaseRow {
+	id: number
+	product: string
+	version: string
+	key_id: string | null
+	sha256: string | null
+	size: number | null
+	published_at: number
+	/** file = 分发包 Last-Modified；index = 索引生成时间兜底 */
+	published_at_source: "file" | "index"
+	yanked: number
+}
+
+/** 发布历史分页结果 */
+export interface ReleasePage {
+	list: ReleaseRow[]
+	total: number
+	page: number
+	size: number
+	/** 本次同步索引失败的人话（页面照常显示已入库历史） */
+	syncError: string | null
+}