merge: integrate WP6-03 dependency for TASK-WP6-04
# Conflicts: # apps/api/src/app.ts # apps/web/src/generated/api/sdk.gen.ts # openapi/openapi.json
This commit is contained in:
@@ -13,6 +13,15 @@ import {
|
||||
AdminGenerationRecordSchema,
|
||||
AdminGenerationListResponseSchema,
|
||||
AdminOverviewResponseSchema,
|
||||
AdminServicesResponseSchema,
|
||||
AdminServiceHealthCheckRequestSchema,
|
||||
AdminServiceLimitRequestSchema,
|
||||
AdminServiceParamsSchema,
|
||||
AdminServiceRecoveryRequestSchema,
|
||||
ExternalServiceIdSchema,
|
||||
ExternalServicePeriodTypeSchema,
|
||||
ExternalServiceStatusSchema,
|
||||
ExternalServiceUsageSchema,
|
||||
AdminCreditParamsSchema,
|
||||
AdminLoginCompleteRequestSchema,
|
||||
AdminLoginCompleteResponseSchema,
|
||||
@@ -185,6 +194,7 @@ import type { RegistrationService } from "./registration.js";
|
||||
import type { AssetPreviewGrantService } from "./preview-grants.js";
|
||||
import type { RecentAssetService } from "./recent-assets.js";
|
||||
import type { AmapAdapter } from "./amap-adapter.js";
|
||||
import { ExternalServiceUsageError, type ExternalServiceUsage } from "./external-service-usage.js";
|
||||
import { ModelConfigurationError } from "./model-configuration.js";
|
||||
import type { ModelConfigurationService } from "./model-configuration.js";
|
||||
import { StickerReleaseError } from "./sticker-release-errors.js";
|
||||
@@ -237,6 +247,7 @@ export interface CreateAppOptions {
|
||||
privateContent?: PrivateContentService;
|
||||
registration?: RegistrationService;
|
||||
stickers?: StickerReleaseService;
|
||||
serviceUsage?: ExternalServiceUsage;
|
||||
}
|
||||
|
||||
const supportGateDirectory = resolve(process.env.DADA_SUPPORT_GATE_ROOT ?? "apps/web/support-gate");
|
||||
@@ -738,6 +749,15 @@ export async function createApp(options: CreateAppOptions = {}) {
|
||||
PrivateContentPromptResponseSchema,
|
||||
PrivateContentGenerationParamsSchema,
|
||||
AdminOverviewResponseSchema,
|
||||
AdminServicesResponseSchema,
|
||||
AdminServiceHealthCheckRequestSchema,
|
||||
AdminServiceLimitRequestSchema,
|
||||
AdminServiceParamsSchema,
|
||||
AdminServiceRecoveryRequestSchema,
|
||||
ExternalServiceIdSchema,
|
||||
ExternalServicePeriodTypeSchema,
|
||||
ExternalServiceStatusSchema,
|
||||
ExternalServiceUsageSchema,
|
||||
CreditSummarySchema,
|
||||
CreditEntryTypeSchema,
|
||||
CreditEntryStatusSchema,
|
||||
@@ -1503,10 +1523,16 @@ export async function createApp(options: CreateAppOptions = {}) {
|
||||
if (!token || !csrfToken) return reply.code(401).send(createErrorEnvelope({ code: "AUTH_SESSION_INVALID", correlationId: request.id }));
|
||||
try {
|
||||
options.registration.authorizeUserMutation({ csrfToken, sessionToken: token });
|
||||
const usage = options.serviceUsage ?? options.registration.serviceUsage;
|
||||
usage.claimAmap();
|
||||
const result = await options.amap.reverseGeocode(request.body as ReverseGeocodeRequest);
|
||||
return { formatted_value: result.formattedValue, service_mode: result.serviceMode, status: "resolved" as const };
|
||||
} catch (error) {
|
||||
if (error instanceof RegistrationError) return registrationFailure(reply, request.id, error);
|
||||
if (error instanceof ExternalServiceUsageError) return reply.code(503).send(null);
|
||||
try {
|
||||
(options.serviceUsage ?? options.registration.serviceUsage).markProviderFailure({ serviceId: "amap_web_service", reason: "provider_unavailable" });
|
||||
} catch { /* preserve the provider failure response */ }
|
||||
return reply.code(503).send(null);
|
||||
}
|
||||
},
|
||||
@@ -1678,6 +1704,151 @@ export async function createApp(options: CreateAppOptions = {}) {
|
||||
},
|
||||
);
|
||||
|
||||
app.get(
|
||||
"/api/v1/admin/services",
|
||||
{
|
||||
schema: {
|
||||
operationId: "getAdminServices",
|
||||
response: { 200: Type.Ref(AdminServicesResponseSchema), 401: Type.Ref(ErrorEnvelopeSchema), 503: Type.Ref(ErrorEnvelopeSchema) },
|
||||
tags: ["Admin Services"],
|
||||
},
|
||||
},
|
||||
async (request, reply) => {
|
||||
const registration = options.registration;
|
||||
const usage = options.serviceUsage ?? registration?.serviceUsage;
|
||||
if (!registration || !usage) return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
const token = cookieValue(headerValue(request.headers.cookie), adminSessionCookieName);
|
||||
const session = token ? registration.readAdminSession(token) : undefined;
|
||||
if (!session) return reply.code(401).send(createErrorEnvelope({ code: "AUTH_SESSION_INVALID", correlationId: request.id }));
|
||||
return {
|
||||
services: usage.readCurrent().map((row) => ({
|
||||
hard_limit: row.hardLimit,
|
||||
pause_reason: row.pauseReason,
|
||||
period_start: new Date(row.periodStart).toISOString(),
|
||||
period_type: row.periodType,
|
||||
service_id: row.serviceId,
|
||||
service_status: row.status,
|
||||
updated_at: new Date(row.updatedAt).toISOString(),
|
||||
used_count: row.usedCount,
|
||||
})),
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
"/api/v1/admin/services/:service_id/health-check",
|
||||
{
|
||||
attachValidation: true,
|
||||
schema: {
|
||||
params: Type.Ref(AdminServiceParamsSchema),
|
||||
body: Type.Ref(AdminServiceHealthCheckRequestSchema),
|
||||
headers: Type.Ref(ModelConfigUpdateHeadersSchema),
|
||||
operationId: "checkAdminServiceHealth",
|
||||
response: { 200: Type.Object({ check_id: Type.String(), available: Type.Boolean(), checked_at: Type.String() }, { additionalProperties: false }), 400: Type.Ref(ErrorEnvelopeSchema), 401: Type.Ref(ErrorEnvelopeSchema), 403: Type.Ref(ErrorEnvelopeSchema), 409: Type.Ref(ErrorEnvelopeSchema), 429: Type.Ref(ErrorEnvelopeSchema), 503: Type.Ref(ErrorEnvelopeSchema) },
|
||||
tags: ["Admin Services"],
|
||||
},
|
||||
},
|
||||
async (request, reply) => {
|
||||
if (request.validationError) return reply.code(400).send(createErrorEnvelope({ code: "REGISTRATION_REQUEST_INVALID", correlationId: request.id }));
|
||||
const registration = options.registration;
|
||||
const usage = options.serviceUsage ?? registration?.serviceUsage;
|
||||
if (!registration || !usage) return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
const token = cookieValue(headerValue(request.headers.cookie), adminSessionCookieName);
|
||||
if (!token) return reply.code(401).send(createErrorEnvelope({ code: "AUTH_SESSION_INVALID", correlationId: request.id }));
|
||||
try {
|
||||
const headers = request.headers as { "x-csrf-token": string };
|
||||
registration.authorizeAdminMutation({ csrfToken: headers["x-csrf-token"], sessionToken: token });
|
||||
const body = request.body as { available: boolean; reason?: string };
|
||||
const params = request.params as { service_id: "resend_email" | "amap_web_service" };
|
||||
const check = usage.recordHealthCheck({ serviceId: params.service_id, available: body.available, ...(body.reason ? { reason: body.reason } : {}) });
|
||||
return { check_id: check.checkId, available: check.available, checked_at: new Date(check.checkedAt).toISOString() };
|
||||
} catch (error) {
|
||||
if (error instanceof RegistrationError) return reply.code(error.httpStatus).send(createErrorEnvelope({ code: error.code, correlationId: request.id }));
|
||||
return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
app.patch(
|
||||
"/api/v1/admin/services/:service_id/limits",
|
||||
{
|
||||
attachValidation: true,
|
||||
schema: {
|
||||
params: Type.Ref(AdminServiceParamsSchema),
|
||||
body: Type.Ref(AdminServiceLimitRequestSchema),
|
||||
headers: Type.Ref(ModelConfigUpdateHeadersSchema),
|
||||
operationId: "updateAdminServiceHardLimit",
|
||||
response: { 200: Type.Ref(AdminServicesResponseSchema), 400: Type.Ref(ErrorEnvelopeSchema), 401: Type.Ref(ErrorEnvelopeSchema), 403: Type.Ref(ErrorEnvelopeSchema), 409: Type.Ref(ErrorEnvelopeSchema), 429: Type.Ref(ErrorEnvelopeSchema), 503: Type.Ref(ErrorEnvelopeSchema) },
|
||||
tags: ["Admin Services"],
|
||||
},
|
||||
},
|
||||
async (request, reply) => {
|
||||
if (request.validationError) return reply.code(400).send(createErrorEnvelope({ code: "REGISTRATION_REQUEST_INVALID", correlationId: request.id }));
|
||||
const registration = options.registration;
|
||||
const usage = options.serviceUsage ?? registration?.serviceUsage;
|
||||
if (!registration || !usage) return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
const token = cookieValue(headerValue(request.headers.cookie), adminSessionCookieName);
|
||||
if (!token) return reply.code(401).send(createErrorEnvelope({ code: "AUTH_SESSION_INVALID", correlationId: request.id }));
|
||||
try {
|
||||
const headers = request.headers as { "x-csrf-token": string };
|
||||
const admin = registration.authorizeAdminMutation({ csrfToken: headers["x-csrf-token"], sessionToken: token });
|
||||
const body = request.body as { hard_limit: number; period_type: "daily" | "monthly" };
|
||||
const params = request.params as { service_id: "resend_email" | "amap_web_service" };
|
||||
usage.setHardLimit({ actorId: admin.userId, hardLimit: body.hard_limit, periodType: body.period_type, serviceId: params.service_id });
|
||||
return {
|
||||
services: usage.readCurrent().map((row) => ({
|
||||
hard_limit: row.hardLimit,
|
||||
pause_reason: row.pauseReason,
|
||||
period_start: new Date(row.periodStart).toISOString(),
|
||||
period_type: row.periodType,
|
||||
service_id: row.serviceId,
|
||||
service_status: row.status,
|
||||
updated_at: new Date(row.updatedAt).toISOString(),
|
||||
used_count: row.usedCount,
|
||||
})),
|
||||
};
|
||||
} catch (error) {
|
||||
if (error instanceof RegistrationError) return reply.code(error.httpStatus).send(createErrorEnvelope({ code: error.code, correlationId: request.id }));
|
||||
if (error instanceof ExternalServiceUsageError) return reply.code(409).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
"/api/v1/admin/services/:service_id/recover",
|
||||
{
|
||||
attachValidation: true,
|
||||
schema: {
|
||||
params: Type.Ref(AdminServiceParamsSchema),
|
||||
body: Type.Ref(AdminServiceRecoveryRequestSchema),
|
||||
headers: Type.Ref(ModelConfigUpdateHeadersSchema),
|
||||
operationId: "recoverAdminService",
|
||||
response: { 200: Type.Object({ status: Type.Literal("active") }, { additionalProperties: false }), 400: Type.Ref(ErrorEnvelopeSchema), 401: Type.Ref(ErrorEnvelopeSchema), 403: Type.Ref(ErrorEnvelopeSchema), 409: Type.Ref(ErrorEnvelopeSchema), 429: Type.Ref(ErrorEnvelopeSchema), 503: Type.Ref(ErrorEnvelopeSchema) },
|
||||
tags: ["Admin Services"],
|
||||
},
|
||||
},
|
||||
async (request, reply) => {
|
||||
if (request.validationError) return reply.code(400).send(createErrorEnvelope({ code: "REGISTRATION_REQUEST_INVALID", correlationId: request.id }));
|
||||
const registration = options.registration;
|
||||
const usage = options.serviceUsage ?? registration?.serviceUsage;
|
||||
if (!registration || !usage) return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
const token = cookieValue(headerValue(request.headers.cookie), adminSessionCookieName);
|
||||
if (!token) return reply.code(401).send(createErrorEnvelope({ code: "AUTH_SESSION_INVALID", correlationId: request.id }));
|
||||
try {
|
||||
const headers = request.headers as { "x-csrf-token": string };
|
||||
const admin = registration.authorizeAdminMutation({ csrfToken: headers["x-csrf-token"], sessionToken: token });
|
||||
const body = request.body as { check_id: string };
|
||||
const params = request.params as { service_id: "resend_email" | "amap_web_service" };
|
||||
return usage.recover({ actorId: admin.userId, checkId: body.check_id, serviceId: params.service_id });
|
||||
} catch (error) {
|
||||
if (error instanceof RegistrationError) return reply.code(error.httpStatus).send(createErrorEnvelope({ code: error.code, correlationId: request.id }));
|
||||
if (error instanceof ExternalServiceUsageError) return reply.code(409).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
return reply.code(503).send(createErrorEnvelope({ code: "AUTH_SERVICE_UNAVAILABLE", correlationId: request.id }));
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
"/api/v1/auth/login/send",
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user