agentworkshop 0.7.8 → 0.7.11

package/app/composables/workshop/apiClient.ts

@@ -1,95 +1,103 @@
-/**
- * 统一 API 客户端 —— 全部手写 fetch 的单一收口。
- * - 信封解析:{code, message, data};code !== 0 或非 2xx 一律抛 ApiError
- * - ApiError 保留业务码与 HTTP 状态(调用方可分支),message 为后端可读文案
- * - 网络层失败(TypeError/断网)→ ApiError('NETWORK'),不再裸奔 "Failed to fetch"
- * - 幂等 GET 可选自动重试(5xx/网络错误;400ms 起退避);写操作永不重试
- */
-
-export class ApiError extends Error {
-  readonly code: string | number
-  readonly status: number
-
-  constructor(code: string | number, status: number, message: string) {
-    super(message)
-    this.name = 'ApiError'
-    this.code = code
-    this.status = status
-  }
-}
-
-/** 鉴权头(cookie token → Bearer;与既有会话契约同源) */
-function authHeaders(json = true): Record<string, string> {
-  const cookieToken = typeof document !== 'undefined'
-    ? (document.cookie.match(/(?:^|;\s*)token=([^;]+)/)?.[1] ?? '')
-    : ''
-  const h: Record<string, string> = {}
-  if (cookieToken) h.authorization = `Bearer ${decodeURIComponent(cookieToken)}`
-  if (json) h['content-type'] = 'application/json'
-  return h
-}
-
-const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
-
-function isIdempotent(init?: RequestInit): boolean {
-  const method = (init?.method ?? 'GET').toUpperCase()
-  return method === 'GET' || method === 'HEAD'
-}
-
-/** 单次请求:信封解析 + 错误归一化(所有失败路径都抛 ApiError) */
-async function attemptOnce<T>(base: string, path: string, init?: RequestInit): Promise<T> {
-  let res: Response
-  try {
-    res = await fetch(base + path, { ...init, headers: { ...authHeaders(!!init?.body), ...init?.headers } })
-  }
-  catch {
-    throw new ApiError('NETWORK', 0, '无法连接服务器，请检查网络或服务状态')
-  }
-  let json: { code?: string | number, message?: string, data?: T } | null = null
-  try {
-    json = await res.json()
-  }
-  catch {
-    // 非 JSON 响应(代理/网关 HTML 错误页等)——按状态码归一化
-  }
-  if (!res.ok) {
-    throw new ApiError(
-      json?.code ?? `HTTP_${res.status}`,
-      res.status,
-      json?.message || `请求失败(HTTP ${res.status})`,
-    )
-  }
-  if (json?.code !== 0) {
-    throw new ApiError(json?.code ?? 'REQUEST_ERROR', res.status, json?.message || '请求失败')
-  }
-  return json.data as T
-}
-
-/**
- * 统一请求入口。
- * @param opts.base   API 前缀(如 '/api/workshop/daq')
- * @param opts.path   路径后缀(如 '/:id/bind')
- * @param opts.init   fetch RequestInit(body 由调用方 JSON.stringify)
- * @param opts.retries 幂等请求额外重试次数(仅 5xx/网络错误;默认 0)
- */
-export async function apiFetch<T>(opts: { base: string, path?: string, init?: RequestInit, retries?: number }): Promise<T> {
-  const { base, path = '', init, retries = 0 } = opts
-  const idempotent = isIdempotent(init)
-  const attempts = idempotent ? retries + 1 : 1
-  let lastError: ApiError | undefined
-  for (let attempt = 0; attempt < attempts; attempt++) {
-    try {
-      return await attemptOnce<T>(base, path, init)
-    }
-    catch (err) {
-      const apiErr = err instanceof ApiError
-        ? err
-        : new ApiError('INTERNAL_ERROR', 0, err instanceof Error ? err.message : String(err))
-      const retryable = idempotent && (apiErr.code === 'NETWORK' || apiErr.status >= 500)
-      lastError = apiErr
-      if (!retryable || attempt === attempts - 1) throw apiErr
-      await sleep(400 * (attempt + 1))
-    }
-  }
-  throw lastError ?? new ApiError('INTERNAL_ERROR', 0, '请求失败')
-}
+/**
+ * 统一 API 客户端 —— 全部手写 fetch 的单一收口。
+ * - 信封解析:{code, message, data};code !== 0 或非 2xx 一律抛 ApiError
+ * - ApiError 保留业务码与 HTTP 状态(调用方可分支),message 为后端可读文案
+ * - 网络层失败(TypeError/断网)→ ApiError('NETWORK'),不再裸奔 "Failed to fetch"
+ * - 幂等 GET 可选自动重试(5xx/网络错误;400ms 起退避);写操作永不重试
+ */
+
+export class ApiError extends Error {
+  readonly code: string | number
+  readonly status: number
+
+  constructor(code: string | number, status: number, message: string) {
+    super(message)
+    this.name = 'ApiError'
+    this.code = code
+    this.status = status
+  }
+}
+
+/** 鉴权头(cookie token → Bearer;与既有会话契约同源) */
+function authHeaders(json = true): Record<string, string> {
+  const cookieToken = typeof document !== 'undefined'
+    ? (document.cookie.match(/(?:^|;\s*)token=([^;]+)/)?.[1] ?? '')
+    : ''
+  const h: Record<string, string> = {}
+  if (cookieToken) h.authorization = `Bearer ${decodeURIComponent(cookieToken)}`
+  if (json) h['content-type'] = 'application/json'
+  return h
+}
+
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
+
+function isIdempotent(init?: RequestInit): boolean {
+  const method = (init?.method ?? 'GET').toUpperCase()
+  return method === 'GET' || method === 'HEAD'
+}
+
+/** 单次请求:信封解析 + 错误归一化(所有失败路径都抛 ApiError) */
+async function attemptOnce<T>(base: string, path: string, init?: RequestInit): Promise<T> {
+  let res: Response
+  try {
+    // 超时防挂起:无 AbortSignal 的 fetch 在连接黑洞时 promise 永不 settle,loading 永卡
+    res = await fetch(base + path, {
+      ...init,
+      headers: { ...authHeaders(!!init?.body), ...init?.headers },
+      signal: init?.signal ?? AbortSignal.timeout(init?.method && init.method.toUpperCase() !== 'GET' ? 30_000 : 15_000),
+    })
+  }
+  catch (err) {
+    if (err instanceof Error && (err.name === 'TimeoutError' || err.name === 'AbortError')) {
+      throw new ApiError('TIMEOUT', 0, '请求超时,请检查网络或服务状态')
+    }
+    throw new ApiError('NETWORK', 0, '无法连接服务器，请检查网络或服务状态')
+  }
+  let json: { code?: string | number, message?: string, data?: T } | null = null
+  try {
+    json = await res.json()
+  }
+  catch {
+    // 非 JSON 响应(代理/网关 HTML 错误页等)——按状态码归一化
+  }
+  if (!res.ok) {
+    throw new ApiError(
+      json?.code ?? `HTTP_${res.status}`,
+      res.status,
+      json?.message || `请求失败(HTTP ${res.status})`,
+    )
+  }
+  if (json?.code !== 0) {
+    throw new ApiError(json?.code ?? 'REQUEST_ERROR', res.status, json?.message || '请求失败')
+  }
+  return json.data as T
+}
+
+/**
+ * 统一请求入口。
+ * @param opts.base   API 前缀(如 '/api/workshop/daq')
+ * @param opts.path   路径后缀(如 '/:id/bind')
+ * @param opts.init   fetch RequestInit(body 由调用方 JSON.stringify)
+ * @param opts.retries 幂等请求额外重试次数(仅 5xx/网络错误;默认 0)
+ */
+export async function apiFetch<T>(opts: { base: string, path?: string, init?: RequestInit, retries?: number }): Promise<T> {
+  const { base, path = '', init, retries = 0 } = opts
+  const idempotent = isIdempotent(init)
+  const attempts = idempotent ? retries + 1 : 1
+  let lastError: ApiError | undefined
+  for (let attempt = 0; attempt < attempts; attempt++) {
+    try {
+      return await attemptOnce<T>(base, path, init)
+    }
+    catch (err) {
+      const apiErr = err instanceof ApiError
+        ? err
+        : new ApiError('INTERNAL_ERROR', 0, apiErrorMessage(err))
+      const retryable = idempotent && (apiErr.code === 'NETWORK' || apiErr.status >= 500)
+      lastError = apiErr
+      if (!retryable || attempt === attempts - 1) throw apiErr
+      await sleep(400 * (attempt + 1))
+    }
+  }
+  throw lastError ?? new ApiError('INTERNAL_ERROR', 0, '请求失败')
+}

