From 23cf98bf61dca835b53eb08c8be8a921ed4ea61d Mon Sep 17 00:00:00 2001 From: WuYongJie <549727955@qq.com> Date: Wed, 18 Nov 2026 17:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=BB=E5=B8=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8F=8D=E9=A6=88=E5=8F=8A=E7=BB=9F=E4=B8=80=E9=92=89?= =?UTF-8?q?=E9=92=89=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 5 + app/api/canvas/[id]/feedback/route.ts | 92 +++++ .../[id]/CanvasEditorLegacyPageClient.tsx | 1 + app/feedback/[id]/page.tsx | 107 ++++++ components/canvas/CanvasChatPanel.tsx | 14 + components/canvas/CanvasFeedbackDialog.tsx | 363 ++++++++++++++++++ components/canvas/CanvasSurfaceHeader.tsx | 4 + docs/canvas-feedback.md | 38 ++ instrumentation.ts | 5 + lib/canvas/feedback-client.ts | 78 ++++ lib/canvas/feedback-context.ts | 301 +++++++++++++++ lib/canvas/feedback-contract.ts | 100 +++++ lib/canvas/feedback-store.ts | 189 +++++++++ .../migrations/0105_add_canvas_feedback.sql | 15 + lib/db/migrations/meta/_journal.json | 7 + lib/db/schema.ts | 15 + lib/notifications/notification-center.ts | 83 ++++ playwright.helpers.config.ts | 1 + tests/e2e/canvas-issue-feedback.test.ts | 225 +++++++++++ tests/routes/canvas-feedback.test.ts | 194 ++++++++++ 20 files changed, 1837 insertions(+) create mode 100644 app/api/canvas/[id]/feedback/route.ts create mode 100644 app/feedback/[id]/page.tsx create mode 100644 components/canvas/CanvasFeedbackDialog.tsx create mode 100644 docs/canvas-feedback.md create mode 100644 lib/canvas/feedback-client.ts create mode 100644 lib/canvas/feedback-context.ts create mode 100644 lib/canvas/feedback-contract.ts create mode 100644 lib/canvas/feedback-store.ts create mode 100644 lib/db/migrations/0105_add_canvas_feedback.sql create mode 100644 lib/notifications/notification-center.ts create mode 100644 tests/e2e/canvas-issue-feedback.test.ts create mode 100644 tests/routes/canvas-feedback.test.ts diff --git a/.env.example b/.env.example index 948807853..e40b60974 100644 --- a/.env.example +++ b/.env.example @@ -40,6 +40,11 @@ EMAIL_VERIFICATION_SECRET= # Optional scheduled job protection. CRON_SECRET= +# Canvas feedback: server-side project credentials for the shared notification center. +YYD_NOTIFICATION_CENTER_URL=https://sc.jiansun.vip/notification-center +YYD_NOTIFICATION_CENTER_PROJECT_CODE= +YYD_NOTIFICATION_CENTER_PROJECT_SECRET= + # ----------------------------------------------------------------------------- # Database # ----------------------------------------------------------------------------- diff --git a/app/api/canvas/[id]/feedback/route.ts b/app/api/canvas/[id]/feedback/route.ts new file mode 100644 index 000000000..12246e710 --- /dev/null +++ b/app/api/canvas/[id]/feedback/route.ts @@ -0,0 +1,92 @@ +import { after, NextResponse } from "next/server"; +import { z, ZodError } from "zod"; +import { auth } from "@/app/(auth)/auth"; +import { CanvasFeedbackError, collectCanvasFeedbackContext } from "@/lib/canvas/feedback-context"; +import { feedbackCommandSchema } from "@/lib/canvas/feedback-contract"; +import { + deliverCanvasFeedback, + feedbackReceipt, + findCanvasFeedback, + refreshCanvasFeedback, + saveCanvasFeedback, +} from "@/lib/canvas/feedback-store"; + +export const runtime = "nodejs"; +export const dynamic = "force-dynamic"; +const response = (data: unknown, status = 200) => + NextResponse.json(data, { status, headers: { "Cache-Control": "no-store" } }); +function failure(error: unknown) { + if (error instanceof CanvasFeedbackError) return response({ error: error.message }, error.status); + if (error instanceof ZodError || error instanceof SyntaxError) + return response({ error: "反馈资料格式不正确,请重新打开问题反馈后重试。" }, 400); + console.error("[Canvas feedback] request failed", { + errorType: error instanceof Error ? error.name : "unknown", + }); + return response({ error: "反馈暂未保存成功,请保留问题说明,稍后重试。" }, 503); +} + +export async function POST(request: Request, { params }: { params: Promise<{ id: string }> }) { + try { + const session = await auth(); + if (!session?.user?.id) return response({ error: "登录已过期,请登录后发送反馈。" }, 401); + const projectId = z + .string() + .uuid() + .parse((await params).id); + const raw = await request.text(); + if (new TextEncoder().encode(raw).byteLength > 262144) + return response({ error: "反馈资料过大,请减少补充说明后重试。" }, 413); + const command = feedbackCommandSchema.parse(JSON.parse(raw)); + if (command.action === "submit") { + const existing = await findCanvasFeedback(command.id); + if (existing) { + if (existing.userId !== session.user.id || existing.projectId !== projectId) + throw new CanvasFeedbackError("反馈编号不可用", 409); + return response({ feedback: feedbackReceipt(await refreshCanvasFeedback(existing)) }); + } + } + const context = await collectCanvasFeedbackContext( + session.user.id, + projectId, + command.client, + command.action === "submit" ? command.selection : null, + ); + if (command.action === "context") return response({ context }); + const selected = context.requests.find((item) => item.key === command.selection) || null; + const row = await saveCanvasFeedback({ + id: command.id, + userId: session.user.id, + description: command.description, + appUrl: process.env.NEXT_PUBLIC_APP_URL || new URL(request.url).origin, + snapshot: { + reporter: context.reporter, + project: context.project, + request: selected, + client: command.client, + userAgent: (request.headers.get("user-agent") || "").slice(0, 512), + }, + }); + after(() => deliverCanvasFeedback(row.id)); + return response({ feedback: feedbackReceipt(row) }, 202); + } catch (error) { + return failure(error); + } +} + +export async function GET(request: Request, { params }: { params: Promise<{ id: string }> }) { + try { + const session = await auth(); + if (!session?.user?.id) return response({ error: "登录已过期,请登录后查看反馈状态。" }, 401); + const projectId = z + .string() + .uuid() + .parse((await params).id); + const id = z.string().uuid().parse(new URL(request.url).searchParams.get("feedbackId")); + const row = await findCanvasFeedback(id); + if (!row || row.userId !== session.user.id || row.projectId !== projectId) + throw new CanvasFeedbackError("反馈记录不存在", 404); + return response({ feedback: feedbackReceipt(await refreshCanvasFeedback(row)) }); + } catch (error) { + return failure(error); + } +} diff --git a/app/canvas/[id]/CanvasEditorLegacyPageClient.tsx b/app/canvas/[id]/CanvasEditorLegacyPageClient.tsx index 634c5c2fe..b984bbfb5 100644 --- a/app/canvas/[id]/CanvasEditorLegacyPageClient.tsx +++ b/app/canvas/[id]/CanvasEditorLegacyPageClient.tsx @@ -11406,6 +11406,7 @@ export default function CanvasEditorLegacyPage({ setPanelMode("fileList"); }} projectTitle={projectTitle} + projectId={id} rightInset={panelOcclusionRight} /> )} diff --git a/app/feedback/[id]/page.tsx b/app/feedback/[id]/page.tsx new file mode 100644 index 000000000..3839cb1fd --- /dev/null +++ b/app/feedback/[id]/page.tsx @@ -0,0 +1,107 @@ +import { notFound, redirect } from "next/navigation"; +import { z } from "zod"; +import { auth } from "@/app/(auth)/auth"; +import { feedbackReceipt, findCanvasFeedback } from "@/lib/canvas/feedback-store"; +import { formatFeedbackTime } from "@/lib/canvas/feedback-contract"; + +export const dynamic = "force-dynamic"; + +export default async function CanvasFeedbackPage({ params }: { params: Promise<{ id: string }> }) { + const session = await auth(); + if (!session?.user?.id) redirect("/login"); + const id = (await params).id; + if (!z.string().uuid().safeParse(id).success) notFound(); + const feedback = await findCanvasFeedback(id); + if (!feedback || (feedback.userId !== session.user.id && session.user.type !== "admin")) + notFound(); + const { reporter, project, request, client, userAgent } = feedback.snapshot; + const fields = [ + ["反馈编号", feedback.id], + ["反馈人", `${reporter.name} · ${reporter.email} · ${reporter.department || "未登记部门"}`], + ["用户编号", reporter.id], + ["反馈时间", formatFeedbackTime(feedback.createdAt.toISOString())], + ["画布", `${project.title}(${project.id})`], + ["对话编号", client.chatId || "未打开对话"], + ["请求号", request?.requestId || "尚未获取"], + ["任务或消息编号", request?.id || "未关联"], + ["请求时间", request?.createdAt ? formatFeedbackTime(request.createdAt) : "未记录"], + ["状态与模型", `${request?.status || "页面问题"} / ${request?.model || "未记录"}`], + [ + "处理耗时", + request?.durationMs != null + ? `${(request.durationMs / 1000).toFixed(1)} 秒` + : "未记录或尚未结束", + ], + [ + "资料来源", + request?.evidence === "browser" + ? "浏览器当前对话,服务端尚无对应消息记录" + : "服务端记录及浏览器当前页面", + ], + ["页面版本", client.pageVersion], + ["浏览器", userAgent], + [ + "窗口与网络", + `${client.viewport.width} × ${client.viewport.height} · ${client.online ? "在线" : "离线"}`, + ], + ]; + return ( +
+

