@allbluecn/web-app 0.19.2 → 0.19.4

package/src/design-engine/engine/engine-path.ts

@@ -56,7 +56,7 @@ export class PathEditEngine extends DocEngine {
   enterPathEdit(nodeId: string): boolean {
     try {
       return this.enterPathEditInner(nodeId)
-    } catch (error) {
+    } catch {
       return false
     }
   }
@@ -99,9 +99,6 @@ export class PathEditEngine extends DocEngine {
     }
     const anchors: PathEditAnchor[] = parsedPath.anchors
     const closed = parsedPath.closed
-    if (anchors.length < 2) {
-      return false
-    }
     this.exitPathEdit()
     this.pathEditState = { nodeId, anchors, closed, selected: null }
     this.setFrameInteractivity((frameId) => frameId === nodeId)
@@ -111,7 +108,7 @@ export class PathEditEngine extends DocEngine {
     try {
       this.app?.editor?.cancel()
       this.selectionState = [nodeId]
-    } catch (error) {
+    } catch {
       this.selectionState = [nodeId]
     }
     this.drawPathEditDecor()
@@ -197,6 +194,8 @@ export class PathEditEngine extends DocEngine {
     if (!state || state.selected === null) return false
     const anchor = state.anchors[state.selected]
     if (!anchor) return false
+    // 面板/键盘触发的离散编辑同样落「变更前」快照（与全仓命令统一极性）
+    this.history.push(this.currentDoc)
     applyPointType(anchor, type)
     this.commitPathEdit()
     return true
@@ -208,6 +207,7 @@ export class PathEditEngine extends DocEngine {
     if (!state || state.selected === null) return false
     const anchor = state.anchors[state.selected]
     if (!anchor) return false
+    this.history.push(this.currentDoc)
     applyPointType(anchor, (anchor.pointType ?? "disconnected") === "straight" ? "mirror" : "straight")
     this.commitPathEdit()
     return true
@@ -285,13 +285,15 @@ export class PathEditEngine extends DocEngine {
     }
   }
 
-  // 在选中锚点与其后锚点的段中点插入新锚点并选中
+  // 在选中锚点与其后锚点的段中点插入新锚点并选中（面板按钮入口；落一条
+  // 「变更前」快照，与线段单击插锚同撤销语义）
   addPathAnchorAfterSelected(): boolean {
     const state = this.pathEditState
     if (!state) return false
     const segIndex = state.selected ?? Math.max(0, state.anchors.length - 2)
     const next = insertAnchorOnSegment(state.anchors, segIndex, state.closed)
     if (!next) return false
+    this.history.push(this.currentDoc)
     state.anchors = next
     state.selected = segIndex + 1
     this.commitPathEdit()
@@ -303,6 +305,7 @@ export class PathEditEngine extends DocEngine {
     if (!state || state.selected === null) return false
     const next = deleteAnchor(state.anchors, state.selected)
     if (!next) return false
+    this.history.push(this.currentDoc)
     state.anchors = next
     state.selected = null
     this.commitPathEdit()
@@ -312,6 +315,7 @@ export class PathEditEngine extends DocEngine {
   togglePathClosed(): boolean {
     const state = this.pathEditState
     if (!state) return false
+    this.history.push(this.currentDoc)
     state.closed = !state.closed
     this.commitPathEdit()
     return true
@@ -359,6 +363,9 @@ export class PathEditEngine extends DocEngine {
   // pathEditHitModel.segments 下标对齐
   private pathEditSegmentMap: Array<{ seg: number; t0: number; t1: number }> = []
   private pathEditDrag: { index: number } | null = null
+  // 当前拖拽手势是否已落「变更前」checkpoint（首个 move 落一次；插锚手势
+  // 由 insertPathAnchorAt 落，置 true 跳过）
+  private pathEditDragCheckpointed = false
   private pathEditInteractionIds: Array<() => void> = []
 
   // client 命中模型：锚点/线段的世界坐标投影（drawPathEditDecor 与命中共用）
@@ -422,9 +429,6 @@ export class PathEditEngine extends DocEngine {
     }
     this.pathEditHitModel = { anchorPoints, segments }
     this.pathEditSegmentMap = segSources
-    if (typeof window !== "undefined") {
-      ;(window as unknown as Record<string, unknown>).__pathDebug = { anchorPoints, segments }
-    }
   }
 
   // host 内部坐标（client 相对视口 → 相对 host）：leafer 的 client 坐标系是
@@ -478,16 +482,20 @@ export class PathEditEngine extends DocEngine {
       if (hit.kind === "anchor") {
         this.selectPathAnchor(hit.index)
         dragIndex = hit.index
+        // 拖拽尚未发生：checkpoint 延迟到首个 move 落「变更前」快照（纯点击
+        // 不产生撤销记录）
+        this.pathEditDragCheckpointed = false
       } else {
         // 单击线段 = 插入锚点并立即进入拖拽（Figma click-drag 语义）。曲线
-        // 段命中子段参数换算回锚点段全局 t，de Casteljau 拆分才落在点击处
+        // 段命中子段参数换算回锚点段全局 t，de Casteljau 拆分才落在点击处。
+        // 插锚已由 insertPathAnchorAt 落一条「变更前」快照，本手势作为一条
+        // 撤销步骤，不再重复 checkpoint
         const source = this.pathEditSegmentMap[hit.index] ?? { seg: hit.index, t0: 0, t1: 1 }
         const t = source.t0 + (source.t1 - source.t0) * hit.t
         this.insertPathAnchorAt(source.seg, t)
         dragIndex = source.seg + 1
+        this.pathEditDragCheckpointed = true
       }
-      // 拖拽前置 checkpoint（拖拽过程 updateNodeGeometry 不入 history）
-      this.history.push(this.currentDoc)
       this.pathEditDrag = { index: dragIndex }
       try {
         host.setPointerCapture(e.pointerId)
@@ -517,6 +525,12 @@ export class PathEditEngine extends DocEngine {
 
     const onPointerMove = (e: PointerEvent): void => {
       if (!this.pathEditDrag) return
+      // 首次 move 落「变更前」快照（全仓命令统一极性：undo(current) 直接回退
+      // 到拖拽前；拖拽过程 updateNodeGeometry 不入 history）
+      if (!this.pathEditDragCheckpointed) {
+        this.pathEditDragCheckpointed = true
+        this.history.push(this.currentDoc)
+      }
       const world = worldOfClient(e.clientX, e.clientY)
       if (!world) return
       this.movePathAnchor(this.pathEditDrag.index, world.x, world.y)
@@ -525,8 +539,8 @@ export class PathEditEngine extends DocEngine {
     const onPointerUp = (): void => {
       if (!this.pathEditDrag) return
       this.pathEditDrag = null
-      // 拖拽结束落一条 history（与面板预览/提交同模式）
-      this.history.push(this.currentDoc)
+      // checkpoint 已在首个 move 落栈；此处再 push「变更后」快照会让首次
+      // undo 消费在同状态快照上（no-op），需按两次才真正回退
       this.notifyDocChange()
     }
 
@@ -573,6 +587,7 @@ export class PathEditEngine extends DocEngine {
     for (const dispose of this.pathEditInteractionIds) dispose()
     this.pathEditInteractionIds = []
     this.pathEditDrag = null
+    this.pathEditDragCheckpointed = false
   }
 
   // 锚点装饰（sky 层，纯渲染 hittable:false）：Sketch 式空心圆/实心选中圆/
@@ -586,30 +601,19 @@ export class PathEditEngine extends DocEngine {
     const tree = this.app?.tree as unknown as {
       getClientPointByWorld: (w: { x: number; y: number }) => { x: number; y: number }
     }
-    const dbg = (msg: string): void => {
-      if (typeof window !== "undefined") {
-        const buf = ((window as unknown as Record<string, unknown>).__pathEditLog as string[] | undefined) ?? []
-        buf.push(msg)
-        ;(window as unknown as Record<string, unknown>).__pathEditLog = buf.slice(-30)
-      }
-    }
     if (!state || !sky || !tree) {
-      dbg(`early-return sky=${Boolean(sky)} tree=${Boolean(tree)}`)
       return
     }
     this.clearPathEditDecor()
     const node = this.currentDoc.nodes.find((n) => n.id === state.nodeId)
     if (!node) {
-      dbg(`early-return node missing ${state.nodeId}`)
       return
     }
     const { Line, Rect, Ellipse } = this.mod
     // 模块缺图形类（无头 mock）时静默降级为无装饰（同圆角拖拽守卫惯例）
     if (!Line?.one || !Rect?.one || !Ellipse?.one) {
-      dbg("early-return mod classes missing")
       return
     }
-    dbg(`drawing decor for ${state.nodeId}`)
 
     // 命中模型随装饰同步刷新（视口 CHANGE 由 bindCornerDragViewport 的
     // 同款监听驱动本方法 drawPathEditDecor）

package/src/design-engine/engine/export-node.ts

@@ -16,7 +16,13 @@ function resolveExport(leaf: ILeaf | ExportLeaf): ExportFn | null {
 }
 
 function safeFileName(name: string): string {
-  return name.replace(/[\\/:*?"<>|]/g, "_").trim() || "node";
+  // 前导点剥离：".."（路径遍历形态）与 ".hidden"（隐藏文件）不落 download 名
+  return (
+    name
+      .replace(/[\\/:*?"<>|]/g, "_")
+      .replace(/^\.+/, "")
+      .trim() || "node"
+  );
 }
 
 function unwrapData(value: unknown): unknown {
@@ -53,14 +59,30 @@ export async function withShaderStaticFrames<T>(
     .filter((paint): paint is ShaderPaintLike => paint !== null);
   if (shaderPaints.length === 0) return run();
   const { shaderFillRuntime } = await import("@/components/design/canvas/plugins/shader/bridge");
+  // 逐 paint try 包裹：多 shader paint 时第 2 个 renderStaticFrame 抛错不能
+  // 让第 1 个已冻结实例失去配对恢复（画布停帧至下次交互）——只恢复冻结成功项
+  const frozen: ShaderPaintLike[] = [];
   for (const paint of shaderPaints) {
-    shaderFillRuntime.renderStaticFrame(nodeId, paint.id);
+    try {
+      shaderFillRuntime.renderStaticFrame(nodeId, paint.id);
+      frozen.push(paint);
+    } catch (error) {
+      console.warn(
+        `[design-engine] renderStaticFrame failed for paint ${paint.id}: ${error instanceof Error ? error.message : "unknown"}`,
+      );
+    }
   }
   try {
     return await run();
   } finally {
-    for (const paint of shaderPaints) {
-      shaderFillRuntime.resumeAfterStaticFrame(nodeId, paint.id);
+    for (const paint of frozen) {
+      try {
+        shaderFillRuntime.resumeAfterStaticFrame(nodeId, paint.id);
+      } catch (error) {
+        console.warn(
+          `[design-engine] resumeAfterStaticFrame failed for paint ${paint.id}: ${error instanceof Error ? error.message : "unknown"}`,
+        );
+      }
     }
   }
 }

package/src/design-engine/engine/path-anchors.ts

@@ -111,35 +111,76 @@ function quadPoint(p0: { x: number; y: number }, p1: { x: number; y: number }, p
   }
 }
 
-/** 解析 SVG path 串（M/L/C/Q/Z，绝对坐标）为折线环；开放路径自动闭合（布尔需闭合轮廓） */
+const PATH_TOKEN_RE = /[MLCQZz]|-?\d*\.?\d+(?:e[-+]?\d+)?/g
+
+/**
+ * path 串 token 化。未被命令/数字 token 消费的残余只允许空白与逗号（SVG
+ * 分隔符）：含小写相对命令（m/l/c/q）等不支持形态或杂质字符时整段判废返回
+ * null——此前这些字符被静默丢弃，数字错位成错误几何（布尔/编辑拿到坏数据）。
+ */
+function tokenizePathCommands(path: string): string[] | null {
+  const tokens = path.match(PATH_TOKEN_RE) ?? []
+  if (/[^\s,]/.test(path.replace(PATH_TOKEN_RE, ""))) return null
+  return tokens
+}
+
+/** 命令数字参数读取：缺失或 token 错位（如 "M 10 L 20 20" 中读到 "L"）时
+ * 返回 null，调用方整段判废——NaN 坐标曾径直流入布尔环与锚点模型 */
+function numAt(tokens: string[], i: number): number | null {
+  const raw = tokens[i]
+  if (raw === undefined) return null
+  const value = Number(raw)
+  return Number.isFinite(value) ? value : null
+}
+
+/** 解析 SVG path 串（M/L/C/Q/Z，绝对坐标）为折线环；开放路径自动闭合（布尔需闭合轮廓）。
+ * 非法 path（不支持的命令/参数错位）返回空环，由调用方的长度守卫兜底 */
 export function flattenPathString(path: string): Ring {
-  const tokens = path.match(/[MLCQZz]|-?\d*\.?\d+(?:e[-+]?\d+)?/g) ?? []
+  const tokens = tokenizePathCommands(path)
   const ring: Ring = []
+  if (!tokens) return ring
   let current: { x: number; y: number } = { x: 0, y: 0 }
   let start: { x: number; y: number } = { x: 0, y: 0 }
   let i = 0
-  const num = (tokens: string[], index: number): number => Number(tokens[index])
   while (i < tokens.length) {
     const cmd = tokens[i++]
     if (cmd === "M") {
-      current = { x: num(tokens, i), y: num(tokens, i + 1) }
+      const x = numAt(tokens, i)
+      const y = numAt(tokens, i + 1)
+      if (x === null || y === null) return []
+      current = { x, y }
       start = { ...current }
       if (!ring.length) ring.push({ ...current })
       i += 2
     } else if (cmd === "L") {
-      current = { x: num(tokens, i), y: num(tokens, i + 1) }
+      const x = numAt(tokens, i)
+      const y = numAt(tokens, i + 1)
+      if (x === null || y === null) return []
+      current = { x, y }
       ring.push({ ...current })
       i += 2
     } else if (cmd === "C") {
-      const c1 = { x: num(tokens, i), y: num(tokens, i + 1) }
-      const c2 = { x: num(tokens, i + 2), y: num(tokens, i + 3) }
-      const to = { x: num(tokens, i + 4), y: num(tokens, i + 5) }
+      const c1x = numAt(tokens, i)
+      const c1y = numAt(tokens, i + 1)
+      const c2x = numAt(tokens, i + 2)
+      const c2y = numAt(tokens, i + 3)
+      const tox = numAt(tokens, i + 4)
+      const toy = numAt(tokens, i + 5)
+      if (c1x === null || c1y === null || c2x === null || c2y === null || tox === null || toy === null) return []
+      const c1 = { x: c1x, y: c1y }
+      const c2 = { x: c2x, y: c2y }
+      const to = { x: tox, y: toy }
       i += 6
       for (let s = 1; s <= 16; s++) ring.push(cubicPoint(current, c1, c2, to, s / 16))
       current = to
     } else if (cmd === "Q") {
-      const c = { x: num(tokens, i), y: num(tokens, i + 1) }
-      const to = { x: num(tokens, i + 2), y: num(tokens, i + 3) }
+      const cx = numAt(tokens, i)
+      const cy = numAt(tokens, i + 1)
+      const tox = numAt(tokens, i + 2)
+      const toy = numAt(tokens, i + 3)
+      if (cx === null || cy === null || tox === null || toy === null) return []
+      const c = { x: cx, y: cy }
+      const to = { x: tox, y: toy }
       i += 4
       for (let s = 1; s <= 8; s++) ring.push(quadPoint(current, c, to, s / 8))
       current = to
@@ -153,32 +194,49 @@ export function flattenPathString(path: string): Ring {
 
 export type ParsedPath = { anchors: PathEditAnchor[]; closed: boolean }
 
-const num = (tokens: string[], i: number): number => Number(tokens[i])
-
+/** 解析 path 串为带手柄锚点。非法 path（不支持的命令/参数错位）返回空锚点集，
+ * 由调用方的 anchors.length 守卫兜底 */
 export function parsePathAnchors(path: string): ParsedPath {
-  const tokens = path.match(/[MLCQZz]|-?\d*\.?\d+(?:e[-+]?\d+)?/g) ?? []
+  const tokens = tokenizePathCommands(path)
   const anchors: PathEditAnchor[] = []
   let closed = false
+  if (!tokens) return { anchors, closed }
   let i = 0
   while (i < tokens.length) {
     const cmd = tokens[i++]
-    if (cmd === "M") {
-      anchors.push({ x: num(tokens, i), y: num(tokens, i + 1) })
-      i += 2
-    } else if (cmd === "L") {
-      anchors.push({ x: num(tokens, i), y: num(tokens, i + 1) })
+    if (cmd === "M" || cmd === "L") {
+      const x = numAt(tokens, i)
+      const y = numAt(tokens, i + 1)
+      if (x === null || y === null) return { anchors: [], closed: false }
+      anchors.push({ x, y })
       i += 2
     } else if (cmd === "C") {
-      const c1 = { x: num(tokens, i), y: num(tokens, i + 1) }
-      const c2 = { x: num(tokens, i + 2), y: num(tokens, i + 3) }
-      const to = { x: num(tokens, i + 4), y: num(tokens, i + 5) }
+      const c1x = numAt(tokens, i)
+      const c1y = numAt(tokens, i + 1)
+      const c2x = numAt(tokens, i + 2)
+      const c2y = numAt(tokens, i + 3)
+      const tox = numAt(tokens, i + 4)
+      const toy = numAt(tokens, i + 5)
+      if (c1x === null || c1y === null || c2x === null || c2y === null || tox === null || toy === null) {
+        return { anchors: [], closed: false }
+      }
+      const c1 = { x: c1x, y: c1y }
+      const c2 = { x: c2x, y: c2y }
+      const to = { x: tox, y: toy }
       i += 6
       const prev = anchors[anchors.length - 1]
       if (prev) prev.hOut = c1
       anchors.push({ x: to.x, y: to.y, hIn: c2 })
     } else if (cmd === "Q") {
-      const c = { x: num(tokens, i), y: num(tokens, i + 1) }
-      const to = { x: num(tokens, i + 2), y: num(tokens, i + 3) }
+      const cx = numAt(tokens, i)
+      const cy = numAt(tokens, i + 1)
+      const tox = numAt(tokens, i + 2)
+      const toy = numAt(tokens, i + 3)
+      if (cx === null || cy === null || tox === null || toy === null) {
+        return { anchors: [], closed: false }
+      }
+      const c = { x: cx, y: cy }
+      const to = { x: tox, y: toy }
       i += 4
       const prev = anchors[anchors.length - 1]
       if (prev) prev.hOut = c
@@ -272,8 +330,13 @@ export function insertAnchorOnSegment(
   const onCurve = cubicAt(from, c1, c2, to, t)
   const inserted: PathEditAnchor = { x: onCurve.x, y: onCurve.y, hIn: mid12, hOut: mid23 }
   next[segIndex] = { ...from, hOut: mid1 }
-  next[segIndex + 1] = { ...to, hIn: mid3 }
-  next.splice(segIndex + 1, 0, inserted)
+  // 闭合末段（首尾段）的 to 是首锚点 anchors[0]：必须覆写 index 0 的 hIn——
+  // 按 segIndex+1 直写会越界追加数组尾部，首锚点出现两份（陈旧 hIn 留在
+  // index 0），序列化出一条退化的零长闭合段。新锚点按 wraparound 语义插在
+  // 数组末尾（段序 a_{n-1} → inserted → a0）
+  const wrap = closed && segIndex === count - 1
+  next[wrap ? 0 : segIndex + 1] = { ...to, hIn: mid3 }
+  next.splice(wrap ? count : segIndex + 1, 0, inserted)
   return next
 }
 

package/src/devframe-docks/session-iframe.tsx

@@ -15,6 +15,10 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ⚠ devframe 专用 dock（@devframes/vite 独立 iframe 产物，仅本地开发期可见）：
+// 不在主应用 bundle 内、无 paraglide/theme 上下文，故中文文案与硬编码色值为
+// 该隔离环境的刻意豁免，不适用「i18n + CSS 变量」主应用规范。
+
 import { createRoot } from 'react-dom/client'
 import { StrictMode, useEffect, useState } from 'react'
 

package/src/hooks/__tests__/use-entity-subscription.test.ts

@@ -20,13 +20,29 @@ import { renderHook, waitFor } from '@testing-library/react'
 
 const instances: MockEventSource[] = []
 
+// 共享连接管理器要求 addEventListener/removeEventListener（多组件共用一条
+// EventSource 时不能用会被互相覆盖的 onmessage），mock 需实现同款接口
 class MockEventSource {
   onmessage: ((e: MessageEvent) => void) | null = null
   onerror: (() => void) | null = null
   closed = false
+  private listeners = new Map<string, Set<(e: MessageEvent) => void>>()
   constructor(public url: string) {
     instances.push(this)
   }
+  addEventListener(type: string, listener: (e: MessageEvent) => void) {
+    if (!this.listeners.has(type)) this.listeners.set(type, new Set())
+    this.listeners.get(type)!.add(listener)
+  }
+  removeEventListener(type: string, listener: (e: MessageEvent) => void) {
+    this.listeners.get(type)?.delete(listener)
+  }
+  emit(type: string, event: MessageEvent) {
+    for (const listener of this.listeners.get(type) ?? []) listener(event)
+  }
+  get listenerCount(): number {
+    return [...this.listeners.values()].reduce((n, s) => n + s.size, 0)
+  }
   close() { this.closed = true }
 }
 
@@ -61,7 +77,7 @@ describe('useEntitySubscription', () => {
     const { result } = renderHook(() => useEntitySubscription(['e1']))
 
     const instance = instances[instances.length - 1]
-    instance.onmessage?.(new MessageEvent('message', {
+    instance.emit('message', new MessageEvent('message', {
       data: JSON.stringify({ type: 'update', id: 'e1', fields: { title: 'New' } }),
     }))
 
@@ -71,6 +87,28 @@ describe('useEntitySubscription', () => {
     expect(result.current?.type).toBe('update')
   })
 
+  it('same ids 的两个实例共享一条连接（refCount 管理，卸载最后一次才 close）', async () => {
+    const { useEntitySubscription } = await import('@/hooks/use-entity-subscription')
+    const a = renderHook(() => useEntitySubscription(['e1']))
+    const b = renderHook(() => useEntitySubscription(['e1']))
+
+    expect(instances).toHaveLength(1)
+    a.unmount()
+    expect(instances[0].closed).toBe(false) // b 仍在用
+    b.unmount()
+    expect(instances[0].closed).toBe(true)
+  })
+
+  it('unmount 摘除本实例的 message 监听', async () => {
+    const { useEntitySubscription } = await import('@/hooks/use-entity-subscription')
+    const { unmount } = renderHook(() => useEntitySubscription(['e1']))
+    const instance = instances[instances.length - 1]
+    const before = instance.listenerCount
+    expect(before).toBeGreaterThan(0)
+    unmount()
+    expect(instance.listenerCount).toBe(before - 1)
+  })
+
   it('closes EventSource on unmount', async () => {
     const { useEntitySubscription } = await import('@/hooks/use-entity-subscription')
     const { unmount } = renderHook(() => useEntitySubscription(['e1']))

package/src/hooks/use-entity-subscription.ts

@@ -18,21 +18,52 @@
 import { useEffect, useState } from "react"
 import type { EntityUpdateEvent } from "@allbluecn/kernel"
 
+interface SharedSource {
+  es: EventSource
+  refCount: number
+}
+
+// 模块级连接池：同一 ids 集合（签名相同）的多组件共享一条 /api/ws 长连接，
+// refCount 归零才关闭（与 use-notifications 的单例+计数模式同款）
+const sharedSources = new Map<string, SharedSource>()
+
 export function useEntitySubscription(entityIds: string[]): EntityUpdateEvent | null {
   const [lastEvent, setLastEvent] = useState<EntityUpdateEvent | null>(null)
 
+  // 编码后再签名：encodeURIComponent 保证 id 内的 ","/"&" 不会破坏 query 语义，
+  // 编码后的签名可直接作为 URL query 值
+  const subscriptionKey = entityIds.length
+    ? entityIds.map(encodeURIComponent).sort().join(",")
+    : ""
+
   useEffect(() => {
-    if (!entityIds.length) return
-    const es = new EventSource(`/api/ws?ids=${entityIds.join(",")}`)
+    if (!subscriptionKey) return
 
-    es.onmessage = (e) => {
+    let entry = sharedSources.get(subscriptionKey)
+    if (!entry) {
+      const es = new EventSource(`/api/ws?ids=${subscriptionKey}`)
+      entry = { es, refCount: 0 }
+      sharedSources.set(subscriptionKey, entry)
+    }
+    const conn = entry
+    conn.refCount += 1
+
+    const onMessage = (e: MessageEvent) => {
       try {
         setLastEvent(JSON.parse(e.data))
       } catch { /* keepalive */ }
     }
+    conn.es.addEventListener("message", onMessage as EventListener)
 
-    return () => es.close()
-  }, [entityIds.join(",")])
+    return () => {
+      conn.es.removeEventListener("message", onMessage as EventListener)
+      conn.refCount -= 1
+      if (conn.refCount === 0) {
+        conn.es.close()
+        sharedSources.delete(subscriptionKey)
+      }
+    }
+  }, [subscriptionKey])
 
   return lastEvent
 }

package/src/hooks/use-load-more.ts

@@ -7,9 +7,9 @@ import { useEffect, useRef, useState } from "react";
 /**
  * 无限滚动加载状态机：IntersectionObserver 哨兵 + loading 防重入。
  *
- * 哨兵进入视口且 hasMore 时触发 onLoadMore；返回 Promise 时 resolve 后解除
- * loading，同步返回则由调用方经 hasMore/数据更新间接解除。供
- * InfiniteScrollSentinel 等无限滚动组件复用。
+ * 哨兵进入视口且 hasMore 时触发 onLoadMore；返回 Promise 时 settle 后解除
+ * loading，同步返回则在下一个微任务复位（保留一拍防重入语义，且不会把哨兵
+ * 永久封锁）。供 InfiniteScrollSentinel 等无限滚动组件复用。
  */
 export function useLoadMore(
   onLoadMore: () => void | Promise<void>,
@@ -38,9 +38,19 @@ export function useLoadMore(
       (entries) => {
         if (entries[0]?.isIntersecting && !loadingRef.current) {
           setLoading(true);
-          const result = onLoadMore();
-          if (result && typeof (result as Promise<void>).then === "function") {
-            (result as Promise<void>).then(() => setLoading(false));
+          try {
+            const result = onLoadMore();
+            if (result && typeof (result as Promise<void>).then === "function") {
+              (result as Promise<void>)
+                .then(() => setLoading(false))
+                .catch(() => setLoading(false));
+            } else {
+              // 同步返回：微任务复位 loading，避免哨兵被 loadingRef 永久封锁
+              Promise.resolve().then(() => setLoading(false));
+            }
+          } catch {
+            // onLoadMore 同步抛错也必须解除 loading，否则哨兵永久失效
+            setLoading(false);
           }
         }
       },

package/src/hooks/use-notifications.ts

@@ -27,13 +27,15 @@ export function parseNotificationEvent(raw: string): NotificationSseValue | null
 }
 
 function toastNotification(item: NotificationItem, navigate: (opts: { to: string }) => void) {
+  // link 来自服务端数据：仅接受站内相对路径，避免拼错/外部 URL 经 toast 触发跳转
+  const link = item.link && item.link.startsWith('/') ? item.link : null
   toast(item.title, {
     description: item.body ?? undefined,
-    action: item.link
+    action: link
       ? {
           label: m.notifications_actions_view(),
           onClick: () => {
-            navigate({ to: item.link! })
+            navigate({ to: link })
           },
         }
       : undefined,
@@ -88,7 +90,8 @@ export function useNotifications(options?: { toastEnabled?: boolean }) {
       if (!value) return
       if (value.kind === 'unread_snapshot') {
         queryClient.setQueryData(NOTIFICATION_UNREAD_KEY, { count: value.count })
-      } else {
+      } else if (value.kind === 'notification') {
+        // 显式枚举 kind：未知 kind 不误计未读数（快照仅连接时下发一次，错了无从纠偏）
         queryClient.setQueryData(NOTIFICATION_UNREAD_KEY, (old) => {
           const count = (old as { count?: number } | undefined)?.count ?? 0
           return { count: count + 1 }

package/src/hooks/use-paged-groups.ts

@@ -100,6 +100,7 @@ export function usePagedGroupsCore<G, T, Req>(
   useEffect(() => {
     if (!enabled) return;
     let alive = true;
+    let minLoadingTimer: ReturnType<typeof setTimeout> | undefined;
     const startedAt = performance.now();
     setState((s) => ({ ...s, isLoading: true }));
 
@@ -111,10 +112,9 @@ export function usePagedGroupsCore<G, T, Req>(
         settle();
         return;
       }
-      const timer = setTimeout(() => {
+      minLoadingTimer = setTimeout(() => {
         if (alive) settle();
       }, remaining);
-      void timer;
     };
 
     (async () => {
@@ -132,6 +132,7 @@ export function usePagedGroupsCore<G, T, Req>(
 
     return () => {
       alive = false;
+      if (minLoadingTimer) clearTimeout(minLoadingTimer);
     };
     // 过滤/分组参数均编码进 fullSig，仅签名变化时重载
   }, [fullSig]);