修复生图结果消息被覆盖不显示
Some checks failed
Lint / build (20) (push) Has been cancelled
Playwright Tests / test (push) Has been cancelled

This commit is contained in:
Your Name 2026-02-07 20:57:57 +08:00
parent 79d54f0a92
commit 1fd0db078a
2 changed files with 37 additions and 7 deletions

View File

@ -3,6 +3,9 @@ import { auth } from "@/app/(auth)/auth";
import { saveMessages, getMessagesByChatId } from "@/lib/db/queries"; import { saveMessages, getMessagesByChatId } from "@/lib/db/queries";
import type { DBMessage } from "@/lib/db/schema"; import type { DBMessage } from "@/lib/db/schema";
export const dynamic = "force-dynamic";
export const revalidate = 0;
/** /**
* 获取聊天消息 * 获取聊天消息
* 用于从数据库重新加载消息 * 用于从数据库重新加载消息
@ -41,7 +44,14 @@ export async function GET(request: NextRequest) {
}; };
}); });
return NextResponse.json({ messages: formattedMessages }); return NextResponse.json(
{ messages: formattedMessages },
{
headers: {
"Cache-Control": "no-store, max-age=0",
},
}
);
} catch (error) { } catch (error) {
console.error("[Messages API] GET Error:", error); console.error("[Messages API] GET Error:", error);
return NextResponse.json( return NextResponse.json(
@ -100,4 +110,3 @@ export async function POST(request: NextRequest) {
); );
} }
} }

View File

@ -63,6 +63,14 @@ function normalizeImageParamsForProvider(
return normalized; return normalized;
} }
function sortMessagesByCreatedAt(messages: ChatMessage[]): ChatMessage[] {
return [...messages].sort((a, b) => {
const timeA = (a as any).createdAt ? new Date((a as any).createdAt).getTime() : 0;
const timeB = (b as any).createdAt ? new Date((b as any).createdAt).getTime() : 0;
return timeA - timeB;
});
}
export function Chat({ export function Chat({
id, id,
initialMessages, initialMessages,
@ -465,15 +473,28 @@ export function Chat({
await new Promise(resolve => setTimeout(resolve, 500)); await new Promise(resolve => setTimeout(resolve, 500));
// 获取最新消息 // 获取最新消息
const response = await fetch(`/api/messages?chatId=${id}`); const response = await fetch(`/api/messages?chatId=${id}&_t=${Date.now()}`, {
cache: "no-store",
});
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json();
if (data.messages && Array.isArray(data.messages)) { if (data.messages && Array.isArray(data.messages)) {
console.log("[Chat] Reloading messages from database:", data.messages.length); console.log("[Chat] Reloading messages from database:", data.messages.length);
// 更新消息状态 // 合并消息,避免数据库短暂延迟导致实时 append 的图片消息被覆盖丢失
setMessages(data.messages); setMessages((prev) => {
// 清空 appendedMessages,因为已经从数据库加载了完整消息 const mergedMap = new Map<string, ChatMessage>();
setAppendedMessages([]); prev.forEach((message) => mergedMap.set(message.id, message));
(data.messages as ChatMessage[]).forEach((message) => mergedMap.set(message.id, message));
return sortMessagesByCreatedAt(Array.from(mergedMap.values()));
});
// 仅清理已经成功落库的 appended 消息,保留仍未在数据库中出现的实时消息
const persistedIds = new Set<string>(
(data.messages as ChatMessage[]).map((message) => message.id)
);
setAppendedMessages((prev) =>
prev.filter((message) => !persistedIds.has(message.id))
);
} }
} }
} catch (error) { } catch (error) {