agentworkshop 0.7.8 → 0.7.11

package/server/api/workshop/plugins/[name]/enable.post.ts

@@ -1,16 +1,18 @@
 /**
  * POST /api/workshop/plugins/:name/enable —— 启用插件(admin;热重载生效)。
+ * 统一信封:经 defineApiHandler,错误(AppError)带人话 message 供前端直出。
  */
-import { defineEventHandler, createError } from 'h3'
 import { resolveUser, requireAdmin } from '@/server/api/workshop/caller'
+import { AppError, ErrorCodes } from '@/server/utils/errors'
 import { pluginManifest, reloadPluginHost, setPluginEnabled } from '@/server/services/workshop/plugins/host.mjs'
+import { defineApiHandler } from '@/server/utils/response'
 
-export default defineEventHandler(async (event) => {
+export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
   requireAdmin(event)
   const name = String(event.context.params?.name ?? '')
   if (!pluginManifest().some(p => p.name === name)) {
-    throw createError({ statusCode: 404, statusMessage: `plugin not found: ${name}` })
+    throw new AppError(404, ErrorCodes.NOT_FOUND, `插件不存在: ${name}`)
   }
   setPluginEnabled(name, true)
   await reloadPluginHost()

package/server/api/workshop/ws.ts

@@ -24,7 +24,8 @@ import type { AgentEvent } from '../../services/workshop/agents/agent-interface'
 import type { A2AMessage } from '../../services/workshop/types/a2a'
 import type { AepEnvelope } from '../../../shared/workshop-protocol'
 import { parseJson } from '../../services/workshop/db/database'
-import { registerScenePeer, unregisterScenePeer, broadcastPeerEvent } from '../../services/workshop/scene-events'
+import { registerScenePeer, setPeerVisibleLines, unregisterScenePeer, broadcastPeerEvent } from '../../services/workshop/scene-events'
+import { visibleLineIds } from '../../services/workshop/permissions'
 import { subscribeHitlEvents } from '../../services/workshop/agents/hitl-registry'
 import { createLogger } from '../../services/workshop/logger'
 import { retentionSettings } from '../../services/workshop/settings'
@@ -167,6 +168,12 @@ function resolveChannelIdFromUrl(peer: WsPeer): string | undefined {
   return resolveQueryParam(peer, 'channelId') ?? resolveQueryParam(peer, 'channel_id')
 }
 
+/** 场景事件注册(鉴权后):按用户产线可见集挂 per-peer 过滤,未经鉴权的 peer 不注册 */
+function attachScenePeer(peer: WsPeer, user: { id: string, role: string }): void {
+  setPeerVisibleLines(peer, visibleLineIds(user))
+  registerScenePeer(peer)
+}
+
 /** 安全发送控制帧(error/pong/snapshot;死连接静默丢弃) */
 function sendControl(peer: WsPeer, obj: unknown): void {
   try {
@@ -589,8 +596,8 @@ function subscribePeer(manager: AgentChannelManager, peer: WsPeer, channelId: st
     return
   }
   stream.peers.add(peer)
-  // 共享场景事件注册表:daq 等无频道归属广播由此直达该 peer
-  registerScenePeer(peer)
+  // 共享场景事件注册表:daq 等无频道归属广播由此直达该 peer(sub 鉴权成功后补挂)
+  attachScenePeer(peer, user)
   let channels = peerChannels.get(peer)
   if (!channels) {
     channels = new Set()
@@ -677,9 +684,14 @@ export default defineWebSocketHandler({
       return
     }
     ensureHubBound(manager)
-    // 场景事件(daq.reading / daq.node.changed / dcw.* / device.* 等无频道归属广播)
-    // 在连接层即注册 —— 不依赖 channel 订阅:/daq 等纯遥测页面建连即得实时帧
-    registerScenePeer(peer)
+    // 场景事件(daq.reading / dcw.* / device.* 等无频道归属广播)鉴权扇出:
+    // ?token= 有效才注册 scene peer(按用户产线可见集过滤);无/坏 token 的连接
+    // 收不到任何 scene 帧(sub 帧鉴权成功后补注册)。前端全部连接携带 ?token=。
+    const qpUser = (() => {
+      const t = resolveQueryParam(peer, 'token')
+      return t ? resolveUserByToken(t) : null
+    })()
+    if (qpUser) attachScenePeer(peer, qpUser)
     // 兼容旧路径:?channelId= 连接即订阅(无 lastSeq → 快照对齐)
     const channelId = resolveChannelIdFromUrl(peer)
     if (!channelId) return // 纯上行 sub 模式(多 channel 复用一条连接)

package/server/data/daqs.json

@@ -64,9 +64,9 @@
     "posX": 1695,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 169.5,
+    "value": 167.8,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-27T12:39:08.110Z"
   },
   {
@@ -308,9 +308,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 317,
+    "value": 311,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-28T09:37:38.518Z"
   },
   {
@@ -330,9 +330,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 169.4,
+    "value": 165.5,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-29T03:30:57.463Z"
   },
   {
@@ -1012,9 +1012,9 @@
     "posX": 2395,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 172.7,
+    "value": 171.6,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T12:28:53.918+08:00",
     "createdAt": "2026-08-31T04:07:19.038Z"
   },
   {
@@ -3026,9 +3026,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 1.0214,
-    "state": "alarm",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "value": 1.0315,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T10:17:59.182Z"
   },
   {
@@ -3050,9 +3050,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 0.9829,
-    "state": "alarm",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "value": 0.9496,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T11:18:01.401Z"
   },
   {
@@ -3072,9 +3072,9 @@
     "deviceBindingId": "dev-mthzr991-ujuad",
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 1.0231,
-    "state": "alarm",
-    "lastAt": "2026-09-05T20:09:01.412+08:00",
+    "value": 1.0282,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T11:34:59.332Z"
   },
   {
@@ -3214,9 +3214,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-1b318320",
-    "value": 167,
+    "value": 167.3,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-04T05:08:10.069Z"
   },
   {
@@ -3749,9 +3749,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 58.9,
+    "value": 57.4,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.477+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-05T05:47:00.640Z"
   },
   {
@@ -3774,9 +3774,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 42.4,
+    "value": 42.7,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T05:47:00.697Z"
   },
   {
@@ -3804,9 +3804,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 0.8,
+    "value": 0.76,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:02.706+08:00",
+    "lastAt": "2026-09-06T12:28:54.182+08:00",
     "createdAt": "2026-09-05T05:47:00.821Z"
   },
   {
@@ -3835,7 +3835,7 @@
     "lineId": "ln-6a34fbc7",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T12:28:59.680+08:00",
     "createdAt": "2026-09-05T05:47:00.864Z"
   },
   {
@@ -3858,9 +3858,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 183.5,
-    "state": "warn",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "value": 177.7,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T05:47:03.624Z"
   },
   {
@@ -3890,7 +3890,7 @@
     "lineId": "ln-6a34fbc7",
     "value": -0.4,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:02.188+08:00",
+    "lastAt": "2026-09-06T12:28:58.123+08:00",
     "createdAt": "2026-09-05T05:47:03.680Z"
   },
   {
@@ -3959,9 +3959,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-419463e0",
-    "value": 58.9,
+    "value": 57.4,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.477+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-05T06:09:13.444Z"
   },
   {
@@ -3984,9 +3984,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-419463e0",
-    "value": 42.1,
+    "value": 42.5,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T06:09:13.490Z"
   },
   {
@@ -4014,9 +4014,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": 0.8,
+    "value": 0.76,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:02.965+08:00",
+    "lastAt": "2026-09-06T12:28:53.394+08:00",
     "createdAt": "2026-09-05T06:09:13.540Z"
   },
   {
@@ -4045,7 +4045,7 @@
     "lineId": "ln-419463e0",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T12:28:59.680+08:00",
     "createdAt": "2026-09-05T06:09:13.567Z"
   },
   {
@@ -4068,9 +4068,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-419463e0",
-    "value": 183.5,
-    "state": "warn",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "value": 177.7,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T06:09:14.128Z"
   },
   {
@@ -4098,9 +4098,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": 0,
+    "value": -0.5,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:03.477+08:00",
+    "lastAt": "2026-09-06T12:28:57.862+08:00",
     "createdAt": "2026-09-05T06:09:14.173Z"
   },
   {
@@ -4350,9 +4350,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-3548f325",
-    "value": -0.1,
+    "value": -0.5,
     "state": "alarm",
-    "lastAt": "2026-09-05T20:09:02.452+08:00",
+    "lastAt": "2026-09-06T12:28:57.862+08:00",
     "createdAt": "2026-09-05T07:23:51.869Z"
   },
   {
@@ -4564,9 +4564,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-871ac52d",
-    "value": 43.8,
+    "value": 43.57,
     "state": "ok",
-    "lastAt": "2026-09-05T20:09:03.215+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T09:47:55.620Z"
   },
   {
@@ -4620,5 +4620,49 @@
     "state": "offline",
     "lastAt": null,
     "createdAt": "2026-09-05T23:58:31.450+08:00"
+  },
+  {
+    "id": "dn-8d0da4c4",
+    "templateRef": "daq-temp-tc",
+    "name": "lx8-daq",
+    "driver": "mock",
+    "enabled": true,
+    "intervalMs": 1000,
+    "publishIntervalMs": 0,
+    "unit": "℃",
+    "decimals": 1,
+    "min": 150,
+    "max": 185,
+    "warnLow": 152.8,
+    "warnHigh": 182.2,
+    "deviceBindingId": null,
+    "driverConfig": {},
+    "lineId": "ln-1acc1a0c",
+    "value": 166.7,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
+    "createdAt": "2026-09-06T02:22:23.148+08:00"
+  },
+  {
+    "id": "dn-36c860c8",
+    "templateRef": "daq-temp-tc",
+    "name": "lx8-daq",
+    "driver": "mock",
+    "enabled": true,
+    "intervalMs": 1000,
+    "publishIntervalMs": 0,
+    "unit": "℃",
+    "decimals": 1,
+    "min": 150,
+    "max": 185,
+    "warnLow": 152.8,
+    "warnHigh": 182.2,
+    "deviceBindingId": null,
+    "driverConfig": {},
+    "lineId": "ln-917490c1",
+    "value": 167.4,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
+    "createdAt": "2026-09-06T02:24:50.532+08:00"
   }
 ]

package/server/data/dcw-lines.json

@@ -1370,5 +1370,26 @@
     "color": "#41c8f4",
     "description": "",
     "createdAt": "2026-09-05T23:58:29.513+08:00"
+  },
+  {
+    "id": "ln-ea2ec4af",
+    "name": "lx7",
+    "color": "#b58cff",
+    "description": "",
+    "createdAt": "2026-09-06T02:21:55.267+08:00"
+  },
+  {
+    "id": "ln-1acc1a0c",
+    "name": "lx8",
+    "color": "#ff8a5c",
+    "description": "",
+    "createdAt": "2026-09-06T02:22:23.135+08:00"
+  },
+  {
+    "id": "ln-917490c1",
+    "name": "lx8-mtopq0r1",
+    "color": "#3aa0ff",
+    "description": "",
+    "createdAt": "2026-09-06T02:24:50.518+08:00"
   }
 ]

package/server/data/dcw-products.json

@@ -1244,5 +1244,145 @@
     "name": "cfg-prod",
     "description": "",
     "createdAt": "2026-09-05T20:08:42.255+08:00"
+  },
+  {
+    "id": "pd-a136dbbf",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:31:30.539+08:00"
+  },
+  {
+    "id": "pd-52746c22",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:34:34.938+08:00"
+  },
+  {
+    "id": "pd-11d4b14d",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:36:55.733+08:00"
+  },
+  {
+    "id": "pd-fd48e9df",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:38:22.240+08:00"
+  },
+  {
+    "id": "pd-74361ea8",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:40:55.343+08:00"
+  },
+  {
+    "id": "pd-b220f792",
+    "lineId": "",
+    "name": "lx-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:42:23.503+08:00"
+  },
+  {
+    "id": "pd-7c48a733",
+    "lineId": "",
+    "name": "lx2-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:50:15.679+08:00"
+  },
+  {
+    "id": "pd-dd794a60",
+    "lineId": "",
+    "name": "lx3-prod",
+    "description": "",
+    "createdAt": "2026-09-06T01:54:41.053+08:00"
+  },
+  {
+    "id": "pd-b4d2819f",
+    "lineId": "",
+    "name": "lx4-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:00:59.081+08:00"
+  },
+  {
+    "id": "pd-c787b400",
+    "lineId": "",
+    "name": "lx5-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:05:17.274+08:00"
+  },
+  {
+    "id": "pd-b265d280",
+    "lineId": "",
+    "name": "lx6-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:06:14.614+08:00"
+  },
+  {
+    "id": "pd-71604a52",
+    "lineId": "",
+    "name": "dbg2-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:19:22.163+08:00"
+  },
+  {
+    "id": "pd-3adf854f",
+    "lineId": "ln-1acc1a0c",
+    "name": "lx8-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:22:23.179+08:00"
+  },
+  {
+    "id": "pd-75752beb",
+    "lineId": "ln-917490c1",
+    "name": "lx8-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:24:50.563+08:00"
+  },
+  {
+    "id": "pd-1f9917a5",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:26:09.209+08:00"
+  },
+  {
+    "id": "pd-16138f8b",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:29:04.442+08:00"
+  },
+  {
+    "id": "pd-15ba9244",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:40:12.841+08:00"
+  },
+  {
+    "id": "pd-44a14b9d",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:53:10.758+08:00"
+  },
+  {
+    "id": "pd-13d7d912",
+    "lineId": "",
+    "name": "全协议产品-mtpbat7b",
+    "description": "",
+    "createdAt": "2026-09-06T12:44:52.278+08:00"
+  },
+  {
+    "id": "pd-d20c4164",
+    "lineId": "",
+    "name": "全协议产品-mtpd7kfb",
+    "description": "",
+    "createdAt": "2026-09-06T13:33:16.771+08:00"
   }
 ]