fix: replace queueMicrotask array debounce with per-eventId Map for race-free stream patch

Author: steve02081504

src/public/parts/shells/chat/public/src/group.mjs

@@ -140,8 +140,8 @@ async function applyGroupHash() {
 	let displayMessages = []
 	/** @type {object[]} 当前频道原始消息行（与 API messages 一致），供增量 merge */
 	let rawMessages = []
-	/** @type {object[]} 待合并的 WS 消息行（microtask 防抖批处理） */
-	const pendingNewEvents = []
+	/** @type {Map<string, object>} eventId → 最新待合并消息行（后写覆盖前写） */
+	const pendingEventMap = new Map()
 	/** @type {boolean} 是否已排队一次 microtask 批处理 */
 	let patchScheduled = false
 
@@ -173,85 +173,46 @@ async function applyGroupHash() {
 	}
 
 	/**
-	 * 将新到的 DAG 事件增量合并进 displayMessages 并追加到虚拟列表，
-	 * 避免全量重绘导致的闪烁与滚动跳动。
-	 * @param {object[]} newEvents 尚未合并进 rawMessages 的新事件行
-	 * @returns {Promise<void>}
-	 */
-	async function patchNewMessages(newEvents) {
-		if (!newEvents.length) return
-		if (lastChannelMeta?.type === 'list' || !msgVirtualList) {
-			await loadMessages()
-			return
-		}
-		if (newEvents.some(e => e?.type === 'pin_message' || e?.type === 'unpin_message')) {
-			await loadMessages()
-			return
-		}
-		const known = new Set(
-			rawMessages.map(m => m?.eventId || m?.id).filter(Boolean),
-		)
-		const toAdd = []
-		for (const e of newEvents) {
-			const id = e?.eventId || e?.id
-			if (id && known.has(id)) continue
-			if (id) known.add(id)
-			toAdd.push(e)
-		}
-		if (!toAdd.length) return
-
-		const prevLen = displayMessages.length
-		const merged = mergeChannelMessagesForDisplay([...rawMessages, ...toAdd])
-		for (let i = 0; i < prevLen; i++) {
-			const a = displayMessages[i]?.eventId ?? displayMessages[i]?.id
-			const b = merged[i]?.eventId ?? merged[i]?.id
-			if (a !== b) {
-				await loadMessages()
-				return
-			}
-		}
-		const appended = merged.slice(prevLen)
-		if (!appended.length) {
-			await loadMessages()
-			return
-		}
-		displayMessages.push(...appended)
-		rawMessages.push(...toAdd)
-		if (typeof msgVirtualList.appendItem === 'function') {
-			for (const item of appended)
-				await msgVirtualList.appendItem(item, false)
-			if (msgScrollContainer)
-				msgScrollContainer.scrollTop = msgScrollContainer.scrollHeight
-		}
-		else await loadMessages()
-
-		void attachLastMessageTimeline(displayMessages).catch(e => {
-			Sentry.captureException(e)
-			console.error('attachLastMessageTimeline failed:', e)
-		})
-	}
-
-	/**
-	 * 调度一次增量消息更新（防抖：同一 microtask 前多次入队合并为一批）。
-	 * @param {object} row 新到的频道消息行（与 API message 行形状一致）
+	 * 将 DAG 消息行调度进增量 patch 队列（同一 eventId 后写覆盖）。
+	 * @param {object} line 消息行（含 eventId 字段）
 	 * @returns {void}
 	 */
-	function scheduleMessagePatch(row) {
-		if (!row || typeof row !== 'object') return
-		pendingNewEvents.push(row)
+	function scheduleMessagePatch(line) {
+		if (!line || typeof line !== 'object') return
+		const key = line.eventId || line.content?.chatLogEntryId || JSON.stringify(line)
+		pendingEventMap.set(key, line)
 		if (patchScheduled) return
 		patchScheduled = true
-		queueMicrotask(async () => {
-			const eventsToProcess = pendingNewEvents.splice(0)
+		queueMicrotask(() => {
 			patchScheduled = false
-			if (signal.aborted) return
+			if (signal.aborted) {
+				pendingEventMap.clear()
+				return
+			}
 			try {
-				await patchNewMessages(eventsToProcess)
+				const lines = [...pendingEventMap.values()]
+				pendingEventMap.clear()
+				if (!lines.length) return
+				let changed = false
+				for (const l of lines) {
+					const idx = rawMessages.findIndex(r => r.eventId === l.eventId)
+					if (idx >= 0) {
+						rawMessages[idx] = l
+						changed = true
+					}
+					else {
+						rawMessages.push(l)
+						changed = true
+					}
+				}
+				if (!changed) return
+				displayMessages = mergeChannelMessagesForDisplay(rawMessages)
+				msgVirtualList?.refresh?.()
 			}
 			catch (e) {
 				Sentry.captureException(e)
-				console.error('patchNewMessages failed, falling back to loadMessages:', e)
-				await loadMessages()
+				console.error('scheduleMessagePatch flush failed, falling back to loadMessages:', e)
+				void loadMessages()
 			}
 		})
 	}