agentworkshop 0.7.24 → 0.7.27

package/app/composables/workshop/useDaqStream.ts

@@ -97,6 +97,9 @@ const api = <T>(path: string, init?: RequestInit): Promise<T> =>
 
 const createStore = () => {
   const nodes = reactive<DaqNodeLive[]>([])
+  // id→节点 O(1) 索引(存 reactive 代理,消费方走索引读取仍被依赖追踪);
+  // 身份仅在 push/splice/load 时变化,故仅在这些点维护,热路径(读数合批/帧入账)免全表 find
+  const nodeIndex = new Map<string, DaqNodeLive>()
   const alarms = reactive<DaqAlarmRow[]>([]) // S5:未确认报警(轮询 + ack 后刷新)
   const controller = reactive<DaqControllerState>({ running: true, defaultIntervalMs: 1000, defaultPublishIntervalMs: 0, nodesTotal: 0, nodesOnline: 0 })
   const meta = reactive<DaqBackendMeta>({
@@ -109,6 +112,12 @@ const createStore = () => {
   // 帧缓冲(v2 多形态信号:nodeId → 最近 FRAMES_CAP 帧,新帧头插)
   const frames = reactive<Record<string, DaqFrameLive[]>>({})
 
+  /** 重建 O(1) 索引(load 级联重建;push/splice 单键维护) */
+  function rebuildIndex(): void {
+    nodeIndex.clear()
+    for (const n of nodes) nodeIndex.set(n.id, n)
+  }
+
   function upsert(node: DaqNodeView): void {
     const i = nodes.findIndex(x => x.id === node.id)
     if (i >= 0) {
@@ -117,6 +126,7 @@ const createStore = () => {
     }
     else {
       nodes.push({ ...node, hist: [] })
+      nodeIndex.set(node.id, nodes[nodes.length - 1]!)
     }
   }
 
@@ -134,13 +144,13 @@ const createStore = () => {
     const latest = new Map<string, AepDaqReading>()
     for (const r of batch) {
       latest.set(r.nodeId, r)
-      const n = nodes.find(x => x.id === r.nodeId)
+      const n = nodeIndex.get(r.nodeId)
       if (!n) continue
       n.hist.push(r.value)
       if (n.hist.length > HIST_CAP) n.hist.splice(0, n.hist.length - HIST_CAP)
     }
     for (const r of latest.values()) {
-      const n = nodes.find(x => x.id === r.nodeId)
+      const n = nodeIndex.get(r.nodeId)
       if (!n) continue
       n.value = r.value
       n.state = r.state
@@ -158,6 +168,9 @@ const createStore = () => {
       if (p.op === 'removed') {
         const i = nodes.findIndex(x => x.id === p.node!.id)
         if (i >= 0) nodes.splice(i, 1)
+        nodeIndex.delete(p.node.id)
+        // 孤儿帧缓冲同步清理(每节点 ≤30 帧 × 预览点;不清理则常驻内存)
+        Reflect.deleteProperty(frames, p.node.id)
         return
       }
       upsert(p.node)
@@ -196,7 +209,7 @@ const createStore = () => {
       })
       if (list.length > FRAMES_CAP) list.splice(FRAMES_CAP)
     }
-    const n = nodes.find(x => x.id === p.nodeId)
+    const n = nodeIndex.get(p.nodeId)
     if (n) {
       n.value = p.metrics?.avg ?? n.value
       if (p.state) n.state = p.state
@@ -262,8 +275,12 @@ const createStore = () => {
           next.push({ ...raw, hist: [] })
         }
       }
-      // 服务端权威:本轮未出现的节点移除(其 hist 随之丢弃,与原语义一致)
+      // 服务端权威:本轮未出现的节点移除(其 hist 随之丢弃,与原语义一致);孤儿帧缓冲同拍清理
       nodes.splice(0, nodes.length, ...next)
+      rebuildIndex()
+      for (const k of Object.keys(frames)) {
+        if (!nodeIndex.has(k)) Reflect.deleteProperty(frames, k)
+      }
       Object.assign(controller, data.controller)
       Object.assign(meta, data.meta ?? {})
       meta.driverAvailable = data.driverAvailable ?? {}
@@ -298,6 +315,8 @@ const createStore = () => {
     await api(`/${id}`, { method: 'DELETE' })
     const i = nodes.findIndex(x => x.id === id)
     if (i >= 0) nodes.splice(i, 1)
+    nodeIndex.delete(id)
+    Reflect.deleteProperty(frames, id)
   }
 
   async function bindNode(id: string, deviceId: string | null): Promise<void> {
@@ -436,7 +455,7 @@ const createStore = () => {
     alarms,
     fetchAlarms,
     ackAlarm,
-    nodeById: (id: string): DaqNodeLive | undefined => nodes.find(n => n.id === id),
+    nodeById: (id: string): DaqNodeLive | undefined => nodeIndex.get(id) ?? nodes.find(n => n.id === id),
     samplesOf,
     fetchFrames,
     frames,

package/app/composables/workshop/useDcwStream.ts

@@ -22,6 +22,8 @@ export interface DcwWriteHistoryEntry { id: string, nodeId: string, nodeName: st
 
 function createStore() {
   const nodes = reactive<DcwNodeView[]>([])
+  // id→节点 O(1) 索引(存 reactive 代理;仅在 push/splice/load 身份变化点维护,读帧热路径免全表 find)
+  const nodeIndex = new Map<string, DcwNodeView>()
   const controller = reactive<AepDcwControllerState>({ running: true, nodesTotal: 0, nodesOnline: 0, writesTotal: 0, writesFailed: 0 })
   const templates = reactive<DcwTemplateDef[]>(DCW_TEMPLATES.map(t => ({ ...t })))
   const recipes = reactive<RecipeView[]>([])
@@ -37,7 +39,10 @@ function createStore() {
   function upsert(node: DcwNodeView): void {
     const i = nodes.findIndex(x => x.id === node.id)
     if (i >= 0) nodes[i] = Object.assign(nodes[i]!, node)
-    else nodes.push(node)
+    else {
+      nodes.push(node)
+      nodeIndex.set(node.id, nodes[nodes.length - 1]!)
+    }
   }
 
   function applyChange(p: AepDcwNodeChange): void {
@@ -45,6 +50,7 @@ function createStore() {
     if (p.op === 'removed') {
       const i = nodes.findIndex(x => x.id === p.node!.id)
       if (i >= 0) nodes.splice(i, 1)
+      nodeIndex.delete(p.node.id)
       return
     }
     upsert(p.node)
@@ -73,7 +79,7 @@ function createStore() {
     {
       if (e.type === 'dcw.written') {
         const p = e.payload as AepDcwWritten
-        const n = nodes.find(x => x.id === p.nodeId)
+        const n = nodeIndex.get(p.nodeId)
         if (n) {
           n.value = p.value
           n.state = p.ok ? 'ok' : 'error'
@@ -85,7 +91,7 @@ function createStore() {
       }
       else if (e.type === 'dcw.read') {
         const p = e.payload as AepDcwRead
-        const n = nodes.find(x => x.id === p.nodeId)
+        const n = nodeIndex.get(p.nodeId)
         if (n) {
           if (p.ok) n.readValue = p.value
           n.lastReadAt = p.at
@@ -108,6 +114,8 @@ function createStore() {
     try {
       const data = await api<{ controller: AepDcwControllerState, nodes: DcwNodeView[], templates?: DcwTemplateDef[], recipes?: RecipeView[], runs?: RecipeRunView[], history?: DcwWriteHistoryEntry[], products?: ProductView[], lines?: LineView[], lineStates?: LineRunState[] }>('')
       nodes.splice(0, nodes.length, ...data.nodes)
+      nodeIndex.clear()
+      for (const n of nodes) nodeIndex.set(n.id, n)
       Object.assign(controller, data.controller)
       if (data.templates?.length) templates.splice(0, templates.length, ...data.templates.map(t => ({ ...t })))
       recipes.splice(0, recipes.length, ...(data.recipes ?? []))
@@ -190,6 +198,7 @@ function createStore() {
       await api(`/${id}`, { method: 'DELETE' })
       const i = nodes.findIndex(x => x.id === id)
       if (i >= 0) nodes.splice(i, 1)
+      nodeIndex.delete(id)
     },
     bindNode: async (id: string, deviceId: string | null): Promise<void> => {
       const data = await api<{ node: DcwNodeView }>(`/${id}/bind`, { method: 'POST', body: JSON.stringify({ deviceId }) })
@@ -258,7 +267,7 @@ function createStore() {
       return data.run
     },
     runData: (id: string): Promise<RecipeRunData> => api(`/runs/${id}/data`),
-    nodeById: (id: string): DcwNodeView | undefined => nodes.find(n => n.id === id),
+    nodeById: (id: string): DcwNodeView | undefined => nodeIndex.get(id) ?? nodes.find(n => n.id === id),
     // ---------- 产品 ----------
     createProduct: async (input: ProductInput): Promise<ProductView> => {
       const data = await api<{ product: ProductView }>('/products', { method: 'POST', body: JSON.stringify(input) })