diff --git a/docs/canvas-feedback.md b/docs/canvas-feedback.md index 2f706e53d..ead331976 100644 --- a/docs/canvas-feedback.md +++ b/docs/canvas-feedback.md @@ -16,6 +16,7 @@ - 浏览器在首次提交时固定反馈 UUID 和请求内容,在当前标签页保留提交资料。重复点击、响应丢失后的重试和刷新恢复均沿用原 UUID。 - 服务端按 UUID 插入一次,持久化的通知内容保持不变。通知中心幂等键为 `canvas-feedback:{id}:v1`;每次 HTTP 请求生成新 nonce。 - 保存成功后异步提交通知。节点运行时每分钟继续处理尚未入队的反馈,最多尝试 5 次;连接异常、5xx 和 429 按 1、5、15、30 分钟间隔重试,其他明确拒绝停止重试。 +- 反馈与调度时间统一为 UTC;首次调度显式写入应用时间,数据库默认值也使用 UTC。普通画布能力的默认创建时间按数据库时区转换,视频队列显式写入的 UTC 时间保持原值。 - 通知中心返回投递 ID 后只查询该单,不重新发送。中心负责实际投递及其重试;`DELIVERY_OUTCOME_UNKNOWN` 不自动补发。 - `pending`(本地保存)、`accepted`(中心受理)、`sent/unread/read`(钉钉接受或阅读)、`failed` 分别显示,不把受理当作送达。 @@ -29,7 +30,7 @@ YYD_NOTIFICATION_CENTER_PROJECT_SECRET= 项目代码及密钥使用通知中心分配值,仅配置到服务端。消息签名沿用通知中心 HMAC 契约,签名路径不含公网 `/notification-center` 前缀。 -上线前先备份生产环境配置,并单独执行加表迁移 `0105_add_canvas_feedback.sql`;本次迁移仅新增反馈表和索引,不修改任务、画布、计费或原通知表。应用发布仍使用既有构建机直传流程。回滚应用可保留新增表,尚未入队的反馈在恢复新版后继续处理。 +上线前先备份生产环境配置,并单独执行 `0105_add_canvas_feedback.sql` 和 `0106_canvas_feedback_utc_defaults.sql`;迁移仅涉及反馈表及其默认值,不修改任务、画布、计费或原通知表。应用发布仍使用既有构建机直传流程。回滚应用可保留新增表,尚未入队的反馈在恢复新版后继续处理。 ## 验证 diff --git a/lib/canvas/feedback-context.ts b/lib/canvas/feedback-context.ts index abb3dd825..2adf1698d 100644 --- a/lib/canvas/feedback-context.ts +++ b/lib/canvas/feedback-context.ts @@ -28,6 +28,12 @@ export class CanvasFeedbackError extends Error { const text = (value: unknown) => (typeof value === "string" ? value : ""); const duration = (started: Date | null, completed: Date | null) => started && completed ? Math.max(0, completed.getTime() - started.getTime()) : null; +// The general capability store uses the database default; the video queue writes UTC. +const capabilityCreatedAt = sql`to_char( + case when ${canvasCapabilityTask.capabilityId} = 'video-canvas.generation' + then ${canvasCapabilityTask.createdAt} + else ${canvasCapabilityTask.createdAt} at time zone current_setting('TimeZone') at time zone 'UTC' + end, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`; function requestSummary( column: typeof canvasImageTask.request | typeof canvasCapabilityTask.request, ) { @@ -155,7 +161,7 @@ export async function collectCanvasFeedbackContext( id: canvasCapabilityTask.id, requestId: canvasCapabilityTask.requestId, capabilityId: canvasCapabilityTask.capabilityId, - createdAt: canvasCapabilityTask.createdAt, + createdAt: capabilityCreatedAt, startedAt: canvasCapabilityTask.startedAt, completedAt: canvasCapabilityTask.completedAt, status: canvasCapabilityTask.status, @@ -173,7 +179,7 @@ export async function collectCanvasFeedbackContext( ...(kind === "capability" && validId ? [eq(canvasCapabilityTask.id, selectedId)] : []), ), ) - .orderBy(desc(canvasCapabilityTask.createdAt)) + .orderBy(desc(capabilityCreatedAt)) .limit(10), client.chatId ? db @@ -262,7 +268,7 @@ export async function collectCanvasFeedbackContext( kind: "capability", id: task.id, requestId: task.requestId, - createdAt: task.createdAt.toISOString(), + createdAt: task.createdAt, prompt: text(request.params?.prompt) || text(request.input?.prompt) || diff --git a/lib/canvas/feedback-store.ts b/lib/canvas/feedback-store.ts index fdcf703d0..de0afff2c 100644 --- a/lib/canvas/feedback-store.ts +++ b/lib/canvas/feedback-store.ts @@ -93,6 +93,7 @@ export async function saveCanvasFeedback(input: { snapshot: input.snapshot, notification: buildFeedbackNotification({ ...input, createdAt: createdAt.toISOString() }), createdAt, + nextAttemptAt: createdAt, }) .onConflictDoNothing({ target: canvasFeedback.id }); const row = await findCanvasFeedback(input.id); diff --git a/lib/db/migrations/0106_canvas_feedback_utc_defaults.sql b/lib/db/migrations/0106_canvas_feedback_utc_defaults.sql new file mode 100644 index 000000000..e64321cbd --- /dev/null +++ b/lib/db/migrations/0106_canvas_feedback_utc_defaults.sql @@ -0,0 +1,3 @@ +ALTER TABLE "CanvasFeedback" + ALTER COLUMN "nextAttemptAt" SET DEFAULT (now() AT TIME ZONE 'UTC'), + ALTER COLUMN "createdAt" SET DEFAULT (now() AT TIME ZONE 'UTC'); diff --git a/lib/db/migrations/meta/_journal.json b/lib/db/migrations/meta/_journal.json index 9ea13e496..bd6483836 100644 --- a/lib/db/migrations/meta/_journal.json +++ b/lib/db/migrations/meta/_journal.json @@ -645,6 +645,13 @@ "when": 1794960000000, "tag": "0105_add_canvas_feedback", "breakpoints": true + }, + { + "idx": 90, + "version": "7", + "when": 1794960000001, + "tag": "0106_canvas_feedback_utc_defaults", + "breakpoints": true } ] } diff --git a/lib/db/schema.ts b/lib/db/schema.ts index fc22af642..660b9769e 100644 --- a/lib/db/schema.ts +++ b/lib/db/schema.ts @@ -1,4 +1,4 @@ -import type { InferSelectModel } from "drizzle-orm"; +import { type InferSelectModel, sql } from "drizzle-orm"; import { boolean, foreignKey, @@ -714,9 +714,9 @@ export const canvasFeedback = pgTable("CanvasFeedback", { deliveryId: varchar("deliveryId", { length: 128 }), status: varchar("status", { length: 24 }).notNull().default("pending"), attempts: integer("attempts").notNull().default(0), - nextAttemptAt: timestamp("nextAttemptAt").notNull().defaultNow(), + nextAttemptAt: timestamp("nextAttemptAt").notNull().default(sql`(now() AT TIME ZONE 'UTC')`), lastErrorCode: varchar("lastErrorCode", { length: 128 }), - createdAt: timestamp("createdAt").notNull().defaultNow(), + createdAt: timestamp("createdAt").notNull().default(sql`(now() AT TIME ZONE 'UTC')`), }, (table) => ({ dueIndex: index("CanvasFeedback_due_idx").on(table.status, table.nextAttemptAt) })); export const accessIpEvent = pgTable("AccessIpEvent", {