画布问题反馈

+

{feedbackReceipt(feedback).message}

+
+ {fields.map(([label, value]) => ( +
+
{label}
+
{value}
+
+ ))} +
+ {[ + ["用户说明", feedback.description || "未补充说明"], + ["请求内容", request?.prompt || "未关联具体请求"], + ["错误信息", request?.error || client.errors.join("\n") || "未记录明确错误"], + ].map(([label, value]) => ( +
+

{label}

+

{value}

+
+ ))} + {request?.parameters && Object.keys(request.parameters).length > 0 && ( +
+

请求参数

+
+            {JSON.stringify(request.parameters, null, 2)}
+          
+
+ )} + {client.nodes.length > 0 && ( +
+ 相关画布节点 +
+            {JSON.stringify(client.nodes, null, 2)}
+          
+
+ )} +
+ 当前对话上下文 +
+ {client.messages.map((item) => ( +
+

+ {item.role === "user" ? "用户" : "助手"} · {item.id} +

+

{item.text}

+
+ ))} +
+
+ + 打开相关画布 + +
+ ); +} diff --git a/components/canvas/CanvasChatPanel.tsx b/components/canvas/CanvasChatPanel.tsx index b88bc921b..9032015fa 100644 --- a/components/canvas/CanvasChatPanel.tsx +++ b/components/canvas/CanvasChatPanel.tsx @@ -1,4 +1,6 @@ "use client"; +import { CANVAS_FEEDBACK_CONTEXT_EVENT, feedbackMessages, type FeedbackCaptureEvent } from "@/lib/canvas/feedback-client"; +import { CanvasFeedbackDialog } from "./CanvasFeedbackDialog"; import { advancePastAtomicRanges, scanMarkdownImageStreaming } from "@/lib/canvas/markdown-image-streaming"; import { useChat } from "@ai-sdk/react"; @@ -4429,6 +4431,15 @@ export function CanvasChatPanel({ // 获取纯 UUID(去掉 canvas- 前缀)用于 API 调用 const rawChatId = toRawCanvasChatId(activeChatId); + useEffect(() => { + const collectFeedback = (event: Event) => { + const detail = (event as FeedbackCaptureEvent).detail; + if (detail.projectId !== canvasId) return; + detail.receive({ chatId: rawChatId, messages: feedbackMessages(activeMessagesRef.current) }); + }; + window.addEventListener(CANVAS_FEEDBACK_CONTEXT_EVENT, collectFeedback); + return () => window.removeEventListener(CANVAS_FEEDBACK_CONTEXT_EVENT, collectFeedback); + }, [canvasId, rawChatId]); const buildHistoryMessagesUrl = useCallback( (targetRawChatId: string, options?: { cacheBust?: boolean }) => { const params = new URLSearchParams({ @@ -15887,6 +15898,9 @@ export function CanvasChatPanel({
+
+ +
+ + + + 问题反馈 + + 自动附上当前画布、用户和相关请求资料。你可以补充问题现象,发送给魔礼红。 + + + {receipt ? ( +
+

{receipt.message}

+

反馈编号:{receipt.id}

+ + 查看已保存的完整反馈 + +
+ ) : ( +
+ {loading ? ( +

+ 正在整理排查资料… +

+ ) : context ? ( +

+ {context.reporter.name} · {context.project.title} +

+ ) : null} +
+ + + {selected && ( +
+

+ 请求号: + + {selected.requestId || "尚未获取,将附上消息编号"} + +

+

+ {selected.prompt} +

+ {selected.error && ( +

{selected.error}

+ )} +
+ )} +
+
+ +