feat: 收口模板升级与阶段七持续回归

This commit is contained in:
que01 committed 2026-10-17 21:33:57 +08:00
1 parent ec16fff70e
commit 71c528de34
29 files changed
+1962 -304

No files matched your search

@@ -27,7 +27,11 @@ export class AdminTemplatePackageController {
@Post("import")
async import(@Req() request: FastifyRequest) {
const { subject } = await this.access.requireTemplateAdmin(request);
return this.templates.importArchive(request, subject);
return this.templates.importArchive(
request,
subject,
request.headers["x-request-id"]?.toString() ?? request.id,
);
}
@Post(":id/publish")
@@ -14,6 +14,7 @@ import { promises as fs } from "node:fs";
import path from "node:path";
import { promisify } from "node:util";
import { PrismaService } from "../../prisma.service.js";
import { recordTemplateOperationFailure } from "./template-operation-failure.js";
const execFileAsync = promisify(execFile);
const MAX_ARCHIVE_BYTES = 50 * 1024 * 1024;
@@ -181,13 +182,15 @@ export class AdminTemplatePackageService {
};
}
async importArchive(request: FastifyRequest, actorId: string) {
async importArchive(request: FastifyRequest, actorId: string, requestId?: string) {
const part = await request.file({ limits: { files: 1, fileSize: MAX_ARCHIVE_BYTES } });
if (!part) throw new BadRequestException("请上传模板 archive 文件");
if (part.fieldname !== "archive") throw new BadRequestException("上传字段必须是 archive");
const chunks: Buffer[] = [];
let bytes = 0;
let storedArtifactPath: string | null = null;
let failurePackageKey: string | undefined;
let failureVersion: string | undefined;
try {
for await (const chunk of part.file) {
const buffer = Buffer.from(chunk as Uint8Array);
@@ -242,6 +245,8 @@ export class AdminTemplatePackageService {
path.join(packageRoot, "template.json"),
"template.json",
)) as Manifest;
failurePackageKey = typeof manifest.packageKey === "string" ? manifest.packageKey : undefined;
failureVersion = typeof manifest.version === "string" ? manifest.version : undefined;
const packageJson = jsonObject(
await this.readJson(path.join(packageRoot, "package.json"), "package.json"),
"package.json",
@@ -304,6 +309,7 @@ export class AdminTemplatePackageService {
errors: [],
fileCount: files.length,
extractedBytes: files.reduce((total, file) => total + file.bytes, 0),
files: checksums.files.map((file) => ({ ...file })),
},
contentChecksum: checksums.contentChecksum,
archiveChecksum,
@@ -328,6 +334,14 @@ export class AdminTemplatePackageService {
return { imported: true, idempotent: false, version: this.publicVersion(version) };
} catch (error) {
if (storedArtifactPath) await fs.rm(storedArtifactPath, { force: true });
await recordTemplateOperationFailure(this.prisma, {
action: "import",
error,
...(requestId ? { requestId } : {}),
actorId,
...(failurePackageKey ? { packageKey: failurePackageKey } : {}),
...(failureVersion ? { version: failureVersion } : {}),
});
throw error;
} finally {
await fs.rm(temporaryRoot, { recursive: true, force: true });
@@ -18,6 +18,7 @@ import type { BrandReleaseSnapshot } from "../../brand-release.service.js";
import { PrismaService } from "../../prisma.service.js";
import { assemblePublicWorkspace } from "../public/public-workspace.snapshot-assembler.js";
import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-assets.service.js";
import { recordTemplateOperationFailure } from "./template-operation-failure.js";
function record(value: unknown): Record<string, unknown> {
return value && typeof value === "object" && !Array.isArray(value)
@@ -118,7 +119,18 @@ export class AdminTemplatePreviewService {
};
}
const projection = await this.buildPreview(id, industry);
let projection: Awaited<ReturnType<AdminTemplatePreviewService["buildPreview"]>>;
try {
projection = await this.buildPreview(id, industry);
} catch (error) {
await recordTemplateOperationFailure(this.prisma, {
action: "preview",
error,
...(requestId ? { requestId } : {}),
actorId,
});
throw error;
}
this.cleanupPreviewSessions();
const token = randomBytes(32).toString("hex");
const expiresAt = Date.now() + 15 * 60 * 1000;
@@ -15,6 +15,8 @@ import { AdminUploadService } from "./admin-upload.service.js";
import { AdminUploadController } from "./admin-upload.controller.js";
import { AdminTemplatePackageController } from "./admin-template-package.controller.js";
import { AdminTemplatePackageService } from "./admin-template-package.service.js";
import { TemplateOperationMetricsController } from "./template-operation-metrics.controller.js";
import { TemplateOperationMetricsService } from "./template-operation-metrics.service.js";
import { AdminTemplatePreviewService } from "./admin-template-preview.service.js";
import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-assets.service.js";
@@ -29,6 +31,7 @@ import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-asse
AdminLocalUploadController,
AdminBookingController,
AdminTemplatePackageController,
TemplateOperationMetricsController,
],
providers: [
AdminBrandConfigService,
@@ -40,6 +43,7 @@ import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-asse
AdminTemplatePackageService,
AdminTemplatePreviewService,
AdminTemplatePreviewAssetsService,
TemplateOperationMetricsService,
],
})
export class AdminModule {}
@@ -0,0 +1,35 @@
import { HttpException } from "@nestjs/common";
import { PrismaService } from "../../prisma.service.js";
export async function recordTemplateOperationFailure(
prisma: PrismaService,
input: {
action: string;
error: unknown;
requestId?: string;
actorId?: string;
brandId?: string;
packageKey?: string;
version?: string;
},
): Promise<void> {
const status = input.error instanceof HttpException ? input.error.getStatus() : 500;
try {
await prisma.templateOperationFailureEvent.create({
data: {
action: input.action,
resultCode: `HTTP_${status}`,
...(input.requestId ? { requestId: input.requestId } : {}),
...(input.actorId ? { actorId: input.actorId } : {}),
...(input.brandId ? { brandId: input.brandId } : {}),
...(input.packageKey ? { packageKey: input.packageKey } : {}),
...(input.version ? { version: input.version } : {}),
},
});
await prisma.templateOperationFailureEvent.deleteMany({
where: { createdAt: { lt: new Date(Date.now() - 180 * 24 * 60 * 60 * 1000) } },
});
} catch {
// Failure telemetry must never replace the operation's original result.
}
}
@@ -0,0 +1,29 @@
import { Controller, Get, Query, Req } from "@nestjs/common";
import type { FastifyRequest } from "fastify";
import { Type } from "class-transformer";
import { IsInt, IsOptional, Max, Min } from "class-validator";
import { AdminAccessService } from "../../admin-access.service.js";
import { TemplateOperationMetricsService } from "./template-operation-metrics.service.js";
class TemplateOperationMetricsQueryDto {
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
@Max(90)
days = 30;
}
@Controller("admin/template-operations")
export class TemplateOperationMetricsController {
constructor(
private readonly access: AdminAccessService,
private readonly metrics: TemplateOperationMetricsService,
) {}
@Get("failures")
async failures(@Req() request: FastifyRequest, @Query() query: TemplateOperationMetricsQueryDto) {
await this.access.requireTemplateAdmin(request);
return this.metrics.failures(query.days);
}
}
@@ -0,0 +1,52 @@
import { Injectable } from "@nestjs/common";
import { PrismaService } from "../../prisma.service.js";
const trackedActions = [
"import",
"preview",
"install",
"upgrade",
"rollback",
"install_conflict",
] as const;
@Injectable()
export class TemplateOperationMetricsService {
constructor(private readonly prisma: PrismaService) {}
async failures(days = 30) {
const since = new Date(Date.now() - days * 24 * 60 * 60 * 1000);
const [templateEvents, releaseAttempts] = await Promise.all([
this.prisma.templateOperationFailureEvent.groupBy({
by: ["action"],
where: { createdAt: { gte: since } },
_count: { _all: true },
}),
this.prisma.miniAppReleaseAttempt.groupBy({
by: ["phase", "status"],
where: {
createdAt: { gte: since },
status: { in: ["failed", "timed_out"] },
},
_count: { _all: true },
}),
]);
const eventCounts = new Map(templateEvents.map((item) => [item.action, item._count._all]));
const buildUploadCounts = new Map<string, number>();
for (const item of releaseAttempts) {
const action = item.phase === "build" ? "build" : "upload";
buildUploadCounts.set(action, (buildUploadCounts.get(action) ?? 0) + item._count._all);
}
return {
since: since.toISOString(),
until: new Date().toISOString(),
days,
backfilled: false,
failures: [
...trackedActions.map((action) => ({ action, count: eventCounts.get(action) ?? 0 })),
{ action: "build", count: buildUploadCounts.get("build") ?? 0 },
{ action: "upload", count: buildUploadCounts.get("upload") ?? 0 },
],
};
}
}
@@ -1,11 +1,17 @@
import { Controller, Get, Post, Req } from "@nestjs/common";
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 { PrismaService } from "../../prisma.service.js";
import { recordTemplateOperationFailure } from "../admin/template-operation-failure.js";
import { requireAdminIdentity } from "./admin-access.identity.js";
@Controller("admin/workspace")
class AdminTemplateController {
constructor(private readonly templateWorkspace: TemplateWorkspaceService) {}
constructor(
private readonly templateWorkspace: TemplateWorkspaceService,
private readonly prisma: PrismaService,
) {}
@Get("template/preview")
preview(@Req() request: FastifyRequest): Promise<unknown> {
@@ -13,13 +19,58 @@ class AdminTemplateController {
}
@Post("template/upgrade")
upgrade(@Req() request: FastifyRequest): Promise<unknown> {
return this.templateWorkspace.upgrade(requireAdminIdentity(request).brandId);
async upgrade(
@Req() request: FastifyRequest,
@Body() body: UpgradeTemplateDto,
): Promise<unknown> {
const identity = requireAdminIdentity(request);
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
try {
return await this.templateWorkspace.upgrade(
identity.brandId,
body,
identity.subject,
requestId,
);
} catch (error) {
await recordTemplateOperationFailure(this.prisma, {
action:
error instanceof Error && error.name.includes("Conflict")
? "install_conflict"
: "upgrade",
error,
requestId,
actorId: identity.subject,
brandId: identity.brandId,
});
throw error;
}
}
@Post("template/rollback")
rollback(@Req() request: FastifyRequest): Promise<unknown> {
return this.templateWorkspace.rollback(requireAdminIdentity(request).brandId);
async rollback(
@Req() request: FastifyRequest,
@Body() body: RollbackTemplateDto,
): Promise<unknown> {
const identity = requireAdminIdentity(request);
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
try {
return await this.templateWorkspace.rollback(
identity.brandId,
identity.subject,
body,
requestId,
);
} catch (error) {
await recordTemplateOperationFailure(this.prisma, {
action: "rollback",
error,
requestId,
actorId: identity.subject,
brandId: identity.brandId,
});
throw error;
}
}
}
@@ -4,12 +4,15 @@ import { InstallTemplateDto } from "../../admin.dto.js";
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
import { requireAdminIdentity } from "./admin-access.identity.js";
import { AdminWorkspaceService } from "./admin-workspace.service.js";
import { PrismaService } from "../../prisma.service.js";
import { recordTemplateOperationFailure } from "../admin/template-operation-failure.js";
@Controller("admin/workspace")
class AdminWorkspacePreviewController {
constructor(
private readonly workspaceService: AdminWorkspaceService,
private readonly templateWorkspace: TemplateWorkspaceService,
private readonly prisma: PrismaService,
) {}
@Get()
@@ -23,12 +26,31 @@ class AdminWorkspacePreviewController {
}
@Post("install")
install(@Req() request: FastifyRequest, @Body() body: InstallTemplateDto): Promise<unknown> {
return this.templateWorkspace.install(
requireAdminIdentity(request).brandId,
body.templateKey,
body.templatePackageVersionId,
);
async install(
@Req() request: FastifyRequest,
@Body() body: InstallTemplateDto,
): Promise<unknown> {
const identity = requireAdminIdentity(request);
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
try {
return await this.templateWorkspace.install(
identity.brandId,
body.templateKey,
body.templatePackageVersionId,
);
} catch (error) {
await recordTemplateOperationFailure(this.prisma, {
action:
error instanceof Error && error.name.includes("Conflict")
? "install_conflict"
: "install",
error,
requestId,
actorId: identity.subject,
brandId: identity.brandId,
});
throw error;
}
}
}