agentworkshop 0.7.53 → 0.7.58

package/server/services/workshop/daq/daq-node.repo.ts

@@ -9,19 +9,39 @@ import { join } from 'node:path'
 import { DaqNode } from './daq-node'
 import { ensureDataDir } from '@/shared/config/home.mjs'
 import { loadJsonFile, saveJsonFileAtomic } from '../json-store.mjs'
+import { migrateDriverKind } from './drivers'
 
 const log = createLogger('daq.node-repo')
 
 // 配置根 .AgentWorkShop/data（ensureDataDir 自动迁移旧 cwd/server/data 位置）
 const DB_PATH = join(ensureDataDir(), 'daqs.json')
 
-function load(): DaqNode[] {
+function load(): { nodes: DaqNode[], migrated: number } {
   try {
     const parsed = loadJsonFile(DB_PATH, null)
-    return Array.isArray(parsed) ? parsed.map(r => DaqNode.fromRow(r as Record<string, unknown>)) : []
+    if (!Array.isArray(parsed)) return { nodes: [], migrated: 0 }
+    let migrated = 0
+    const nodes = (parsed as Record<string, unknown>[]).map((r) => {
+      const node = DaqNode.fromRow(r)
+      // P0-5 启动迁移:旧命名归一(modbus→modbus-tcp 等);无法归一的未知 kind
+      // 降级 mock 并打标(fail-visible,不砖启动)—— 该节点采样路径显式失败待重配。
+      if (r.driver != null) {
+        const m = migrateDriverKind(String(r.driver))
+        if (m.kind !== node.driver) {
+          node.driver = m.kind
+          migrated++
+          if (m.downgraded) {
+            node.lastError = `驱动「${String(r.driver)}」未注册,已降级 mock —— 请重新配置节点驱动后重采`
+            log.warn(`[daq] 节点 ${node.id}(${node.name}) 驱动「${String(r.driver)}」未注册,已降级 mock`)
+          }
+        }
+      }
+      return node
+    })
+    return { nodes, migrated }
   }
   catch {
-    return []
+    return { nodes: [], migrated: 0 }
   }
 }
 
@@ -30,7 +50,10 @@ class DaqNodeRepo {
   private flushTimer: NodeJS.Timeout | null = null
 
   constructor() {
-    this.list = load()
+    const { nodes, migrated } = load()
+    this.list = nodes
+    // 迁移结果立即落盘(别名归一/降级打标持久化,避免每次启动重复告警)
+    if (migrated > 0) this.flushNow()
   }
 
   /** 磁盘 ↔ 内存同构:全量对象快照(启动恢复 / 诊断导出) */

package/server/services/workshop/daq/daq-node.ts

@@ -7,7 +7,7 @@
  * 采样历史仅驻内存(环形缓冲),不进磁盘快照 —— 磁盘只存"配置 + 最近一次读数"。
  */
 
-import { daqKeyFromRef, type DaqDriverKind, type DaqNodeState, type DaqNodeView, type DataTransform } from '../../../../shared/daq-protocol'
+import { daqKeyFromRef, maskDriverConfigSecrets, type DaqDriverKind, type DaqNodeState, type DaqNodeView, type DataTransform } from '../../../../shared/daq-protocol'
 import { findDaqTemplate } from './daq-templates'
 
 /** 采样历史环形缓冲长度(前端趋势图/火花线消费;1s 周期 ≈ 5 分钟窗口) */
@@ -256,7 +256,9 @@ export class DaqNode {
       warnHigh: this.warnHigh,
       deviceBindingId: this.deviceBindingId,
       deviceIds: this.deviceIds,
-      driverConfig: this.driverConfig,
+      // 凭据脱敏(2026-10-04 评审):REST/AEP 投影不回显 password/secret/token 类字段;
+      // 编辑流从仓储取原值,掩码只影响外发视图
+      driverConfig: maskDriverConfigSecrets(this.driverConfig),
       transform: this.transform,
       posX: this.posX,
       posZ: this.posZ,

package/server/services/workshop/daq/daq-runtime.ts

@@ -117,7 +117,8 @@ export class DaqNodeRuntime {
           at: new Date(now).toISOString(),
           frame: f.kind === 'vector'
             ? { kind: 'vector', points: (f.points ?? []).slice(0, 4096), metrics }
-            : { kind: 'image', objectKey: f.objectKey, thumbKey: f.thumbKey, mime: f.mime, width: f.width, height: f.height, metrics },
+            // P0-2:sha256/size 随信封透传(生产侧已算,此处不得丢 —— 丢则 daq_frames.meta 无完整性指纹)
+            : { kind: 'image', objectKey: f.objectKey, thumbKey: f.thumbKey, mime: f.mime, width: f.width, height: f.height, sha256: f.sha256, size: f.size, metrics },
         })
         return
       }

package/server/services/workshop/daq/drivers/index.ts

@@ -1,29 +1,29 @@
-/**
- * DAQ 协议驱动族(mock / Modbus TCP / OPC UA / Modbus RTU / MQTT / HTTP)与注册表
- *
- * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
- * (目录 index 解析),外部调用方无需改动。
- *
- * 模块划分:
- *   shared.ts              模块头 / 依赖注入类型 / 驱动接口(DaqDriver 等)
- *   mock.ts                mock 内置模拟源
- *   modbus-tcp.ts          Modbus TCP 真实驱动(连接池按 host:port:unitId 复用)
- *   opcua.ts               OPC UA 真实驱动(会话池按 endpoint+账号 复用)
- *   modbus-rtu.ts          Modbus RTU over TCP 真实驱动(串口网关透传)
- *   mqtt.ts                MQTT 真实驱动(broker 连接池 + 订阅缓存)
- *   http.ts                HTTP/REST 轮询真实驱动
- *   s7-stub.ts             S7 预留(未安装栈时的显式拒绝桩)
- *   registry.ts            驱动注册表与旧命名归一解析
- */
-export type { DaqSampleCtx, DaqDriverInput, DaqFrameSample, DaqDriver } from './shared'
-export { mockDaqDriver } from './mock'
-export { evictModbusConn, closeModbusSafely, withModbusConn, modbusKey, getModbusConn, decodeRegisters, registerOffset, classifyCommError, WORDS_OF, modbusTcpDriver } from './modbus-tcp'
-export type { ModbusConn, ModbusTransport } from './modbus-tcp'
-export { opcuaKey, getOpcUaConn, evictOpcUaConn, opcUaDriver } from './opcua'
-export type { OpcUaConn } from './opcua'
-export { modbusRtuDriver } from './modbus-rtu'
-export { extractNumeric, parseHeaders, mqttDaqDriver } from './mqtt'
-export type { MqttConn } from './mqtt'
-export { httpDaqDriver } from './http'
-export { registerPluginDriver, listPluginDrivers, clearPluginDrivers, listPluginDriverMetas, normalizeDriverKind, resolveDaqDriver, probeDriverAvailability, driverCatalog } from './registry'
-export type { PluginDriverMeta } from './registry'
+/**
+ * DAQ 协议驱动族(mock / Modbus TCP / OPC UA / Modbus RTU / MQTT / HTTP)与注册表
+ *
+ * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
+ * (目录 index 解析),外部调用方无需改动。
+ *
+ * 模块划分:
+ *   shared.ts              模块头 / 依赖注入类型 / 驱动接口(DaqDriver 等)
+ *   mock.ts                mock 内置模拟源
+ *   modbus-tcp.ts          Modbus TCP 真实驱动(连接池按 host:port:unitId 复用)
+ *   opcua.ts               OPC UA 真实驱动(会话池按 endpoint+账号 复用)
+ *   modbus-rtu.ts          Modbus RTU over TCP 真实驱动(串口网关透传)
+ *   mqtt.ts                MQTT 真实驱动(broker 连接池 + 订阅缓存)
+ *   http.ts                HTTP/REST 轮询真实驱动
+ *   s7-stub.ts             S7 预留(未安装栈时的显式拒绝桩)
+ *   registry.ts            驱动注册表与旧命名归一解析
+ */
+export type { DaqSampleCtx, DaqDriverInput, DaqFrameSample, DaqDriver } from './shared'
+export { mockDaqDriver } from './mock'
+export { evictModbusConn, closeModbusSafely, withModbusConn, modbusKey, getModbusConn, decodeRegisters, registerOffset, classifyCommError, WORDS_OF, modbusTcpDriver } from './modbus-tcp'
+export type { ModbusConn, ModbusTransport } from './modbus-tcp'
+export { opcuaKey, getOpcUaConn, evictOpcUaConn, opcUaDriver } from './opcua'
+export type { OpcUaConn } from './opcua'
+export { modbusRtuDriver } from './modbus-rtu'
+export { extractNumeric, parseHeaders, mqttDaqDriver } from './mqtt'
+export type { MqttConn } from './mqtt'
+export { httpDaqDriver } from './http'
+export { registerPluginDriver, listPluginDrivers, clearPluginDrivers, listPluginDriverMetas, normalizeDriverKind, requireDriverKind, migrateDriverKind, resolveDaqDriver, probeDriverAvailability, driverCatalog } from './registry'
+export type { PluginDriverMeta } from './registry'

package/server/services/workshop/daq/drivers/mqtt.ts

@@ -1,182 +1,217 @@
-/**
- * MQTT 真实驱动(broker 连接池 + 订阅缓存)
- * (由 server/services/workshop/daq/drivers.ts 按职责拆出;内容逐行原文搬运)
- */
-import type { DaqDriver } from './shared'
-import { reqNative } from './shared'
-
-// ============================================================
-// MQTT 真实驱动(mqtt 包;broker 连接池复用,订阅缓存 topic 最新报文)
-// ============================================================
-
-export interface MqttConn {
-  client: import('mqtt').MqttClient
-  /** topic → 最新原始报文(解析按节点 jsonPath 在采样时进行) */
-  topics: Map<string, { raw: string, at: number }>
-}
-
-export const mqttPool = new Map<string, MqttConn>()
-
-export function mqttKey(cfg: Record<string, unknown>): string {
-  return `mqtt://${cfg.host}:${cfg.port ?? 1883}|${cfg.username ?? ''}`
-}
-
-export async function getMqttConn(cfg: Record<string, unknown>): Promise<MqttConn> {
-  const key = mqttKey(cfg)
-  const existing = mqttPool.get(key)
-  // 池命中必须验证活性:一次 error 事件后 client.end(true) 的"死连接"若留在池里,
-  // 该 broker 下所有节点会静默永久停采(空 raw → sample 全部 null 被当跳帧)
-  if (existing) {
-    if (existing.client.connected) return existing
-    try {
-      existing.client.end(true)
-    }
-    catch { /* 已死 */ }
-    mqttPool.delete(key)
-  }
-  const mqtt = reqNative('mqtt') as typeof import('mqtt')
-  const url = `mqtt://${String(cfg.host)}:${Number(cfg.port ?? 1883)}`
-  const client = await new Promise<import('mqtt').MqttClient>((resolve, reject) => {
-    const c = mqtt.connect(url, {
-      username: cfg.username ? String(cfg.username) : undefined,
-      password: cfg.password ? String(cfg.password) : undefined,
-      connectTimeout: 4000,
-      reconnectPeriod: 5000,
-    })
-    c.once('connect', () => resolve(c))
-    c.once('error', (err) => {
-      // 仅首次建连阶段的 error 走 reject;连接成功后的运行期 error 由下方 error 监听驱逐
-      try {
-        c.end(true)
-      }
-      catch { /* 未连上 */ }
-      reject(new Error(`MQTT 连接失败: ${err.message}`))
-    })
-  })
-  const conn: MqttConn = { client, topics: new Map() }
-  client.on('message', (topic, payload) => {
-    const t = conn.topics.get(topic)
-    if (t) {
-      t.raw = payload.toString()
-      t.at = Date.now()
-    }
-  })
-  // 运行期错误/关闭:从池中驱逐并强制终止(含 mqtt.js 自动重连),下次采样自动重建。
-  // 此前一次 error 即"永久打死整池"——死连接留在池里,该 broker 下全部节点静默停采。
-  const evict = () => {
-    if (mqttPool.get(key) === conn) {
-      mqttPool.delete(key)
-      try {
-        client.end(true)
-      }
-      catch { /* 已死 */ }
-    }
-  }
-  client.on('error', evict)
-  client.on('close', evict)
-  client.on('close', () => {
-    // 断线期间清空缓存,避免恢复后消费陈旧值
-    for (const t of conn.topics.values()) {
-      t.raw = ''
-      t.at = 0
-    }
-  })
-  mqttPool.set(key, conn)
-  return conn
-}
-
-/** 从报文提取数值:纯数字直取;JSON 按路径(jsonPath,点分隔含数组下标)取 */
-export function extractNumeric(text: string, jsonPath?: string): number {
-  const trimmed = text.trim()
-  const direct = Number(trimmed)
-  if (Number.isFinite(direct) && trimmed !== '') return direct
-  const parsed: unknown = JSON.parse(trimmed)
-  const target = jsonPath
-    ? jsonPath.split('.').reduce<unknown>((acc, k) => (acc == null ? undefined : (acc as Record<string, unknown>)[k]), parsed)
-    : parsed
-  const num = typeof target === 'number' ? target : Number(target)
-  if (!Number.isFinite(num)) throw new Error(`无法提取数值(jsonPath=${jsonPath || '未配置'};报文 ${trimmed.slice(0, 60)})`)
-  return num
-}
-
-/** HTTP 请求头解析(headersJSON → Record;非法输入给可读错误) */
-export function parseHeaders(headersJSON: unknown): Record<string, string> {
-  if (!headersJSON || !String(headersJSON).trim()) return {}
-  const parsed: unknown = JSON.parse(String(headersJSON))
-  if (typeof parsed !== 'object' || parsed == null || Array.isArray(parsed)) throw new Error('headersJSON 必须是 JSON 对象')
-  const out: Record<string, string> = {}
-  for (const [k, v] of Object.entries(parsed)) out[k] = String(v)
-  return out
-}
-
-export const sleep = (ms: number): Promise<void> => new Promise(r => setTimeout(r, ms))
-
-export const mqttDaqDriver: DaqDriver = {
-  kind: 'mqtt',
-  async available() {
-    try {
-      reqNative('mqtt')
-      return true
-    }
-    catch {
-      return false
-    }
-  },
-  async sample({ driverConfig }) {
-    const topic = String(driverConfig.topic ?? '')
-    if (!topic) throw new Error('缺少主题 topic')
-    const conn = await getMqttConn(driverConfig)
-    if (!conn.topics.has(topic)) {
-      conn.topics.set(topic, { raw: '', at: 0 })
-      await new Promise<void>((resolve, reject) => {
-        conn.client.subscribe(topic, (err) => {
-          if (err)
-            reject(new Error(`订阅失败: ${err.message}`))
-          else
-            resolve()
-        })
-      })
-    }
-    // 首帧等待(最多 3s):之后由消息事件持续刷新缓存
-    const entry = conn.topics.get(topic)!
-    const t0 = Date.now()
-    while (!entry.raw && Date.now() - t0 < 3000) await sleep(100)
-    if (!entry.raw) return null
-    return extractNumeric(entry.raw, driverConfig.jsonPath ? String(driverConfig.jsonPath) : undefined)
-  },
-  async test(driverConfig) {
-    const t0 = Date.now()
-    try {
-      if (!driverConfig.host) return { ok: false, message: '缺少 Broker 地址 host' }
-      if (!driverConfig.topic) return { ok: false, message: '缺少主题 topic' }
-      const conn = await getMqttConn(driverConfig)
-      const topic = String(driverConfig.topic)
-      if (!conn.topics.has(topic)) {
-        conn.topics.set(topic, { raw: '', at: 0 })
-        await new Promise<void>((resolve, reject) => {
-          conn.client.subscribe(topic, (err) => {
-            if (err)
-              reject(new Error(`订阅失败: ${err.message}`))
-            else
-              resolve()
-          })
-        })
-      }
-      const entry = conn.topics.get(topic)!
-      const t1 = Date.now()
-      while (!entry.raw && Date.now() - t1 < 4000) await sleep(100)
-      if (entry.raw) {
-        const v = extractNumeric(entry.raw, driverConfig.jsonPath ? String(driverConfig.jsonPath) : undefined)
-        return { ok: true, message: `Broker 连接成功,收到 ${topic} = ${v}`, sampleValue: v, latencyMs: Date.now() - t0 }
-      }
-      return {
-        ok: true,
-        message: `Broker 已连接并订阅 ${topic}(4s 内未收到消息;设备发布后采样即开始)`,
-        latencyMs: Date.now() - t0,
-      }
-    }
-    catch (err) {
-      return { ok: false, message: `MQTT 连接失败: ${err instanceof Error ? err.message : String(err)}` }
-    }
-  },
-}
+/**
+ * MQTT 真实驱动(broker 连接池 + 订阅缓存)
+ * (由 server/services/workshop/daq/drivers.ts 按职责拆出;内容逐行原文搬运)
+ */
+import { existsSync, readFileSync } from 'node:fs'
+import type { DaqDriver } from './shared'
+import { reqNative } from './shared'
+import { daqRuntimeSettings } from '../../settings'
+
+// ============================================================
+// MQTT 真实驱动(mqtt 包;broker 连接池复用,订阅缓存 topic 最新报文)
+// 2026-10-09 生产化:mqtts(TLS)+ 陈值保护 —— 此前 URL 硬编码 mqtt://,
+// 且设备停发时 sample 恒回最后一条冻值(连接活着但数据是旧的,静默说谎)。
+// ============================================================
+
+export interface MqttConn {
+  client: import('mqtt').MqttClient
+  /** topic → 最新原始报文(解析按节点 jsonPath 在采样时进行) */
+  topics: Map<string, { raw: string, at: number }>
+}
+
+/** 陈值判定缺省窗:设备停发超过该时长即拒用冻值(节点 driverConfig.staleMs 可覆盖,0=关闭) */
+export const MQTT_STALE_DEFAULT_MS = 300_000
+
+export const mqttPool = new Map<string, MqttConn>()
+
+/** TLS 连接参数合并:节点 driverConfig 优先,缺省回落全局 daq.mqtt.*(runtime-settings/env) */
+function tlsOpts(cfg: Record<string, unknown>): { secure: boolean, ca: string[] | undefined, rejectUnauthorized: boolean, caFile: string } {
+  const bus = daqRuntimeSettings().mqtt
+  const secure = Boolean(cfg.secure ?? cfg.tls ?? bus.secure)
+  const caFile = String(cfg.caFile ?? bus.caFile ?? '')
+  let ca: string[] | undefined
+  if (caFile) {
+    if (!existsSync(caFile)) throw new Error(`MQTT CA 证书文件不存在: ${caFile}`)
+    ca = [readFileSync(caFile, 'utf8')]
+  }
+  const rejectUnauthorized = cfg.rejectUnauthorized != null ? Boolean(cfg.rejectUnauthorized) : bus.rejectUnauthorized
+  return { secure, ca, rejectUnauthorized, caFile }
+}
+
+/** 连接选项(采/控共用):TLS 语义同源,调用方补各自的重连策略 */
+export function mqttConnectOpts(cfg: Record<string, unknown>): import('mqtt').IClientOptions {
+  const { secure, ca, rejectUnauthorized } = tlsOpts(cfg)
+  return {
+    username: cfg.username ? String(cfg.username) : undefined,
+    password: cfg.password ? String(cfg.password) : undefined,
+    ...(secure ? { ca, rejectUnauthorized } : {}),
+    connectTimeout: 4000,
+  }
+}
+
+export function mqttKey(cfg: Record<string, unknown>): string {
+  const { secure, caFile } = tlsOpts(cfg)
+  return `mqtt${secure ? 's' : ''}://${cfg.host}:${cfg.port ?? 1883}|${cfg.username ?? ''}|${caFile}`
+}
+
+export async function getMqttConn(cfg: Record<string, unknown>): Promise<MqttConn> {
+  const key = mqttKey(cfg)
+  const existing = mqttPool.get(key)
+  // 池命中必须验证活性:一次 error 事件后 client.end(true) 的"死连接"若留在池里,
+  // 该 broker 下所有节点会静默永久停采(空 raw → sample 全部 null 被当跳帧)
+  if (existing) {
+    if (existing.client.connected) return existing
+    try {
+      existing.client.end(true)
+    }
+    catch { /* 已死 */ }
+    mqttPool.delete(key)
+  }
+  const mqtt = reqNative('mqtt') as typeof import('mqtt')
+  const { secure } = tlsOpts(cfg)
+  const url = `mqtt${secure ? 's' : ''}://${String(cfg.host)}:${Number(cfg.port ?? 1883)}`
+  const client = await new Promise<import('mqtt').MqttClient>((resolve, reject) => {
+    const c = mqtt.connect(url, { ...mqttConnectOpts(cfg), reconnectPeriod: 5000 })
+    c.once('connect', () => resolve(c))
+    c.once('error', (err) => {
+      // 仅首次建连阶段的 error 走 reject;连接成功后的运行期 error 由下方 error 监听驱逐
+      try {
+        c.end(true)
+      }
+      catch { /* 未连上 */ }
+      reject(new Error(`MQTT 连接失败: ${err.message}`))
+    })
+  })
+  const conn: MqttConn = { client, topics: new Map() }
+  client.on('message', (topic, payload) => {
+    const t = conn.topics.get(topic)
+    if (t) {
+      t.raw = payload.toString()
+      t.at = Date.now()
+    }
+  })
+  // 运行期错误/关闭:从池中驱逐并强制终止(含 mqtt.js 自动重连),下次采样自动重建。
+  // 此前一次 error 即"永久打死整池"——死连接留在池里,该 broker 下全部节点静默停采。
+  const evict = () => {
+    if (mqttPool.get(key) === conn) {
+      mqttPool.delete(key)
+      try {
+        client.end(true)
+      }
+      catch { /* 已死 */ }
+    }
+  }
+  client.on('error', evict)
+  client.on('close', evict)
+  client.on('close', () => {
+    // 断线期间清空缓存,避免恢复后消费陈旧值
+    for (const t of conn.topics.values()) {
+      t.raw = ''
+      t.at = 0
+    }
+  })
+  mqttPool.set(key, conn)
+  return conn
+}
+
+/** 从报文提取数值:纯数字直取;JSON 按路径(jsonPath,点分隔含数组下标)取 */
+export function extractNumeric(text: string, jsonPath?: string): number {
+  const trimmed = text.trim()
+  const direct = Number(trimmed)
+  if (Number.isFinite(direct) && trimmed !== '') return direct
+  const parsed: unknown = JSON.parse(trimmed)
+  const target = jsonPath
+    ? jsonPath.split('.').reduce<unknown>((acc, k) => (acc == null ? undefined : (acc as Record<string, unknown>)[k]), parsed)
+    : parsed
+  const num = typeof target === 'number' ? target : Number(target)
+  if (!Number.isFinite(num)) throw new Error(`无法提取数值(jsonPath=${jsonPath || '未配置'};报文 ${trimmed.slice(0, 60)})`)
+  return num
+}
+
+/** HTTP 请求头解析(headersJSON → Record;非法输入给可读错误) */
+export function parseHeaders(headersJSON: unknown): Record<string, string> {
+  if (!headersJSON || !String(headersJSON).trim()) return {}
+  const parsed: unknown = JSON.parse(String(headersJSON))
+  if (typeof parsed !== 'object' || parsed == null || Array.isArray(parsed)) throw new Error('headersJSON 必须是 JSON 对象')
+  const out: Record<string, string> = {}
+  for (const [k, v] of Object.entries(parsed)) out[k] = String(v)
+  return out
+}
+
+export const sleep = (ms: number): Promise<void> => new Promise(r => setTimeout(r, ms))
+
+export const mqttDaqDriver: DaqDriver = {
+  kind: 'mqtt',
+  async available() {
+    try {
+      reqNative('mqtt')
+      return true
+    }
+    catch {
+      return false
+    }
+  },
+  async sample({ driverConfig }) {
+    const topic = String(driverConfig.topic ?? '')
+    if (!topic) throw new Error('缺少主题 topic')
+    const conn = await getMqttConn(driverConfig)
+    if (!conn.topics.has(topic)) {
+      conn.topics.set(topic, { raw: '', at: 0 })
+      await new Promise<void>((resolve, reject) => {
+        conn.client.subscribe(topic, (err) => {
+          if (err)
+            reject(new Error(`订阅失败: ${err.message}`))
+          else
+            resolve()
+        })
+      })
+    }
+    // 首帧等待(最多 3s):之后由消息事件持续刷新缓存
+    const entry = conn.topics.get(topic)!
+    const t0 = Date.now()
+    while (!entry.raw && Date.now() - t0 < 3000) await sleep(100)
+    if (!entry.raw) return null
+    // 陈值保护:连接活着但设备停发时,缓存里只剩最后一条冻值 —— 如实报错让节点
+    // 离线(lastError 可读、告警链可见),绝不把旧值当新值采进去。恢复发布即自愈。
+    const staleMs = Number(driverConfig.staleMs ?? MQTT_STALE_DEFAULT_MS)
+    if (staleMs > 0 && entry.at > 0 && Date.now() - entry.at > staleMs) {
+      throw new Error(`MQTT 数据停发超过 ${Math.round((Date.now() - entry.at) / 1000)}s(陈值保护,拒用冻值;最近报文 ${new Date(entry.at).toISOString()})`)
+    }
+    return extractNumeric(entry.raw, driverConfig.jsonPath ? String(driverConfig.jsonPath) : undefined)
+  },
+  async test(driverConfig) {
+    const t0 = Date.now()
+    try {
+      if (!driverConfig.host) return { ok: false, message: '缺少 Broker 地址 host' }
+      if (!driverConfig.topic) return { ok: false, message: '缺少主题 topic' }
+      const conn = await getMqttConn(driverConfig)
+      const topic = String(driverConfig.topic)
+      if (!conn.topics.has(topic)) {
+        conn.topics.set(topic, { raw: '', at: 0 })
+        await new Promise<void>((resolve, reject) => {
+          conn.client.subscribe(topic, (err) => {
+            if (err)
+              reject(new Error(`订阅失败: ${err.message}`))
+            else
+              resolve()
+          })
+        })
+      }
+      const entry = conn.topics.get(topic)!
+      const t1 = Date.now()
+      while (!entry.raw && Date.now() - t1 < 4000) await sleep(100)
+      if (entry.raw) {
+        const v = extractNumeric(entry.raw, driverConfig.jsonPath ? String(driverConfig.jsonPath) : undefined)
+        return { ok: true, message: `Broker 连接成功,收到 ${topic} = ${v}`, sampleValue: v, latencyMs: Date.now() - t0 }
+      }
+      return {
+        ok: true,
+        message: `Broker 已连接并订阅 ${topic}(4s 内未收到消息;设备发布后采样即开始)`,
+        latencyMs: Date.now() - t0,
+      }
+    }
+    catch (err) {
+      return { ok: false, message: `MQTT 连接失败: ${err instanceof Error ? err.message : String(err)}` }
+    }
+  },
+}

package/server/services/workshop/daq/drivers/registry.ts

@@ -76,6 +76,40 @@ export function listPluginDriverMetas(): PluginDriverMeta[] {
   return plugins.listMetas()
 }
 
+/** 严格解析:未知 kind 显式报错(配置错协议名静默采 mock 数据属工业高危默认;2026-10-04 评审) */
+export function requireDriverKind(kind: string): DaqDriverKind {
+  if (kind === 'modbus') return 'modbus-tcp'
+  if (kind === 'rtu' || kind === 'modbus-rtu-tcp') return 'modbus-rtu'
+  if (kind in REGISTRY || pluginRegistry().has(kind)) return kind as DaqDriverKind
+  throw new Error('未知数采驱动协议: ' + JSON.stringify(kind) + '(已注册: ' + [...Object.keys(REGISTRY), ...pluginRegistry().keys()].join(', ') + ')')
+}
+
+/**
+ * 启动迁移:磁盘遗留 kind 别名归一;无法归一的未知 kind 降级 mock 并打标
+ * (fail-visible,不砖启动 —— 由 daq-node.repo load() 调用,该节点采样路径显式失败待重配)。
+ */
+export function migrateDriverKind(kind: string): { kind: DaqDriverKind, downgraded: boolean } {
+  if (kind === 'modbus') return { kind: 'modbus-tcp', downgraded: false }
+  if (kind === 'rtu' || kind === 'modbus-rtu-tcp') return { kind: 'modbus-rtu', downgraded: false }
+  if (kind in REGISTRY || pluginRegistry().has(kind)) return { kind: kind as DaqDriverKind, downgraded: false }
+  return { kind: 'mock', downgraded: true }
+}
+
+/**
+ * 驱动缺失占位(插件未加载/已卸载、磁盘遗留坏 kind 经 resolve 直达):
+ * 采样/测试一律显式失败 —— 曾经的 `?? mockDaqDriver` 兜底会让真实协议节点
+ * 在驱动缺失时静默产出 mock 数据(假数据,2026-10-08 P0-5)。
+ */
+function unavailableDaqDriver(kind: string): DaqDriver {
+  const msg = `数采驱动「${kind}」未注册(插件未加载或已卸载),已拒绝采样 —— 请重新配置节点驱动`
+  return {
+    kind: kind as DaqDriverKind,
+    available: async () => false,
+    sample: () => { throw new Error(msg) },
+    test: async () => ({ ok: false, message: msg }),
+  }
+}
+
 export function normalizeDriverKind(kind: string): DaqDriverKind {
   if (kind === 'modbus') return 'modbus-tcp'
   if (kind === 'rtu' || kind === 'modbus-rtu-tcp') return 'modbus-rtu'
@@ -83,7 +117,7 @@ export function normalizeDriverKind(kind: string): DaqDriverKind {
 }
 
 export function resolveDaqDriver(kind: DaqDriverKind): DaqDriver {
-  return pluginRegistry().get(kind) ?? REGISTRY[kind] ?? mockDaqDriver
+  return pluginRegistry().get(kind) ?? REGISTRY[kind] ?? unavailableDaqDriver(kind)
 }
 
 /** 驱动可用性探测(meta 报告:包缺失时 UI 显示"未安装"而非硬失败;含插件驱动) */