Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d923b8cea9 | ||
|
|
a1b29cedee | ||
|
|
34504c0b44 | ||
|
|
3af5611da5 | ||
|
|
2fe108d66a | ||
|
|
4cd3749806 | ||
|
|
00aeaa3cb1 | ||
|
|
b190f2758a | ||
|
|
4d9c84defc | ||
|
|
b4e3e86dcd | ||
|
|
5051839986 | ||
|
|
84522a8908 | ||
|
|
18bcdbeb00 | ||
|
|
040504774d | ||
|
|
1001c43af6 | ||
|
|
121148f6cf | ||
|
|
a08a2f0f98 | ||
|
|
669d4a7de6 |
No files matched your search
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"scope": "模板完成证据登记,保留命令、日志与产物哈希",
|
||||
"generatedAt": "2026-10-21T06:14:04.698Z",
|
||||
"generatedAt": "2026-10-23T06:35:59.337Z",
|
||||
"templates": {
|
||||
"acheng-campus-food": {
|
||||
"real-manifest-interaction": {
|
||||
@@ -256,5 +256,5 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"sourceTreeHash": "e25ff96a374cec651bc82f2b142f662039831c34104005579fec55d921c9f7f7"
|
||||
"sourceTreeHash": "f39e31a1959e24c07bf60776a0d3c5f28e5745962ca004301ff304daa1430041"
|
||||
}
|
||||
@@ -9,6 +9,8 @@ API_PREFIX=
|
||||
CORS_ORIGINS=http://localhost:3000
|
||||
ADMIN_PORT=3000
|
||||
SESSION_SECRET=replace-with-a-long-random-value
|
||||
# 单实例使用 memory;多实例部署改用 postgres 并先执行数据库迁移
|
||||
CLIENT_ERROR_THROTTLE_STORE=memory
|
||||
DEFAULT_BRAND_ID=00000000-0000-0000-0000-000000000001
|
||||
TEMPLATE_ARTIFACT_ROOT=/var/lib/personal-brand/template-artifacts
|
||||
SEED_ADMIN_PASSWORD=change-me-now-123
|
||||
|
||||
@@ -6,6 +6,8 @@ POSTGRES_PORT=5432
|
||||
|
||||
DATABASE_URL=postgresql://personal_brand:replace-with-a-long-database-password@127.0.0.1:5432/personal_brand?schema=public
|
||||
SESSION_SECRET=replace-with-at-least-32-random-characters
|
||||
# 单实例使用 memory;多实例部署改用 postgres 并先执行数据库迁移
|
||||
CLIENT_ERROR_THROTTLE_STORE=memory
|
||||
DEFAULT_BRAND_ID=00000000-0000-0000-0000-000000000001
|
||||
SEED_ADMIN_PASSWORD=replace-with-a-one-time-initial-password
|
||||
SEED_MODE=skip
|
||||
|
||||
@@ -3,7 +3,13 @@ name: CI
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
# 纯文档提交不消耗 2 核 runner;需要状态时用 workflow_dispatch 手动触发。
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
# PR 不设置 paths-ignore:branch protection 的 required checks 必须始终上报,
|
||||
# 否则纯文档 PR 会永远等不到状态检查而无法合并。
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
@@ -55,6 +61,33 @@ jobs:
|
||||
- run: pnpm build:admin:preview
|
||||
- run: pnpm validate:template-release
|
||||
|
||||
browser-smoke:
|
||||
name: Browser smoke
|
||||
# 只在 PR 和手动触发时运行,避免 main 合并后重复消耗共享生产 runner。
|
||||
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
needs: [static]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: ${{ env.PNPM_VERSION }}
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- name: Cache Playwright browsers
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/ms-playwright
|
||||
key: playwright-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
- name: Install Chromium
|
||||
run: pnpm --filter @personal-brand/taro exec playwright install --with-deps chromium
|
||||
- name: Run PR browser smoke
|
||||
run: pnpm test:browser:smoke
|
||||
|
||||
api:
|
||||
name: API integration
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
# 提交前让模板完成证据的源码哈希跟随当前工作树,避免额外的 chore 提交。
|
||||
set -e
|
||||
[ -f scripts/template-evidence-refresh.mjs ] || exit 0
|
||||
command -v node >/dev/null 2>&1 || exit 0
|
||||
node scripts/template-evidence-refresh.mjs --stage
|
||||
@@ -24,6 +24,9 @@ media/
|
||||
|
||||
**/.swc/
|
||||
.codex-tasks/
|
||||
!.codex-tasks/template-audit-execution/
|
||||
!.codex-tasks/template-audit-execution/raw/
|
||||
!.codex-tasks/template-audit-execution/raw/completion-evidence.json
|
||||
docker-compose.override.yml
|
||||
.env.production
|
||||
|
||||
|
||||
@@ -28,8 +28,9 @@ export function InquiryPreviewEditor({
|
||||
const record = query.data?.find((item) => item.id === runtime.key);
|
||||
const field = runtime.fields.find((item) => item.key === fieldKey);
|
||||
useEffect(() => {
|
||||
if (field) form.setFieldsValue({ ...field });
|
||||
}, [fieldKey, runtime.key, form]);
|
||||
if (!record || !field) return;
|
||||
form.setFieldsValue({ ...field });
|
||||
}, [field, fieldKey, form, record, runtime.key]);
|
||||
const update = (values: Record<string, unknown>) =>
|
||||
runtime.fields.map((item) => (item.key === fieldKey ? { ...item, ...values } : item));
|
||||
const save = useMutation({
|
||||
|
||||
@@ -1,34 +1,15 @@
|
||||
import { Alert, Button, Grid, Select, Segmented, Space, Typography } from "antd";
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import type { AdminTemplateContent, RuntimeWorkspace } from "@personal-brand/api-client";
|
||||
import type { BrandProfile } from "@personal-brand/api-client";
|
||||
import { Alert, Grid, Segmented, Select, Space } from "antd";
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
BrandProfile,
|
||||
RuntimeWorkspace,
|
||||
} from "@personal-brand/api-client";
|
||||
import { StatusTag } from "../../components/StatusTag.js";
|
||||
import { RecordContentEditor } from "../../components/RecordContentEditor.js";
|
||||
import { TemplatePreview } from "./TemplatePreview.js";
|
||||
import { InquiryPreviewEditor } from "./InquiryPreviewEditor.js";
|
||||
import {
|
||||
resolvePreviewSelection,
|
||||
previewTrustRecordId,
|
||||
type PreviewSelection,
|
||||
type PreviewTarget,
|
||||
} from "./preview-selection.js";
|
||||
import { filterSectionsForPreviewTarget } from "../../lib/presentation/presentation-bindings.js";
|
||||
import "./PresentationEditor.css";
|
||||
import { useEditorDraft } from "./use-editor-draft.js";
|
||||
import {
|
||||
usePresentationRecordQueries,
|
||||
useBrandPresentationSections,
|
||||
useBrandSaveMutation,
|
||||
useBrandPresentationForm,
|
||||
useBrandPreviewDraft,
|
||||
} from "./presentation-editor-state.js";
|
||||
import { useRecordPreview } from "./presentation-editor-record-preview.js";
|
||||
import type { RecordDraft } from "./presentation-editor-record-preview.js";
|
||||
import { pageTitle, previewTargetSource, trustSection } from "./presentation-editor-helpers.js";
|
||||
import { useDraftWorkspace } from "./use-draft-workspace.js";
|
||||
import { PresentationFormPanel } from "./PresentationFormPanel.js";
|
||||
import type { PreviewSelection } from "./preview-selection.js";
|
||||
import { usePresentationEditorController } from "./presentation-editor-controller.js";
|
||||
import { PresentationEditorInspector } from "./PresentationEditorInspector.js";
|
||||
import { PresentationEditorPreview } from "./PresentationEditorPreview.js";
|
||||
|
||||
interface PresentationEditorProps {
|
||||
templateContent: AdminTemplateContent | null | undefined;
|
||||
@@ -49,254 +30,14 @@ export function PresentationEditor({
|
||||
error,
|
||||
initialSelection,
|
||||
}: PresentationEditorProps) {
|
||||
const queryClient = useQueryClient();
|
||||
const navigate = useNavigate();
|
||||
const breakpoints = Grid.useBreakpoint();
|
||||
const [activePage, setActivePage] = useState<string>();
|
||||
const [selection, setSelection] = useState<PreviewSelection | undefined>(initialSelection);
|
||||
const [hasInitializedSelection, setHasInitializedSelection] = useState(Boolean(initialSelection));
|
||||
const [detailOfferingId, setDetailOfferingId] = useState<string>();
|
||||
const [recordDraft, setRecordDraft] = useState<RecordDraft>();
|
||||
const [inquiryDraft, setInquiryDraft] =
|
||||
useState<RuntimeWorkspace["inquiryForms"][number]["fields"]>();
|
||||
const [brandDirty, setBrandDirty] = useState(false);
|
||||
const guardDraft = useEditorDraft(brandDirty || !!recordDraft || !!inquiryDraft);
|
||||
const inquiryRuntime = previewWorkspace?.inquiryForms.find((item) => item.target === "brand");
|
||||
const sections = useBrandPresentationSections(templateContent);
|
||||
const pageOptions = useMemo(() => {
|
||||
const pages = new Map<string, string>();
|
||||
for (const item of templateContent?.navigation ?? []) pages.set(item.page, item.label);
|
||||
for (const section of templateContent?.admin.sections ?? []) {
|
||||
const navigation = templateContent?.navigation.find((item) => item.page === section.page);
|
||||
if (!pages.has(section.page))
|
||||
pages.set(section.page, navigation?.label ?? pageTitle(section.page));
|
||||
}
|
||||
return [...pages].map(([value, label]) => ({ value, label }));
|
||||
}, [templateContent]);
|
||||
const selectedPage = pageOptions.some((item) => item.value === activePage)
|
||||
? activePage
|
||||
: pageOptions[0]?.value;
|
||||
const visibleSections = sections.filter((section) => section.page === selectedPage);
|
||||
const recordSections = useMemo(
|
||||
() =>
|
||||
(templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => trustSection(item, selectedPage ?? "home")),
|
||||
[templateContent, selectedPage],
|
||||
);
|
||||
const visibleTargets = useMemo<PreviewTarget[]>(
|
||||
() =>
|
||||
[...(templateContent?.admin.sections ?? []), ...recordSections]
|
||||
.filter(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
(selectedPage !== "detail" || section.target === "brand"),
|
||||
)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: previewTargetSource(section, target.key),
|
||||
...(section.key.startsWith("trust:") ? { trustType: section.key.slice(6) } : {}),
|
||||
})),
|
||||
)
|
||||
.concat(
|
||||
selectedPage === "inquiry" && inquiryRuntime
|
||||
? inquiryRuntime.fields.map((field) => ({
|
||||
key: `inquiry-field:${field.key}`,
|
||||
label: field.label,
|
||||
page: "inquiry",
|
||||
source: "inquiry" as const,
|
||||
}))
|
||||
: [],
|
||||
),
|
||||
[templateContent, selectedPage, recordSections, inquiryRuntime],
|
||||
);
|
||||
const activeTarget = selection?.targetKey;
|
||||
const selectedTarget = visibleTargets.find((target) => target.key === activeTarget);
|
||||
const selectedSection = [...(templateContent?.admin.sections ?? []), ...recordSections].find(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
section.previewTargets?.some((target) => target.key === selectedTarget?.key),
|
||||
);
|
||||
const selectedRecordSource =
|
||||
selectedTarget?.source === "offering" || selectedTarget?.source === "trust"
|
||||
? selectedTarget.source
|
||||
: undefined;
|
||||
const { offeringsQuery, trustQuery, selectedRecord } = usePresentationRecordQueries(
|
||||
selectedRecordSource,
|
||||
selection?.recordId,
|
||||
);
|
||||
const editableSections = filterSectionsForPreviewTarget(
|
||||
visibleSections.filter((section) =>
|
||||
section.fields.some((field) => field.binding.startsWith("brand.")),
|
||||
),
|
||||
selectedTarget?.key,
|
||||
);
|
||||
const recordSection = useMemo(
|
||||
() =>
|
||||
selectedSection && selection?.targetKey
|
||||
? {
|
||||
...selectedSection,
|
||||
fields: selectedSection.fields.filter(
|
||||
(field) => field.previewTarget === selection.targetKey,
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
[selectedSection, selection?.targetKey],
|
||||
);
|
||||
const handleTargetSelected = useCallback(
|
||||
(next?: PreviewSelection) => {
|
||||
const select = () =>
|
||||
setSelection(
|
||||
next
|
||||
? resolvePreviewSelection(
|
||||
next.targetKey,
|
||||
next.recordId,
|
||||
visibleTargets,
|
||||
selectedPage ?? "home",
|
||||
)
|
||||
: undefined,
|
||||
);
|
||||
if (recordDraft || inquiryDraft)
|
||||
guardDraft(() => {
|
||||
setInquiryDraft(undefined);
|
||||
setRecordDraft(undefined);
|
||||
select();
|
||||
});
|
||||
else select();
|
||||
},
|
||||
[visibleTargets, selectedPage, recordDraft, inquiryDraft, guardDraft],
|
||||
);
|
||||
const relatedTargets = [
|
||||
...(templateContent?.admin.sections ?? [])
|
||||
.filter((section) => section.page === selectedPage && section.target !== "brand")
|
||||
.map((section) => section.target),
|
||||
...((templateContent?.trustContentTypes ?? []).some((item) =>
|
||||
item.pages?.includes(selectedPage ?? ""),
|
||||
)
|
||||
? ["trust"]
|
||||
: []),
|
||||
];
|
||||
const pageLinks = [...new Set(relatedTargets)].flatMap((target) =>
|
||||
target === "trust"
|
||||
? (templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => ({
|
||||
target: `trust:${item.type}`,
|
||||
label: `编辑${item.label}`,
|
||||
}))
|
||||
: [
|
||||
{
|
||||
target,
|
||||
label: (
|
||||
{ offering: "管理此页展示的业务内容", inquiry: "管理此页的咨询表单" } as Record<
|
||||
string,
|
||||
string
|
||||
>
|
||||
)[target],
|
||||
},
|
||||
],
|
||||
);
|
||||
const relevantPageLinks = selectedSection
|
||||
? pageLinks.filter((item) => {
|
||||
if (item.target.startsWith("trust:")) return selectedSection.target === "trust";
|
||||
return item.target === selectedSection.target;
|
||||
})
|
||||
: pageLinks;
|
||||
const formState = useBrandPresentationForm({ brand, config, sections });
|
||||
const { form, initialValues } = formState;
|
||||
const save = useBrandSaveMutation({
|
||||
...formState,
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
queryClient,
|
||||
onSaved: () => setBrandDirty(false),
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const initialPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
if (initialPage) {
|
||||
setActivePage(
|
||||
pageOptions.some((item) => item.value === initialPage)
|
||||
? initialPage
|
||||
: pageOptions[0]?.value,
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!activePage && pageOptions.length) setActivePage(pageOptions[0]?.value);
|
||||
}, [activePage, initialSelection, pageOptions]);
|
||||
useEffect(() => {
|
||||
if (hasInitializedSelection) return;
|
||||
if (!pageOptions.length) return;
|
||||
if (!initialSelection) return;
|
||||
const requestedPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
const resolvedPage =
|
||||
requestedPage && pageOptions.some((item) => item.value === requestedPage)
|
||||
? requestedPage
|
||||
: (pageOptions[0]?.value ?? "home");
|
||||
setSelection(
|
||||
resolvePreviewSelection(
|
||||
initialSelection.targetKey,
|
||||
initialSelection.recordId,
|
||||
visibleTargets,
|
||||
resolvedPage,
|
||||
),
|
||||
);
|
||||
setActivePage(resolvedPage);
|
||||
setHasInitializedSelection(true);
|
||||
}, [hasInitializedSelection, initialSelection, pageOptions, selectedPage, visibleTargets]);
|
||||
useEffect(() => {
|
||||
if (!initialSelection) setSelection(undefined);
|
||||
}, [initialSelection, selectedPage, templateContent?.displayName]);
|
||||
useEffect(() => {
|
||||
if (!selection?.recordId) return;
|
||||
const records =
|
||||
selectedTarget?.source === "trust"
|
||||
? previewWorkspace?.trustItems
|
||||
: previewWorkspace?.offerings;
|
||||
if (records && !records.some((item) => item.id === selection.recordId)) setSelection(undefined);
|
||||
}, [
|
||||
previewWorkspace?.offerings,
|
||||
previewWorkspace?.trustItems,
|
||||
selectedTarget?.source,
|
||||
selection,
|
||||
]);
|
||||
useEffect(
|
||||
() => setRecordDraft(undefined),
|
||||
[selection?.targetKey, selection?.recordId, selectedPage],
|
||||
);
|
||||
const { previewBrand, handleValuesChange, resetPreview } = useBrandPreviewDraft({
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
form,
|
||||
onDirty: () => setBrandDirty(true),
|
||||
});
|
||||
const recordPreview = useRecordPreview({ recordDraft, selectedRecord, recordSection });
|
||||
useEffect(() => resetPreview(), [config, initialValues, resetPreview]);
|
||||
const draftWorkspace = useDraftWorkspace({
|
||||
previewWorkspace,
|
||||
previewBrand,
|
||||
inquiryRuntime,
|
||||
inquiryDraft,
|
||||
recordDraft,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
recordPreview,
|
||||
const controller = usePresentationEditorController({
|
||||
templateContent,
|
||||
previewWorkspace,
|
||||
config,
|
||||
brand,
|
||||
...(initialSelection ? { initialSelection } : {}),
|
||||
});
|
||||
const selectedDetailOfferingId =
|
||||
detailOfferingId && draftWorkspace?.offerings.some((item) => item.id === detailOfferingId)
|
||||
? detailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id;
|
||||
|
||||
return (
|
||||
<section className="presentation-editor" aria-labelledby="presentation-editor-title">
|
||||
@@ -324,306 +65,33 @@ export function PresentationEditor({
|
||||
{breakpoints.xs ? (
|
||||
<Select
|
||||
aria-label="选择小程序页面"
|
||||
value={selectedPage}
|
||||
options={pageOptions}
|
||||
onChange={(value) =>
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
form.setFieldsValue(initialValues);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(value);
|
||||
})
|
||||
}
|
||||
value={controller.selectedPage ?? null}
|
||||
options={controller.pageOptions}
|
||||
onChange={controller.selectPage}
|
||||
className="admin-field-w-2xl"
|
||||
/>
|
||||
) : (
|
||||
<Segmented
|
||||
value={selectedPage}
|
||||
options={pageOptions}
|
||||
onChange={(value) =>
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
form.setFieldsValue(initialValues);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(String(value));
|
||||
})
|
||||
}
|
||||
value={controller.selectedPage ?? null}
|
||||
options={controller.pageOptions}
|
||||
onChange={(value) => controller.selectPage(String(value))}
|
||||
/>
|
||||
)}
|
||||
</Space>
|
||||
<div className="presentation-editor__workspace">
|
||||
<div className="presentation-editor__preview">
|
||||
<h3 className="admin-section-title admin-flush">页面预览</h3>
|
||||
{selectedPage === "detail" && draftWorkspace?.offerings.length ? (
|
||||
<Select
|
||||
aria-label="选择详情页业务内容"
|
||||
className="admin-block admin-offset-bottom-sm"
|
||||
value={selectedDetailOfferingId}
|
||||
options={draftWorkspace.offerings.map((item) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}))}
|
||||
onChange={(value) => {
|
||||
setDetailOfferingId(value);
|
||||
setSelection(undefined);
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<TemplatePreview
|
||||
brand={previewBrand}
|
||||
{...(draftWorkspace ? { workspace: draftWorkspace } : {})}
|
||||
page={selectedPage ?? "home"}
|
||||
{...(selectedPage === "detail" && selectedDetailOfferingId
|
||||
? { offeringId: selectedDetailOfferingId }
|
||||
: {})}
|
||||
{...(activeTarget ? { targetKey: activeTarget } : {})}
|
||||
{...(selection ? { selection } : {})}
|
||||
targets={visibleTargets}
|
||||
onTargetSelected={handleTargetSelected}
|
||||
/>
|
||||
</div>
|
||||
<aside className="presentation-editor__outline" aria-label="页面区域">
|
||||
<h3 className="admin-section-title admin-flush">页面区域</h3>
|
||||
<p className="admin-section-description">选择区域,编辑对应内容</p>
|
||||
{visibleTargets.length ? (
|
||||
<Space className="presentation-editor__regions admin-offset-top" wrap>
|
||||
{visibleTargets.map((target) => (
|
||||
<Button
|
||||
key={target.key}
|
||||
className={
|
||||
visibleTargets.some((parent) => parent.children?.includes(target.key))
|
||||
? "is-child-region"
|
||||
: ""
|
||||
}
|
||||
aria-pressed={activeTarget === target.key}
|
||||
type={activeTarget === target.key ? "primary" : "default"}
|
||||
onClick={() => {
|
||||
const recordId =
|
||||
target.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: target.source === "trust"
|
||||
? previewTrustRecordId(
|
||||
draftWorkspace?.trustItems ?? [],
|
||||
target.trustType,
|
||||
)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: target.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
}}
|
||||
>
|
||||
{target.label}
|
||||
</Button>
|
||||
))}
|
||||
</Space>
|
||||
) : null}
|
||||
{!visibleTargets.length ? (
|
||||
<Typography.Text type="secondary">此页为动态预览</Typography.Text>
|
||||
) : null}
|
||||
</aside>
|
||||
<div className="presentation-editor__inspector">
|
||||
<h3 className="admin-section-title admin-flush">
|
||||
{selectedTarget?.label ?? pageTitle(selectedPage ?? "home")}
|
||||
</h3>
|
||||
<StatusTag
|
||||
tone={
|
||||
save.isError
|
||||
? "error"
|
||||
: save.isPending || brandDirty || recordDraft || inquiryDraft
|
||||
? "warning"
|
||||
: "neutral"
|
||||
}
|
||||
label={
|
||||
save.isPending
|
||||
? "正在保存"
|
||||
: save.isError
|
||||
? "保存失败,请重试"
|
||||
: brandDirty || recordDraft || inquiryDraft
|
||||
? "有未保存修改"
|
||||
: "草稿已同步"
|
||||
}
|
||||
/>
|
||||
{selectedPage === "detail" && !selectedTarget ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="详情页由所选业务内容动态生成"
|
||||
description="选择业务内容预览详情,记录内容在业务提供项中维护;公共标题和按钮文案可从左侧区域列表配置,对全部详情生效。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() => {
|
||||
void navigate("/admin/services");
|
||||
}}
|
||||
>
|
||||
管理业务内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
<InquiryPreviewEditor
|
||||
runtime={
|
||||
draftWorkspace?.inquiryForms.find((item) => item.key === inquiryRuntime.key) ??
|
||||
inquiryRuntime
|
||||
}
|
||||
fieldKey={activeTarget.slice("inquiry-field:".length)}
|
||||
onDraft={setInquiryDraft}
|
||||
onSaved={() => setInquiryDraft(undefined)}
|
||||
/>
|
||||
) : selectedTarget?.composite ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="这是一个组合区域"
|
||||
description={
|
||||
<Space wrap>
|
||||
{(selectedTarget.children ?? []).map((childKey) => {
|
||||
const child = visibleTargets.find((item) => item.key === childKey);
|
||||
if (!child) return null;
|
||||
return (
|
||||
<Button
|
||||
key={child.key}
|
||||
onClick={() => {
|
||||
const recordId =
|
||||
child.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: child.source === "trust"
|
||||
? previewTrustRecordId(
|
||||
draftWorkspace?.trustItems ?? [],
|
||||
child.trustType,
|
||||
)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: child.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
}}
|
||||
>
|
||||
编辑{child.label}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
) : selectedRecordSource && selection?.recordId && selectedSection ? (
|
||||
selectedRecord ? (
|
||||
<RecordContentEditor
|
||||
key={`${selectedRecordSource}:${selectedRecord.id}:${selectedSection.key}`}
|
||||
source={selectedRecordSource}
|
||||
record={selectedRecord}
|
||||
section={recordSection!}
|
||||
context="visual"
|
||||
onDraft={(values) =>
|
||||
setRecordDraft({
|
||||
source: selectedRecordSource,
|
||||
id: selectedRecord.id,
|
||||
values,
|
||||
})
|
||||
}
|
||||
onSaved={() => setRecordDraft(undefined)}
|
||||
/>
|
||||
) : (
|
||||
<Alert
|
||||
type={
|
||||
(
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? "error"
|
||||
: "info"
|
||||
}
|
||||
title={
|
||||
(
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? "内容读取失败"
|
||||
: (
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isSuccess
|
||||
: trustQuery.isSuccess
|
||||
)
|
||||
? "对应内容已不存在,请重新选择页面中的区域"
|
||||
: "正在读取对应内容"
|
||||
}
|
||||
{...((
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? {
|
||||
action: (
|
||||
<Button
|
||||
size="small"
|
||||
onClick={() => {
|
||||
if (selectedRecordSource === "offering")
|
||||
void offeringsQuery.refetch();
|
||||
else void trustQuery.refetch();
|
||||
}}
|
||||
>
|
||||
重试
|
||||
</Button>
|
||||
),
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
) : selectedRecordSource ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="此区域尚未配置内容"
|
||||
description="创建并启用对应内容后,即可在预览中点选编辑。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() =>
|
||||
guardDraft(() => {
|
||||
void navigate(
|
||||
selectedRecordSource === "trust"
|
||||
? `/admin/trust?type=${encodeURIComponent(selectedTarget?.trustType ?? "")}`
|
||||
: "/admin/services",
|
||||
);
|
||||
})
|
||||
}
|
||||
>
|
||||
配置此区域内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : !selectedTarget ? (
|
||||
<div className="presentation-editor__empty">
|
||||
<h3 className="admin-subhead">选择要编辑的区域</h3>
|
||||
<p className="admin-section-description">
|
||||
点击预览中的内容,或使用区域列表,查看并修改对应字段。
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<PresentationFormPanel
|
||||
form={form}
|
||||
initialValues={initialValues}
|
||||
editableSections={editableSections}
|
||||
relevantPageLinks={relevantPageLinks}
|
||||
selectedTarget={selectedTarget}
|
||||
save={{
|
||||
error: save.error,
|
||||
isPending: save.isPending,
|
||||
mutate: (values) => save.mutate(values),
|
||||
}}
|
||||
onValuesChange={handleValuesChange}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<PresentationEditorPreview
|
||||
previewBrand={controller.previewBrand}
|
||||
draftWorkspace={controller.draftWorkspace}
|
||||
selectedPage={controller.selectedPage}
|
||||
selectedDetailOfferingId={controller.selectedDetailOfferingId}
|
||||
activeTarget={controller.activeTarget}
|
||||
selection={controller.selection}
|
||||
visibleTargets={controller.visibleTargets}
|
||||
onSelectDetailOffering={controller.selectDetailOffering}
|
||||
onTargetSelected={controller.handleTargetSelected}
|
||||
onSelectPreviewTarget={controller.selectPreviewTarget}
|
||||
/>
|
||||
<PresentationEditorInspector controller={controller} />
|
||||
</div>
|
||||
</>
|
||||
) : null}
|
||||
|
||||
@@ -0,0 +1,196 @@
|
||||
import { Alert, Button, Space } from "antd";
|
||||
import { StatusTag } from "../../components/StatusTag.js";
|
||||
import { RecordContentEditor } from "../../components/RecordContentEditor.js";
|
||||
import { InquiryPreviewEditor } from "./InquiryPreviewEditor.js";
|
||||
import { PresentationFormPanel } from "./PresentationFormPanel.js";
|
||||
import { pageTitle } from "./presentation-editor-helpers.js";
|
||||
import type { PresentationEditorController } from "./presentation-editor-controller.js";
|
||||
|
||||
export function PresentationEditorInspector({
|
||||
controller,
|
||||
}: {
|
||||
controller: PresentationEditorController;
|
||||
}) {
|
||||
const {
|
||||
selectedPage,
|
||||
selectedTarget,
|
||||
activeTarget,
|
||||
selection,
|
||||
selectedSection,
|
||||
selectedRecordSource,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
editableSections,
|
||||
relevantPageLinks,
|
||||
inquiryRuntime,
|
||||
draftWorkspace,
|
||||
form,
|
||||
initialValues,
|
||||
save,
|
||||
offeringsQuery,
|
||||
trustQuery,
|
||||
recordDraft,
|
||||
inquiryDraft,
|
||||
brandDirty,
|
||||
guardDraft,
|
||||
} = controller;
|
||||
const recordQuery = selectedRecordSource === "trust" ? trustQuery : offeringsQuery;
|
||||
|
||||
return (
|
||||
<div className="presentation-editor__inspector">
|
||||
<h3 className="admin-section-title admin-flush">
|
||||
{selectedTarget?.label ?? pageTitle(selectedPage ?? "home")}
|
||||
</h3>
|
||||
<StatusTag
|
||||
tone={
|
||||
save.isError
|
||||
? "error"
|
||||
: save.isPending || brandDirty || recordDraft || inquiryDraft
|
||||
? "warning"
|
||||
: "neutral"
|
||||
}
|
||||
label={
|
||||
save.isPending
|
||||
? "正在保存"
|
||||
: save.isError
|
||||
? "保存失败,请重试"
|
||||
: brandDirty || recordDraft || inquiryDraft
|
||||
? "有未保存修改"
|
||||
: "草稿已同步"
|
||||
}
|
||||
/>
|
||||
{selectedPage === "detail" && !selectedTarget ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="详情页由所选业务内容动态生成"
|
||||
description="选择业务内容预览详情,记录内容在业务提供项中维护;公共标题和按钮文案可从左侧区域列表配置,对全部详情生效。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() => {
|
||||
void controller.navigate("/admin/services");
|
||||
}}
|
||||
>
|
||||
管理业务内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
<InquiryPreviewEditor
|
||||
runtime={
|
||||
draftWorkspace?.inquiryForms.find((item) => item.key === inquiryRuntime.key) ??
|
||||
inquiryRuntime
|
||||
}
|
||||
fieldKey={activeTarget.slice("inquiry-field:".length)}
|
||||
onDraft={controller.setInquiryDraft}
|
||||
onSaved={() => controller.setInquiryDraft(undefined)}
|
||||
/>
|
||||
) : selectedTarget?.composite ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="这是一个组合区域"
|
||||
description={
|
||||
<Space wrap>
|
||||
{(selectedTarget.children ?? []).map((childKey) => {
|
||||
const child = visibleTarget(childKey, controller);
|
||||
if (!child) return null;
|
||||
return (
|
||||
<Button key={child.key} onClick={() => controller.selectPreviewTarget(child)}>
|
||||
编辑{child.label}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
) : selectedRecordSource && selection?.recordId && selectedSection ? (
|
||||
selectedRecord ? (
|
||||
<RecordContentEditor
|
||||
key={`${selectedRecordSource}:${selectedRecord.id}:${selectedSection.key}`}
|
||||
source={selectedRecordSource}
|
||||
record={selectedRecord}
|
||||
section={recordSection!}
|
||||
context="visual"
|
||||
onDraft={(values) =>
|
||||
controller.setRecordDraft({
|
||||
source: selectedRecordSource,
|
||||
id: selectedRecord.id,
|
||||
values,
|
||||
})
|
||||
}
|
||||
onSaved={() => controller.setRecordDraft(undefined)}
|
||||
/>
|
||||
) : (
|
||||
<Alert
|
||||
type={recordQuery.isError ? "error" : "info"}
|
||||
title={
|
||||
recordQuery.isError
|
||||
? "内容读取失败"
|
||||
: recordQuery.isSuccess
|
||||
? "对应内容已不存在,请重新选择页面中的区域"
|
||||
: "正在读取对应内容"
|
||||
}
|
||||
{...(recordQuery.isError
|
||||
? {
|
||||
action: (
|
||||
<Button size="small" onClick={() => void recordQuery.refetch()}>
|
||||
重试
|
||||
</Button>
|
||||
),
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
) : selectedRecordSource ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="此区域尚未配置内容"
|
||||
description="创建并启用对应内容后,即可在预览中点选编辑。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() =>
|
||||
guardDraft(() => {
|
||||
void controller.navigate(
|
||||
selectedRecordSource === "trust"
|
||||
? `/admin/trust?type=${encodeURIComponent(selectedTarget?.trustType ?? "")}`
|
||||
: "/admin/services",
|
||||
);
|
||||
})
|
||||
}
|
||||
>
|
||||
配置此区域内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : !selectedTarget ? (
|
||||
<div className="presentation-editor__empty">
|
||||
<h3 className="admin-subhead">选择要编辑的区域</h3>
|
||||
<p className="admin-section-description">
|
||||
点击预览中的内容,或使用区域列表,查看并修改对应字段。
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<PresentationFormPanel
|
||||
key={`${selectedPage}:${selectedTarget.key}`}
|
||||
form={form}
|
||||
initialValues={initialValues}
|
||||
editableSections={editableSections}
|
||||
relevantPageLinks={relevantPageLinks}
|
||||
selectedTarget={selectedTarget}
|
||||
save={{
|
||||
error: save.error,
|
||||
isPending: save.isPending,
|
||||
mutate: (values) => save.mutate(values),
|
||||
}}
|
||||
onValuesChange={controller.handleValuesChange}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function visibleTarget(key: string, controller: PresentationEditorController) {
|
||||
return controller.visibleTargets.find((item) => item.key === key);
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
import { Button, Select, Space, Typography } from "antd";
|
||||
import type { BrandProfile, RuntimeWorkspace } from "@personal-brand/api-client";
|
||||
import { TemplatePreview } from "./TemplatePreview.js";
|
||||
import type { PreviewSelection, PreviewTarget } from "./preview-selection.js";
|
||||
|
||||
interface PresentationEditorPreviewProps {
|
||||
previewBrand: BrandProfile;
|
||||
draftWorkspace?: RuntimeWorkspace | undefined;
|
||||
selectedPage: string | undefined;
|
||||
selectedDetailOfferingId: string | undefined;
|
||||
activeTarget: string | undefined;
|
||||
selection: PreviewSelection | undefined;
|
||||
visibleTargets: PreviewTarget[];
|
||||
onSelectDetailOffering: (id: string) => void;
|
||||
onTargetSelected: (next?: PreviewSelection) => void;
|
||||
onSelectPreviewTarget: (target: PreviewTarget) => void;
|
||||
}
|
||||
|
||||
export function PresentationEditorPreview({
|
||||
previewBrand,
|
||||
draftWorkspace,
|
||||
selectedPage,
|
||||
selectedDetailOfferingId,
|
||||
activeTarget,
|
||||
selection,
|
||||
visibleTargets,
|
||||
onSelectDetailOffering,
|
||||
onTargetSelected,
|
||||
onSelectPreviewTarget,
|
||||
}: PresentationEditorPreviewProps) {
|
||||
return (
|
||||
<>
|
||||
<div className="presentation-editor__preview">
|
||||
<h3 className="admin-section-title admin-flush">页面预览</h3>
|
||||
{selectedPage === "detail" && draftWorkspace?.offerings.length ? (
|
||||
<Select
|
||||
aria-label="选择详情页业务内容"
|
||||
className="admin-block admin-offset-bottom-sm"
|
||||
value={selectedDetailOfferingId ?? null}
|
||||
options={draftWorkspace.offerings.map((item) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}))}
|
||||
onChange={onSelectDetailOffering}
|
||||
/>
|
||||
) : null}
|
||||
<TemplatePreview
|
||||
brand={previewBrand}
|
||||
{...(draftWorkspace ? { workspace: draftWorkspace } : {})}
|
||||
page={selectedPage ?? "home"}
|
||||
{...(selectedPage === "detail" && selectedDetailOfferingId
|
||||
? { offeringId: selectedDetailOfferingId }
|
||||
: {})}
|
||||
{...(activeTarget ? { targetKey: activeTarget } : {})}
|
||||
{...(selection ? { selection } : {})}
|
||||
targets={visibleTargets}
|
||||
onTargetSelected={onTargetSelected}
|
||||
/>
|
||||
</div>
|
||||
<aside className="presentation-editor__outline" aria-label="页面区域">
|
||||
<h3 className="admin-section-title admin-flush">页面区域</h3>
|
||||
<p className="admin-section-description">选择区域,编辑对应内容</p>
|
||||
{visibleTargets.length ? (
|
||||
<Space className="presentation-editor__regions admin-offset-top" wrap>
|
||||
{visibleTargets.map((target) => (
|
||||
<Button
|
||||
key={target.key}
|
||||
className={
|
||||
visibleTargets.some((parent) => parent.children?.includes(target.key))
|
||||
? "is-child-region"
|
||||
: ""
|
||||
}
|
||||
aria-pressed={activeTarget === target.key}
|
||||
type={activeTarget === target.key ? "primary" : "default"}
|
||||
onClick={() => onSelectPreviewTarget(target)}
|
||||
>
|
||||
{target.label}
|
||||
</Button>
|
||||
))}
|
||||
</Space>
|
||||
) : null}
|
||||
{!visibleTargets.length ? (
|
||||
<Typography.Text type="secondary">此页为动态预览</Typography.Text>
|
||||
) : null}
|
||||
</aside>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -146,7 +146,7 @@ export function TemplatePreview({
|
||||
<>
|
||||
{!ready && !error ? (
|
||||
<div className="template-preview__loading">
|
||||
<Spin tip="正在加载页面预览" />
|
||||
<Spin description="正在加载页面预览" />
|
||||
</div>
|
||||
) : null}
|
||||
{error ? (
|
||||
|
||||
@@ -0,0 +1,416 @@
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useNavigate, type NavigateFunction } from "react-router-dom";
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
BrandProfile,
|
||||
Offering,
|
||||
RuntimeWorkspace,
|
||||
TemplateAdminSection,
|
||||
TrustContent,
|
||||
} from "@personal-brand/api-client";
|
||||
import type { FormInstance } from "antd";
|
||||
import { filterSectionsForPreviewTarget } from "../../lib/presentation/presentation-bindings.js";
|
||||
import type { PresentationValues } from "../../lib/presentation/presentation-bindings.js";
|
||||
import {
|
||||
resolvePreviewSelection,
|
||||
previewTrustRecordId,
|
||||
type PreviewSelection,
|
||||
type PreviewTarget,
|
||||
} from "./preview-selection.js";
|
||||
import { useEditorDraft } from "./use-editor-draft.js";
|
||||
import {
|
||||
useBrandPresentationForm,
|
||||
useBrandPresentationSections,
|
||||
useBrandPreviewDraft,
|
||||
useBrandSaveMutation,
|
||||
usePresentationRecordQueries,
|
||||
} from "./presentation-editor-state.js";
|
||||
import { useRecordPreview, type RecordDraft } from "./presentation-editor-record-preview.js";
|
||||
import { pageTitle, previewTargetSource, trustSection } from "./presentation-editor-helpers.js";
|
||||
import { useDraftWorkspace } from "./use-draft-workspace.js";
|
||||
|
||||
export interface PresentationEditorControllerInput {
|
||||
templateContent: AdminTemplateContent | null | undefined;
|
||||
previewWorkspace?: RuntimeWorkspace | undefined;
|
||||
config: Record<string, unknown> | null | undefined;
|
||||
brand: BrandProfile;
|
||||
initialSelection?: PreviewSelection;
|
||||
}
|
||||
|
||||
export interface PresentationRecordQuery {
|
||||
isError: boolean;
|
||||
isSuccess: boolean;
|
||||
refetch: () => unknown;
|
||||
}
|
||||
|
||||
export interface PresentationEditorController {
|
||||
pageOptions: { value: string; label: string }[];
|
||||
selectedPage: string | undefined;
|
||||
visibleTargets: PreviewTarget[];
|
||||
selectedTarget: PreviewTarget | undefined;
|
||||
selectedSection: TemplateAdminSection | undefined;
|
||||
selectedRecordSource: "offering" | "trust" | undefined;
|
||||
selectedRecord: Offering | TrustContent | undefined;
|
||||
recordSection: TemplateAdminSection | undefined;
|
||||
editableSections: TemplateAdminSection[];
|
||||
relevantPageLinks: { target: string; label: string | undefined }[];
|
||||
inquiryRuntime: RuntimeWorkspace["inquiryForms"][number] | undefined;
|
||||
draftWorkspace: RuntimeWorkspace | undefined;
|
||||
previewBrand: BrandProfile;
|
||||
selectedDetailOfferingId: string | undefined;
|
||||
form: FormInstance<PresentationValues>;
|
||||
initialValues: PresentationValues;
|
||||
save: {
|
||||
error: unknown;
|
||||
isError: boolean;
|
||||
isPending: boolean;
|
||||
mutate: (values: PresentationValues) => void;
|
||||
};
|
||||
offeringsQuery: PresentationRecordQuery;
|
||||
trustQuery: PresentationRecordQuery;
|
||||
recordDraft: RecordDraft | undefined;
|
||||
inquiryDraft: RuntimeWorkspace["inquiryForms"][number]["fields"] | undefined;
|
||||
brandDirty: boolean;
|
||||
selection: PreviewSelection | undefined;
|
||||
activeTarget: string | undefined;
|
||||
guardDraft: (action: () => void) => void;
|
||||
selectPage: (page: string) => void;
|
||||
selectDetailOffering: (id: string) => void;
|
||||
selectPreviewTarget: (target: PreviewTarget) => void;
|
||||
handleTargetSelected: (next?: PreviewSelection) => void;
|
||||
setRecordDraft: (draft: RecordDraft | undefined) => void;
|
||||
setInquiryDraft: (fields: RuntimeWorkspace["inquiryForms"][number]["fields"] | undefined) => void;
|
||||
handleValuesChange: (changed: PresentationValues, allValues: PresentationValues) => void;
|
||||
navigate: NavigateFunction;
|
||||
}
|
||||
|
||||
/**
|
||||
* PresentationEditor 的状态与派生数据集中在此处。
|
||||
* 视图组件只负责渲染,避免页面组件继续膨胀。
|
||||
*/
|
||||
export function usePresentationEditorController({
|
||||
templateContent,
|
||||
previewWorkspace,
|
||||
config,
|
||||
brand,
|
||||
initialSelection,
|
||||
}: PresentationEditorControllerInput): PresentationEditorController {
|
||||
const queryClient = useQueryClient();
|
||||
const navigate = useNavigate();
|
||||
const [activePage, setActivePage] = useState<string>();
|
||||
const [selection, setSelection] = useState<PreviewSelection | undefined>(initialSelection);
|
||||
const [hasInitializedSelection, setHasInitializedSelection] = useState(Boolean(initialSelection));
|
||||
const [detailOfferingId, setDetailOfferingId] = useState<string>();
|
||||
const [recordDraft, setRecordDraft] = useState<RecordDraft>();
|
||||
const [inquiryDraft, setInquiryDraft] =
|
||||
useState<RuntimeWorkspace["inquiryForms"][number]["fields"]>();
|
||||
const [brandDirty, setBrandDirty] = useState(false);
|
||||
const guardDraft = useEditorDraft(brandDirty || !!recordDraft || !!inquiryDraft);
|
||||
const inquiryRuntime = previewWorkspace?.inquiryForms.find((item) => item.target === "brand");
|
||||
const sections = useBrandPresentationSections(templateContent);
|
||||
const pageOptions = useMemo(() => {
|
||||
const pages = new Map<string, string>();
|
||||
for (const item of templateContent?.navigation ?? []) pages.set(item.page, item.label);
|
||||
for (const section of templateContent?.admin.sections ?? []) {
|
||||
const navigation = templateContent?.navigation.find((item) => item.page === section.page);
|
||||
if (!pages.has(section.page))
|
||||
pages.set(section.page, navigation?.label ?? pageTitle(section.page));
|
||||
}
|
||||
return [...pages].map(([value, label]) => ({ value, label }));
|
||||
}, [templateContent]);
|
||||
const selectedPage = pageOptions.some((item) => item.value === activePage)
|
||||
? activePage
|
||||
: pageOptions[0]?.value;
|
||||
const visibleSections = sections.filter((section) => section.page === selectedPage);
|
||||
const recordSections = useMemo(
|
||||
() =>
|
||||
(templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => trustSection(item, selectedPage ?? "home")),
|
||||
[templateContent, selectedPage],
|
||||
);
|
||||
const visibleTargets = useMemo<PreviewTarget[]>(
|
||||
() =>
|
||||
[...(templateContent?.admin.sections ?? []), ...recordSections]
|
||||
.filter(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
(selectedPage !== "detail" || section.target === "brand"),
|
||||
)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: previewTargetSource(section, target.key),
|
||||
...(section.key.startsWith("trust:") ? { trustType: section.key.slice(6) } : {}),
|
||||
})),
|
||||
)
|
||||
.concat(
|
||||
selectedPage === "inquiry" && inquiryRuntime
|
||||
? inquiryRuntime.fields.map((field) => ({
|
||||
key: `inquiry-field:${field.key}`,
|
||||
label: field.label,
|
||||
page: "inquiry",
|
||||
source: "inquiry" as const,
|
||||
}))
|
||||
: [],
|
||||
),
|
||||
[templateContent, selectedPage, recordSections, inquiryRuntime],
|
||||
);
|
||||
const activeTarget = selection?.targetKey;
|
||||
const selectedTarget = visibleTargets.find((target) => target.key === activeTarget);
|
||||
const selectedSection = [...(templateContent?.admin.sections ?? []), ...recordSections].find(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
section.previewTargets?.some((target) => target.key === selectedTarget?.key),
|
||||
);
|
||||
const selectedRecordSource =
|
||||
selectedTarget?.source === "offering" || selectedTarget?.source === "trust"
|
||||
? selectedTarget.source
|
||||
: undefined;
|
||||
const { offeringsQuery, trustQuery, selectedRecord } = usePresentationRecordQueries(
|
||||
selectedRecordSource,
|
||||
selection?.recordId,
|
||||
);
|
||||
const editableSections = filterSectionsForPreviewTarget(
|
||||
visibleSections.filter((section) =>
|
||||
section.fields.some((field) => field.binding.startsWith("brand.")),
|
||||
),
|
||||
selectedTarget?.key,
|
||||
);
|
||||
const recordSection = useMemo(
|
||||
() =>
|
||||
selectedSection && selection?.targetKey
|
||||
? {
|
||||
...selectedSection,
|
||||
fields: selectedSection.fields.filter(
|
||||
(field) => field.previewTarget === selection.targetKey,
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
[selectedSection, selection?.targetKey],
|
||||
);
|
||||
const handleTargetSelected = useCallback(
|
||||
(next?: PreviewSelection) => {
|
||||
const select = () =>
|
||||
setSelection(
|
||||
next
|
||||
? resolvePreviewSelection(
|
||||
next.targetKey,
|
||||
next.recordId,
|
||||
visibleTargets,
|
||||
selectedPage ?? "home",
|
||||
)
|
||||
: undefined,
|
||||
);
|
||||
if (recordDraft || inquiryDraft)
|
||||
guardDraft(() => {
|
||||
setInquiryDraft(undefined);
|
||||
setRecordDraft(undefined);
|
||||
select();
|
||||
});
|
||||
else select();
|
||||
},
|
||||
[visibleTargets, selectedPage, recordDraft, inquiryDraft, guardDraft],
|
||||
);
|
||||
const relatedTargets = [
|
||||
...(templateContent?.admin.sections ?? [])
|
||||
.filter((section) => section.page === selectedPage && section.target !== "brand")
|
||||
.map((section) => section.target),
|
||||
...((templateContent?.trustContentTypes ?? []).some((item) =>
|
||||
item.pages?.includes(selectedPage ?? ""),
|
||||
)
|
||||
? ["trust"]
|
||||
: []),
|
||||
];
|
||||
const pageLinks = [...new Set(relatedTargets)].flatMap((target) =>
|
||||
target === "trust"
|
||||
? (templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => ({
|
||||
target: `trust:${item.type}`,
|
||||
label: `编辑${item.label}`,
|
||||
}))
|
||||
: [
|
||||
{
|
||||
target,
|
||||
label: (
|
||||
{ offering: "管理此页展示的业务内容", inquiry: "管理此页的咨询表单" } as Record<
|
||||
string,
|
||||
string
|
||||
>
|
||||
)[target],
|
||||
},
|
||||
],
|
||||
);
|
||||
const relevantPageLinks = selectedSection
|
||||
? pageLinks.filter((item) => {
|
||||
if (item.target.startsWith("trust:")) return selectedSection.target === "trust";
|
||||
return item.target === selectedSection.target;
|
||||
})
|
||||
: pageLinks;
|
||||
const formState = useBrandPresentationForm({ brand, config, sections });
|
||||
const { form, initialValues } = formState;
|
||||
const save = useBrandSaveMutation({
|
||||
...formState,
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
queryClient,
|
||||
onSaved: () => setBrandDirty(false),
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const initialPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
if (initialPage) {
|
||||
setActivePage(
|
||||
pageOptions.some((item) => item.value === initialPage)
|
||||
? initialPage
|
||||
: pageOptions[0]?.value,
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!activePage && pageOptions.length) setActivePage(pageOptions[0]?.value);
|
||||
}, [activePage, initialSelection, pageOptions]);
|
||||
useEffect(() => {
|
||||
if (hasInitializedSelection) return;
|
||||
if (!pageOptions.length) return;
|
||||
if (!initialSelection) return;
|
||||
const requestedPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
const resolvedPage =
|
||||
requestedPage && pageOptions.some((item) => item.value === requestedPage)
|
||||
? requestedPage
|
||||
: (pageOptions[0]?.value ?? "home");
|
||||
setSelection(
|
||||
resolvePreviewSelection(
|
||||
initialSelection.targetKey,
|
||||
initialSelection.recordId,
|
||||
visibleTargets,
|
||||
resolvedPage,
|
||||
),
|
||||
);
|
||||
setActivePage(resolvedPage);
|
||||
setHasInitializedSelection(true);
|
||||
}, [hasInitializedSelection, initialSelection, pageOptions, selectedPage, visibleTargets]);
|
||||
useEffect(() => {
|
||||
if (!initialSelection) setSelection(undefined);
|
||||
}, [initialSelection, selectedPage, templateContent?.displayName]);
|
||||
useEffect(() => {
|
||||
if (!selection?.recordId) return;
|
||||
const records =
|
||||
selectedTarget?.source === "trust"
|
||||
? previewWorkspace?.trustItems
|
||||
: previewWorkspace?.offerings;
|
||||
if (records && !records.some((item) => item.id === selection.recordId)) setSelection(undefined);
|
||||
}, [
|
||||
previewWorkspace?.offerings,
|
||||
previewWorkspace?.trustItems,
|
||||
selectedTarget?.source,
|
||||
selection,
|
||||
]);
|
||||
useEffect(
|
||||
() => setRecordDraft(undefined),
|
||||
[selection?.targetKey, selection?.recordId, selectedPage],
|
||||
);
|
||||
const { previewBrand, handleValuesChange, resetPreview } = useBrandPreviewDraft({
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
form,
|
||||
onDirty: () => setBrandDirty(true),
|
||||
});
|
||||
const recordPreview = useRecordPreview({ recordDraft, selectedRecord, recordSection });
|
||||
useEffect(() => resetPreview(), [config, initialValues, resetPreview]);
|
||||
const draftWorkspace = useDraftWorkspace({
|
||||
previewWorkspace,
|
||||
previewBrand,
|
||||
inquiryRuntime,
|
||||
inquiryDraft,
|
||||
recordDraft,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
recordPreview,
|
||||
templateContent,
|
||||
});
|
||||
const selectedDetailOfferingId =
|
||||
detailOfferingId && draftWorkspace?.offerings.some((item) => item.id === detailOfferingId)
|
||||
? detailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id;
|
||||
|
||||
const selectPage = useCallback(
|
||||
(page: string) => {
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(page);
|
||||
});
|
||||
},
|
||||
[guardDraft, resetPreview],
|
||||
);
|
||||
const selectDetailOffering = useCallback((id: string) => {
|
||||
setDetailOfferingId(id);
|
||||
setSelection(undefined);
|
||||
}, []);
|
||||
const selectPreviewTarget = useCallback(
|
||||
(target: PreviewTarget) => {
|
||||
const recordId =
|
||||
target.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: target.source === "trust"
|
||||
? previewTrustRecordId(draftWorkspace?.trustItems ?? [], target.trustType)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: target.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
},
|
||||
[handleTargetSelected, selectedPage, selectedDetailOfferingId, draftWorkspace],
|
||||
);
|
||||
|
||||
return {
|
||||
pageOptions,
|
||||
selectedPage,
|
||||
visibleTargets,
|
||||
selectedTarget,
|
||||
selectedSection,
|
||||
selectedRecordSource,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
editableSections,
|
||||
relevantPageLinks,
|
||||
inquiryRuntime,
|
||||
draftWorkspace,
|
||||
previewBrand,
|
||||
selectedDetailOfferingId,
|
||||
form,
|
||||
initialValues,
|
||||
save,
|
||||
offeringsQuery,
|
||||
trustQuery,
|
||||
recordDraft,
|
||||
inquiryDraft,
|
||||
brandDirty,
|
||||
selection,
|
||||
activeTarget,
|
||||
guardDraft,
|
||||
selectPage,
|
||||
selectDetailOffering,
|
||||
selectPreviewTarget,
|
||||
handleTargetSelected,
|
||||
setRecordDraft,
|
||||
setInquiryDraft,
|
||||
handleValuesChange,
|
||||
navigate,
|
||||
};
|
||||
}
|
||||
@@ -89,7 +89,6 @@ export function useBrandPresentationForm({
|
||||
return values;
|
||||
}, [brand, config, sections]);
|
||||
|
||||
useEffect(() => form.setFieldsValue(initialValues), [form, initialValues]);
|
||||
return { form, initialValues };
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,21 @@ const element = (tag) =>
|
||||
|
||||
export const View = element("div");
|
||||
export const Text = element("span");
|
||||
export const Button = element("button");
|
||||
export const Button = React.forwardRef(
|
||||
({ children, className, style, onClick, loading, ...props }, ref) =>
|
||||
React.createElement(
|
||||
"button",
|
||||
{
|
||||
...props,
|
||||
ref,
|
||||
className,
|
||||
style,
|
||||
onClick,
|
||||
...(loading ? { "aria-busy": "true" } : {}),
|
||||
},
|
||||
children,
|
||||
),
|
||||
);
|
||||
export const Input = React.forwardRef(({ onInput, ...props }, ref) =>
|
||||
React.createElement("input", {
|
||||
...props,
|
||||
@@ -101,16 +115,18 @@ export const Label = element("label");
|
||||
export const Image = React.forwardRef(({ mode, src, style, ...props }, ref) => {
|
||||
const key = React.useContext(TemplateAssetContext);
|
||||
const assets = React.useContext(TemplatePreviewAssetsContext);
|
||||
const normalizedSrc = typeof src === "string" ? src.trim() : "";
|
||||
if (!normalizedSrc) return null;
|
||||
return React.createElement("img", {
|
||||
...props,
|
||||
ref,
|
||||
src:
|
||||
assets && typeof src === "string" && src.startsWith("/assets/")
|
||||
assets && normalizedSrc.startsWith("/assets/")
|
||||
? // 导入包资源以 /assets 开头;本地多模板预览的 renderer 可能额外携带包 key 前缀。
|
||||
(assets[src]?.dataUrl ??
|
||||
assets[src.replace(`/assets/${key}/`, "/assets/")]?.dataUrl ??
|
||||
src)
|
||||
: resolveImageSource(src, key),
|
||||
(assets[normalizedSrc]?.dataUrl ??
|
||||
assets[normalizedSrc.replace(`/assets/${key}/`, "/assets/")]?.dataUrl ??
|
||||
normalizedSrc)
|
||||
: resolveImageSource(normalizedSrc, key),
|
||||
style: { objectFit: mode === "aspectFit" ? "contain" : "cover", ...style },
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,28 @@
|
||||
-- CreateTable
|
||||
CREATE TABLE "ClientErrorThrottleWindow" (
|
||||
"subject" TEXT NOT NULL,
|
||||
"windowStart" TIMESTAMP(3) NOT NULL,
|
||||
"count" INTEGER NOT NULL,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "ClientErrorThrottleWindow_pkey" PRIMARY KEY ("subject")
|
||||
);
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "ClientErrorDedupe" (
|
||||
"id" TEXT NOT NULL,
|
||||
"subject" TEXT NOT NULL,
|
||||
"errorId" TEXT NOT NULL,
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
CONSTRAINT "ClientErrorDedupe_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "ClientErrorThrottleWindow_windowStart_idx" ON "ClientErrorThrottleWindow"("windowStart");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "ClientErrorDedupe_subject_errorId_key" ON "ClientErrorDedupe"("subject", "errorId");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "ClientErrorDedupe_createdAt_idx" ON "ClientErrorDedupe"("createdAt");
|
||||
@@ -468,6 +468,25 @@ model AdminUser {
|
||||
templateAuditLogs TemplatePackageAuditLog[] @relation("TemplatePackageAuditActor")
|
||||
}
|
||||
|
||||
model ClientErrorThrottleWindow {
|
||||
subject String @id
|
||||
windowStart DateTime
|
||||
count Int
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@index([windowStart])
|
||||
}
|
||||
|
||||
model ClientErrorDedupe {
|
||||
id String @id @default(uuid())
|
||||
subject String
|
||||
errorId String
|
||||
createdAt DateTime @default(now())
|
||||
|
||||
@@unique([subject, errorId])
|
||||
@@index([createdAt])
|
||||
}
|
||||
|
||||
model TemplatePackage {
|
||||
id String @id @default(uuid())
|
||||
packageKey String @unique
|
||||
|
||||
@@ -4,16 +4,36 @@ import { PrismaService } from "./prisma.service.js";
|
||||
import { readAdminToken } from "./admin-access.identity.js";
|
||||
import { readIdentity } from "./auth.js";
|
||||
|
||||
type TokenAccess = {
|
||||
subject: string;
|
||||
brandId: string;
|
||||
mustChangePassword: boolean;
|
||||
tokenVersion: number;
|
||||
platformTemplateRole: string;
|
||||
};
|
||||
|
||||
type BrandAccess = { subject: string; brandId: string; role: string };
|
||||
|
||||
@Injectable()
|
||||
export class AdminAccessService {
|
||||
/**
|
||||
* 同一 HTTP 请求内 Guard 和 Controller 都会调用访问校验。
|
||||
* 用 WeakMap 按请求缓存结果,既避免重复查询,也不会把权限状态跨请求缓存。
|
||||
*/
|
||||
private readonly tokenAccess = new WeakMap<FastifyRequest, Promise<TokenAccess>>();
|
||||
private readonly brandAccess = new WeakMap<FastifyRequest, Promise<BrandAccess>>();
|
||||
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async requireToken(request: FastifyRequest): Promise<{
|
||||
subject: string;
|
||||
brandId: string;
|
||||
mustChangePassword: boolean;
|
||||
tokenVersion: number;
|
||||
}> {
|
||||
requireToken(request: FastifyRequest): Promise<TokenAccess> {
|
||||
const cached = this.tokenAccess.get(request);
|
||||
if (cached) return cached;
|
||||
const pending = this.resolveToken(request);
|
||||
this.tokenAccess.set(request, pending);
|
||||
return pending;
|
||||
}
|
||||
|
||||
private async resolveToken(request: FastifyRequest): Promise<TokenAccess> {
|
||||
const token = readAdminToken(request);
|
||||
if (!token) throw new UnauthorizedException("缺少管理员登录态");
|
||||
let identity;
|
||||
@@ -25,7 +45,12 @@ export class AdminAccessService {
|
||||
if (identity.role !== "admin") throw new ForbiddenException("无管理员权限");
|
||||
const user = await this.prisma.adminUser.findUnique({
|
||||
where: { id: identity.subject },
|
||||
select: { isEnabled: true, mustChangePassword: true, tokenVersion: true },
|
||||
select: {
|
||||
isEnabled: true,
|
||||
mustChangePassword: true,
|
||||
tokenVersion: true,
|
||||
platformTemplateRole: true,
|
||||
},
|
||||
});
|
||||
if (!user || identity.tokenVersion !== user.tokenVersion)
|
||||
throw new UnauthorizedException("管理员登录态已失效,请重新登录");
|
||||
@@ -35,12 +60,19 @@ export class AdminAccessService {
|
||||
brandId: identity.brandId,
|
||||
mustChangePassword: user.mustChangePassword,
|
||||
tokenVersion: user.tokenVersion,
|
||||
platformTemplateRole: user.platformTemplateRole,
|
||||
};
|
||||
}
|
||||
|
||||
async requireBrand(
|
||||
request: FastifyRequest,
|
||||
): Promise<{ subject: string; brandId: string; role: string }> {
|
||||
requireBrand(request: FastifyRequest): Promise<BrandAccess> {
|
||||
const cached = this.brandAccess.get(request);
|
||||
if (cached) return cached;
|
||||
const pending = this.resolveBrand(request);
|
||||
this.brandAccess.set(request, pending);
|
||||
return pending;
|
||||
}
|
||||
|
||||
private async resolveBrand(request: FastifyRequest): Promise<BrandAccess> {
|
||||
const access = await this.requireToken(request);
|
||||
if (access.mustChangePassword)
|
||||
throw new ForbiddenException("请先完成初始密码修改后再访问管理后台");
|
||||
@@ -63,11 +95,7 @@ export class AdminAccessService {
|
||||
const access = await this.requireToken(request);
|
||||
if (access.mustChangePassword)
|
||||
throw new ForbiddenException("请先完成初始密码修改后再访问管理后台");
|
||||
const user = await this.prisma.adminUser.findUniqueOrThrow({
|
||||
where: { id: access.subject },
|
||||
select: { platformTemplateRole: true },
|
||||
});
|
||||
if (user.platformTemplateRole !== "template_admin")
|
||||
if (access.platformTemplateRole !== "template_admin")
|
||||
throw new ForbiddenException("当前账号没有模板管理权限");
|
||||
return { subject: access.subject };
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { UnauthorizedException } from "@nestjs/common";
|
||||
import { createHmac, timingSafeEqual } from "node:crypto";
|
||||
import { isPlaceholderSecret } from "./runtime-config.js";
|
||||
|
||||
type Identity = {
|
||||
subject: string;
|
||||
@@ -9,9 +10,20 @@ type Identity = {
|
||||
exp: number;
|
||||
};
|
||||
|
||||
let warnedAboutPlaceholderSecret = false;
|
||||
|
||||
function secret(): string {
|
||||
const value = process.env.SESSION_SECRET;
|
||||
if (!value || value.length < 32) throw new UnauthorizedException("服务端会话密钥未正确配置");
|
||||
if (isPlaceholderSecret(value)) {
|
||||
// 生产环境已在启动时 fail fast;这里保留二次防线,避免绕过 createApp 的调用方签发弱 token。
|
||||
if (process.env.NODE_ENV === "production")
|
||||
throw new UnauthorizedException("服务端会话密钥未正确配置");
|
||||
if (!warnedAboutPlaceholderSecret) {
|
||||
warnedAboutPlaceholderSecret = true;
|
||||
console.warn("[api] SESSION_SECRET 仍是示例占位符,仅可用于本地开发");
|
||||
}
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,10 @@ import multipart from "@fastify/multipart";
|
||||
import fastifyStatic from "@fastify/static";
|
||||
import path from "node:path";
|
||||
import { AppModule, configureApp } from "./app.module.js";
|
||||
import { assertProductionSecret } from "./runtime-config.js";
|
||||
|
||||
export async function createApp(): Promise<NestFastifyApplication> {
|
||||
assertProductionSecret(process.env.SESSION_SECRET);
|
||||
const app = await NestFactory.create<NestFastifyApplication>(AppModule, new FastifyAdapter());
|
||||
app
|
||||
.getHttpAdapter()
|
||||
|
||||
@@ -1,22 +1,12 @@
|
||||
import { AdminBrand } from "../../admin-auth.decorators.js";
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
ForbiddenException,
|
||||
Get,
|
||||
Param,
|
||||
Post,
|
||||
Query,
|
||||
Req,
|
||||
UnauthorizedException,
|
||||
} from "@nestjs/common";
|
||||
import { Body, Controller, Get, Param, Post, Query, Req } from "@nestjs/common";
|
||||
import { Transform } from "class-transformer";
|
||||
import type { TransformFnParams } from "class-transformer";
|
||||
import { BookingStatus } from "@prisma/client";
|
||||
import { IsBoolean, IsEnum, IsOptional, IsString } from "class-validator";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { AdminAccessService } from "../../admin-access.service.js";
|
||||
import { BookingService } from "../../booking.service.js";
|
||||
import { readIdentity } from "../../auth.js";
|
||||
import { UpdateBookingStatusDto, UpdateBookingTagsDto, CreateTagDto } from "../../admin.dto.js";
|
||||
|
||||
class AdminBookingQueryDto {
|
||||
@@ -35,67 +25,67 @@ class AdminBookingQueryDto {
|
||||
@AdminBrand()
|
||||
@Controller("admin/bookings")
|
||||
export class AdminBookingController {
|
||||
constructor(private readonly bookings: BookingService) {}
|
||||
constructor(
|
||||
private readonly access: AdminAccessService,
|
||||
private readonly bookings: BookingService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
list(@Req() request: FastifyRequest, @Query() query: AdminBookingQueryDto): Promise<unknown> {
|
||||
const brandId = this.requireAdmin(request);
|
||||
async list(
|
||||
@Req() request: FastifyRequest,
|
||||
@Query() query: AdminBookingQueryDto,
|
||||
): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.listForAdmin(brandId, query);
|
||||
}
|
||||
|
||||
@Get("unread-count")
|
||||
unreadCount(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.bookings.unreadCountForAdmin(this.requireAdmin(request));
|
||||
async unreadCount(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.unreadCountForAdmin(brandId);
|
||||
}
|
||||
|
||||
@Get(":id")
|
||||
detail(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
return this.bookings.getForAdmin(this.requireAdmin(request), id);
|
||||
async detail(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.getForAdmin(brandId, id);
|
||||
}
|
||||
|
||||
@Post(":id/status")
|
||||
update(
|
||||
async update(
|
||||
@Req() request: FastifyRequest,
|
||||
@Param("id") id: string,
|
||||
@Body() body: UpdateBookingStatusDto,
|
||||
): Promise<unknown> {
|
||||
return this.bookings.updateStatus(this.requireAdmin(request), id, body.status, body.adminNote);
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.updateStatus(brandId, id, body.status, body.adminNote);
|
||||
}
|
||||
|
||||
@Post(":id/read")
|
||||
markRead(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
return this.bookings.markRead(this.requireAdmin(request), id);
|
||||
async markRead(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.markRead(brandId, id);
|
||||
}
|
||||
|
||||
@Post(":id/tags")
|
||||
updateTags(
|
||||
async updateTags(
|
||||
@Req() request: FastifyRequest,
|
||||
@Param("id") id: string,
|
||||
@Body() body: UpdateBookingTagsDto,
|
||||
): Promise<unknown> {
|
||||
return this.bookings.updateTags(this.requireAdmin(request), id, body.tagIds);
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.updateTags(brandId, id, body.tagIds);
|
||||
}
|
||||
|
||||
@Get("tags")
|
||||
listTags(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.bookings.listTags(this.requireAdmin(request));
|
||||
async listTags(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.listTags(brandId);
|
||||
}
|
||||
|
||||
@Post("tags")
|
||||
createTag(@Req() request: FastifyRequest, @Body() body: CreateTagDto): Promise<unknown> {
|
||||
return this.bookings.createTag(this.requireAdmin(request), body.name);
|
||||
}
|
||||
|
||||
private requireAdmin(request: FastifyRequest): string {
|
||||
const token = request.headers.authorization?.replace(/^Bearer\s+/i, "");
|
||||
if (!token) throw new UnauthorizedException("缺少管理员登录态");
|
||||
let identity;
|
||||
try {
|
||||
identity = readIdentity(token);
|
||||
} catch {
|
||||
throw new UnauthorizedException("管理员登录态无效或已过期");
|
||||
}
|
||||
if (identity.role !== "admin") throw new ForbiddenException("无管理员权限");
|
||||
return identity.brandId;
|
||||
async createTag(@Req() request: FastifyRequest, @Body() body: CreateTagDto): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.createTag(brandId, body.name);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
import { HttpException, Injectable } from "@nestjs/common";
|
||||
import { Inject, Injectable } from "@nestjs/common";
|
||||
import {
|
||||
CLIENT_ERROR_THROTTLE_STORE,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
const RATE_WINDOW_MS = 60_000;
|
||||
const RATE_LIMIT = 10;
|
||||
const DEDUPE_TTL_MS = 10 * 60_000;
|
||||
const DEDUPE_CAPACITY = 500;
|
||||
const LOG_STACK_LIMIT = 4000;
|
||||
|
||||
export interface ClientErrorReport {
|
||||
@@ -22,27 +22,16 @@ export interface ClientErrorReceipt {
|
||||
duplicate: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台渲染异常去重与限流。
|
||||
* 当前生产为单实例 PM2,因此使用进程内窗口;扩成多实例前需要换成共享存储。
|
||||
*/
|
||||
@Injectable()
|
||||
export class AdminClientErrorService {
|
||||
private readonly recentErrorIds = new Map<string, number>();
|
||||
private readonly windows = new Map<string, number[]>();
|
||||
constructor(
|
||||
@Inject(CLIENT_ERROR_THROTTLE_STORE)
|
||||
private readonly throttle: ClientErrorThrottleStore,
|
||||
) {}
|
||||
|
||||
record(report: ClientErrorReport): ClientErrorReceipt {
|
||||
const now = Date.now();
|
||||
this.prune(now);
|
||||
|
||||
const dedupeKey = `${report.subject}:${report.errorId}`;
|
||||
if (this.recentErrorIds.has(dedupeKey)) {
|
||||
return { received: true, duplicate: true };
|
||||
}
|
||||
|
||||
this.assertWithinRate(report.subject, now);
|
||||
this.recentErrorIds.set(dedupeKey, now);
|
||||
this.trimDedupe();
|
||||
async record(report: ClientErrorReport): Promise<ClientErrorReceipt> {
|
||||
const result = await this.throttle.record(report);
|
||||
if (result.duplicate) return { received: true, duplicate: true };
|
||||
|
||||
console.error("admin client error", {
|
||||
errorId: report.errorId,
|
||||
@@ -57,35 +46,4 @@ export class AdminClientErrorService {
|
||||
|
||||
return { received: true, duplicate: false };
|
||||
}
|
||||
|
||||
private assertWithinRate(subject: string, now: number): void {
|
||||
const recent = (this.windows.get(subject) ?? []).filter(
|
||||
(timestamp) => now - timestamp < RATE_WINDOW_MS,
|
||||
);
|
||||
if (recent.length >= RATE_LIMIT) {
|
||||
this.windows.set(subject, recent);
|
||||
throw new HttpException("客户端错误上报过于频繁,请稍后再试", 429);
|
||||
}
|
||||
recent.push(now);
|
||||
this.windows.set(subject, recent);
|
||||
}
|
||||
|
||||
private prune(now: number): void {
|
||||
for (const [key, timestamp] of this.recentErrorIds) {
|
||||
if (now - timestamp >= DEDUPE_TTL_MS) this.recentErrorIds.delete(key);
|
||||
}
|
||||
for (const [subject, timestamps] of this.windows) {
|
||||
const recent = timestamps.filter((timestamp) => now - timestamp < RATE_WINDOW_MS);
|
||||
if (recent.length === 0) this.windows.delete(subject);
|
||||
else this.windows.set(subject, recent);
|
||||
}
|
||||
}
|
||||
|
||||
private trimDedupe(): void {
|
||||
while (this.recentErrorIds.size > DEDUPE_CAPACITY) {
|
||||
const oldest = this.recentErrorIds.keys().next();
|
||||
if (oldest.done) return;
|
||||
this.recentErrorIds.delete(oldest.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
UpdateBrandPresentationDto,
|
||||
UpdateTrustContentDto,
|
||||
} from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TrustContentService } from "../../template/trust-content.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
|
||||
@@ -15,7 +15,7 @@ import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
@Controller("admin/config")
|
||||
export class AdminConfigController {
|
||||
constructor(
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly trustContent: TrustContentService,
|
||||
private readonly brandConfig: AdminBrandConfigService,
|
||||
) {}
|
||||
@Get("brand")
|
||||
@@ -42,7 +42,7 @@ export class AdminConfigController {
|
||||
@Get("trust-content")
|
||||
listTrustContent(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.listTrustContent(identity.brandId);
|
||||
return this.trustContent.listTrustContent(identity.brandId);
|
||||
}
|
||||
@Post("trust-content")
|
||||
createTrustContent(
|
||||
@@ -50,7 +50,7 @@ export class AdminConfigController {
|
||||
@Body() body: CreateTrustContentDto,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.createTrustContent(identity.brandId, body);
|
||||
return this.trustContent.createTrustContent(identity.brandId, body);
|
||||
}
|
||||
@Patch("trust-content/:id")
|
||||
updateTrustContent(
|
||||
@@ -59,7 +59,7 @@ export class AdminConfigController {
|
||||
@Body() body: UpdateTrustContentDto,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.updateTrustContent(identity.brandId, id, body);
|
||||
return this.trustContent.updateTrustContent(identity.brandId, id, body);
|
||||
}
|
||||
@Delete("trust-content/:id")
|
||||
async deleteTrustContent(
|
||||
@@ -67,6 +67,6 @@ export class AdminConfigController {
|
||||
@Param("id") id: string,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.deleteTrustContent(identity.brandId, id);
|
||||
return this.trustContent.deleteTrustContent(identity.brandId, id);
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,9 @@ import { InfrastructureModule } from "../infrastructure.module.js";
|
||||
import { AdminBookingController } from "./admin-booking.controller.js";
|
||||
import { AdminClientErrorController } from "./admin-client-error.controller.js";
|
||||
import { AdminClientErrorService } from "./admin-client-error.service.js";
|
||||
import { createClientErrorThrottleStore } from "./client-error-throttle.factory.js";
|
||||
import { CLIENT_ERROR_THROTTLE_STORE } from "./client-error-throttle.store.js";
|
||||
import { PrismaService } from "../../prisma.service.js";
|
||||
import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
import { AdminConfigController } from "./admin-config.controller.js";
|
||||
import { AdminLocalUploadController } from "./admin-local-upload.controller.js";
|
||||
@@ -47,6 +50,11 @@ import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-asse
|
||||
AdminTemplatePreviewService,
|
||||
AdminTemplatePreviewAssetsService,
|
||||
TemplateOperationMetricsService,
|
||||
{
|
||||
provide: CLIENT_ERROR_THROTTLE_STORE,
|
||||
useFactory: (prisma: PrismaService) => createClientErrorThrottleStore(prisma),
|
||||
inject: [PrismaService],
|
||||
},
|
||||
AdminClientErrorService,
|
||||
],
|
||||
})
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import type { PrismaService } from "../../prisma.service.js";
|
||||
import { PostgresClientErrorThrottleStore } from "./client-error-throttle.postgres.store.js";
|
||||
import {
|
||||
MemoryClientErrorThrottleStore,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
export function createClientErrorThrottleStore(
|
||||
prisma: PrismaService,
|
||||
mode = process.env.CLIENT_ERROR_THROTTLE_STORE ?? "memory",
|
||||
): ClientErrorThrottleStore {
|
||||
switch (mode) {
|
||||
case "memory":
|
||||
return new MemoryClientErrorThrottleStore();
|
||||
case "postgres":
|
||||
return new PostgresClientErrorThrottleStore(prisma);
|
||||
default:
|
||||
throw new Error(`Unsupported CLIENT_ERROR_THROTTLE_STORE: ${mode}`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
import { randomUUID } from "node:crypto";
|
||||
import { HttpException } from "@nestjs/common";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import type { PrismaService } from "../../prisma.service.js";
|
||||
import {
|
||||
CLIENT_ERROR_DEDUPE_TTL_MS,
|
||||
CLIENT_ERROR_RATE_LIMIT,
|
||||
CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
type ClientErrorThrottleReport,
|
||||
type ClientErrorThrottleResult,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
/**
|
||||
* 多实例部署使用的共享存储实现。
|
||||
* 去重与限流在同一事务中执行:限流拒绝时不会留下已去重标记。
|
||||
*/
|
||||
export class PostgresClientErrorThrottleStore implements ClientErrorThrottleStore {
|
||||
private lastCleanupAt = 0;
|
||||
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async record(
|
||||
report: ClientErrorThrottleReport,
|
||||
now = Date.now(),
|
||||
): Promise<ClientErrorThrottleResult> {
|
||||
const cutoff = new Date(now - CLIENT_ERROR_DEDUPE_TTL_MS);
|
||||
const windowStart = new Date(
|
||||
Math.floor(now / CLIENT_ERROR_RATE_WINDOW_MS) * CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
const recordedAt = new Date(now);
|
||||
let duplicate = false;
|
||||
|
||||
await this.prisma.$transaction(async (transaction) => {
|
||||
const inserted = await transaction.$queryRaw<Array<{ id: string }>>(Prisma.sql`
|
||||
INSERT INTO "ClientErrorDedupe" ("id", "subject", "errorId", "createdAt")
|
||||
VALUES (${randomUUID()}, ${report.subject}, ${report.errorId}, ${recordedAt})
|
||||
ON CONFLICT ("subject", "errorId") DO UPDATE SET
|
||||
"createdAt" = EXCLUDED."createdAt"
|
||||
WHERE "ClientErrorDedupe"."createdAt" < ${cutoff}
|
||||
RETURNING "id"
|
||||
`);
|
||||
if (!inserted.length) {
|
||||
duplicate = true;
|
||||
return;
|
||||
}
|
||||
|
||||
const rows = await transaction.$queryRaw<Array<{ count: number }>>(Prisma.sql`
|
||||
INSERT INTO "ClientErrorThrottleWindow" ("subject", "windowStart", "count", "updatedAt")
|
||||
VALUES (${report.subject}, ${windowStart}, 1, ${recordedAt})
|
||||
ON CONFLICT ("subject") DO UPDATE SET
|
||||
"count" = CASE
|
||||
WHEN EXCLUDED."windowStart" > "ClientErrorThrottleWindow"."windowStart"
|
||||
THEN 1
|
||||
WHEN EXCLUDED."windowStart" = "ClientErrorThrottleWindow"."windowStart"
|
||||
THEN LEAST("ClientErrorThrottleWindow"."count" + 1, ${CLIENT_ERROR_RATE_LIMIT + 1})
|
||||
ELSE "ClientErrorThrottleWindow"."count"
|
||||
END,
|
||||
"windowStart" = GREATEST(
|
||||
"ClientErrorThrottleWindow"."windowStart",
|
||||
EXCLUDED."windowStart"
|
||||
),
|
||||
"updatedAt" = EXCLUDED."updatedAt"
|
||||
RETURNING "count"
|
||||
`);
|
||||
if (Number(rows[0]?.count ?? 1) > CLIENT_ERROR_RATE_LIMIT) {
|
||||
throw new HttpException("客户端错误上报过于频繁,请稍后再试", 429);
|
||||
}
|
||||
});
|
||||
|
||||
await this.cleanupIfNeeded(cutoff, windowStart, now);
|
||||
return { duplicate };
|
||||
}
|
||||
|
||||
private async cleanupIfNeeded(cutoff: Date, windowStart: Date, now: number): Promise<void> {
|
||||
if (now - this.lastCleanupAt < CLIENT_ERROR_RATE_WINDOW_MS) return;
|
||||
this.lastCleanupAt = now;
|
||||
try {
|
||||
await Promise.all([
|
||||
this.prisma.clientErrorDedupe.deleteMany({ where: { createdAt: { lt: cutoff } } }),
|
||||
this.prisma.clientErrorThrottleWindow.deleteMany({
|
||||
where: {
|
||||
windowStart: {
|
||||
lt: new Date(windowStart.getTime() - CLIENT_ERROR_RATE_WINDOW_MS),
|
||||
},
|
||||
},
|
||||
}),
|
||||
]);
|
||||
} catch (error) {
|
||||
// 清理失败不能影响诊断上报本身,下一分钟会再次尝试。
|
||||
console.warn("[api] client error throttle cleanup failed", error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { HttpException } from "@nestjs/common";
|
||||
|
||||
export const CLIENT_ERROR_RATE_WINDOW_MS = 60_000;
|
||||
export const CLIENT_ERROR_RATE_LIMIT = 10;
|
||||
export const CLIENT_ERROR_DEDUPE_TTL_MS = 10 * 60_000;
|
||||
export const CLIENT_ERROR_DEDUPE_CAPACITY = 500;
|
||||
export const CLIENT_ERROR_THROTTLE_STORE = Symbol("CLIENT_ERROR_THROTTLE_STORE");
|
||||
|
||||
export interface ClientErrorThrottleReport {
|
||||
subject: string;
|
||||
errorId: string;
|
||||
}
|
||||
|
||||
export interface ClientErrorThrottleResult {
|
||||
duplicate: boolean;
|
||||
}
|
||||
|
||||
export interface ClientErrorThrottleStore {
|
||||
record(report: ClientErrorThrottleReport, now?: number): Promise<ClientErrorThrottleResult>;
|
||||
}
|
||||
|
||||
/** 单实例部署使用的进程内实现;多实例必须切换为共享存储。 */
|
||||
export class MemoryClientErrorThrottleStore implements ClientErrorThrottleStore {
|
||||
private readonly recentErrorIds = new Map<string, number>();
|
||||
private readonly windows = new Map<string, number[]>();
|
||||
|
||||
record(report: ClientErrorThrottleReport, now = Date.now()): Promise<ClientErrorThrottleResult> {
|
||||
this.prune(now);
|
||||
|
||||
const dedupeKey = `${report.subject}:${report.errorId}`;
|
||||
if (this.recentErrorIds.has(dedupeKey)) return Promise.resolve({ duplicate: true });
|
||||
|
||||
this.assertWithinRate(report.subject, now);
|
||||
this.recentErrorIds.set(dedupeKey, now);
|
||||
this.trimDedupe();
|
||||
return Promise.resolve({ duplicate: false });
|
||||
}
|
||||
|
||||
private assertWithinRate(subject: string, now: number): void {
|
||||
const recent = (this.windows.get(subject) ?? []).filter(
|
||||
(timestamp) => now - timestamp < CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
if (recent.length >= CLIENT_ERROR_RATE_LIMIT) {
|
||||
this.windows.set(subject, recent);
|
||||
throw new HttpException("客户端错误上报过于频繁,请稍后再试", 429);
|
||||
}
|
||||
recent.push(now);
|
||||
this.windows.set(subject, recent);
|
||||
}
|
||||
|
||||
private prune(now: number): void {
|
||||
for (const [key, timestamp] of this.recentErrorIds) {
|
||||
if (now - timestamp >= CLIENT_ERROR_DEDUPE_TTL_MS) this.recentErrorIds.delete(key);
|
||||
}
|
||||
for (const [subject, timestamps] of this.windows) {
|
||||
const recent = timestamps.filter(
|
||||
(timestamp) => now - timestamp < CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
if (recent.length === 0) this.windows.delete(subject);
|
||||
else this.windows.set(subject, recent);
|
||||
}
|
||||
}
|
||||
|
||||
private trimDedupe(): void {
|
||||
while (this.recentErrorIds.size > CLIENT_ERROR_DEDUPE_CAPACITY) {
|
||||
const oldest = this.recentErrorIds.keys().next();
|
||||
if (oldest.done) return;
|
||||
this.recentErrorIds.delete(oldest.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,9 @@ import { AdminMembershipGuard } from "../admin-membership.guard.js";
|
||||
import { BrandReleaseApiService } from "../brand-release-api.service.js";
|
||||
import { BrandReleaseService } from "../brand-release.service.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { TemplateWorkspaceService } from "../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../template/template-installation.service.js";
|
||||
import { TrustContentService } from "../template/trust-content.service.js";
|
||||
import { WechatAuthService } from "../wechat-auth.js";
|
||||
|
||||
@Module({
|
||||
@@ -15,7 +17,9 @@ import { WechatAuthService } from "../wechat-auth.js";
|
||||
AdminMembershipGuard,
|
||||
BrandReleaseService,
|
||||
BrandReleaseApiService,
|
||||
TemplateWorkspaceService,
|
||||
PageSchemeService,
|
||||
TemplateInstallationService,
|
||||
TrustContentService,
|
||||
],
|
||||
exports: [
|
||||
PrismaService,
|
||||
@@ -24,7 +28,9 @@ import { WechatAuthService } from "../wechat-auth.js";
|
||||
AdminMembershipGuard,
|
||||
BrandReleaseService,
|
||||
BrandReleaseApiService,
|
||||
TemplateWorkspaceService,
|
||||
PageSchemeService,
|
||||
TemplateInstallationService,
|
||||
TrustContentService,
|
||||
],
|
||||
})
|
||||
export class InfrastructureModule {}
|
||||
@@ -14,7 +14,8 @@ import type {
|
||||
CreateBrandMemberDto,
|
||||
UpdateBrandMemberDto,
|
||||
} from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
|
||||
type AdminIdentity = { subject: string; brandId: string; tokenVersion?: number };
|
||||
|
||||
@@ -22,11 +23,12 @@ type AdminIdentity = { subject: string; brandId: string; tokenVersion?: number }
|
||||
export class TenantService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly pageSchemes: PageSchemeService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
async getCreationOptions() {
|
||||
const catalog = await this.templateWorkspace.getPageSchemeCatalog();
|
||||
const catalog = await this.pageSchemes.getPageSchemeCatalog();
|
||||
// 创建品牌只应从每个页面方案的最新已发布版本开始;旧版本仍可在页面方案页显式切换。
|
||||
return {
|
||||
...catalog,
|
||||
@@ -40,7 +42,7 @@ export class TenantService {
|
||||
const name = body.name.trim();
|
||||
const slug = body.slug.trim();
|
||||
if (!name || !slug) throw new BadRequestException("品牌名称和小程序地址标识不能为空");
|
||||
const packageVersion = await this.templateWorkspace.resolveInstallablePackageVersion(
|
||||
const packageVersion = await this.templateInstallations.resolveInstallablePackageVersion(
|
||||
body.businessType,
|
||||
body.templatePackageVersionId,
|
||||
);
|
||||
|
||||
@@ -2,24 +2,28 @@ import { AdminBrand, AdminRoles } from "../../admin-auth.decorators.js";
|
||||
import { Body, Controller, Get, Post, Req } from "@nestjs/common";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { RollbackTemplateDto, UpgradeTemplateDto } from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
|
||||
@AdminBrand()
|
||||
@Controller("admin/workspace")
|
||||
class AdminTemplateController {
|
||||
constructor(private readonly templateWorkspace: TemplateWorkspaceService) {}
|
||||
constructor(
|
||||
private readonly pageSchemes: PageSchemeService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@Get("template/options")
|
||||
options(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.templateWorkspace.getPageSchemeOptions(requireAdminIdentity(request).brandId);
|
||||
return this.pageSchemes.getPageSchemeOptions(requireAdminIdentity(request).brandId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@Get("template/preview")
|
||||
preview(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.templateWorkspace.preview(requireAdminIdentity(request).brandId);
|
||||
return this.templateInstallations.preview(requireAdminIdentity(request).brandId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@@ -30,7 +34,7 @@ class AdminTemplateController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.upgrade(identity.brandId, body, identity.subject, requestId);
|
||||
return this.templateInstallations.upgrade(identity.brandId, body, identity.subject, requestId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@@ -41,7 +45,7 @@ class AdminTemplateController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.rollback(identity.brandId, identity.subject, body, requestId);
|
||||
return this.templateInstallations.rollback(identity.brandId, identity.subject, body, requestId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,19 +8,19 @@ import {
|
||||
validateCapabilityConfig,
|
||||
} from "@personal-brand/config";
|
||||
import { PrismaService } from "../../prisma.service.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import type { UpdateCapabilityInstallationDto } from "../../admin.dto.js";
|
||||
|
||||
@Injectable()
|
||||
export class AdminWorkspaceCapabilitiesService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
async list(brandId: string) {
|
||||
const [templateKey, installations] = await Promise.all([
|
||||
this.templateWorkspace.getEffectiveTemplateKey(brandId),
|
||||
this.templateInstallations.getEffectiveTemplateKey(brandId),
|
||||
this.prisma.capabilityInstallation.findMany({ where: { brandId } }),
|
||||
]);
|
||||
const installed = new Map(installations.map((item) => [item.capabilityKey, item]));
|
||||
@@ -54,7 +54,7 @@ export class AdminWorkspaceCapabilitiesService {
|
||||
body: UpdateCapabilityInstallationDto,
|
||||
) {
|
||||
const template = getBrandTemplate(
|
||||
await this.templateWorkspace.getEffectiveTemplateKey(brandId),
|
||||
await this.templateInstallations.getEffectiveTemplateKey(brandId),
|
||||
);
|
||||
if (!template?.capabilities.includes(key as never) && !(key in capabilityPlugins))
|
||||
throw new BadRequestException("能力未被当前模板声明");
|
||||
|
||||
@@ -2,7 +2,7 @@ import { AdminBrand, AdminRoles } from "../../admin-auth.decorators.js";
|
||||
import { Controller, Get, Post, Body, Req } from "@nestjs/common";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { InstallTemplateDto, SelectTemplateVersionDto } from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
import { AdminWorkspaceService } from "./admin-workspace.service.js";
|
||||
|
||||
@@ -11,7 +11,7 @@ import { AdminWorkspaceService } from "./admin-workspace.service.js";
|
||||
class AdminWorkspacePreviewController {
|
||||
constructor(
|
||||
private readonly workspaceService: AdminWorkspaceService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
@@ -32,7 +32,7 @@ class AdminWorkspacePreviewController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.install(
|
||||
return this.templateInstallations.install(
|
||||
identity.brandId,
|
||||
body.templateKey,
|
||||
body.templatePackageVersionId,
|
||||
@@ -49,7 +49,7 @@ class AdminWorkspacePreviewController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.selectVersion(
|
||||
return this.templateInstallations.selectVersion(
|
||||
identity.brandId,
|
||||
body,
|
||||
identity.subject,
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
const PLACEHOLDER_PATTERN = /(replace-with|change-me|changeme|^your[-_ ]|example|placeholder)/i;
|
||||
|
||||
/** 判断值是否仍是仓库示例中的占位符,而不是真实随机密钥。 */
|
||||
export function isPlaceholderSecret(value: string): boolean {
|
||||
return PLACEHOLDER_PATTERN.test(value.trim());
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产环境启动前的快速失败校验。
|
||||
* 本地开发允许占位符,避免示例 `.env` 阻塞调试;生产环境必须使用真实随机值。
|
||||
*/
|
||||
export function assertProductionSecret(
|
||||
value: string | undefined,
|
||||
nodeEnv: string | undefined = process.env.NODE_ENV,
|
||||
): void {
|
||||
if (nodeEnv !== "production") return;
|
||||
const secret = value?.trim() ?? "";
|
||||
if (secret.length < 32) throw new Error("SESSION_SECRET 必须是至少 32 位的随机值");
|
||||
if (isPlaceholderSecret(secret)) throw new Error("SESSION_SECRET 不能使用示例占位符");
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
import type { TemplatePackageVersion } from "@prisma/client";
|
||||
|
||||
export function record(value: unknown): Record<string, unknown> {
|
||||
return value && typeof value === "object" && !Array.isArray(value)
|
||||
? (value as Record<string, unknown>)
|
||||
: {};
|
||||
}
|
||||
|
||||
export function manifestRecords(value: unknown): Record<string, unknown>[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is Record<string, unknown> =>
|
||||
Boolean(item && typeof item === "object" && !Array.isArray(item)),
|
||||
)
|
||||
: [];
|
||||
}
|
||||
|
||||
export function stringList(value: unknown): string[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is string => typeof item === "string")
|
||||
: [];
|
||||
}
|
||||
|
||||
export function hasBindingValue(config: Record<string, unknown>, binding: unknown): boolean {
|
||||
if (typeof binding !== "string" || !binding.startsWith("brand.config.")) return false;
|
||||
const value = binding
|
||||
.slice("brand.config.".length)
|
||||
.split(".")
|
||||
.reduce<unknown>((current, key) => record(current)[key], config);
|
||||
return value !== undefined && value !== null && value !== "";
|
||||
}
|
||||
|
||||
export function compareRecords(current: Record<string, unknown>, target: Record<string, unknown>) {
|
||||
const currentKeys = Object.keys(current);
|
||||
const targetKeys = Object.keys(target);
|
||||
return {
|
||||
added: targetKeys
|
||||
.filter((key) => !(key in current))
|
||||
.map((key) => ({ key, target: target[key] })),
|
||||
removed: currentKeys
|
||||
.filter((key) => !(key in target))
|
||||
.map((key) => ({ key, current: current[key] })),
|
||||
changed: targetKeys
|
||||
.filter(
|
||||
(key) => key in current && JSON.stringify(current[key]) !== JSON.stringify(target[key]),
|
||||
)
|
||||
.map((key) => ({ key, current: current[key], target: target[key] })),
|
||||
};
|
||||
}
|
||||
|
||||
export function compareKeyedRecords(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByKey = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.key === "string")
|
||||
.map((item) => [item.key as string, item]),
|
||||
);
|
||||
const targetByKey = new Map(
|
||||
target.filter((item) => typeof item.key === "string").map((item) => [item.key as string, item]),
|
||||
);
|
||||
return {
|
||||
added: [...targetByKey].filter(([key]) => !currentByKey.has(key)).map(([, item]) => item),
|
||||
removed: [...currentByKey].filter(([key]) => !targetByKey.has(key)).map(([, item]) => item),
|
||||
changed: [...targetByKey].flatMap(([key, item]) => {
|
||||
const previous = currentByKey.get(key);
|
||||
return previous && JSON.stringify(previous) !== JSON.stringify(item)
|
||||
? [{ key, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
export function compareFiles(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByPath = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const targetByPath = new Map(
|
||||
target
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const available = currentByPath.size > 0 && targetByPath.size > 0;
|
||||
return {
|
||||
available,
|
||||
...(available
|
||||
? {
|
||||
added: [...targetByPath]
|
||||
.filter(([path]) => !currentByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
removed: [...currentByPath]
|
||||
.filter(([path]) => !targetByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
changed: [...targetByPath].flatMap(([path, item]) => {
|
||||
const previous = currentByPath.get(path);
|
||||
return previous && previous.sha256 !== item.sha256
|
||||
? [{ path, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
}
|
||||
: { reason: "版本验证报告未包含完整文件清单" }),
|
||||
};
|
||||
}
|
||||
|
||||
export function readPackageFiles(
|
||||
version: Pick<TemplatePackageVersion, "validationReport">,
|
||||
): Record<string, unknown>[] {
|
||||
return manifestRecords(record(version.validationReport).files);
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||
import {
|
||||
type BrandTemplateKey,
|
||||
brandTemplateKeys,
|
||||
getBrandTemplate,
|
||||
getVisualTemplate,
|
||||
getVisualTemplateManifest,
|
||||
isVisualTemplateCompatible,
|
||||
validateTemplatePackageManifest,
|
||||
} from "@personal-brand/config";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { compareTemplateVersions } from "../template-version-order.js";
|
||||
import { record } from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class PageSchemeService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getPageSchemeCatalog() {
|
||||
const versions = await this.prisma.templatePackageVersion.findMany({
|
||||
where: { status: "published" },
|
||||
orderBy: [{ importedAt: "desc" }, { createdAt: "desc" }],
|
||||
});
|
||||
const candidates = versions.flatMap((version) => {
|
||||
const manifest = record(version.manifestSnapshot);
|
||||
const visualTemplateKey = manifest.visualTemplateKey;
|
||||
if (
|
||||
manifest.packageKey !== version.packageKey ||
|
||||
manifest.version !== version.version ||
|
||||
typeof visualTemplateKey !== "string" ||
|
||||
visualTemplateKey !== version.packageKey
|
||||
)
|
||||
return [];
|
||||
const visualTemplate = getVisualTemplate(visualTemplateKey);
|
||||
const visualManifest = getVisualTemplateManifest(visualTemplateKey);
|
||||
if (!visualTemplate || !visualManifest) return [];
|
||||
const supportedBusinessTypes = Array.isArray(manifest.supportedIndustryTemplates)
|
||||
? manifest.supportedIndustryTemplates.filter(
|
||||
(value): value is BrandTemplateKey =>
|
||||
typeof value === "string" &&
|
||||
brandTemplateKeys.includes(value) &&
|
||||
Boolean(getBrandTemplate(value)),
|
||||
)
|
||||
: [];
|
||||
if (
|
||||
supportedBusinessTypes.length === 0 ||
|
||||
supportedBusinessTypes.some(
|
||||
(businessType) => !isVisualTemplateCompatible(visualTemplate, businessType),
|
||||
) ||
|
||||
validateTemplatePackageManifest(manifest).length > 0
|
||||
)
|
||||
return [];
|
||||
return [
|
||||
{
|
||||
templatePackageVersionId: version.id,
|
||||
packageKey: version.packageKey,
|
||||
name: version.displayName,
|
||||
description: visualManifest.description,
|
||||
version: version.version,
|
||||
supportedBusinessTypes,
|
||||
},
|
||||
];
|
||||
});
|
||||
const latestByPackage = new Map<string, string>();
|
||||
for (const candidate of candidates) {
|
||||
const latestVersion = latestByPackage.get(candidate.packageKey);
|
||||
if (!latestVersion || compareTemplateVersions(candidate.version, latestVersion) > 0) {
|
||||
latestByPackage.set(candidate.packageKey, candidate.version);
|
||||
}
|
||||
}
|
||||
const pageSchemes = candidates.map(({ packageKey, ...candidate }) => ({
|
||||
...candidate,
|
||||
isLatestForPackage: latestByPackage.get(packageKey) === candidate.version,
|
||||
}));
|
||||
|
||||
return {
|
||||
businesses: brandTemplateKeys.map((key) => {
|
||||
const template = getBrandTemplate(key);
|
||||
if (!template) throw new BadRequestException("业务类型配置不完整");
|
||||
return { key, name: template.name, description: template.description };
|
||||
}),
|
||||
pageSchemes,
|
||||
};
|
||||
}
|
||||
|
||||
async getPageSchemeOptions(brandId: string) {
|
||||
const brand = await this.prisma.brandProfile.findUnique({
|
||||
where: { id: brandId },
|
||||
select: { templateKey: true },
|
||||
});
|
||||
const template = brand ? getBrandTemplate(brand.templateKey) : undefined;
|
||||
if (!brand || !template) throw new BadRequestException("品牌业务类型无效");
|
||||
const catalog = await this.getPageSchemeCatalog();
|
||||
return {
|
||||
business: {
|
||||
key: template.key,
|
||||
name: template.name,
|
||||
description: template.description,
|
||||
},
|
||||
pageSchemes: catalog.pageSchemes.filter((scheme) =>
|
||||
scheme.supportedBusinessTypes.includes(template.key),
|
||||
),
|
||||
};
|
||||
}
|
||||
}
|
||||
+15
-258
@@ -3,7 +3,6 @@ import type { TemplatePackageVersion } from "@prisma/client";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import {
|
||||
type BrandTemplateKey,
|
||||
brandTemplateKeys,
|
||||
getBrandTemplate,
|
||||
getVisualTemplate,
|
||||
getVisualTemplateManifest,
|
||||
@@ -11,157 +10,25 @@ import {
|
||||
validateTemplatePackageManifest,
|
||||
} from "@personal-brand/config";
|
||||
import type { TemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { CreateTrustContentDto, UpdateTrustContentDto } from "./admin.dto.js";
|
||||
import type { RollbackTemplateDto, UpgradeTemplateDto } from "./admin.dto.js";
|
||||
import { PrismaService } from "./prisma.service.js";
|
||||
import { recordTemplateOperationFailure } from "./modules/admin/template-operation-failure.js";
|
||||
import { compareTemplateVersions, latestTemplateVersion } from "./template-version-order.js";
|
||||
import type { RollbackTemplateDto, UpgradeTemplateDto } from "../admin.dto.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { recordTemplateOperationFailure } from "../modules/admin/template-operation-failure.js";
|
||||
import { latestTemplateVersion } from "../template-version-order.js";
|
||||
import {
|
||||
compareFiles,
|
||||
compareKeyedRecords,
|
||||
compareRecords,
|
||||
hasBindingValue,
|
||||
manifestRecords,
|
||||
readPackageFiles,
|
||||
record,
|
||||
stringList,
|
||||
} from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class TemplateWorkspaceService {
|
||||
export class TemplateInstallationService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getPageSchemeCatalog() {
|
||||
const versions = await this.prisma.templatePackageVersion.findMany({
|
||||
where: { status: "published" },
|
||||
orderBy: [{ importedAt: "desc" }, { createdAt: "desc" }],
|
||||
});
|
||||
const candidates = versions.flatMap((version) => {
|
||||
const manifest = record(version.manifestSnapshot);
|
||||
const visualTemplateKey = manifest.visualTemplateKey;
|
||||
if (
|
||||
manifest.packageKey !== version.packageKey ||
|
||||
manifest.version !== version.version ||
|
||||
typeof visualTemplateKey !== "string" ||
|
||||
visualTemplateKey !== version.packageKey
|
||||
)
|
||||
return [];
|
||||
const visualTemplate = getVisualTemplate(visualTemplateKey);
|
||||
const visualManifest = getVisualTemplateManifest(visualTemplateKey);
|
||||
if (!visualTemplate || !visualManifest) return [];
|
||||
const supportedBusinessTypes = Array.isArray(manifest.supportedIndustryTemplates)
|
||||
? manifest.supportedIndustryTemplates.filter(
|
||||
(value): value is BrandTemplateKey =>
|
||||
typeof value === "string" &&
|
||||
brandTemplateKeys.includes(value) &&
|
||||
Boolean(getBrandTemplate(value)),
|
||||
)
|
||||
: [];
|
||||
if (
|
||||
supportedBusinessTypes.length === 0 ||
|
||||
supportedBusinessTypes.some(
|
||||
(businessType) => !isVisualTemplateCompatible(visualTemplate, businessType),
|
||||
) ||
|
||||
validateTemplatePackageManifest(manifest).length > 0
|
||||
)
|
||||
return [];
|
||||
return [
|
||||
{
|
||||
templatePackageVersionId: version.id,
|
||||
packageKey: version.packageKey,
|
||||
name: version.displayName,
|
||||
description: visualManifest.description,
|
||||
version: version.version,
|
||||
supportedBusinessTypes,
|
||||
},
|
||||
];
|
||||
});
|
||||
const latestByPackage = new Map<string, string>();
|
||||
for (const candidate of candidates) {
|
||||
const latestVersion = latestByPackage.get(candidate.packageKey);
|
||||
if (!latestVersion || compareTemplateVersions(candidate.version, latestVersion) > 0) {
|
||||
latestByPackage.set(candidate.packageKey, candidate.version);
|
||||
}
|
||||
}
|
||||
const pageSchemes = candidates.map(({ packageKey, ...candidate }) => ({
|
||||
...candidate,
|
||||
isLatestForPackage: latestByPackage.get(packageKey) === candidate.version,
|
||||
}));
|
||||
|
||||
return {
|
||||
businesses: brandTemplateKeys.map((key) => {
|
||||
const template = getBrandTemplate(key);
|
||||
if (!template) throw new BadRequestException("业务类型配置不完整");
|
||||
return { key, name: template.name, description: template.description };
|
||||
}),
|
||||
pageSchemes,
|
||||
};
|
||||
}
|
||||
|
||||
async getPageSchemeOptions(brandId: string) {
|
||||
const brand = await this.prisma.brandProfile.findUnique({
|
||||
where: { id: brandId },
|
||||
select: { templateKey: true },
|
||||
});
|
||||
const template = brand ? getBrandTemplate(brand.templateKey) : undefined;
|
||||
if (!brand || !template) throw new BadRequestException("品牌业务类型无效");
|
||||
const catalog = await this.getPageSchemeCatalog();
|
||||
return {
|
||||
business: {
|
||||
key: template.key,
|
||||
name: template.name,
|
||||
description: template.description,
|
||||
},
|
||||
pageSchemes: catalog.pageSchemes.filter((scheme) =>
|
||||
scheme.supportedBusinessTypes.includes(template.key),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
async getTrustContentTypes(brandId: string): Promise<string[]> {
|
||||
const installation = await this.prisma.brandTemplateInstallation.findUnique({
|
||||
where: { brandId },
|
||||
include: { templatePackageVersion: true },
|
||||
});
|
||||
if (!installation?.templatePackageVersion)
|
||||
throw new BadRequestException("品牌没有锁定精确视觉模板包版本");
|
||||
const manifest = record(
|
||||
installation.templatePackageVersion.manifestSnapshot,
|
||||
) as unknown as TemplatePackageManifest;
|
||||
if (validateTemplatePackageManifest(manifest).length)
|
||||
throw new BadRequestException("当前安装的模板包不符合统一模板契约");
|
||||
return manifest.trustContentTypes?.map((item) => item.type) ?? [];
|
||||
}
|
||||
async createTrustContent(brandId: string, body: CreateTrustContentDto) {
|
||||
if (!(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.create({
|
||||
data: {
|
||||
...fields,
|
||||
brandId,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
async updateTrustContent(brandId: string, id: string, body: UpdateTrustContentDto) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
if (body.type !== undefined && !(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.update({
|
||||
where: { id },
|
||||
data: {
|
||||
...fields,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
listTrustContent(brandId: string) {
|
||||
return this.prisma.trustContent.findMany({
|
||||
where: { brandId },
|
||||
orderBy: [{ type: "asc" }, { sortOrder: "asc" }],
|
||||
});
|
||||
}
|
||||
|
||||
async deleteTrustContent(brandId: string, id: string) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
await this.prisma.trustContent.delete({ where: { id } });
|
||||
return { deleted: true };
|
||||
}
|
||||
async getEffectiveTemplateKey(brandId: string): Promise<BrandTemplateKey> {
|
||||
const [brand, installation] = await Promise.all([
|
||||
this.prisma.brandProfile.findUnique({
|
||||
@@ -759,113 +626,3 @@ export class TemplateWorkspaceService {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function readPackageFiles(
|
||||
version: Pick<TemplatePackageVersion, "validationReport">,
|
||||
): Record<string, unknown>[] {
|
||||
return manifestRecords(record(version.validationReport).files);
|
||||
}
|
||||
|
||||
function record(value: unknown): Record<string, unknown> {
|
||||
return value && typeof value === "object" && !Array.isArray(value)
|
||||
? (value as Record<string, unknown>)
|
||||
: {};
|
||||
}
|
||||
|
||||
function manifestRecords(value: unknown): Record<string, unknown>[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is Record<string, unknown> =>
|
||||
Boolean(item && typeof item === "object" && !Array.isArray(item)),
|
||||
)
|
||||
: [];
|
||||
}
|
||||
|
||||
function stringList(value: unknown): string[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is string => typeof item === "string")
|
||||
: [];
|
||||
}
|
||||
|
||||
function hasBindingValue(config: Record<string, unknown>, binding: unknown): boolean {
|
||||
if (typeof binding !== "string" || !binding.startsWith("brand.config.")) return false;
|
||||
const value = binding
|
||||
.slice("brand.config.".length)
|
||||
.split(".")
|
||||
.reduce<unknown>((current, key) => record(current)[key], config);
|
||||
return value !== undefined && value !== null && value !== "";
|
||||
}
|
||||
|
||||
function compareRecords(current: Record<string, unknown>, target: Record<string, unknown>) {
|
||||
const currentKeys = Object.keys(current);
|
||||
const targetKeys = Object.keys(target);
|
||||
return {
|
||||
added: targetKeys
|
||||
.filter((key) => !(key in current))
|
||||
.map((key) => ({ key, target: target[key] })),
|
||||
removed: currentKeys
|
||||
.filter((key) => !(key in target))
|
||||
.map((key) => ({ key, current: current[key] })),
|
||||
changed: targetKeys
|
||||
.filter(
|
||||
(key) => key in current && JSON.stringify(current[key]) !== JSON.stringify(target[key]),
|
||||
)
|
||||
.map((key) => ({ key, current: current[key], target: target[key] })),
|
||||
};
|
||||
}
|
||||
|
||||
function compareKeyedRecords(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByKey = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.key === "string")
|
||||
.map((item) => [item.key as string, item]),
|
||||
);
|
||||
const targetByKey = new Map(
|
||||
target.filter((item) => typeof item.key === "string").map((item) => [item.key as string, item]),
|
||||
);
|
||||
return {
|
||||
added: [...targetByKey].filter(([key]) => !currentByKey.has(key)).map(([, item]) => item),
|
||||
removed: [...currentByKey].filter(([key]) => !targetByKey.has(key)).map(([, item]) => item),
|
||||
changed: [...targetByKey].flatMap(([key, item]) => {
|
||||
const previous = currentByKey.get(key);
|
||||
return previous && JSON.stringify(previous) !== JSON.stringify(item)
|
||||
? [{ key, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
function compareFiles(current: Record<string, unknown>[], target: Record<string, unknown>[]) {
|
||||
const currentByPath = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const targetByPath = new Map(
|
||||
target
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const available = currentByPath.size > 0 && targetByPath.size > 0;
|
||||
return {
|
||||
available,
|
||||
...(available
|
||||
? {
|
||||
added: [...targetByPath]
|
||||
.filter(([path]) => !currentByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
removed: [...currentByPath]
|
||||
.filter(([path]) => !targetByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
changed: [...targetByPath].flatMap(([path, item]) => {
|
||||
const previous = currentByPath.get(path);
|
||||
return previous && previous.sha256 !== item.sha256
|
||||
? [{ path, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
}
|
||||
: { reason: "版本验证报告未包含完整文件清单" }),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import { validateTemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { TemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { CreateTrustContentDto, UpdateTrustContentDto } from "../admin.dto.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { record } from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class TrustContentService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getTrustContentTypes(brandId: string): Promise<string[]> {
|
||||
const installation = await this.prisma.brandTemplateInstallation.findUnique({
|
||||
where: { brandId },
|
||||
include: { templatePackageVersion: true },
|
||||
});
|
||||
if (!installation?.templatePackageVersion)
|
||||
throw new BadRequestException("品牌没有锁定精确视觉模板包版本");
|
||||
const manifest = record(
|
||||
installation.templatePackageVersion.manifestSnapshot,
|
||||
) as unknown as TemplatePackageManifest;
|
||||
if (validateTemplatePackageManifest(manifest).length)
|
||||
throw new BadRequestException("当前安装的模板包不符合统一模板契约");
|
||||
return manifest.trustContentTypes?.map((item) => item.type) ?? [];
|
||||
}
|
||||
|
||||
async createTrustContent(brandId: string, body: CreateTrustContentDto) {
|
||||
if (!(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.create({
|
||||
data: {
|
||||
...fields,
|
||||
brandId,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async updateTrustContent(brandId: string, id: string, body: UpdateTrustContentDto) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
if (body.type !== undefined && !(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.update({
|
||||
where: { id },
|
||||
data: {
|
||||
...fields,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
listTrustContent(brandId: string) {
|
||||
return this.prisma.trustContent.findMany({
|
||||
where: { brandId },
|
||||
orderBy: [{ type: "asc" }, { sortOrder: "asc" }],
|
||||
});
|
||||
}
|
||||
|
||||
async deleteTrustContent(brandId: string, id: string) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
await this.prisma.trustContent.delete({ where: { id } });
|
||||
return { deleted: true };
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { ForbiddenException } from "@nestjs/common";
|
||||
import { AdminAccessService } from "../src/admin-access.service.js";
|
||||
import { signIdentity } from "../src/auth.js";
|
||||
|
||||
process.env.SESSION_SECRET = "admin-access-service-test-secret-1234567890";
|
||||
|
||||
type RequestFixture = {
|
||||
headers: { authorization: string };
|
||||
};
|
||||
|
||||
function requestFixture(subject = "admin-1", brandId = "brand-1"): RequestFixture {
|
||||
return {
|
||||
headers: {
|
||||
authorization: `Bearer ${signIdentity({ subject, brandId, role: "admin" })}`,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function accessFixture() {
|
||||
const calls = { adminUser: 0, membership: 0 };
|
||||
const prisma = {
|
||||
adminUser: {
|
||||
findUnique: async () => {
|
||||
calls.adminUser += 1;
|
||||
return {
|
||||
isEnabled: true,
|
||||
mustChangePassword: false,
|
||||
tokenVersion: 0,
|
||||
platformTemplateRole: "none",
|
||||
};
|
||||
},
|
||||
},
|
||||
brandMembership: {
|
||||
findUnique: async () => {
|
||||
calls.membership += 1;
|
||||
return { role: "owner", isEnabled: true };
|
||||
},
|
||||
},
|
||||
};
|
||||
return { calls, prisma };
|
||||
}
|
||||
|
||||
test("同一请求内 Guard 与 Controller 复用访问校验结果", async () => {
|
||||
const { calls, prisma } = accessFixture();
|
||||
const service = new AdminAccessService(prisma as never);
|
||||
const request = requestFixture();
|
||||
|
||||
const [guardResult, controllerResult] = await Promise.all([
|
||||
service.requireBrand(request as never),
|
||||
service.requireBrand(request as never),
|
||||
]);
|
||||
assert.deepEqual(guardResult, controllerResult);
|
||||
await service.requireRole(request as never, ["owner"]);
|
||||
await assert.rejects(
|
||||
service.requireTemplateAdmin(request as never),
|
||||
(error: unknown) => error instanceof ForbiddenException,
|
||||
);
|
||||
|
||||
assert.equal(calls.adminUser, 1);
|
||||
assert.equal(calls.membership, 1);
|
||||
});
|
||||
|
||||
test("不同请求之间不共享访问校验缓存", async () => {
|
||||
const { calls, prisma } = accessFixture();
|
||||
const service = new AdminAccessService(prisma as never);
|
||||
|
||||
await service.requireBrand(requestFixture("admin-1") as never);
|
||||
await service.requireBrand(requestFixture("admin-2") as never);
|
||||
|
||||
assert.equal(calls.adminUser, 2);
|
||||
assert.equal(calls.membership, 2);
|
||||
});
|
||||
@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { HttpException } from "@nestjs/common";
|
||||
import { AdminClientErrorService } from "../src/modules/admin/admin-client-error.service.js";
|
||||
import { MemoryClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
function report(errorId: string, subject = "admin:user-1") {
|
||||
return {
|
||||
@@ -15,40 +16,42 @@ function report(errorId: string, subject = "admin:user-1") {
|
||||
};
|
||||
}
|
||||
|
||||
test("首次上报记录,相同 errorId 在窗口内按管理员去重", () => {
|
||||
const service = new AdminClientErrorService();
|
||||
assert.deepEqual(service.record(report("admin-error-1")), {
|
||||
function service() {
|
||||
return new AdminClientErrorService(new MemoryClientErrorThrottleStore());
|
||||
}
|
||||
|
||||
test("首次上报记录,相同 errorId 在窗口内按管理员去重", async () => {
|
||||
const errors = service();
|
||||
assert.deepEqual(await errors.record(report("admin-error-1")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
assert.deepEqual(service.record(report("admin-error-1")), {
|
||||
assert.deepEqual(await errors.record(report("admin-error-1")), {
|
||||
received: true,
|
||||
duplicate: true,
|
||||
});
|
||||
// 不同管理员使用相同 errorId 时互不影响
|
||||
assert.deepEqual(service.record(report("admin-error-1", "admin:user-2")), {
|
||||
assert.deepEqual(await errors.record(report("admin-error-1", "admin:user-2")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
});
|
||||
|
||||
test("同一管理员 60 秒内最多接受 10 条不同错误", () => {
|
||||
const service = new AdminClientErrorService();
|
||||
test("同一管理员 60 秒内最多接受 10 条不同错误", async () => {
|
||||
const errors = service();
|
||||
for (let index = 0; index < 10; index += 1) {
|
||||
assert.deepEqual(service.record(report(`admin-rate-${index}`)), {
|
||||
assert.deepEqual(await errors.record(report(`admin-rate-${index}`)), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
}
|
||||
try {
|
||||
service.record(report("admin-rate-overflow"));
|
||||
assert.fail("应当触发限流");
|
||||
} catch (error) {
|
||||
await assert.rejects(errors.record(report("admin-rate-overflow")), (error) => {
|
||||
assert.ok(error instanceof HttpException);
|
||||
assert.equal(error.getStatus(), 429);
|
||||
}
|
||||
return true;
|
||||
});
|
||||
// 另一个管理员不受影响
|
||||
assert.deepEqual(service.record(report("admin-rate-other", "admin:user-2")), {
|
||||
assert.deepEqual(await errors.record(report("admin-rate-other", "admin:user-2")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { createClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.factory.js";
|
||||
import { PostgresClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.postgres.store.js";
|
||||
import { MemoryClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
const prisma = {} as never;
|
||||
|
||||
test("默认使用进程内存储", () => {
|
||||
const store = createClientErrorThrottleStore(prisma, "memory");
|
||||
assert.ok(store instanceof MemoryClientErrorThrottleStore);
|
||||
});
|
||||
|
||||
test("多实例可切换为 Postgres 共享存储", () => {
|
||||
const store = createClientErrorThrottleStore(prisma, "postgres");
|
||||
assert.ok(store instanceof PostgresClientErrorThrottleStore);
|
||||
});
|
||||
|
||||
test("未知存储模式在启动时快速失败", () => {
|
||||
assert.throws(
|
||||
() => createClientErrorThrottleStore(prisma, "redis"),
|
||||
/Unsupported CLIENT_ERROR_THROTTLE_STORE/,
|
||||
);
|
||||
});
|
||||
@@ -12,6 +12,11 @@ import { createApp } from "../dist/main.js";
|
||||
import { readIdentity, signIdentity } from "../dist/auth.js";
|
||||
import { WechatAuthService } from "../dist/wechat-auth.js";
|
||||
import { AdminMiniAppReleaseService } from "../dist/modules/admin/admin-miniapp-release.service.js";
|
||||
import { PostgresClientErrorThrottleStore } from "../dist/modules/admin/client-error-throttle.postgres.store.js";
|
||||
import {
|
||||
CLIENT_ERROR_DEDUPE_TTL_MS,
|
||||
CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
} from "../dist/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
let app;
|
||||
const prisma = new PrismaClient();
|
||||
@@ -1928,6 +1933,88 @@ test("admin client error reports are authenticated, validated, and deduplicated"
|
||||
assert.equal(invalid.statusCode, 400);
|
||||
});
|
||||
|
||||
test("postgres client error store deduplicates and rate limits across instances", async () => {
|
||||
const storeA = new PostgresClientErrorThrottleStore(prisma);
|
||||
const storeB = new PostgresClientErrorThrottleStore(prisma);
|
||||
const subjectPrefix = `pg-client-error-${randomUUID()}`;
|
||||
const dedupeSubject = `${subjectPrefix}-dedupe`;
|
||||
const concurrentSubject = `${subjectPrefix}-concurrent`;
|
||||
const rateSubject = `${subjectPrefix}-rate`;
|
||||
const lateSubject = `${subjectPrefix}-late`;
|
||||
const now = Date.now();
|
||||
try {
|
||||
assert.deepEqual(await storeA.record({ subject: dedupeSubject, errorId: "same" }, now), {
|
||||
duplicate: false,
|
||||
});
|
||||
assert.deepEqual(await storeB.record({ subject: dedupeSubject, errorId: "same" }, now), {
|
||||
duplicate: true,
|
||||
});
|
||||
assert.deepEqual(
|
||||
await storeB.record(
|
||||
{ subject: dedupeSubject, errorId: "same" },
|
||||
now + CLIENT_ERROR_DEDUPE_TTL_MS + 1_000,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
|
||||
const concurrent = await Promise.all(
|
||||
Array.from({ length: 6 }, (_, index) =>
|
||||
(index % 2 === 0 ? storeA : storeB).record(
|
||||
{ subject: concurrentSubject, errorId: "concurrent-same" },
|
||||
now,
|
||||
),
|
||||
),
|
||||
);
|
||||
assert.equal(concurrent.filter((result) => !result.duplicate).length, 1);
|
||||
|
||||
for (let index = 0; index < 10; index += 1) {
|
||||
const store = index % 2 === 0 ? storeA : storeB;
|
||||
assert.deepEqual(
|
||||
await store.record({ subject: rateSubject, errorId: `rate-${index}` }, now),
|
||||
{ duplicate: false },
|
||||
);
|
||||
}
|
||||
await assert.rejects(
|
||||
storeB.record({ subject: rateSubject, errorId: "rate-overflow" }, now),
|
||||
(error) => error.getStatus?.() === 429,
|
||||
);
|
||||
assert.deepEqual(
|
||||
await storeA.record(
|
||||
{ subject: rateSubject, errorId: "rate-next-window" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
|
||||
// 旧窗口的迟到请求不得把窗口指针回拨,否则会额外放行一整窗口。
|
||||
await storeA.record(
|
||||
{ subject: lateSubject, errorId: "late-first" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
await storeB.record({ subject: lateSubject, errorId: "late-old" }, now);
|
||||
for (let index = 0; index < 9; index += 1) {
|
||||
assert.deepEqual(
|
||||
await storeA.record(
|
||||
{ subject: lateSubject, errorId: `late-next-${index}` },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
}
|
||||
await assert.rejects(
|
||||
storeB.record(
|
||||
{ subject: lateSubject, errorId: "late-overflow" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
(error) => error.getStatus?.() === 429,
|
||||
);
|
||||
} finally {
|
||||
const subjects = [dedupeSubject, concurrentSubject, rateSubject, lateSubject];
|
||||
await prisma.clientErrorDedupe.deleteMany({ where: { subject: { in: subjects } } });
|
||||
await prisma.clientErrorThrottleWindow.deleteMany({ where: { subject: { in: subjects } } });
|
||||
}
|
||||
});
|
||||
|
||||
async function assertProtectedRouteBoundary(url, options = {}) {
|
||||
const { method = "GET", payload, forbiddenRole = "customer", headers = {} } = options;
|
||||
const requestOptions = payload === undefined ? { method, headers } : { method, headers, payload };
|
||||
@@ -5123,6 +5210,71 @@ test("disabled brand membership blocks existing admin token", async () => {
|
||||
}
|
||||
});
|
||||
|
||||
test("booking endpoints share the brand access policy", async () => {
|
||||
const username = `booking-policy-${randomUUID()}`;
|
||||
const password = "booking-policy-password-123";
|
||||
const user = await prisma.adminUser.create({
|
||||
data: {
|
||||
username,
|
||||
passwordHash: await bcrypt.hash(password, 12),
|
||||
displayName: "预订策略测试管理员",
|
||||
mustChangePassword: true,
|
||||
},
|
||||
});
|
||||
const membership = await prisma.brandMembership.create({
|
||||
data: { brandId, adminUserId: user.id, role: "admin", isEnabled: true },
|
||||
});
|
||||
try {
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username, password },
|
||||
});
|
||||
assert.equal(login.statusCode, 201, login.body);
|
||||
const headers = { authorization: `Bearer ${sessionToken(login)}` };
|
||||
const routes = [
|
||||
{ method: "GET", url: "/admin/bookings" },
|
||||
{ method: "GET", url: "/admin/bookings/unread-count" },
|
||||
{ method: "GET", url: "/admin/bookings/tags" },
|
||||
{ method: "POST", url: "/admin/bookings/tags", payload: { name: "策略测试标签" } },
|
||||
];
|
||||
|
||||
// 初始密码未修改时,预订路由必须与其他后台路由一样被拒绝。
|
||||
for (const route of routes) {
|
||||
const response = await request(route.url, {
|
||||
method: route.method,
|
||||
headers,
|
||||
...(route.payload ? { payload: route.payload } : {}),
|
||||
});
|
||||
assert.equal(response.statusCode, 403, `${route.method} ${route.url}: ${response.body}`);
|
||||
}
|
||||
|
||||
// 品牌成员被停用后,同一 token 也不能再访问预订数据。
|
||||
await prisma.adminUser.update({ where: { id: user.id }, data: { mustChangePassword: false } });
|
||||
const changed = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username, password },
|
||||
});
|
||||
assert.equal(changed.statusCode, 201, changed.body);
|
||||
const activeHeaders = { authorization: `Bearer ${sessionToken(changed)}` };
|
||||
assert.equal((await request("/admin/bookings", { headers: activeHeaders })).statusCode, 200);
|
||||
|
||||
await prisma.brandMembership.update({
|
||||
where: { id: membership.id },
|
||||
data: { isEnabled: false },
|
||||
});
|
||||
for (const route of routes) {
|
||||
const response = await request(route.url, {
|
||||
method: route.method,
|
||||
headers: activeHeaders,
|
||||
...(route.payload ? { payload: route.payload } : {}),
|
||||
});
|
||||
assert.equal(response.statusCode, 403, `${route.method} ${route.url}: ${response.body}`);
|
||||
}
|
||||
} finally {
|
||||
await prisma.adminUser.delete({ where: { id: user.id } });
|
||||
}
|
||||
});
|
||||
|
||||
test("admin can read and update brand and service configuration", async () => {
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { assertProductionSecret, isPlaceholderSecret } from "../src/runtime-config.js";
|
||||
|
||||
test("production rejects missing or short session secrets", () => {
|
||||
assert.throws(() => assertProductionSecret(undefined, "production"), /至少 32 位/);
|
||||
assert.throws(() => assertProductionSecret("short-secret", "production"), /至少 32 位/);
|
||||
});
|
||||
|
||||
test("production rejects example placeholder secrets", () => {
|
||||
assert.throws(
|
||||
() => assertProductionSecret("replace-with-at-least-32-random-characters", "production"),
|
||||
/示例占位符/,
|
||||
);
|
||||
assert.throws(
|
||||
() => assertProductionSecret("change-me-now-1234567890-abcdefghij", "production"),
|
||||
/示例占位符/,
|
||||
);
|
||||
});
|
||||
|
||||
test("production accepts a strong random secret", () => {
|
||||
assert.doesNotThrow(() =>
|
||||
assertProductionSecret("s3cure-Random-Value-0123456789-abcdefghij", "production"),
|
||||
);
|
||||
});
|
||||
|
||||
test("development keeps working with the example placeholder", () => {
|
||||
assert.doesNotThrow(() =>
|
||||
assertProductionSecret("replace-with-a-long-random-value", "development"),
|
||||
);
|
||||
});
|
||||
|
||||
test("placeholder detection covers documented example values", () => {
|
||||
assert.equal(isPlaceholderSecret("replace-with-a-long-random-value"), true);
|
||||
assert.equal(isPlaceholderSecret(" YOur-secret-value "), true);
|
||||
assert.equal(isPlaceholderSecret("s3cure-Random-Value-0123456789-abcdefghij"), false);
|
||||
});
|
||||
@@ -45,7 +45,6 @@ async function main() {
|
||||
.filter((entry) => entry.isDirectory() && entry.name !== targetMigration)
|
||||
.map((entry) => entry.name)
|
||||
.sort();
|
||||
assert.equal(migrationDirs.at(-1), "20261019100000_remove_brand_profile_defaults");
|
||||
await admin.$executeRawUnsafe(`CREATE SCHEMA "${schema}"`);
|
||||
createdSchema = true;
|
||||
|
||||
|
||||
+35
-1
@@ -61,7 +61,41 @@ pnpm --filter @personal-brand/taro test
|
||||
pnpm --filter @personal-brand/taro test:browser
|
||||
```
|
||||
|
||||
浏览器测试需要先启动 API 和餐饮 H5 预览。`PREVIEW_URL` 指定预览地址,`CHROMIUM_PATH` 指定本机 Chromium;测试只读取开发库,模拟错误响应用于失败路径,不写入真实数据。
|
||||
完整浏览器回归需要同时启动四类服务,缺一会产生误导性的失败:
|
||||
|
||||
```sh
|
||||
# 1. API(3001)。CORS 必须放行 Admin 与两个 H5 预览来源,否则浏览器报 Failed to fetch。
|
||||
CORS_ORIGINS=http://localhost:3002,http://localhost:3003,http://localhost:3005 \
|
||||
pnpm --filter @personal-brand/api dev
|
||||
|
||||
# 2. Admin(3005)。dev server 会把 /api 代理到 3001;静态 preview 没有该代理。
|
||||
ADMIN_PORT=3005 pnpm --filter @personal-brand/admin dev
|
||||
|
||||
# 3. 餐饮 H5(3002)
|
||||
TEMPLATE_KEY=acheng-campus-food PREVIEW_PORT=3002 pnpm --filter @personal-brand/taro dev:h5
|
||||
|
||||
# 4. 林境 H5(3003)
|
||||
TEMPLATE_KEY=linjing-editorial PREVIEW_PORT=3003 pnpm --filter @personal-brand/taro dev:h5
|
||||
```
|
||||
|
||||
然后执行:
|
||||
|
||||
```sh
|
||||
ADMIN_URL=http://127.0.0.1:3005 PREVIEW_URL=http://127.0.0.1:3002 \
|
||||
pnpm --filter @personal-brand/taro test:browser
|
||||
```
|
||||
|
||||
`PREVIEW_URL` 指定餐饮预览地址,林境用例固定访问 `http://localhost:3003`,`CHROMIUM_PATH` 可指定本机 Chromium。测试只读取开发库,模拟错误响应用于失败路径,不写入真实数据。
|
||||
|
||||
当前 Taro 4.3 的 `dev:h5` watch 模式在本地会持续增长直至 OOM,而一次性构建正常。遇到该问题时改用 `TEMPLATE_KEY=<key> pnpm --filter @personal-brand/taro build:h5`,再通过静态服务器托管 `dist/<key>/h5`;静态托管同样需要把对应来源加入 `CORS_ORIGINS`。
|
||||
|
||||
PR 和本地可用轻量 smoke 验证 Admin 会话与创建品牌流程:
|
||||
|
||||
```sh
|
||||
pnpm test:browser:smoke
|
||||
```
|
||||
|
||||
该命令会自动构建 Admin 并启动静态预览;完整浏览器回归仍使用 `pnpm --filter @personal-brand/taro test:browser`。
|
||||
|
||||
## 回滚与切换
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
"typecheck": "tsc --noEmit",
|
||||
"lint": "pnpm --workspace-root exec eslint apps/taro/src apps/taro/config \"packages/template-*/taro/**/*.{ts,tsx}\"",
|
||||
"test": "node --experimental-strip-types --test test/*.test.mjs",
|
||||
"test:browser": "playwright test"
|
||||
"test:browser": "playwright test",
|
||||
"test:browser:smoke": "playwright test -c playwright.smoke.config.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@personal-brand/types": "workspace:*",
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import { defineConfig } from "@playwright/test";
|
||||
|
||||
const adminOrigin = process.env.ADMIN_URL || "http://127.0.0.1:3005";
|
||||
|
||||
export default defineConfig({
|
||||
testDir: "./test/browser",
|
||||
// PR smoke 只覆盖最容易影响所有后台操作的会话与品牌创建流程。
|
||||
testMatch: ["admin-session.spec.ts", "brand-creation-and-page-scheme.spec.ts"],
|
||||
timeout: 30000,
|
||||
fullyParallel: false,
|
||||
workers: 1,
|
||||
use: {
|
||||
viewport: { width: 1440, height: 1000 },
|
||||
screenshot: "only-on-failure",
|
||||
trace: "retain-on-failure",
|
||||
launchOptions: { args: ["--no-sandbox"] },
|
||||
},
|
||||
reporter: [["list"]],
|
||||
outputDir: "../../.codex-tasks/browser-smoke/raw",
|
||||
webServer: {
|
||||
// 使用已构建的 Admin 静态产物,避免在 CI 中额外启动 API 或 Vite 开发代理。
|
||||
command:
|
||||
"pnpm --dir ../../apps/admin exec vite preview --host 127.0.0.1 --port 3005 --strictPort",
|
||||
url: `${adminOrigin}/admin/brands/new`,
|
||||
reuseExistingServer: !process.env.CI,
|
||||
timeout: 60000,
|
||||
},
|
||||
});
|
||||
@@ -88,6 +88,27 @@ async function verifyCanvasTargets(page: Page, manifest: any, pageKey: string) {
|
||||
}
|
||||
|
||||
const adminOrigin = process.env.ADMIN_URL || "http://localhost:3005";
|
||||
const consoleWarnings = new WeakMap<Page, string[]>();
|
||||
|
||||
test.beforeEach(({ page }) => {
|
||||
const warnings: string[] = [];
|
||||
consoleWarnings.set(page, warnings);
|
||||
page.on("console", (message) => {
|
||||
const text = message.text();
|
||||
const isWarning =
|
||||
message.type() === "warning" ||
|
||||
(message.type() === "error" &&
|
||||
(text.startsWith("Warning:") ||
|
||||
text.includes("non-boolean attribute") ||
|
||||
text.includes("empty string")));
|
||||
if (isWarning) warnings.push(text);
|
||||
});
|
||||
});
|
||||
|
||||
test.afterEach(({ page }) => {
|
||||
expect(consoleWarnings.get(page) ?? []).toEqual([]);
|
||||
});
|
||||
|
||||
const brand = {
|
||||
id: "brand-fixture",
|
||||
slug: "preview-fixture",
|
||||
@@ -712,6 +733,9 @@ test("林境模板支持首页和主理人区域点选", async ({ page }) => {
|
||||
title: "专业资历",
|
||||
summary: "建筑与门系统经验",
|
||||
content: "持续服务私宅项目",
|
||||
sortOrder: 0,
|
||||
isPublished: true,
|
||||
coverUrl: null,
|
||||
config: {
|
||||
pillars: editorialPillars,
|
||||
serviceFlow: editorialFlow,
|
||||
|
||||
@@ -1,7 +1,28 @@
|
||||
import fs from "node:fs";
|
||||
import { test, expect } from "@playwright/test";
|
||||
import { test, expect, type Page } from "@playwright/test";
|
||||
|
||||
const adminOrigin = process.env.ADMIN_URL || "http://localhost:3005";
|
||||
const consoleWarnings = new WeakMap<Page, string[]>();
|
||||
|
||||
test.beforeEach(({ page }) => {
|
||||
const warnings: string[] = [];
|
||||
consoleWarnings.set(page, warnings);
|
||||
page.on("console", (message) => {
|
||||
const text = message.text();
|
||||
const isWarning =
|
||||
message.type() === "warning" ||
|
||||
(message.type() === "error" &&
|
||||
(text.startsWith("Warning:") ||
|
||||
text.includes("non-boolean attribute") ||
|
||||
text.includes("empty string")));
|
||||
if (isWarning) warnings.push(text);
|
||||
});
|
||||
});
|
||||
|
||||
test.afterEach(({ page }) => {
|
||||
expect(consoleWarnings.get(page) ?? []).toEqual([]);
|
||||
});
|
||||
|
||||
const templateContent = JSON.parse(
|
||||
fs.readFileSync("../../packages/template-acheng-campus-food/template.json", "utf8"),
|
||||
);
|
||||
|
||||
@@ -11,13 +11,17 @@ const manifest = JSON.parse(
|
||||
);
|
||||
const version = {
|
||||
id: "preview-browser-version",
|
||||
templatePackageId: "preview-browser-package",
|
||||
packageKey: manifest.packageKey,
|
||||
version: manifest.version,
|
||||
displayName: manifest.displayName,
|
||||
status: "imported",
|
||||
contentChecksum: "fixture-checksum",
|
||||
archiveChecksum: "fixture-archive-checksum",
|
||||
importedAt: "2026-10-21T00:00:00.000Z",
|
||||
updatedAt: "2026-10-21T00:00:00.000Z",
|
||||
manifestSnapshot: manifest,
|
||||
importedBy: { displayName: "模板管理员" },
|
||||
importedBy: { id: "template-admin", username: "admin", displayName: "模板管理员" },
|
||||
validationReport: {},
|
||||
manifestSummary: { supportedIndustryTemplates: manifest.supportedIndustryTemplates },
|
||||
};
|
||||
@@ -103,6 +107,16 @@ test("模板管理可重试预览,并切换我的、详情和禁止提交的
|
||||
}
|
||||
if (url.pathname.endsWith("/admin/templates"))
|
||||
return route.fulfill({ json: { items: [version], page: 1, pageSize: 20, total: 1 } });
|
||||
if (url.pathname.endsWith("/admin/template-operations/failures"))
|
||||
return route.fulfill({
|
||||
json: {
|
||||
since: "2026-09-21T00:00:00.000Z",
|
||||
until: "2026-10-21T00:00:00.000Z",
|
||||
days: 30,
|
||||
backfilled: true,
|
||||
failures: [],
|
||||
},
|
||||
});
|
||||
if (url.pathname.endsWith("/admin/brands")) return route.fulfill({ json: [] });
|
||||
return route.fulfill({ json: { name: "测试工作区" } });
|
||||
});
|
||||
|
||||
@@ -18,12 +18,15 @@ type PackedChecksums = {
|
||||
|
||||
type PreviewVersion = {
|
||||
id: string;
|
||||
templatePackageId: string;
|
||||
packageKey: string;
|
||||
version: string;
|
||||
displayName: string;
|
||||
status: "imported";
|
||||
manifestSnapshot: PackedManifest;
|
||||
importedBy: { displayName: string };
|
||||
importedBy: { id: string; username: string; displayName: string };
|
||||
importedAt: string;
|
||||
updatedAt: string;
|
||||
validationReport: Record<string, unknown>;
|
||||
manifestSummary: { supportedIndustryTemplates: string[] };
|
||||
artifactPath: string;
|
||||
@@ -88,12 +91,15 @@ async function buildPreviewFixture(mediaCase: MediaCase) {
|
||||
const archivePath = path.join(temporary, archive);
|
||||
const version: PreviewVersion = {
|
||||
id: `preview-media-${mediaCase.packageKey}-${mediaCase.industry}`,
|
||||
templatePackageId: `preview-media-package-${mediaCase.packageKey}`,
|
||||
packageKey: manifest.packageKey,
|
||||
version: manifest.version,
|
||||
displayName: manifest.displayName,
|
||||
status: "imported",
|
||||
manifestSnapshot: manifest,
|
||||
importedBy: { displayName: "模板管理员" },
|
||||
importedBy: { id: "template-admin", username: "admin", displayName: "模板管理员" },
|
||||
importedAt: "2026-10-21T00:00:00.000Z",
|
||||
updatedAt: "2026-10-21T00:00:00.000Z",
|
||||
validationReport: {},
|
||||
manifestSummary: { supportedIndustryTemplates: manifest.supportedIndustryTemplates },
|
||||
artifactPath: archivePath,
|
||||
@@ -216,6 +222,16 @@ test("导入包预览矩阵展示身份、资源和完整媒体槽位", async ({
|
||||
total: 1,
|
||||
},
|
||||
});
|
||||
if (url.pathname.endsWith("/admin/template-operations/failures"))
|
||||
return route.fulfill({
|
||||
json: {
|
||||
since: "2026-09-21T00:00:00.000Z",
|
||||
until: "2026-10-21T00:00:00.000Z",
|
||||
days: 30,
|
||||
backfilled: true,
|
||||
failures: [],
|
||||
},
|
||||
});
|
||||
if (url.pathname.endsWith("/admin/brands")) return route.fulfill({ json: [] });
|
||||
return route.fulfill({ json: { name: "测试工作区" } });
|
||||
});
|
||||
|
||||
@@ -6,6 +6,8 @@ module.exports = {
|
||||
apps: [
|
||||
{
|
||||
name: "personal-brand-api",
|
||||
instances: 1,
|
||||
exec_mode: "fork",
|
||||
cwd: path.join(root, "current/apps/api"),
|
||||
script: "dist/main.js",
|
||||
interpreter: process.execPath,
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { createRequire } from "node:module";
|
||||
|
||||
process.env.DEPLOY_ROOT = "/srv/personal-brand";
|
||||
const require = createRequire(import.meta.url);
|
||||
const config = require("./ecosystem.config.cjs");
|
||||
|
||||
test("异常上报使用进程内存储时 PM2 必须保持单实例", () => {
|
||||
assert.equal(config.apps.length, 1);
|
||||
assert.equal(config.apps[0].instances, 1);
|
||||
assert.equal(config.apps[0].exec_mode, "fork");
|
||||
});
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
import path from "node:path";
|
||||
import { spawn, spawnSync } from "node:child_process";
|
||||
import { checkPackage } from "../scripts/deploy/check-package.mjs";
|
||||
import { assertReleaseEnvironment } from "./release-environment.mjs";
|
||||
|
||||
const root = process.env.DEPLOY_ROOT;
|
||||
if (!root || !path.isAbsolute(root)) throw new Error("DEPLOY_ROOT must be absolute");
|
||||
@@ -28,20 +29,7 @@ if (!postgresContainer || !/^[a-zA-Z0-9_.-]+$/.test(postgresContainer)) {
|
||||
throw new Error("POSTGRES_CONTAINER is required for the database backup");
|
||||
}
|
||||
if (Number(process.versions.node.split(".")[0]) !== 24) throw new Error("Node.js 24 is required");
|
||||
if (
|
||||
process.env.NODE_ENV !== "production" ||
|
||||
!process.env.DATABASE_URL ||
|
||||
!process.env.SESSION_SECRET ||
|
||||
process.env.SESSION_SECRET.length < 32 ||
|
||||
!process.env.DEFAULT_BRAND_ID ||
|
||||
!process.env.LOCAL_MEDIA_ROOT
|
||||
) {
|
||||
throw new Error("Production environment is missing required values");
|
||||
}
|
||||
if (!path.isAbsolute(process.env.LOCAL_MEDIA_ROOT))
|
||||
throw new Error("LOCAL_MEDIA_ROOT must be absolute");
|
||||
if (process.env.API_PREFIX) throw new Error("API_PREFIX must be empty when Traefik strips /api");
|
||||
const databaseUrl = new URL(process.env.DATABASE_URL);
|
||||
const databaseUrl = assertReleaseEnvironment(process.env);
|
||||
const privateDatabaseHost = /^(10\.|192\.168\.|172\.(1[6-9]|2\d|3[0-1])\.)/.test(
|
||||
databaseUrl.hostname,
|
||||
);
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
import path from "node:path";
|
||||
|
||||
const PLACEHOLDER_PATTERN = /(replace-with|change-me|changeme|^your[-_ ]|example|placeholder)/i;
|
||||
|
||||
/** 判断值是否仍是示例占位符,而不是真实随机密钥。 */
|
||||
export function isPlaceholderSecret(value) {
|
||||
return PLACEHOLDER_PATTERN.test(value.trim());
|
||||
}
|
||||
|
||||
/**
|
||||
* 切流前校验共享生产环境文件。
|
||||
* 除必填项外,必须拒绝示例密钥,避免上线后才在 API 启动时失败。
|
||||
*/
|
||||
export function assertReleaseEnvironment(environment) {
|
||||
if (
|
||||
environment.NODE_ENV !== "production" ||
|
||||
!environment.DATABASE_URL ||
|
||||
!environment.SESSION_SECRET ||
|
||||
!environment.DEFAULT_BRAND_ID ||
|
||||
!environment.LOCAL_MEDIA_ROOT
|
||||
) {
|
||||
throw new Error("Production environment is missing required values");
|
||||
}
|
||||
if (environment.SESSION_SECRET.trim().length < 32) {
|
||||
throw new Error("SESSION_SECRET must contain at least 32 characters");
|
||||
}
|
||||
if (isPlaceholderSecret(environment.SESSION_SECRET)) {
|
||||
throw new Error("SESSION_SECRET must not use an example placeholder");
|
||||
}
|
||||
if (!path.isAbsolute(environment.LOCAL_MEDIA_ROOT)) {
|
||||
throw new Error("LOCAL_MEDIA_ROOT must be absolute");
|
||||
}
|
||||
if (environment.API_PREFIX) {
|
||||
throw new Error("API_PREFIX must be empty when Traefik strips /api");
|
||||
}
|
||||
const throttleStore = environment.CLIENT_ERROR_THROTTLE_STORE ?? "memory";
|
||||
if (!["memory", "postgres"].includes(throttleStore)) {
|
||||
throw new Error("CLIENT_ERROR_THROTTLE_STORE must be memory or postgres");
|
||||
}
|
||||
return new URL(environment.DATABASE_URL);
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { assertReleaseEnvironment } from "./release-environment.mjs";
|
||||
|
||||
const validEnvironment = {
|
||||
NODE_ENV: "production",
|
||||
DATABASE_URL: "postgresql://user:password@127.0.0.1:5432/personal_brand",
|
||||
SESSION_SECRET: "Zx9vQ2mK7pL4rT8wY3nB6cF1hJ5sD0gA",
|
||||
DEFAULT_BRAND_ID: "brand-1",
|
||||
LOCAL_MEDIA_ROOT: "/srv/personal-brand/media",
|
||||
};
|
||||
|
||||
test("生产环境校验接受真实随机密钥", () => {
|
||||
const databaseUrl = assertReleaseEnvironment(validEnvironment);
|
||||
assert.equal(databaseUrl.hostname, "127.0.0.1");
|
||||
});
|
||||
|
||||
test("生产环境校验拒绝示例占位密钥", () => {
|
||||
assert.throws(
|
||||
() =>
|
||||
assertReleaseEnvironment({
|
||||
...validEnvironment,
|
||||
SESSION_SECRET: "replace-with-at-least-32-random-characters",
|
||||
}),
|
||||
/must not use an example placeholder/,
|
||||
);
|
||||
});
|
||||
|
||||
test("生产环境校验拒绝过短密钥", () => {
|
||||
assert.throws(
|
||||
() => assertReleaseEnvironment({ ...validEnvironment, SESSION_SECRET: "short-secret" }),
|
||||
/at least 32 characters/,
|
||||
);
|
||||
});
|
||||
|
||||
test("生产环境校验拒绝缺失的必填项", () => {
|
||||
assert.throws(
|
||||
() => assertReleaseEnvironment({ ...validEnvironment, DEFAULT_BRAND_ID: "" }),
|
||||
/missing required values/,
|
||||
);
|
||||
});
|
||||
|
||||
test("生产环境校验拒绝 Traefik 之外的 API 前缀", () => {
|
||||
assert.throws(
|
||||
() => assertReleaseEnvironment({ ...validEnvironment, API_PREFIX: "/api" }),
|
||||
/API_PREFIX must be empty/,
|
||||
);
|
||||
});
|
||||
|
||||
test("生产环境校验拒绝未知的异常限流存储", () => {
|
||||
assert.throws(
|
||||
() => assertReleaseEnvironment({ ...validEnvironment, CLIENT_ERROR_THROTTLE_STORE: "redis" }),
|
||||
/CLIENT_ERROR_THROTTLE_STORE must be memory or postgres/,
|
||||
);
|
||||
});
|
||||
Executable
+132
@@ -0,0 +1,132 @@
|
||||
#!/usr/bin/env bash
|
||||
# 在 CI 主机上安装并注册 Gitea Actions runner(Ubuntu/arm64 或 amd64)。
|
||||
#
|
||||
# 用法(在 runner 主机上、仓库之外执行):
|
||||
# GITEA_URL=https://git.example.com RUNNER_TOKEN=xxx ./deploy/runner/install-runner.sh
|
||||
# DRY_RUN=1 ... ./deploy/runner/install-runner.sh # 只打印将执行的命令
|
||||
#
|
||||
# 需要的环境变量:
|
||||
# GITEA_URL Gitea 站点地址
|
||||
# RUNNER_TOKEN 仓库 Settings → Actions → Runners 里生成的注册 token
|
||||
# 可选:
|
||||
# RUNNER_NAME runner 名称,默认取 hostname
|
||||
# RUNNER_LABELS 默认 ubuntu-latest,oracle-arm
|
||||
# RUNNER_VERSION 默认 5.2.0
|
||||
# RUNNER_ROOT 默认 $HOME/gitea-runner
|
||||
# CACHE_PORT 默认 8193
|
||||
# RUNNER_CACHE_HOST 默认 172.17.0.1(Docker 默认 bridge 网关)
|
||||
set -euo pipefail
|
||||
|
||||
GITEA_URL=${GITEA_URL:?需要设置 GITEA_URL}
|
||||
RUNNER_TOKEN=${RUNNER_TOKEN:?需要设置 RUNNER_TOKEN}
|
||||
RUNNER_NAME=${RUNNER_NAME:-$(hostname -s)}
|
||||
RUNNER_LABELS=${RUNNER_LABELS:-ubuntu-latest,oracle-arm}
|
||||
RUNNER_VERSION=${RUNNER_VERSION:-5.2.0}
|
||||
RUNNER_ROOT=${RUNNER_ROOT:-$HOME/gitea-runner}
|
||||
CACHE_PORT=${CACHE_PORT:-8193}
|
||||
RUNNER_CACHE_HOST=${RUNNER_CACHE_HOST:-172.17.0.1}
|
||||
CACHE_DIR=${CACHE_DIR:-$RUNNER_ROOT/cache-data}
|
||||
DRY_RUN=${DRY_RUN:-0}
|
||||
|
||||
if [ "$DRY_RUN" != "1" ]; then
|
||||
command -v docker >/dev/null 2>&1 || { echo "缺少 docker,请先安装并启动 Docker" >&2; exit 1; }
|
||||
command -v systemctl >/dev/null 2>&1 || { echo "缺少 systemd,当前脚本只支持 systemd 主机" >&2; exit 1; }
|
||||
fi
|
||||
|
||||
case "$(uname -m)" in
|
||||
aarch64 | arm64) ARCH=arm64 ;;
|
||||
x86_64 | amd64) ARCH=amd64 ;;
|
||||
*) echo "不支持的架构: $(uname -m)" >&2; exit 1 ;;
|
||||
esac
|
||||
|
||||
run() {
|
||||
if [ "$DRY_RUN" = "1" ]; then
|
||||
echo "+ ${*//$RUNNER_TOKEN/***}"
|
||||
else
|
||||
"$@"
|
||||
fi
|
||||
}
|
||||
|
||||
archive="gitea-runner-${RUNNER_VERSION}-linux-${ARCH}.xz"
|
||||
base="https://dl.gitea.com/gitea-runner/${RUNNER_VERSION}"
|
||||
|
||||
run mkdir -p "$RUNNER_ROOT" "$CACHE_DIR"
|
||||
if [ ! -x "$RUNNER_ROOT/gitea-runner-${RUNNER_VERSION}-linux-${ARCH}" ]; then
|
||||
run curl -fsSL -o "$RUNNER_ROOT/$archive" "$base/$archive"
|
||||
run curl -fsSL -o "$RUNNER_ROOT/$archive.sha256" "$base/$archive.sha256"
|
||||
run env -C "$RUNNER_ROOT" sha256sum -c "$archive.sha256"
|
||||
run xz -d -f "$RUNNER_ROOT/$archive"
|
||||
fi
|
||||
run ln -sf "gitea-runner-${RUNNER_VERSION}-linux-${ARCH}" "$RUNNER_ROOT/gitea-runner"
|
||||
|
||||
if [ ! -f "$RUNNER_ROOT/.runner" ]; then
|
||||
run env -C "$RUNNER_ROOT" ./gitea-runner register \
|
||||
--no-interactive \
|
||||
--instance "$GITEA_URL" \
|
||||
--token "$RUNNER_TOKEN" \
|
||||
--name "$RUNNER_NAME" \
|
||||
--labels "$RUNNER_LABELS"
|
||||
fi
|
||||
if [ -f "$RUNNER_ROOT/.runner" ]; then
|
||||
run chmod 600 "$RUNNER_ROOT/.runner"
|
||||
fi
|
||||
|
||||
run tee "$RUNNER_ROOT/config.yaml" >/dev/null <<CONFIG
|
||||
log:
|
||||
level: debug
|
||||
runner:
|
||||
file: .runner
|
||||
capacity: 1
|
||||
timeout: 2h
|
||||
fetch_timeout: 10s
|
||||
fetch_interval: 2s
|
||||
labels:
|
||||
$(printf '%s\n' "$RUNNER_LABELS" | tr ',' '\n' | sed 's|^\(.*\)$| - "\1:docker://node:24-bookworm"|')
|
||||
cache:
|
||||
enabled: true
|
||||
dir: ${CACHE_DIR}
|
||||
host: ${RUNNER_CACHE_HOST}
|
||||
port: ${CACHE_PORT}
|
||||
container:
|
||||
options: "--cpus=1.5 --memory=4g"
|
||||
valid_volumes: []
|
||||
docker_host: "-"
|
||||
CONFIG
|
||||
|
||||
run mkdir -p "$HOME/.config/systemd/user"
|
||||
run tee "$HOME/.config/systemd/user/gitea-runner.service" >/dev/null <<UNIT
|
||||
[Unit]
|
||||
Description=Gitea Actions Runner (${RUNNER_NAME})
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
WorkingDirectory=${RUNNER_ROOT}
|
||||
ExecStart=${RUNNER_ROOT}/gitea-runner daemon -c ${RUNNER_ROOT}/config.yaml
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
UNIT
|
||||
|
||||
# 用户级 systemd 服务默认在最后一个会话退出后停止;开启 linger 才能在重启后自动拉起 runner。
|
||||
if command -v loginctl >/dev/null 2>&1; then
|
||||
run sudo loginctl enable-linger "$USER"
|
||||
fi
|
||||
run systemctl --user daemon-reload
|
||||
run systemctl --user enable --now gitea-runner.service
|
||||
|
||||
# 任务容器经 Docker bridge 访问 runner 内置 cache server,ufw 默认 INPUT DROP 会拦截。
|
||||
# Gitea Actions 会给每个 job 建独立 bridge(实测 192.168.x),因此三个私网段都要放行。
|
||||
if command -v ufw >/dev/null 2>&1; then
|
||||
for cidr in 172.16.0.0/12 192.168.0.0/16 10.0.0.0/8; do
|
||||
run sudo ufw allow from "$cidr" to any port "$CACHE_PORT" proto tcp comment "gitea actions cache"
|
||||
done
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "runner 已安装:$RUNNER_ROOT"
|
||||
echo "检查状态:systemctl --user status gitea-runner.service"
|
||||
echo "检查 linger:loginctl show-user \"$USER\" -p Linger"
|
||||
echo "检查日志:journalctl --user -u gitea-runner -n 100 --no-pager"
|
||||
@@ -0,0 +1,50 @@
|
||||
# 0035 Admin 客户端异常上报的去重与限流
|
||||
|
||||
- 状态:已采纳
|
||||
- 日期:2026-10-23
|
||||
|
||||
## Context
|
||||
|
||||
Admin 渲染异常上报 `POST /admin/client-errors` 需要防止两类问题:
|
||||
|
||||
- 同一次渲染错误在多个组件或重试中重复上报,制造日志噪音。
|
||||
- 单账号在错误循环中高频上报,拖垮日志与请求处理。
|
||||
|
||||
生产 PM2 当前保持单实例(`deploy/ecosystem.config.cjs`),因此默认不需要额外基础设施。但当 API 扩展为多实例时,进程内窗口会让实际限流值按实例数放大,跨实例去重也会失效。
|
||||
|
||||
## Decision
|
||||
|
||||
1. 提供两种 `ClientErrorThrottleStore` 实现,由 `CLIENT_ERROR_THROTTLE_STORE` 选择:
|
||||
- `memory`(默认):适合当前单实例 PM2,使用进程内 `Map`。
|
||||
- `postgres`:适合多实例,使用数据库共享去重与限流状态。
|
||||
2. 两种实现使用一致语义:
|
||||
- 去重:`subject + errorId` 在 10 分钟内只接受一次。
|
||||
- 限流:同一 `subject` 每分钟最多接受 10 条不同错误,超出返回 429。
|
||||
3. Postgres 实现使用两张表:
|
||||
- `ClientErrorDedupe` 通过 `(subject, errorId)` 唯一约束去重,并用条件 UPSERT 刷新过期记录。
|
||||
- `ClientErrorThrottleWindow` 按 `subject` 单行保存当前窗口,使用原子 UPSERT 累加计数。
|
||||
- 去重与限流在同一事务内完成,限流拒绝会回滚去重标记,避免客户端重试同一 `errorId` 时被误判为已记录。
|
||||
4. 过期去重记录与旧限流窗口每分钟最多清理一次,清理失败只记录警告,不影响诊断上报。
|
||||
5. 只有通过 `requireBrand` 认证的管理员才能上报,避免匿名刷量。未知的 `CLIENT_ERROR_THROTTLE_STORE` 值必须在启动时失败。
|
||||
|
||||
## Alternatives
|
||||
|
||||
- 只保留进程内实现:多实例下计数与去重不准确,拒绝作为唯一方案。
|
||||
- 直接引入 Redis:增加部署与可用性依赖;当已经有 Postgres 时,数据库方案成本更低。
|
||||
- 不做限流:错误循环会持续写日志,并放大客户端重试,拒绝。
|
||||
- 把错误详情写入数据库:异常上报是诊断辅助数据,故障时不应继续给数据库增加业务写入压力;数据库只保存短期限流状态。
|
||||
|
||||
## Consequences
|
||||
|
||||
- 默认 `memory` 模式保持现有单实例部署的零额外依赖和低延迟。
|
||||
- 多实例部署必须显式设置 `CLIENT_ERROR_THROTTLE_STORE=postgres`;只把 PM2 调成 cluster 模式而不切换存储,会重新引入按实例放大的问题。
|
||||
- Postgres 模式每个接受的上报会增加少量事务写入,但只有已被放行的错误才会进入日志记录路径。
|
||||
- 进程重启会清空 `memory` 模式的状态;`postgres` 模式在重启后仍能保持窗口。
|
||||
- `memory` 模式使用滑动窗口;`postgres` 模式按自然分钟切分,边界附近可能出现短时双倍突发。这是诊断上报可接受的取舍。
|
||||
|
||||
## Migration plan
|
||||
|
||||
1. 当前单实例 PM2 继续使用默认 `memory` 模式。
|
||||
2. 扩展 API 实例数前,先执行 `20261023130000_add_client_error_throttle` 迁移,并设置 `CLIENT_ERROR_THROTTLE_STORE=postgres`。
|
||||
3. 验证多实例下同一 `errorId` 只记录一次,且单账号跨实例超过 10 条/分钟返回 429。
|
||||
4. 如需 Redis 或消息队列,保留 `ClientErrorThrottleStore` 接口与响应形状,仅替换工厂实现并补充并发与过期测试。
|
||||
+33
-2
@@ -4,6 +4,8 @@
|
||||
|
||||
## Runner
|
||||
|
||||
安装与运维步骤见 `docs/runner-setup.md`(`deploy/runner/install-runner.sh` 可复现整套配置)。
|
||||
|
||||
- 程序:`gitea-runner` v5.2.0(linux/arm64),位于 `/home/ubuntu/gitea-runner`
|
||||
- 服务:systemd user unit `gitea-runner.service`
|
||||
- 标签:`ubuntu-latest`、`oracle-arm`
|
||||
@@ -22,8 +24,9 @@ ssh oracle_arm 'journalctl --user -u gitea-runner -n 100 --no-pager'
|
||||
- `static`:格式、lint、typecheck、模板检查、路由与模板 preview 覆盖
|
||||
- `build`:生产构建、Admin preview 构建、模板 release 校验
|
||||
- `api`:PostgreSQL service container 上的 API integration
|
||||
- `browser-smoke`:PR 和手动触发时执行会话恢复、创建品牌与页面方案 smoke;只在 PR 和 `workflow_dispatch` 运行,main 合并后不重复执行
|
||||
|
||||
浏览器回归仍作为发布前本地门禁执行,避免在 2 核生产主机上运行 Playwright 抢占资源。
|
||||
完整浏览器回归仍作为发布前本地门禁执行,避免在 2 核生产主机上运行完整 Playwright 套件抢占资源。PR smoke 只跑两条关键流程,并使用已构建的 Admin 静态产物与 mocked API。
|
||||
|
||||
## 注意
|
||||
|
||||
@@ -67,7 +70,7 @@ Runner 日志级别保持 `debug`:`info` 级别不会记录各 step 的 `Succe
|
||||
|
||||
该轮次全部告警均来自缓存后端不可达(`ETIMEDOUT`),已按上一节修复。
|
||||
|
||||
修复后的对照数据(run `22`,commit `261a33a`):
|
||||
修复后的对照数据(run `22`,commit `261a33a`;run `23` 的 static 为 5.7 分钟):
|
||||
|
||||
| job | 修复前耗时 | 修复后耗时 |
|
||||
| ---------------- | ---------- | --------------------------------------------------------- |
|
||||
@@ -76,3 +79,31 @@ Runner 日志级别保持 `debug`:`info` 级别不会记录各 step 的 `Succe
|
||||
| API integration | 9.7 min | 3.8 min |
|
||||
|
||||
缓存内容为 pnpm store,首次落盘约 268 MB,位于 `/home/ubuntu/gitea-runner/cache-data`。
|
||||
|
||||
## 触发范围
|
||||
|
||||
- `push` 到 `main` 时忽略纯文档改动(`**.md`),避免 2 核主机为文档提交跑完整 CI。
|
||||
- `pull_request` 不设置 `paths-ignore`。branch protection 要求的 status check 必须每次都上报,否则纯文档 PR 会一直停在「等待检查」而无法合并。
|
||||
- 需要给纯文档提交补一次状态时,用 `workflow_dispatch` 手动触发。
|
||||
|
||||
模板完成证据的源码哈希已同步收敛,文档、CI 配置和部署脚本改动不再使证据失效;模板、renderer、Admin 模板编辑器、品牌内容 API 等会影响交付的源码改动仍会更新哈希。`pre-commit` 会按 Git index 重算并暂存证据,不再需要单独的 `chore: 更新模板完成证据源码哈希` 提交。注意:`pre-commit` 只在该仓库执行过 `pnpm install`(触发 `prepare` 设置 `core.hooksPath`)后生效。
|
||||
|
||||
## 分支保护
|
||||
|
||||
`main` 由 Gitea branch protection 保护,规则为:
|
||||
|
||||
- 禁止直接 push 和 force push,所有改动走分支 + Pull Request。
|
||||
- 必须通过 `CI / *` 状态检查(覆盖 `Static checks`、`Production build`、`API integration` 及其后续新增 job)。
|
||||
- `required_approvals = 0`:当前是单人维护,不强制他人审批,但 CI 必须全绿。
|
||||
|
||||
仓库管理员如需紧急放行,应临时调整保护规则并在事后恢复,不要长期用管理员权限绕过检查。规则可通过 `PATCH /api/v1/repos/que01/persionalBrand/branch_protections/main` 复现:
|
||||
|
||||
```json
|
||||
{
|
||||
"enable_push": false,
|
||||
"enable_force_push": false,
|
||||
"enable_status_check": true,
|
||||
"status_check_contexts": ["CI / *"],
|
||||
"required_approvals": 0
|
||||
}
|
||||
```
|
||||
@@ -88,6 +88,8 @@ SEED_ADMIN_PASSWORD=<first-boot-admin-password>
|
||||
|
||||
`DATABASE_URL` 使用最小权限数据库账号。`SESSION_SECRET` 不能复用示例值或开发值。`DEFAULT_BRAND_ID` 供未携带 `brandSlug` 的公共请求使用,缺失时 API 返回 503,不会回退到硬编码品牌。
|
||||
|
||||
`CLIENT_ERROR_THROTTLE_STORE` 默认为 `memory`,与当前 PM2 单实例模式匹配。扩展到多实例前必须先执行数据库迁移并改为 `postgres`,否则每个实例会各自限流与去重,实际阈值会被实例数量放大。
|
||||
|
||||
`CORS_ORIGINS` 默认为空并关闭跨域访问;只有 Admin 或预览应用从其他 origin 调用 API 时,才配置逗号分隔的 HTTPS origin allow-list。
|
||||
|
||||
本次部署会为管理员账号引入 `tokenVersion`。既有 admin token 会因缺少当前版本号而失效,管理员需要重新登录;之后修改密码会立即撤销同一账号的旧 token。媒体上传使用 S3 兼容对象存储和预签名直传,生产环境必须配置独立的 `OBJECT_STORAGE_PUBLIC_URL`、最小权限访问密钥和专用 bucket。微信相关变量只在启用对应能力时配置,同样不能提交真实凭据。
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
# CI Runner 安装与运维
|
||||
|
||||
CI 跑在自托管 Gitea Actions runner 上(当前主机 `oracle_arm`,与生产 API 共用 2 核)。本文件记录可复现的安装步骤,避免换机器时重新摸索。
|
||||
|
||||
## 一次性准备
|
||||
|
||||
1. 在 Gitea 仓库 Settings → Actions → Runners 里创建注册 token(只对单个仓库或整个实例生效)。
|
||||
2. 目标主机需要:Docker、`curl`、`xz`、`ufw`、systemd、可用 sudo、Node 不需要(任务容器自带)。
|
||||
|
||||
## 安装
|
||||
|
||||
把仓库里的脚本拷到目标主机后执行:
|
||||
|
||||
```bash
|
||||
GITEA_URL=https://git.example.com \
|
||||
RUNNER_TOKEN=<注册 token> \
|
||||
RUNNER_NAME=oracle-arm \
|
||||
RUNNER_LABELS=ubuntu-latest,oracle-arm \
|
||||
./install-runner.sh
|
||||
```
|
||||
|
||||
加 `DRY_RUN=1` 可先看它准备执行哪些命令(token 会被替换成 `***`)。
|
||||
|
||||
脚本做的事:
|
||||
|
||||
1. 按架构下载 `gitea-runner-<version>-linux-<arch>`,校验 `.sha256` 后解压到 `~/gitea-runner`。
|
||||
2. 用 `--no-interactive` 注册,写出 `.runner`(已存在则跳过,可重复执行)。
|
||||
3. 生成 `config.yaml`:单并发、`docker://node:24-bookworm` 标签、内置 cache server 监听 `172.17.0.1:8193`、任务容器限制 `--cpus=1.5 --memory=4g`。
|
||||
4. 装 systemd user unit `gitea-runner.service`,执行 `loginctl enable-linger` 后 `enable --now`。
|
||||
5. 放行任务容器到 cache 端口的 ufw 规则。
|
||||
|
||||
## 为什么 ufw 要放行三个网段
|
||||
|
||||
任务容器访问宿主机的 cache server 走 Docker bridge,`ufw` 默认 `INPUT DROP` 会直接丢包。Gitea Actions 每个 job 会新建独立 bridge(实测 `192.168.x`),默认 `docker0` 又是 `172.17.x`,所以需要 `172.16.0.0/12`、`192.168.0.0/16`、`10.0.0.0/8` 三条规则。只放行其中一条的后果是缓存恢复/保存各空等数分钟并最终超时。
|
||||
|
||||
## 日常检查
|
||||
|
||||
```bash
|
||||
systemctl --user status gitea-runner.service
|
||||
journalctl --user -u gitea-runner -n 100 --no-pager
|
||||
du -sh ~/gitea-runner/cache-data
|
||||
```
|
||||
|
||||
仓库侧 `pnpm deploy:status` 也会打印 `ci-runner=` 一行。
|
||||
|
||||
## 排障
|
||||
|
||||
| 现象 | 先查什么 |
|
||||
| ----------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
|
||||
| push 后 CI 一直 queued 不启动 | runner 服务是否 active;Gitea 仓库 Runners 页面是否显示 online |
|
||||
| 日志出现 `Failed to GetCacheEntryDownloadURL ... ETIMEDOUT` | ufw 是否放行三个私网段;`docker exec <job-container> node -e 'fetch("http://172.17.0.1:8193/")'` 应返回 404 |
|
||||
| 一轮 CI 突然变慢 | 缓存是否命中;宿主机负载与磁盘余量 |
|
||||
| 生产 API 变慢 | CI 与生产共用主机,检查是否在跑 build/api job;必要时暂停 runner |
|
||||
| 重启后 runner 没起来 | `loginctl show-user "$USER" -p Linger` 应为 `Linger=yes`;否则执行 `sudo loginctl enable-linger "$USER"` |
|
||||
|
||||
## 约束
|
||||
|
||||
- `capacity: 1`:不要提高并发,2 核主机上并发只会让生产和 CI 一起变慢。
|
||||
- 日志级别保持 `debug`:`info` 级别不记录各 step 的结果行,排障时等于没有日志。
|
||||
- 完整浏览器回归不进入定时或 main 推送 CI;PR 只运行轻量 browser smoke(见 `docs/ci.md`),完整套件仍在发布前执行。
|
||||
@@ -30,7 +30,7 @@ staticStatus 只代表支持范围内的静态检查。completionStatus 保持 u
|
||||
|
||||
已逐条完成源码审阅的 review 可登记在 `.codex-tasks/template-audit-execution/raw/manual-review.json`。登记必须使用和诊断报告一致的 `file/page/target/binding/line/message`,并保留结论与证据;doctor 只把精确匹配的 review 标记为 `source-reviewed`,不改变 `completionStatus`。未匹配的新 review 和全部 blocker 仍会让命令失败。
|
||||
|
||||
完成证据登记在 `.codex-tasks/template-audit-execution/raw/completion-evidence.json`。每套模板必须提供 `real-manifest-interaction`、`save-reload-publish-isolation`、`visual-reference`、`empty-error-branches` 四类 `passed` 证据;每类证据必须包含实际命令、`exitCode=0`、日志或截图产物及其 SHA-256。registry 还必须记录 source tree hash;doctor 会计算当前仓库源码树(排除 `.codex-tasks/` 证据目录)的 hash,并在不匹配时拒绝完成态。doctor 会校验证据覆盖全部模板、产物存在且哈希一致。全部通过时 `completionStatus=complete`;证据文件缺失时保持 `unverified`;登记不完整或哈希不匹配时对应模板为 `incomplete` 并让命令失败。
|
||||
完成证据登记在 `.codex-tasks/template-audit-execution/raw/completion-evidence.json`。每套模板必须提供 `real-manifest-interaction`、`save-reload-publish-isolation`、`visual-reference`、`empty-error-branches` 四类 `passed` 证据;每类证据必须包含实际命令、`exitCode=0`、日志或截图产物及其 SHA-256。registry 还必须记录 source tree hash;doctor 会计算当前仓库源码树的 hash,并在不匹配时拒绝完成态。哈希范围只包含会影响模板交付的源码:排除 `.codex-tasks/`、`.gitea/`、`deploy/`、`scripts/deploy/` 以及除 `docs/template-completion-rules.md` 之外的全部 markdown。改文档、改 CI 或改部署脚本不再让已完成证据失效,改模板、renderer、诊断器或本文件仍然会。doctor 会校验证据覆盖全部模板、产物存在且哈希一致。全部通过时 `completionStatus=complete`;证据文件缺失时保持 `unverified`;登记不完整或哈希不匹配时对应模板为 `incomplete` 并让命令失败。
|
||||
|
||||
AST 解析可追踪 workspace.brand、presentation、object 和局部别名。动态路径、跨组件和间接映射等未知情况标为 review,不能猜测为通过。诊断器包含正反故障注入测试。
|
||||
|
||||
@@ -94,3 +94,9 @@ Taro 小程序构建默认会把 CSS 中的 HTML 标签选择器重写为 `.h5-<
|
||||
4. 原生控件必查:显示类型、宽度、高度令牌、文字垂直居中、点击命中、安全区和底部遮挡。
|
||||
5. 真机必查:request/media 合法域名、登录、拨号、复制、滚动、字体缩放和 iPhone 底部安全区。
|
||||
6. 修复方式先查共享 reset、令牌和 Taro 运行时,再改模板局部样式;同类问题必须补产物契约测试或视觉清单项,不允许只改单个模板的单个按钮。
|
||||
|
||||
## 证据哈希维护
|
||||
|
||||
`git config core.hooksPath .githooks` 由 `pnpm install` 的 `prepare` 自动设置,`.githooks/pre-commit` 会在提交前调用 `node scripts/template-evidence-refresh.mjs --stage`,把最新的 `sourceTreeHash` 合并进同一个提交。不要再用「先提交业务改动、再提交 `chore: 更新模板完成证据源码哈希`」的两段式流程:那会让真正的改动永远拿不到绿色 CI。
|
||||
|
||||
需要手动重算时执行 `pnpm evidence:refresh`;加 `--stage` 会同时 `git add -f` 已跟踪的证据文件。
|
||||
+4
-1
@@ -14,6 +14,8 @@
|
||||
"format": "prettier --write .",
|
||||
"format:check": "prettier --check .",
|
||||
"check": "pnpm format:check && pnpm lint && pnpm typecheck && pnpm template:check",
|
||||
"prepare": "git config core.hooksPath .githooks || true",
|
||||
"evidence:refresh": "node scripts/template-evidence-refresh.mjs",
|
||||
"db:migrate": "pnpm --filter @personal-brand/api db:migrate",
|
||||
"db:seed": "pnpm --filter @personal-brand/api db:seed",
|
||||
"test:api-client": "pnpm --filter @personal-brand/api exec tsx --test ../../packages/api-client/test/**/*.test.ts",
|
||||
@@ -48,7 +50,8 @@
|
||||
"check:local-media": "node scripts/check-local-media.mjs",
|
||||
"test:template-doctor": "node --test scripts/test/template-doctor.test.mjs",
|
||||
"build:taro:atelier": "TEMPLATE_KEY=atelier-solopreneur pnpm --filter @personal-brand/taro build:h5 && TEMPLATE_KEY=atelier-solopreneur pnpm --filter @personal-brand/taro build:weapp",
|
||||
"build:taro:all": "pnpm build:taro:food && pnpm build:taro:linjing && pnpm build:taro:atelier"
|
||||
"build:taro:all": "pnpm build:taro:food && pnpm build:taro:linjing && pnpm build:taro:atelier",
|
||||
"test:browser:smoke": "pnpm --filter @personal-brand/types build && pnpm --filter @personal-brand/admin build && pnpm --filter @personal-brand/taro test:browser:smoke"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.17.0",
|
||||
|
||||
+24
-20
@@ -15,26 +15,30 @@ function run(command, args) {
|
||||
process.stdout.write(result.stdout);
|
||||
}
|
||||
|
||||
run("ssh", [
|
||||
target,
|
||||
"bash",
|
||||
"-lc",
|
||||
[
|
||||
"set -euo pipefail",
|
||||
'source "$HOME/.nvm/nvm.sh"',
|
||||
"export DEPLOY_ROOT=/home/ubuntu/persional-brand",
|
||||
'printf "current=%s\\n" "$(readlink /home/ubuntu/persional-brand/current)"',
|
||||
'printf "api="; test "$(pm2 pid personal-brand-api)" != "0"; echo online',
|
||||
'printf "pm2-autostart="; systemctl --user is-enabled personal-brand-pm2.service',
|
||||
'printf "admin="; systemctl --user is-active personal-brand-admin-static.service',
|
||||
'printf "database="; docker inspect -f "{{.State.Status}}" personal-brand-postgres-1',
|
||||
'printf "backups="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -name "*.dump" | wc -l',
|
||||
'printf "latest-backup="; newest=$(find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
||||
'printf "backup-temp-files="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
||||
'printf "disk="; df -h / | awk "NR==2 {print \\$5 \" used, \" \\$4 \" free\"}"',
|
||||
'printf "release-count="; find /home/ubuntu/persional-brand/releases -mindepth 1 -maxdepth 1 -type d | wc -l',
|
||||
].join("; "),
|
||||
]);
|
||||
// ssh 会把多个参数用空格拼成一个字符串交给远端 shell,整段脚本必须先整体加引号,
|
||||
// 否则 `bash -lc set -euo pipefail; ...` 只会执行 `set`,其余命令落到远端登录 shell。
|
||||
function shellQuote(value) {
|
||||
return "'" + value.replace(/'/g, "'\\''") + "'";
|
||||
}
|
||||
|
||||
const remoteScript = [
|
||||
"set -euo pipefail",
|
||||
'source "$HOME/.nvm/nvm.sh"',
|
||||
"export DEPLOY_ROOT=/home/ubuntu/persional-brand",
|
||||
'printf "current=%s\\n" "$(readlink /home/ubuntu/persional-brand/current)"',
|
||||
'printf "api="; test "$(pm2 pid personal-brand-api)" != "0"; echo online',
|
||||
'printf "pm2-autostart="; systemctl --user is-enabled personal-brand-pm2.service',
|
||||
'printf "admin="; systemctl --user is-active personal-brand-admin-static.service',
|
||||
'printf "database="; docker inspect -f "{{.State.Status}}" personal-brand-postgres-1',
|
||||
'printf "ci-runner="; systemctl --user is-active gitea-runner.service',
|
||||
'printf "backups="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -name "*.dump" | wc -l',
|
||||
'printf "latest-backup="; newest=$(find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
||||
'printf "backup-temp-files="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
||||
'printf "disk="; df -h / | awk \'NR==2 {print $5 " used, " $4 " free"}\'',
|
||||
'printf "release-count="; find /home/ubuntu/persional-brand/releases -mindepth 1 -maxdepth 1 -type d | wc -l',
|
||||
].join("; ");
|
||||
|
||||
run("ssh", [target, "bash -lc " + shellQuote(remoteScript)]);
|
||||
|
||||
for (const route of [
|
||||
"/admin/",
|
||||
|
||||
@@ -431,32 +431,56 @@ function walkRepositoryFiles(root, directory = root) {
|
||||
return files;
|
||||
}
|
||||
|
||||
export function sourceTreeHash(root) {
|
||||
const EVIDENCE_SCOPE_IGNORED_PREFIXES = [".codex-tasks/", ".gitea/", "deploy/", "scripts/deploy/"];
|
||||
const EVIDENCE_SCOPE_IGNORED_EXTENSIONS = [".md", ".mdx"];
|
||||
const EVIDENCE_SCOPE_ALWAYS_INCLUDED = ["docs/template-completion-rules.md"];
|
||||
|
||||
// 证据哈希只覆盖会影响模板交付的源码:文档、CI 配置和部署脚本的改动不使证据失效。
|
||||
export function isEvidenceSourcePath(relativePath) {
|
||||
const normalized = relativePath.split(path.sep).join("/");
|
||||
if (EVIDENCE_SCOPE_ALWAYS_INCLUDED.includes(normalized)) return true;
|
||||
if (EVIDENCE_SCOPE_IGNORED_PREFIXES.some((prefix) => normalized.startsWith(prefix))) return false;
|
||||
return !EVIDENCE_SCOPE_IGNORED_EXTENSIONS.some((extension) => normalized.endsWith(extension));
|
||||
}
|
||||
|
||||
export function sourceTreeHash(root, options = {}) {
|
||||
const rootPath = path.resolve(root);
|
||||
const { staged = false } = options;
|
||||
let files;
|
||||
let readContent;
|
||||
if (fs.existsSync(path.join(rootPath, ".git"))) {
|
||||
const output = execFileSync(
|
||||
"git",
|
||||
["ls-files", "-z", "--cached", "--others", "--exclude-standard"],
|
||||
{ cwd: rootPath, maxBuffer: 64 * 1024 * 1024 },
|
||||
);
|
||||
// 只统计已跟踪文件:未纳入版本控制的文件不属于任何一次可复现的交付。
|
||||
// staged 模式从 Git index 读取内容,供 pre-commit 使用,避免部分暂存时把
|
||||
// 工作区里的未提交改动算进提交对应的证据哈希。
|
||||
const output = execFileSync("git", ["ls-files", "-z", "--cached"], {
|
||||
cwd: rootPath,
|
||||
maxBuffer: 64 * 1024 * 1024,
|
||||
});
|
||||
files = output
|
||||
.toString("utf8")
|
||||
.split("\0")
|
||||
.filter((file) => file && !file.startsWith(".codex-tasks/"))
|
||||
.map((file) => path.join(rootPath, file))
|
||||
.filter((file) => fs.existsSync(file) && fs.statSync(file).isFile());
|
||||
.filter((file) => file && isEvidenceSourcePath(file))
|
||||
.map((file) => path.join(rootPath, file));
|
||||
if (!staged) files = files.filter((file) => fs.existsSync(file) && fs.statSync(file).isFile());
|
||||
readContent = staged
|
||||
? (file) =>
|
||||
execFileSync("git", ["show", ":" + path.relative(rootPath, file)], {
|
||||
cwd: rootPath,
|
||||
maxBuffer: 64 * 1024 * 1024,
|
||||
})
|
||||
: (file) => fs.readFileSync(file);
|
||||
} else {
|
||||
files = walkRepositoryFiles(rootPath).filter(
|
||||
(file) => !path.relative(rootPath, file).startsWith(".codex-tasks/"),
|
||||
files = walkRepositoryFiles(rootPath).filter((file) =>
|
||||
isEvidenceSourcePath(path.relative(rootPath, file)),
|
||||
);
|
||||
readContent = (file) => fs.readFileSync(file);
|
||||
}
|
||||
files.sort();
|
||||
const hash = crypto.createHash("sha256");
|
||||
for (const file of files) {
|
||||
hash.update(path.relative(rootPath, file));
|
||||
hash.update("\0");
|
||||
hash.update(fs.readFileSync(file));
|
||||
hash.update(readContent(file));
|
||||
hash.update("\0");
|
||||
}
|
||||
return hash.digest("hex");
|
||||
|
||||
Executable
+32
@@ -0,0 +1,32 @@
|
||||
#!/usr/bin/env node
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { sourceTreeHash } from "./lib/template-doctor.mjs";
|
||||
|
||||
const REGISTRY = path.join(
|
||||
".codex-tasks",
|
||||
"template-audit-execution",
|
||||
"raw",
|
||||
"completion-evidence.json",
|
||||
);
|
||||
const shouldStage = process.argv.includes("--stage");
|
||||
|
||||
if (!fs.existsSync(REGISTRY)) {
|
||||
console.log(`template evidence: ${REGISTRY} 不存在,跳过`);
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
const registry = JSON.parse(fs.readFileSync(REGISTRY, "utf8"));
|
||||
const nextHash = sourceTreeHash(process.cwd(), { staged: shouldStage });
|
||||
if (registry.sourceTreeHash === nextHash) {
|
||||
console.log("template evidence: 源码哈希已是最新");
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
registry.sourceTreeHash = nextHash;
|
||||
registry.generatedAt = new Date().toISOString();
|
||||
fs.writeFileSync(REGISTRY, JSON.stringify(registry, null, 2) + "\n");
|
||||
console.log(`template evidence: sourceTreeHash 更新为 ${nextHash}`);
|
||||
|
||||
if (shouldStage) execFileSync("git", ["add", "-f", REGISTRY], { stdio: "inherit" });
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
applyCompletionEvidence,
|
||||
applyManualReview,
|
||||
diagnoseTemplate,
|
||||
isEvidenceSourcePath,
|
||||
sourceTreeHash,
|
||||
} from "../lib/template-doctor.mjs";
|
||||
|
||||
@@ -78,6 +79,67 @@ test("CLI 自动发现全部模板,问题退出 1,未知模板退出 2", ()
|
||||
assert.equal(missing.status, 2);
|
||||
});
|
||||
|
||||
test("证据哈希范围排除文档、CI 与部署脚本,保留模板交付相关源码", () => {
|
||||
assert.equal(isEvidenceSourcePath("docs/ci.md"), false);
|
||||
assert.equal(isEvidenceSourcePath("PROJECT_STATUS.md"), false);
|
||||
assert.equal(isEvidenceSourcePath(".gitea/workflows/ci.yml"), false);
|
||||
assert.equal(isEvidenceSourcePath("deploy/install-release.mjs"), false);
|
||||
assert.equal(isEvidenceSourcePath("scripts/deploy/status.mjs"), false);
|
||||
assert.equal(isEvidenceSourcePath(".codex-tasks/template-audit-execution/raw/a.json"), false);
|
||||
assert.equal(isEvidenceSourcePath("docs/template-completion-rules.md"), true);
|
||||
assert.equal(isEvidenceSourcePath("apps/api/src/main.ts"), true);
|
||||
assert.equal(isEvidenceSourcePath("packages/template-linjing-editorial/template.json"), true);
|
||||
});
|
||||
|
||||
test("文档改动不改变证据哈希,源码改动仍然改变", () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "template-doctor-scope-"));
|
||||
try {
|
||||
fs.mkdirSync(path.join(root, "docs"), { recursive: true });
|
||||
fs.writeFileSync(path.join(root, "app.ts"), "export const value = 1;\n");
|
||||
const baseline = sourceTreeHash(root);
|
||||
|
||||
fs.writeFileSync(path.join(root, "PROJECT_STATUS.md"), "状态更新\n");
|
||||
fs.writeFileSync(path.join(root, "docs", "ci.md"), "文档更新\n");
|
||||
assert.equal(sourceTreeHash(root), baseline);
|
||||
|
||||
fs.writeFileSync(path.join(root, "docs", "template-completion-rules.md"), "规则更新\n");
|
||||
assert.notEqual(sourceTreeHash(root), baseline);
|
||||
|
||||
fs.writeFileSync(path.join(root, "app.ts"), "export const value = 2;\n");
|
||||
assert.notEqual(sourceTreeHash(root), baseline);
|
||||
} finally {
|
||||
fs.rmSync(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("pre-commit 证据哈希按暂存区计算,不受部分暂存和未跟踪文件影响", () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "template-doctor-staged-"));
|
||||
const git = (...args) => {
|
||||
const result = spawnSync("git", args, { cwd: root, encoding: "utf8" });
|
||||
assert.equal(result.status, 0, result.stderr);
|
||||
return result.stdout;
|
||||
};
|
||||
try {
|
||||
git("init", "-q");
|
||||
fs.writeFileSync(path.join(root, "app.ts"), "export const value = 1;\n");
|
||||
git("add", "app.ts");
|
||||
const stagedBaseline = sourceTreeHash(root, { staged: true });
|
||||
|
||||
fs.writeFileSync(path.join(root, "app.ts"), "export const value = 2;\n");
|
||||
fs.writeFileSync(path.join(root, "untracked.ts"), "export const draft = true;\n");
|
||||
const stagedWithUnstagedEdits = sourceTreeHash(root, { staged: true });
|
||||
assert.equal(stagedWithUnstagedEdits, stagedBaseline);
|
||||
assert.notEqual(sourceTreeHash(root), stagedBaseline);
|
||||
|
||||
git("-c", "user.name=test", "-c", "user.email=test@example.com", "commit", "-qm", "one");
|
||||
git("checkout", "--", "app.ts");
|
||||
assert.equal(sourceTreeHash(root), stagedBaseline);
|
||||
assert.equal(sourceTreeHash(root, { staged: true }), stagedBaseline);
|
||||
} finally {
|
||||
fs.rmSync(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("完成证据登记必须覆盖全部要求并校验产物哈希", () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "template-doctor-evidence-"));
|
||||
const artifactPath = path.join(root, "integration.log");
|
||||
|
||||
Reference in new issue
Block a user