agentworkshop 0.5.8 → 0.6.0

package/.output/server/index.mjs

@@ -23,6 +23,8 @@ import 'node:child_process';
 import 'node:net';
 import 'node:util';
 import 'node:module';
+import 'node:fs/promises';
+import 'node:zlib';
 
 const kNodeInspect = /* @__PURE__ */ Symbol.for(
   "nodejs.util.inspect.custom"

package/.output/server/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.DfCzGthR.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.D9ehKjSh.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.By9qWDAI.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.CipVM6lf.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/adapters/node.mjs","../../node_modules/.pnpm/nitropack@2.13.4_oxc-parser_b1d7d58181e96cbc69b3295f5f958520/node_modules/nitropack/dist/presets/node/runtime/node-server.mjs"],"names":["HttpsServer","HttpServer","wsAdapter"],"mappings":"","x_google_ignoreList":[0,1,2,3,4,5]}
+{"version":3,"file":"index.mjs","sources":["../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.DfCzGthR.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.D9ehKjSh.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.By9qWDAI.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/shared/crossws.CipVM6lf.mjs","../../node_modules/.pnpm/crossws@0.3.5/node_modules/crossws/dist/adapters/node.mjs","../../node_modules/.pnpm/nitropack@2.13.4_oxc-parser_1ea3e01e591cb0fd9b154d63486cc9e1/node_modules/nitropack/dist/presets/node/runtime/node-server.mjs"],"names":["HttpsServer","HttpServer","wsAdapter"],"mappings":"","x_google_ignoreList":[0,1,2,3,4,5]}

package/.output/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop-prod",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "type": "module",
   "private": true,
   "dependencies": {

package/app/composables/workshop/useDaqStream.ts

@@ -10,10 +10,23 @@ import { reactive } from 'vue'
 import { useTownBus } from './useTownBus'
 import { apiFetch } from './apiClient'
 import type { AepEnvelope } from '#shared/workshop-protocol'
-import { DAQ_TEMPLATES, type AepDaqControllerState, type AepDaqReading, type AepDaqNodeChange, type AepDaqTemplateChange, type DaqNodeView, type DaqTemplateDef, type DaqTemplateInput } from '#shared/daq-protocol'
+import { DAQ_TEMPLATES, type AepDaqControllerState, type AepDaqFrame, type AepDaqReading, type AepDaqNodeChange, type AepDaqTemplateChange, type DaqNodeView, type DaqTemplateDef, type DaqTemplateInput } from '#shared/daq-protocol'
 
 /** 历史缓冲长度(1s 默认周期 ≈ 最近 5 分钟趋势) */
 const HIST_CAP = 60
+/** 每节点帧缓冲上限(图像/向量元数据;画廊分页走 REST) */
+const FRAMES_CAP = 30
+
+/** 帧展示态(WS daq.frame / REST frames 同构) */
+export interface DaqFrameLive {
+  at: number
+  kind: 'vector' | 'image'
+  points?: number[]
+  metrics: Record<string, number>
+  /** 图像内容 URL(同源 cookie 鉴权,<img> 直用) */
+  thumbUrl?: string
+  contentUrl?: string
+}
 
 /** 展示态:本地追加"实时性"字段(view 同构 + 趋势缓冲) */
 export interface DaqNodeLive extends DaqNodeView {
@@ -93,6 +106,8 @@ const createStore = () => {
   })
   // 模板目录:内置 6 种先行(SEO 首帧即有),REST 快照与 WS 帧收敛为 server 权威
   const templates = reactive<DaqTemplateDef[]>(DAQ_TEMPLATES.map(t => ({ ...t })))
+  // 帧缓冲(v2 多形态信号:nodeId → 最近 FRAMES_CAP 帧,新帧头插)
+  const frames = reactive<Record<string, DaqFrameLive[]>>({})
 
   function upsert(node: DaqNodeView): void {
     const i = nodes.findIndex(x => x.id === node.id)
@@ -164,6 +179,31 @@ const createStore = () => {
     else templates.push({ ...p.template })
   }
 
+  /** 帧入账(v2:新帧头插,容量裁剪;图像只存引用 URL,像素按需经 URL 加载)。
+   *  同时驱动节点 value/state/lastAt(向量=avg 展示值)——帧节点的实时链路与
+   *  标量 daq.reading 同源,列表页/数字孪生面板因此零轮询可见。 */
+  function applyFrame(p: AepDaqFrame): void {
+    const at = Date.parse(p.at)
+    const list = frames[p.nodeId] ?? (frames[p.nodeId] = [])
+    if (!list.some(f => f.at === at)) {
+      list.unshift({
+        at,
+        kind: p.kind,
+        points: p.preview,
+        metrics: p.metrics ?? {},
+        thumbUrl: p.thumbUrl,
+        contentUrl: p.thumbUrl ? p.thumbUrl.replace('thumb=1', 'thumb=0') : undefined,
+      })
+      if (list.length > FRAMES_CAP) list.splice(FRAMES_CAP)
+    }
+    const n = nodes.find(x => x.id === p.nodeId)
+    if (n) {
+      n.value = p.metrics?.avg ?? n.value
+      if (p.state) n.state = p.state
+      n.lastAt = p.at
+    }
+  }
+
   /** 挂 WS 帧(townBus);幂等(globalThis 防重复订阅)。返回退订函数。 */
   function ensureWsFeed(): () => void {
     const g = globalThis as typeof globalThis & { __daqBusFed?: boolean }
@@ -171,6 +211,7 @@ const createStore = () => {
     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)
@@ -310,6 +351,18 @@ const createStore = () => {
     return data.points ?? []
   }
 
+  /** 帧历史(REST 分页;WS daq.frame 只补增量,刷新后由此重建基线) */
+  async function fetchFrames(id: string, opts: { fromMs?: number, toMs?: number, kind?: 'vector' | 'image', limit?: number } = {}): Promise<DaqFrameLive[]> {
+    const qs = new URLSearchParams()
+    if (opts.fromMs != null) qs.set('from', String(opts.fromMs))
+    if (opts.toMs != null) qs.set('to', String(opts.toMs))
+    if (opts.kind) qs.set('kind', opts.kind)
+    if (opts.limit != null) qs.set('limit', String(opts.limit))
+    const data = await api<{ frames: DaqFrameLive[] }>(`/${id}/frames?${qs.toString()}`)
+    frames[id] = data.frames ?? []
+    return frames[id]!
+  }
+
   // ---------- 自定义模板 CRUD(server 权威;WS daq.template.changed 收敛其余客户端) ----------
 
   async function createTemplate(input: DaqTemplateInput): Promise<DaqTemplateDef> {
@@ -361,6 +414,11 @@ const createStore = () => {
     ackAlarm,
     nodeById: (id: string): DaqNodeLive | undefined => nodes.find(n => n.id === id),
     samplesOf,
+    fetchFrames,
+    frames,
+    framesOf: (id: string): DaqFrameLive[] => frames[id] ?? [],
+    templateOf: (templateRef: string): DaqTemplateDef | undefined =>
+      templates.find(t => t.key === templateRef || `daq-${t.key}` === templateRef),
     ofDevice: (deviceId: string | null): DaqNodeLive[] =>
       deviceId ? nodes.filter(n => n.deviceBindingId === deviceId) : [],
   })

package/app/config/schema.ts

@@ -62,6 +62,14 @@ export const appConfigSchema = z.object({
       password: z.string().default('awshop'),
       database: z.string().default('awshop'),
     }),
+    // 对象存储(v2 帧管线:图像帧像素;MinIO S3 兼容。不可达 → 本地磁盘降级,采集不中断)
+    objectstore: z.object({
+      host: z.string().default('127.0.0.1'),
+      port: z.number().int().min(1).max(65535).default(9000),
+      accessKey: z.string().default('awshop'),
+      secretKey: z.string().default('awshop-secret'),
+      bucket: z.string().default('daq'),
+    }).optional(),
   }).default({ startInfrastructure: 'auto', mqtt: { host: '127.0.0.1', port: 1883 }, timescale: { host: '127.0.0.1', port: 5432, user: 'postgres', password: 'awshop', database: 'awshop' } }),
 })
 

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

