agentworkshop 0.7.9 → 0.7.11

package/server/services/workshop/dcw/dcw-controller.ts

@@ -193,6 +193,7 @@ class DcwController {
     this.broadcast?.('dcw.written', {
       nodeId: node.id,
       templateRef: node.templateRef,
+      lineId: node.lineId ?? null,
       value: node.value ?? eng,
       raw: outcome.raw,
       ok: outcome.ok,
@@ -234,6 +235,7 @@ class DcwController {
     this.broadcast?.('dcw.read', {
       nodeId: node.id,
       templateRef: node.templateRef,
+      lineId: node.lineId ?? null,
       value,
       raw: r.raw,
       ok: r.ok,
@@ -864,9 +866,16 @@ class DcwController {
     await tsdbReady
     const bucketMs = endMs - startMs > 60_000 ? Math.max(1000, Math.round((endMs - startMs) / 200)) : undefined
     const daq = [] as Array<{ templateRef: string, nodeId: string, nodeName: string, ch: string, unit: string, latest: number | null, avg: number | null, min: number | null, max: number | null, cnt: number }>
-    for (const node of getDaqNodeRepo().all()) {
+    // 并行查询(tsdb 往返一次/节点,互不依赖):N+1 串行会让 50 节点产线的批次视图放大 50 倍时延
+    const results = await Promise.all(getDaqNodeRepo().all().map(async (node) => {
       try {
         const points = await getTsdb().query(node.id, { fromMs: startMs, toMs: endMs, bucketMs, limit: 500 })
+        return { node, points }
+      }
+      catch { return { node, points: [] } } // 单节点查询失败不阻塞整体
+    }))
+    for (const { node, points } of results) {
+      {
         if (points.length === 0) continue
         const values = points.map(p => p.value ?? p.avg ?? 0).filter(v => Number.isFinite(v))
         if (values.length === 0) continue
@@ -884,7 +893,6 @@ class DcwController {
           cnt: values.length,
         })
       }
-      catch { /* 单节点查询失败不阻塞整体 */ }
     }
     return { run, daq, writes }
   }

package/server/services/workshop/permissions.ts

@@ -0,0 +1,79 @@
+/**
+ * 产线级权限服务 —— 用户 × 产线的三态访问控制(none / readonly / operate)。
+ *
+ * 模型:
+ *   - admin / editor:全量全权(运营管理角色,不受 grant 约束);
+ *   - user(普通用户):默认无任何产线权限,由管理员在权限管理页逐线授予:
+ *       readonly = 仅查看(数采节点读取;无数控/写向能力)
+ *       operate  = 可操控(数采读取 + 数控写向 + 产线操作全量)
+ *     无记录 = none(后端数据面直接不返回该产线信息)。
+ *
+ * 消费方:
+ *   - dcw/daq 列表 API(可见性过滤);
+ *   - dcw 写控 / 数采下发 / 产线启停(操控能力校验);
+ *   - agent-node-bindings 绑定校验(只能绑定有权产线的节点);
+ *   - 插件 ctx.permissions(SDK 拓展面,见 plugins/host.mjs)。
+ * 权限变更广播:scene-events 'permissions.changed' + 插件钩子 'permissions:changed'。
+ */
+import { userRepository } from '@/server/repositories/user.repository'
+import { AppError } from '@/server/utils/errors'
+import type { ResolvedUser } from '@/server/api/workshop/caller'
+
+export type LineMode = 'none' | 'readonly' | 'operate'
+export type GrantMode = 'readonly' | 'operate'
+
+/** 管理角色(admin/editor)不受产线 grant 约束 */
+export function isPrivilegedRole(user: { role: string } | null | undefined): boolean {
+  return user?.role === 'admin' || user?.role === 'editor'
+}
+
+/** 用户对某产线的有效访问模式 */
+export function lineMode(user: ResolvedUser | { id: string, role: string }, lineId: string | null | undefined): LineMode {
+  if (!lineId) return isPrivilegedRole(user) ? 'operate' : 'none'
+  if (isPrivilegedRole(user)) return 'operate'
+  const grant = userRepository.lineAccessMap(user.id).get(lineId)
+  return grant === 'operate' ? 'operate' : grant === 'readonly' ? 'readonly' : 'none'
+}
+
+/** 可见产线集合:null = 不限(admin/editor);否则为授权产线 id 集(普通用户) */
+export function visibleLineIds(user: { id: string, role: string }): Set<string> | null {
+  if (isPrivilegedRole(user)) return null
+  return new Set(userRepository.lineAccessMap(user.id).keys())
+}
+
+/** 按 lineId 过滤实体列表(admin/editor 原样返回) */
+export function filterByLine<T>(user: { id: string, role: string }, items: T[], lineIdOf: (item: T) => string | null | undefined): T[] {
+  const visible = visibleLineIds(user)
+  if (!visible) return items
+  return items.filter((it) => {
+    const lid = lineIdOf(it)
+    return lid != null && visible.has(lid)
+  })
+}
+
+/** 操控能力校验:need='operate' 时 readonly/none 均拒;need='readonly' 时 none 拒 */
+export function requireLineMode(user: { id: string, role: string }, lineId: string | null | undefined, need: 'readonly' | 'operate'): LineMode {
+  const mode = lineMode(user, lineId)
+  if (mode === 'operate' || (need === 'readonly' && mode === 'readonly')) return mode
+  if (mode === 'readonly') {
+    throw new AppError(403, 'LINE_READONLY', '该产线为仅查看权限:只读数采可见,写控/操作需管理员授予「可操控」')
+  }
+  throw new AppError(403, 'LINE_FORBIDDEN', `无该产线权限:请联系管理员在「权限管理」中授予(产线 ${lineId ?? '?'})`)
+}
+
+/** 权限变更广播(scene-events + 插件钩子),前端/插件据此刷新授权视图 */
+export function notifyGrantsChanged(userId: string): void {
+  try {
+    // 延迟动态导入避免与 scene-events 循环依赖
+    void import('@/server/services/workshop/scene-events').then((m) => {
+      m.broadcastSceneEvent('permissions.changed', { userId, at: new Date().toISOString() })
+    }).catch(() => {})
+  }
+  catch { /* 广播失败不影响授权写入 */ }
+  try {
+    void import('@/server/services/workshop/plugins/host.mjs').then((m) => {
+      void m.emitPluginEvent('permissions:changed', { userId })
+    }).catch(() => {})
+  }
+  catch { /* 插件钩子失败不影响授权写入 */ }
+}

package/server/services/workshop/plugins/host.mjs

@@ -19,6 +19,23 @@ import { dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { HookBus, createPluginContext, createRouteTable, validatePluginModule } from '@/sdk/index.mjs'
 
+// 延迟解析的产线权限服务(esbuild/别名下避免 nitro 打包循环导入;失败降级为拒绝一切)
+let permissions = null
+let userRepository = null
+async function loadPermissions() {
+  if (permissions) return
+  try {
+    permissions = await import('@/server/services/workshop/permissions')
+    userRepository = await import('@/server/repositories/user.repository').then(m => m.userRepository)
+  }
+  catch (err) {
+    hostLoggerFallback()?.warn('权限服务加载失败(插件 ctx.permissions 降级):', err?.message)
+  }
+}
+function hostLoggerFallback() {
+  return globalThis.__awPluginHost?.logger ?? console
+}
+
 const g = globalThis
 
 function log() {
@@ -163,6 +180,9 @@ async function loadAllPlugins(host, { config, paths }) {
   const disabled = readDisabledSet(homeDir)
   host.disabledSet = disabled
 
+  // 产线权限服务(ctx.permissions 注入用;失败降级)
+  await loadPermissions()
+
   const entries = discoverPluginDirs(host.cwd)
   if (entries.length) host.logger.info(`发现 ${entries.length} 个插件(停用 ${disabled.size}),开始装载 ...`)
 
@@ -249,6 +269,20 @@ async function loadAllPlugins(host, { config, paths }) {
           return fn
         },
         selfOrigin: () => selfOriginRef(host),
+        // 产线权限拓展面(SDK ctx.permissions):插件可查询/管理用户×产线授权
+        permissions: {
+          lineMode: (user, lineId) => permissions.lineMode(user, lineId),
+          visibleLineIds: user => permissions.visibleLineIds(user),
+          listGrants: userId => userRepository.listGrants(userId),
+          setGrants: (userId, entries, grantedBy = 'plugin') => {
+            for (const g of (entries ?? [])) {
+              if (!g?.lineId) continue
+              userRepository.setGrant(userId, String(g.lineId), (g.mode ?? null), grantedBy)
+            }
+            permissions.notifyGrantsChanged(userId)
+            return userRepository.listGrants(userId)
+          },
+        },
       })
       // DAQ 扩展面(v2 帧管线):插件注册自定义驱动与下沉处理器。
       // 桥经 globalThis 排队 —— daq 模块晚于插件宿主装载时,注册项先排队、
@@ -393,7 +427,10 @@ function ensureStateWatcher(host) {
     mkdirSync(dirname(statePath), { recursive: true })
     if (!existsSync(statePath)) writeDisabledSet(modePaths(host.cwd).homeDir, new Set())
     let debounce = null
-    watch(statePath, () => {
+    // watch 目录而非文件:writeDisabledSet 用 rename 原子替换,POSIX 的文件级
+    // watch 挂在旧 inode 上,首次启停后静默失效;目录监听对 rename 稳定
+    watch(dirname(statePath), (_event, filename) => {
+      if (filename && filename !== 'plugins-state.json') return
       clearTimeout(debounce)
       debounce = setTimeout(() => {
         void reloadPluginHost()

package/server/services/workshop/scene-events.ts

@@ -26,6 +26,27 @@ function peers(): Set<WsPeer> {
   return g.__sceneEventPeers ??= new Set()
 }
 
+/**
+ * per-peer 产线可见集(鉴权后由 ws 路由写入):
+ *   undefined/null = 不限(admin/editor 或无产线维度帧场景)
+ *   Set<lineId>    = 仅授权产线的 scene 帧可见(数据面强制,与 REST 同口径)
+ */
+export function setPeerVisibleLines(peer: WsPeer, visible: Set<string> | null): void {
+  (peer as WsPeer & { __awVisibleLines?: Set<string> | null }).__awVisibleLines = visible
+}
+
+function peerSeesLine(peer: WsPeer, lineId: string): boolean {
+  const visible = (peer as WsPeer & { __awVisibleLines?: Set<string> | null }).__awVisibleLines
+  if (visible == null) return true
+  return visible.has(lineId)
+}
+
+/** 帧产线归属:payload.lineId(daع.reading/frame、dcw.written/read 等);undefined = 线无关帧 */
+function payloadLineId(payload: unknown): string | undefined {
+  const lid = (payload as { lineId?: unknown } | null)?.lineId
+  return typeof lid === 'string' && lid !== '' ? lid : undefined
+}
+
 export function registerScenePeer(peer: WsPeer): void {
   peers().add(peer)
 }
@@ -40,13 +61,16 @@ export function sceneEventPeerCount(): number {
 
 /** 全员直推(channelId='' 不落库;死连接静默剔除)。
  *  信封序列化一次、全 peer 复用:dag 遥测经此出口 N 节点×P 页面/秒高频扇出,
- *  per-peer 重复 stringify 是纯浪费。 */
+ *  per-peer 重复 stringify 是纯浪费。
+ *  鉴权扇出:带 lineId 的帧按 peer 可见集过滤(未鉴权 peer 不会注册到本表)。 */
 export function broadcastSceneEvent(type: string, payload: unknown): void {
   // 插件宿主事件桥(event:<type> 钩子;宿主未装载时 no-op)——先于 peers 短路,插件不依赖在线页面
   emitPluginEvent(type, payload)
   if (peers().size === 0) return
+  const lineId = payloadLineId(payload)
   const frame = JSON.stringify({ v: AEP_VERSION, type, seq: 0, at: new Date().toISOString(), channelId: '', payload })
   for (const peer of peers()) {
+    if (lineId !== undefined && !peerSeesLine(peer, lineId)) continue
     try {
       peer.send(frame)
     }

package/shared/config/single-instance.mjs

@@ -22,13 +22,37 @@ function pidAlive(pid) {
 
 const waitSync = ms => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
 
+/**
+ * 校验目标 pid 是否真属本应用(锁文件 stale 后 PID 可能被无关进程复用,
+ * taskkill /T /F 打错目标是不可逆事故)。按进程命令行指纹匹配。
+ */
+async function pidLooksLikeAw(pid) {
+  try {
+    if (process.platform === 'win32') {
+      const { spawnSync } = await import('node:child_process')
+      const r = spawnSync('powershell', ['-NoProfile', '-Command',
+        `(Get-CimInstance Win32_Process -Filter 'ProcessId=${Number(pid)}').CommandLine`], { encoding: 'utf8', timeout: 8000 })
+      const line = String(r.stdout ?? '')
+      return /node|aw|agentworkshop/i.test(line) && /start\.mjs|aw\.mjs|\.output/i.test(line)
+    }
+    const fs = await import('node:fs')
+    const line = fs.readFileSync(`/proc/${pid}/cmdline`, 'utf8').replace(/\0/g, ' ')
+    return /node|aw|agentworkshop/i.test(line)
+  }
+  catch {
+    return false // 无法确认:宁可放弃顶替,不冒杀错风险
+  }
+}
+
 /**
  * 终止进程树并等待其死亡(供 `aw stop` 与 start 的"顶掉旧实例"共用)。
  * Windows:taskkill /T /F;POSIX:SIGTERM 宽限 5s → SIGKILL。
+ * PID 复用防护:强杀前校验目标命令行确实属于本应用,不像则拒绝并交由调用方报错。
  * @returns {Promise<boolean>} 是否已确认死亡
  */
 export async function terminatePid(pid) {
   if (!pidAlive(pid)) return true
+  if (!(await pidLooksLikeAw(pid))) return false
   if (process.platform === 'win32') {
     const { spawnSync } = await import('node:child_process')
     const r = spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], { encoding: 'utf8' })

package/shared/daq-protocol.ts

@@ -410,6 +410,8 @@ export interface AepDaqReading {
   value: number
   state: DaqNodeState
   at: string
+  /** 所属产线(WS 鉴权扇出按线过滤;未挂线 = null,全员可见) */
+  lineId?: string | null
 }
 
 /** daq.frame 帧载荷(向量/图像帧实时下发;不含原始 blob —— 向量仅 ≤64 点预览,图像仅缩略图 URL) */