package/app/composables/workshop/useCharacterAssets.ts

@@ -202,7 +202,7 @@ function createStore(): CharacterAssetStore {
       }
       catch (err) {
         store.loaded = false
-        store.error = err instanceof Error ? err.message : String(err)
+        store.error = apiErrorMessage(err)
       }
       finally {
         store.loading = false

package/app/composables/workshop/useDaqStream.ts

@@ -204,30 +204,44 @@ const createStore = () => {
     }
   }
 
-  /** 挂 WS 帧(townBus);幂等(globalThis 防重复订阅)。返回退订函数。 */
+  /** 挂 WS 帧(townBus)。引用计数:首个调用建立真实订阅,计数归零才退订
+   *  (修复一次性守卫导致首个页面卸载后实时流永久死亡的缺陷)。返回退订函数。 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureWsFeed(): () => void {
-    const g = globalThis as typeof globalThis & { __daqBusFed?: boolean }
-    if (g.__daqBusFed) return () => {}
-    g.__daqBusFed = true
-    return useTownBus().subscribe((e: AepEnvelope) => {
-      if (e.type === 'daq.reading') applyReading(e.payload as AepDaqReading)
-      else if (e.type === 'daq.frame') applyFrame(e.payload as unknown as AepDaqFrame)
-      else if (e.type === 'daq.node.changed') applyChange(e.payload as AepDaqNodeChange)
-      else if (e.type === 'daq.controller') Object.assign(controller, e.payload as AepDaqControllerState)
-      else if (e.type === 'daq.template.changed') applyTemplateChange(e.payload as AepDaqTemplateChange)
-      // S5 实时告警:server 权威事件直推(报警进入轨插入;ack 确认后移出未确认列表)
-      else if (e.type === 'daq.alarm') {
-        const p = e.payload as unknown as DaqAlarmRow
-        if (!alarms.some(a => a.id === p.id)) alarms.unshift(p)
+    feedConsumers++
+    if (feedConsumers === 1) {
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
       }
-      else if (e.type === 'daq.alarm.changed') {
-        const p = e.payload as unknown as { id: string, ackedAt?: string, recovered?: boolean }
-        if (p.ackedAt) {
-          const i = alarms.findIndex(a => a.id === p.id)
-          if (i >= 0) alarms.splice(i, 1)
-        }
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    if (e.type === 'daq.reading') applyReading(e.payload as AepDaqReading)
+    else if (e.type === 'daq.frame') applyFrame(e.payload as unknown as AepDaqFrame)
+    else if (e.type === 'daq.node.changed') applyChange(e.payload as AepDaqNodeChange)
+    else if (e.type === 'daq.controller') Object.assign(controller, e.payload as AepDaqControllerState)
+    else if (e.type === 'daq.template.changed') applyTemplateChange(e.payload as AepDaqTemplateChange)
+    // S5 实时告警:server 权威事件直推(报警进入轨插入;ack 确认后移出未确认列表)
+    else if (e.type === 'daq.alarm') {
+      const p = e.payload as unknown as DaqAlarmRow
+      if (!alarms.some(a => a.id === p.id)) alarms.unshift(p)
+    }
+    else if (e.type === 'daq.alarm.changed') {
+      const p = e.payload as unknown as { id: string, ackedAt?: string, recovered?: boolean }
+      if (p.ackedAt) {
+        const i = alarms.findIndex(a => a.id === p.id)
+        if (i >= 0) alarms.splice(i, 1)
       }
-    })
+    }
   }
 
   async function load(): Promise<void> {
@@ -259,7 +273,7 @@ const createStore = () => {
       store.error = ''
     }
     catch (err) {
-      store.error = err instanceof Error ? err.message : String(err)
+      store.error = apiErrorMessage(err)
     }
   }
 

package/app/composables/workshop/useDcwStream.ts

@@ -50,11 +50,27 @@ function createStore() {
     upsert(p.node)
   }
 
+  /** 引用计数订阅(同 useDaqStream):首个调用建订阅,归零才退订 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureWsFeed(): () => void {
-    const g = globalThis as typeof globalThis & { __dcwBusFed?: boolean }
-    if (g.__dcwBusFed) return () => {}
-    g.__dcwBusFed = true
-    return useTownBus().subscribe((e: AepEnvelope) => {
+    feedConsumers++
+    if (feedConsumers === 1) {
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
+      }
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    {
       if (e.type === 'dcw.written') {
         const p = e.payload as AepDcwWritten
         const n = nodes.find(x => x.id === p.nodeId)
@@ -83,8 +99,9 @@ function createStore() {
         const i = optimizations.findIndex(x => x.id === p.id)
         if (i >= 0) optimizations[i] = p
         else optimizations.unshift(p)
+        if (optimizations.length > 200) optimizations.length = 200
       }
-    })
+    }
   }
 
   async function load(): Promise<void> {
@@ -104,7 +121,7 @@ function createStore() {
       store.error = ''
     }
     catch (err) {
-      store.error = err instanceof Error ? err.message : String(err)
+      store.error = apiErrorMessage(err)
     }
   }
 

package/app/composables/workshop/useDeviceTwins.ts

@@ -83,7 +83,7 @@ function createStore(): DeviceTwinStore {
         catch (err) {
           // 失败不再静默清空:保留旧数据 + 置错误态(apiFetch 归一化网络/HTTP/业务错误)
           store.loaded = false
-          store.error = err instanceof Error ? err.message : String(err)
+          store.error = apiErrorMessage(err)
         }
         finally {
           store.__loading = null

package/app/composables/workshop/useOpsLog.ts

@@ -74,21 +74,34 @@ const createStore = () => {
   const loading = reactive({ list: false, posting: false })
   const error = reactive({ list: '', post: '' })
 
-  /** 挂 WS 帧(townBus);幂等。返回退订函数。 */
+  /** 挂 WS 帧(townBus)。引用计数(同 useDaqStream):归零才退订。 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureLive(): () => void {
-    const g = globalThis as typeof globalThis & { __opsLogFed?: boolean }
-    if (g.__opsLogFed) return () => {}
-    g.__opsLogFed = true
-    void seedRecent()
-    return useTownBus().subscribe((e: AepEnvelope) => {
-      if (e.type === 'ops.log') {
-        const row = ingestFrame(e.payload as AepOpsLog)
-        if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
-          recent.unshift(row)
-          if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
-        }
+    feedConsumers++
+    if (feedConsumers === 1) {
+      void seedRecent()
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
       }
-    })
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    if (e.type === 'ops.log') {
+      const row = ingestFrame(e.payload as AepOpsLog)
+      if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
+        recent.unshift(row)
+        if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
+      }
+    }
   }
 
   /** 首屏预填:最近 15 条历史摘要(实时轨不必从零等事件) */