@@ -7,7 +7,7 @@
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useDcwStream } from '@/app/composables/workshop/useDcwStream'
-import { useDaqStream } from '@/app/composables/workshop/useDaqStream'
+import { useDaqStream, type DaqFrameLive } from '@/app/composables/workshop/useDaqStream'
 import { useDeviceTwins } from '@/app/composables/workshop/useDeviceTwins'
 import { daqKeyFromRef, DAQ_DRIVERS, type DaqDriverKind, type DaqNodeState, type DriverConfigField, type DriverTestResult as DaqDriverTestResult } from '#shared/daq-protocol'
 
@@ -42,9 +42,46 @@ onMounted(() => {
   unsub = daq.ensureWsFeed()
   void daq.load()
   void deviceTwins.load()
+  if (isFrameNode.value) void loadFrames()
 })
 onBeforeUnmount(() => unsub?.())
 
+// ---------- 帧视图(v2 多形态信号:向量轮廓 / 图像画廊;scalar 节点不渲染) ----------
+
+const signalKind = computed(() => tpl.value?.signalKind ?? 'scalar')
+const isFrameNode = computed(() => signalKind.value !== 'scalar')
+const frames = computed(() => daq.framesOf(nodeId.value))
+
+async function loadFrames(): Promise<void> {
+  if (!nodeId.value) return
+  await daq.fetchFrames(nodeId.value, { limit: 24 }).catch(() => {})
+}
+watch(nodeId, () => {
+  if (isFrameNode.value) void loadFrames()
+})
+
+const timeOf = (at: number): string => new Date(at).toLocaleTimeString('zh-CN', { hour12: false })
+const metricsBrief = (f: DaqFrameLive): string =>
+  Object.entries(f.metrics ?? {}).slice(0, 3).map(([k, v]) => `${k}=${v}`).join(' ')
+
+/* 向量轮廓(最近一帧预览;SVG polyline,免 canvas 绘制循环) */
+const VEC_W = 320
+const VEC_H = 84
+const latestVector = computed(() => frames.value.find(f => f.kind === 'vector' && f.points?.length))
+const vecPath = computed(() => {
+  const pts = latestVector.value?.points ?? []
+  if (pts.length < 2) return ''
+  const min = Math.min(...pts)
+  const max = Math.max(...pts)
+  const span = max - min || 1
+  return pts
+    .map((p, i) => `${((i / (pts.length - 1)) * VEC_W).toFixed(1)},${(VEC_H - 6 - ((p - min) / span) * (VEC_H - 12)).toFixed(1)}`)
+    .join(' ')
+})
+
+/* 图像大图查看(点击缩略图;contentUrl 同源 cookie 鉴权直出) */
+const fullFrame = ref<DaqFrameLive | null>(null)
+
 /** WS 下发节拍展示(null=跟随全局;0=每帧;>0 独立间隔) */
 function publishLabel(v: number | null): string {
   if (v == null) return t('daqDetail.k9vnp9h053', { p0: daq.controller.defaultPublishIntervalMs })
@@ -682,6 +719,97 @@ watch(bucketMs, () => void loadHistory())
         </table>
       </section>
     </div>
+
+    <!-- 帧视图(v2 多形态信号:向量轮廓 / 图像画廊;scalar 节点不渲染) -->
+    <section
+      v-if="isFrameNode"
+      class="aw-tile pad frames-tile"
+    >
+      <div class="hist-hd">
+        <h3 class="sec">
+          {{ signalKind === 'image' ? $t('daqDetail.kfrm0001') : $t('daqDetail.kfrm0002') }}
+          <span class="mono frames-n">{{ frames.length }}</span>
+        </h3>
+        <button
+          class="pill-btn"
+          @click="loadFrames"
+        >
+          {{ $t('daqDetail.k3x1jg022') }}
+        </button>
+      </div>
+
+      <!-- 向量:最近帧轮廓 + 帧表 -->
+      <template v-if="signalKind === 'vector'">
+        <svg
+          class="vec-svg"
+          :viewBox="`0 0 ${VEC_W} ${VEC_H}`"
+          preserveAspectRatio="none"
+        >
+          <polyline
+            :points="vecPath"
+            fill="none"
+            stroke="var(--accent)"
+            stroke-width="1.5"
+          />
+        </svg>
+        <table class="raw-table mono">
+          <thead>
+            <tr><th>{{ $t('daqDetail.k40vsf023') }}</th><th>{{ $t('daqDetail.kfrm0004') }}</th><th>{{ $t('daqDetail.kfrm0005') }}</th></tr>
+          </thead>
+          <tbody>
+            <tr
+              v-for="f in frames.filter(x => x.kind === 'vector').slice(0, 12)"
+              :key="f.at"
+            >
+              <td>{{ timeOf(f.at) }}</td>
+              <td>{{ f.points?.length ?? 0 }}</td>
+              <td>{{ metricsBrief(f) }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </template>
+
+      <!-- 图像:缩略图画gallery(懒加载;点击看原图) -->
+      <template v-else>
+        <div
+          v-if="frames.length"
+          class="gal"
+        >
+          <figure
+            v-for="f in frames"
+            :key="f.at"
+            class="gal-item"
+            :title="$t('daqDetail.kfrm0006')"
+            @click="fullFrame = f"
+          >
+            <img
+              :src="f.thumbUrl"
+              loading="lazy"
+              alt="daq frame"
+            >
+            <figcaption class="mono">
+              {{ timeOf(f.at) }} · {{ metricsBrief(f) }}
+            </figcaption>
+          </figure>
+        </div>
+        <p
+          v-else
+          class="frames-empty"
+        >
+          {{ $t('daqDetail.kfrm0003') }}
+        </p>
+        <div
+          v-if="fullFrame"
+          class="gal-full"
+          @click="fullFrame = null"
+        >
+          <img
+            :src="fullFrame.contentUrl ?? fullFrame.thumbUrl"
+            alt="daq frame full"
+          >
+        </div>
+      </template>
+    </section>
   </div>
 </template>
 
@@ -793,4 +921,16 @@ watch(bucketMs, () => void loadHistory())
 .st-pill.warn { color: var(--tone-warning-dot); background: var(--tone-warning-bg); }
 .st-pill.alarm { color: var(--tone-danger-dot); background: var(--tone-danger-bg); }
 .st-pill.offline { color: var(--tone-neutral-dot); background: var(--tone-neutral-bg); }
+
+/* 帧视图(v2 多形态) */
+.frames-tile { margin-top: 14px; }
+.frames-n { margin-left: 8px; color: var(--ink-faint); }
+.vec-svg { width: 100%; height: 96px; display: block; background: var(--tone-neutral-bg); border-radius: 6px; margin-bottom: 10px; }
+.gal { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 10px; }
+.gal-item { margin: 0; cursor: zoom-in; }
+.gal-item img { width: 100%; aspect-ratio: 4 / 3; object-fit: cover; border-radius: 6px; display: block; background: var(--tone-neutral-bg); }
+.gal-item figcaption { margin-top: 4px; font-size: 11px; color: var(--ink-faint); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.frames-empty { margin: 8px 0; font-size: 13px; color: var(--ink-faint); }
+.gal-full { position: fixed; inset: 0; z-index: 60; display: flex; align-items: center; justify-content: center; background: rgb(0 0 0 / 72%); cursor: zoom-out; }
+.gal-full img { max-width: 92vw; max-height: 92vh; border-radius: 8px; }
 </style>

package/app/pages/settings.vue

@@ -22,7 +22,9 @@ function syncRuntimeDraft() {
   draft.value = { ...rcStore.effective }
   dirtyKeys.value = new Set()
 }
-watch(() => rcStore.loaded, (v) => { if (v) syncRuntimeDraft() })
+watch(() => rcStore.loaded, (v) => {
+  if (v) syncRuntimeDraft()
+})
 watch(() => rcStore.effective, () => {
   // 外部写入(CLI/其他窗口/文件监听)推来的变化,未编辑时才回填草稿
   if (dirtyKeys.value.size === 0) syncRuntimeDraft()
@@ -47,7 +49,7 @@ async function saveRuntime() {
       ? { type: 'warning', text: t('settings.runtime.restartNotice', { keys: restart.join(', ') }) }
       : { type: 'success', text: t('settings.runtime.savedLive') }
   }
-  catch (e: any) {
+  catch (e) {
     runtimeNotice.value = { type: 'error', text: e?.response?.data?.message || e?.message || String(e) }
   }
   finally {
@@ -61,7 +63,7 @@ async function resetRuntimeKey(key: string) {
     syncRuntimeDraft()
     runtimeNotice.value = { type: 'success', text: t('settings.runtime.keyReset', { key }) }
   }
-  catch (e: any) {
+  catch (e) {
     runtimeNotice.value = { type: 'error', text: e?.response?.data?.message || e?.message || String(e) }
   }
 }
@@ -72,7 +74,7 @@ async function resetAllRuntime() {
     syncRuntimeDraft()
     runtimeNotice.value = { type: 'success', text: t('settings.runtime.resetAllDone') }
   }
-  catch (e: any) {
+  catch (e) {
     runtimeNotice.value = { type: 'error', text: e?.response?.data?.message || e?.message || String(e) }
   }
 }
@@ -279,7 +281,10 @@ const tabs = computed(() => [
               :message="runtimeNotice.text"
             />
 
-            <template v-for="g in rcStore.groups" :key="g.group">
+            <template
+              v-for="g in rcStore.groups"
+              :key="g.group"
+            >
               <h4 class="rt-group-title">
                 {{ groupLabel(g.group) }}
               </h4>

package/app/plugins/runtime-config.client.ts

@@ -1,65 +1,65 @@
-/**
- * 运行时配置客户端插件 —— 设置热重载落地层。
- * - 启动:拉取服务端设置快照 → 订阅 SSE（UI/CLI/文件任意写入实时同步）
- * - live 应用:标题、主题模式、主题色、默认语言随有效值变化即时生效
- *   · 主题模式/主题色仅当用户未在设置页手动覆盖时跟随（用户本地偏好优先）
- */
-import { useRuntimeConfigStore } from '~/stores/runtime-config'
-import { useAppStore } from '~/stores/app'
-
-export default defineNuxtPlugin(() => {
-  if (!import.meta.client) return
-  const store = useRuntimeConfigStore()
-  const appStore = useAppStore()
-
-  let darkTouched = false
-  let lastDarkFromRuntime: boolean | null = null
-
-  // 用户手动切换过暗色后，禁止运行时主题覆盖（尊重本地偏好）
-  watch(
-    () => appStore.isDark,
-    (v) => {
-      if (lastDarkFromRuntime !== null && v !== lastDarkFromRuntime) darkTouched = true
-    },
-  )
-
-  // 主题模式:runtime 默认 → 应用首次暗态（仅当用户未手动切换）
-  watch(
-    () => store.effective['theme.mode'],
-    (v) => {
-      if (v !== 'light' && v !== 'dark') return
-      if (darkTouched) return
-      const target = v === 'dark'
-      lastDarkFromRuntime = target
-      if (appStore.isDark !== target) appStore.isDark = target
-    },
-    { immediate: true },
-  )
-
-  // 标题:实时反映 app.title
-  watch(
-    () => store.effective['app.title'],
-    (v, old) => {
-      if (typeof v === 'string' && v && v !== old) document.title = v
-    },
-    { immediate: true },
-  )
-
-  // 主题色:app.vue 的 accentBase 优先读 store.accent 本地偏好，
-  // 其次 runtime 有效主题色 —— 这里仅需保证 store 已填充即可（app.vue 计算属性实时跟随）
-  void store.fetchAll().catch(() => {})
-  store.startEvents()
-
-  // i18n 默认语言:仅当用户未在本地选择过语言时跟随 runtime 默认
-  const LOCAL_LOCALE_KEY = 'aw.locale'
-  try {
-    if (!window.localStorage.getItem(LOCAL_LOCALE_KEY)) {
-      const locale = store.effective['i18n.defaultLocale']
-      if (locale === 'zh-CN' || locale === 'en') {
-        const { setLocale } = useI18n()
-        void setLocale(locale)
-      }
-    }
-  }
-  catch { /* localStorage 不可用则跳过 */ }
-})
+/**
+ * 运行时配置客户端插件 —— 设置热重载落地层。
+ * - 启动:拉取服务端设置快照 → 订阅 SSE（UI/CLI/文件任意写入实时同步）
+ * - live 应用:标题、主题模式、主题色、默认语言随有效值变化即时生效
+ *   · 主题模式/主题色仅当用户未在设置页手动覆盖时跟随（用户本地偏好优先）
+ */
+import { useRuntimeConfigStore } from '~/stores/runtime-config'
+import { useAppStore } from '~/stores/app'
+
+export default defineNuxtPlugin(() => {
+  if (!import.meta.client) return
+  const store = useRuntimeConfigStore()
+  const appStore = useAppStore()
+
+  let darkTouched = false
+  let lastDarkFromRuntime: boolean | null = null
+
+  // 用户手动切换过暗色后，禁止运行时主题覆盖（尊重本地偏好）
+  watch(
+    () => appStore.isDark,
+    (v) => {
+      if (lastDarkFromRuntime !== null && v !== lastDarkFromRuntime) darkTouched = true
+    },
+  )
+
+  // 主题模式:runtime 默认 → 应用首次暗态（仅当用户未手动切换）
+  watch(
+    () => store.effective['theme.mode'],
+    (v) => {
+      if (v !== 'light' && v !== 'dark') return
+      if (darkTouched) return
+      const target = v === 'dark'
+      lastDarkFromRuntime = target
+      if (appStore.isDark !== target) appStore.isDark = target
+    },
+    { immediate: true },
+  )
+
+  // 标题:实时反映 app.title
+  watch(
+    () => store.effective['app.title'],
+    (v, old) => {
+      if (typeof v === 'string' && v && v !== old) document.title = v
+    },
+    { immediate: true },
+  )
+
+  // 主题色:app.vue 的 accentBase 优先读 store.accent 本地偏好，
+  // 其次 runtime 有效主题色 —— 这里仅需保证 store 已填充即可（app.vue 计算属性实时跟随）
+  void store.fetchAll().catch(() => {})
+  store.startEvents()
+
+  // i18n 默认语言:仅当用户未在本地选择过语言时跟随 runtime 默认
+  const LOCAL_LOCALE_KEY = 'aw.locale'
+  try {
+    if (!window.localStorage.getItem(LOCAL_LOCALE_KEY)) {
+      const locale = store.effective['i18n.defaultLocale']
+      if (locale === 'zh-CN' || locale === 'en') {
+        const { setLocale } = useI18n()
+        void setLocale(locale)
+      }
+    }
+  }
+  catch { /* localStorage 不可用则跳过 */ }
+})