@@ -117,7 +130,7 @@ const createStore = () => {
       results.splice(0, results.length, ...(data.logs ?? []))
     }
     catch (err) {
-      error.list = err instanceof Error ? err.message : String(err)
+      error.list = apiErrorMessage(err)
     }
     finally {
       loading.list = false
@@ -132,7 +145,7 @@ const createStore = () => {
       await api('', { method: 'POST', body: JSON.stringify(input) })
     }
     catch (err) {
-      error.post = err instanceof Error ? err.message : String(err)
+      error.post = apiErrorMessage(err)
       throw err
     }
     finally {

package/app/composables/workshop/useSceneLayouts.ts

@@ -143,7 +143,7 @@ function createStore(): SceneLayoutStore {
           return
         }
         catch (err) {
-          lastErr = err instanceof Error ? err.message : String(err)
+          lastErr = apiErrorMessage(err)
           if (attempt < 2) await sleep(400 * (attempt + 1))
         }
       }

package/app/composables/workshop/useWorkshopWs.ts

@@ -12,6 +12,11 @@ import { useHitlStore } from '../../stores/workshop/hitl'
 import { useTownBus } from './useTownBus'
 import type { AepEnvelope, AepSnapshot } from '#shared/workshop-protocol'
 
+// 心跳单例(模块作用域):所有 useWorkshopWs() 调用方共享一个 15s 定时器,
+// 避免每组件实例一份冗余 ping 打向同一会话
+let heartbeat: ReturnType<typeof setInterval> | null = null
+let heartbeatUsers = 0
+
 export function useWorkshopWs() {
   const conn = useWsConnectionStore()
   const userStore = useUserStore()
@@ -100,8 +105,9 @@ export function useWorkshopWs() {
     session?.ensureConnected()
   }
 
-  let heartbeat: ReturnType<typeof setInterval> | null = null
   onMounted(() => {
+    heartbeatUsers++
+    if (heartbeat) return
     // 15s 心跳:pong 停止后 checkStale 的断线感知最坏 ~20-35s(服务强杀的半开连接
     // 无 RST,靠 pong 超时发现);ping 发送失败立即关闭走重连,不等 stale 检测
     heartbeat = setInterval(() => {
@@ -110,7 +116,10 @@ export function useWorkshopWs() {
     }, 15_000)
   })
   onBeforeUnmount(() => {
-    if (heartbeat) clearInterval(heartbeat)
+    if (--heartbeatUsers <= 0 && heartbeat) {
+      clearInterval(heartbeat)
+      heartbeat = null
+    }
   })
 
   return { subscribe, unsubscribe, ensureConnected, conn }

package/app/pages/daq/[id].vue

@@ -154,7 +154,7 @@ async function doTest(): Promise<void> {
     testResult.value = await daq.testNode(nodeId.value)
   }
   catch (err) {
-    testResult.value = { ok: false, message: err instanceof Error ? err.message : String(err) }
+    testResult.value = { ok: false, message: apiErrorMessage(err) }
   }
   finally {
     testing.value = false

package/app/pages/daq/index.vue

@@ -36,7 +36,7 @@ async function setNodeLine(id: string, e: Event): Promise<void> {
     if (n) n.lineId = lineId
   }
   catch (err) {
-    message.error(err instanceof Error ? err.message : String(err))
+    message.error(apiErrorMessage(err))
   }
 }
 
@@ -47,7 +47,7 @@ async function setNodeDevice(id: string, e: Event): Promise<void> {
     await daq.bindNode(id, deviceId || null)
   }
   catch (err) {
-    message.error(err instanceof Error ? err.message : String(err))
+    message.error(apiErrorMessage(err))
   }
 }
 
@@ -61,7 +61,7 @@ async function toggleNodeEnabled(n: { id: string, enabled: boolean, state: strin
     message.success(next ? tt('daq.k1nodestart147') : tt('daq.k1nodestop146'))
   }
   catch (err) {
-    message.error(err instanceof Error ? err.message : String(err))
+    message.error(apiErrorMessage(err))
   }
 }
 
@@ -135,7 +135,7 @@ async function ackOne(id: string): Promise<void> {
     message.success(tt('daq.k1acked144'))
   }
   catch (err) {
-    message.error(err instanceof Error ? err.message : String(err))
+    message.error(apiErrorMessage(err))
   }
 }
 
@@ -459,7 +459,7 @@ async function doTestConnection(): Promise<void> {
     addTest.value = await daq.testDriver(addDriver.value, addCfg.value)
   }
   catch (err) {
-    addTest.value = { ok: false, message: err instanceof Error ? err.message : String(err) }
+    addTest.value = { ok: false, message: apiErrorMessage(err) }
   }
   finally {
     addTesting.value = false
@@ -504,7 +504,7 @@ async function doAddNode(): Promise<void> {
     addTest.value = null
   }
   catch (err) {
-    addError.value = err instanceof Error ? err.message : String(err)
+    addError.value = apiErrorMessage(err)
   }
   finally {
     addSaving.value = false
@@ -592,7 +592,7 @@ async function saveTpl(): Promise<void> {
     resetTplForm()
   }
   catch (err) {
-    tplError.value = err instanceof Error ? err.message : String(err)
+    tplError.value = apiErrorMessage(err)
   }
   finally {
     tplSaving.value = false
@@ -609,7 +609,7 @@ async function askDelTpl(t: DaqTemplateDef): Promise<void> {
     await daq.removeTemplate(t.key)
   }
   catch (err) {
-    tplError.value = err instanceof Error ? err.message : String(err)
+    tplError.value = apiErrorMessage(err)
   }
   finally {
     confirmingDel.value = ''

package/app/pages/dcw/[id].vue

@@ -124,7 +124,7 @@ async function doWrite(nodeId: string, value: number): Promise<void> {
     }
   }
   catch (err) {
-    writeError.value = err instanceof Error ? err.message : String(err)
+    writeError.value = apiErrorMessage(err)
   }
   finally {
     writingId.value = ''
@@ -141,7 +141,7 @@ async function doRead(nodeId: string): Promise<void> {
     await dcw.readNode(nodeId)
   }
   catch (err) {
-    writeError.value = err instanceof Error ? err.message : String(err)
+    writeError.value = apiErrorMessage(err)
   }
   finally {
     readingId.value = ''
@@ -164,7 +164,7 @@ async function toggleControl(nodeId: string, enabled: boolean): Promise<void> {
     }
   }
   catch (err) {
-    writeError.value = err instanceof Error ? err.message : String(err)
+    writeError.value = apiErrorMessage(err)
   }
   finally {
     togglingId.value = ''
@@ -207,7 +207,7 @@ async function doTestConnection(): Promise<void> {
     addTest.value = await dcw.testDriver(addDriver.value, addCfg.value)
   }
   catch (err) {
-    addTest.value = { ok: false, message: err instanceof Error ? err.message : String(err) }
+    addTest.value = { ok: false, message: apiErrorMessage(err) }
   }
   finally {
     addTesting.value = false
@@ -241,7 +241,7 @@ async function doAddNode(): Promise<void> {
     addSemantics.value = ''
   }
   catch (err) {
-    addError.value = err instanceof Error ? err.message : String(err)
+    addError.value = apiErrorMessage(err)
   }
   finally {
     addSaving.value = false
@@ -304,7 +304,7 @@ async function doCreateTemplate(): Promise<void> {
     tplForm.semantics = ''
   }
   catch (err) {
-    tplError.value = err instanceof Error ? err.message : String(err)
+    tplError.value = apiErrorMessage(err)
   }
   finally {
     tplSaving.value = false
@@ -332,7 +332,7 @@ async function doLineStart(): Promise<void> {
     lineMsg.value = t('dcwDetail.k17jteb9186', { p0: ls.value.productName, p1: ls.value.recipeName, p2: ls.value.runId })
   }
   catch (err) {
-    lineErr.value = err instanceof Error ? err.message : String(err)
+    lineErr.value = apiErrorMessage(err)
   }
   finally {
     lineBusy.value = false
@@ -349,7 +349,7 @@ async function doLineStop(): Promise<void> {
     lineMsg.value = t('dcwDetail.kzl49pd187', { p0: was })
   }
   catch (err) {
-    lineErr.value = err instanceof Error ? err.message : String(err)
+    lineErr.value = apiErrorMessage(err)
   }
   finally {
     lineBusy.value = false
@@ -375,7 +375,7 @@ async function doCreateProduct(): Promise<void> {
     productForm.description = ''
   }
   catch (err) {
-    productError.value = err instanceof Error ? err.message : String(err)
+    productError.value = apiErrorMessage(err)
   }
   finally {
     productSaving.value = false
@@ -421,7 +421,7 @@ async function doQuery(): Promise<void> {
     if (queryResult.value.channels.length === 0) queryError.value = t('dcwDetail.kszv5sq136')
   }
   catch (err) {
-    queryError.value = err instanceof Error ? err.message : String(err)
+    queryError.value = apiErrorMessage(err)
   }
   finally {
     queryBusy.value = false
@@ -509,7 +509,7 @@ async function saveRecipe(): Promise<void> {
     recipeOpen.value = false
   }
   catch (err) {
-    recipeError.value = err instanceof Error ? err.message : String(err)
+    recipeError.value = apiErrorMessage(err)
   }
   finally {
     recipeSaving.value = false
@@ -526,7 +526,7 @@ async function doApplyRecipe(id: string): Promise<void> {
     if (ok < run.results.length) writeError.value = t('dcwDetail.ks7szkt188', { p0: run.results.filter(r => !r.ok).map(r => r.message).join(';') })
   }
   catch (err) {
-    writeError.value = err instanceof Error ? err.message : String(err)
+    writeError.value = apiErrorMessage(err)
   }
 }
 
@@ -537,7 +537,7 @@ async function doViewRun(id: string): Promise<void> {
     runDataView.value = { runId: id, data }
   }
   catch (err) {
-    writeError.value = err instanceof Error ? err.message : String(err)
+    writeError.value = apiErrorMessage(err)
   }
   finally {
     runDataLoading.value = false