agentworkshop 0.5.9 → 0.6.0

package/app/stores/runtime-config.ts

@@ -1,212 +1,212 @@
-/**
- * 运行时配置 Store —— 前端设置持久化 + 热重载的枢纽。
- *
- * - fetchAll(): GET /api/system/settings（描述符驱动的表单数据源）
- * - patch()   : PATCH /api/system/settings（持久化 + 服务端热应用 + SSE 广播）
- * - reset()   : POST /api/system/settings/reset
- * - startEvents(): fetch + ReadableStream 订阅 SSE，服务端任意写入（UI/CLI/文件监听）都实时同步
- *
- * 与服务端 SystemConfigService 同源（shared/config/schema.json 描述符），
- * 前端看到的值永远等于服务端内存视图。
- */
-import { useCookie, useRuntimeConfig } from '#imports'
-import { useHttp } from '~/composables/useHttp'
-
-export interface SettingsDescriptor {
-  key: string
-  type: 'string' | 'number' | 'boolean' | 'color' | 'select'
-  group: string
-  label: string
-  labelKey?: string
-  description?: string
-  applies: 'live' | 'restart'
-  default?: unknown
-  min?: number
-  max?: number
-  options?: string[]
-}
-
-interface Snapshot {
-  descriptors: SettingsDescriptor[]
-  effective: Record<string, unknown>
-  overrides: Record<string, unknown>
-  sources: Record<string, string>
-  settingsPath: string
-}
-
-interface SettingsEvent {
-  type: 'config:changed' | 'config:reset' | 'config:reloaded'
-  changed: string[]
-  restartRequired: string[]
-  effective: Record<string, unknown>
-  sources: Record<string, string>
-  overrides: Record<string, unknown>
-}
-
-export const useRuntimeConfigStore = defineStore('runtime-config', () => {
-  const descriptors = ref<SettingsDescriptor[]>([])
-  const effective = ref<Record<string, unknown>>({})
-  const overrides = ref<Record<string, unknown>>({})
-  const sources = ref<Record<string, string>>({})
-  const settingsPath = ref('')
-  const loaded = ref(false)
-  const loading = ref(false)
-  const lastEvent = ref<SettingsEvent | null>(null)
-
-  // 分组后的设置项（computed：按 schema.json group 保持声明顺序）
-  const groups = computed(() => {
-    const out: Array<{ group: string, items: SettingsDescriptor[] }> = []
-    for (const d of descriptors.value) {
-      const g = out.find(x => x.group === d.group)
-      if (g) g.items.push(d)
-      else out.push({ group: d.group, items: [d] })
-    }
-    return out
-  })
-
-  function sourceOf(key: string): string {
-    return sources.value[key] ?? 'config.yml'
-  }
-
-  /** 取某键当前有效值 */
-  function valueOf(key: string): unknown {
-    return effective.value[key]
-  }
-
-  async function fetchAll(): Promise<void> {
-    loading.value = true
-    try {
-      const http = useHttp()
-      const env = await http.get<{ data: Snapshot }>('/system/settings')
-      applySnapshot((env as { data?: Snapshot }).data ?? (env as unknown as Snapshot))
-    }
-    catch (err) {
-      // 未登录 / 服务未就绪：保持未加载，UI 显示占位
-      console.warn('[runtime-config] 读取设置失败:', err)
-    }
-    finally {
-      loading.value = false
-    }
-  }
-
-  function applySnapshot(snap: Snapshot): void {
-    descriptors.value = snap.descriptors ?? []
-    effective.value = snap.effective ?? {}
-    overrides.value = snap.overrides ?? {}
-    sources.value = snap.sources ?? {}
-    settingsPath.value = snap.settingsPath ?? ''
-    loaded.value = true
-  }
-
-  /**
-   * 保存一组覆盖（同 PATCH 语义；值为 null 表示清除该键覆盖）。
-   * @returns 服务端返回 { changed, restartRequired, effective, sources }
-   */
-  async function patch(patchMap: Record<string, unknown | null>): Promise<{ changed: string[], restartRequired: string[], effective: Record<string, unknown> }> {
-    const http = useHttp()
-    const env = await http.request<{ data: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }>({
-      method: 'PATCH',
-      url: '/system/settings',
-      data: { override: patchMap },
-    })
-    const res = ((env as { data?: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }).data != null
-      ? (env as { data: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }).data
-      : env as unknown as { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> })
-    if (res.effective) effective.value = res.effective
-    if (res.sources) sources.value = res.sources
-    return res
-  }
-
-  /** 清空全部运行时覆盖（回落 config.yml） */
-  async function resetAll(): Promise<{ changed: string[], restartRequired: string[] }> {
-    const http = useHttp()
-    const env = await http.post<{ data: { changed: string[], restartRequired: string[] } }>('/system/settings/reset')
-    const res = ((env as { data?: { changed: string[] } }).data ?? (env as unknown as { changed: string[] })) as { changed: string[], restartRequired: string[] }
-    if (res.changed?.length) await fetchAll()
-    return res
-  }
-
-  /* ---------------- SSE 订阅（fetch-based，携带 Authorization 头） ---------------- */
-  let controller: AbortController | null = null
-
-  function startEvents(): void {
-    stopEvents()
-    if (!import.meta.client) return
-    const rt = useRuntimeConfig().public
-    const base = (rt.apiBase as string) || '/api'
-    const token = useCookie<string | null>('token').value ?? ''
-    controller = new AbortController()
-
-    void (async () => {
-      try {
-        const res = await fetch(`${base}/system/settings/events`, {
-          headers: token ? { Authorization: `Bearer ${token}` } : {},
-          signal: controller?.signal,
-        })
-        if (!res.ok || !res.body) return
-        const reader = res.body.getReader()
-        const decoder = new TextDecoder()
-        let buf = ''
-        try {
-          for (;;) {
-            const { done, value } = await reader.read()
-            if (done) break
-            buf += decoder.decode(value, { stream: true })
-            let idx
-            while ((idx = buf.indexOf('\n\n')) >= 0) {
-              const chunk = buf.slice(0, idx)
-              buf = buf.slice(idx + 2)
-              const dataLine = chunk.split('\n').find(l => l.startsWith('data:'))
-              if (!dataLine) continue
-              const raw = dataLine.slice(5).trim()
-              if (!raw) continue
-              try {
-                applyEvent(JSON.parse(raw) as SettingsEvent)
-              }
-              catch { /* 非法载荷忽略 */ }
-            }
-          }
-        }
-        catch (err) {
-          if ((err as Error)?.name !== 'AbortError') console.warn('[runtime-config] SSE 读取中断:', err)
-        }
-      }
-      catch (err) {
-        if ((err as Error)?.name !== 'AbortError') console.warn('[runtime-config] SSE 连接失败:', err)
-      }
-    })()
-  }
-
-  function applyEvent(ev: SettingsEvent): void {
-    lastEvent.value = ev
-    if (ev.effective) effective.value = ev.effective
-    if (ev.sources) sources.value = ev.sources
-    if (ev.overrides) overrides.value = ev.overrides
-  }
-
-  function stopEvents(): void {
-    if (controller) {
-      controller.abort()
-      controller = null
-    }
-  }
-
-  return {
-    descriptors,
-    effective,
-    overrides,
-    sources,
-    settingsPath,
-    loaded,
-    loading,
-    lastEvent,
-    groups,
-    sourceOf,
-    valueOf,
-    fetchAll,
-    patch,
-    resetAll,
-    startEvents,
-    stopEvents,
-  }
-})
+/**
+ * 运行时配置 Store —— 前端设置持久化 + 热重载的枢纽。
+ *
+ * - fetchAll(): GET /api/system/settings（描述符驱动的表单数据源）
+ * - patch()   : PATCH /api/system/settings（持久化 + 服务端热应用 + SSE 广播）
+ * - reset()   : POST /api/system/settings/reset
+ * - startEvents(): fetch + ReadableStream 订阅 SSE，服务端任意写入（UI/CLI/文件监听）都实时同步
+ *
+ * 与服务端 SystemConfigService 同源（shared/config/schema.json 描述符），
+ * 前端看到的值永远等于服务端内存视图。
+ */
+import { useCookie, useRuntimeConfig } from '#imports'
+import { useHttp } from '~/composables/useHttp'
+
+export interface SettingsDescriptor {
+  key: string
+  type: 'string' | 'number' | 'boolean' | 'color' | 'select'
+  group: string
+  label: string
+  labelKey?: string
+  description?: string
+  applies: 'live' | 'restart'
+  default?: unknown
+  min?: number
+  max?: number
+  options?: string[]
+}
+
+interface Snapshot {
+  descriptors: SettingsDescriptor[]
+  effective: Record<string, unknown>
+  overrides: Record<string, unknown>
+  sources: Record<string, string>
+  settingsPath: string
+}
+
+interface SettingsEvent {
+  type: 'config:changed' | 'config:reset' | 'config:reloaded'
+  changed: string[]
+  restartRequired: string[]
+  effective: Record<string, unknown>
+  sources: Record<string, string>
+  overrides: Record<string, unknown>
+}
+
+export const useRuntimeConfigStore = defineStore('runtime-config', () => {
+  const descriptors = ref<SettingsDescriptor[]>([])
+  const effective = ref<Record<string, unknown>>({})
+  const overrides = ref<Record<string, unknown>>({})
+  const sources = ref<Record<string, string>>({})
+  const settingsPath = ref('')
+  const loaded = ref(false)
+  const loading = ref(false)
+  const lastEvent = ref<SettingsEvent | null>(null)
+
+  // 分组后的设置项（computed：按 schema.json group 保持声明顺序）
+  const groups = computed(() => {
+    const out: Array<{ group: string, items: SettingsDescriptor[] }> = []
+    for (const d of descriptors.value) {
+      const g = out.find(x => x.group === d.group)
+      if (g) g.items.push(d)
+      else out.push({ group: d.group, items: [d] })
+    }
+    return out
+  })
+
+  function sourceOf(key: string): string {
+    return sources.value[key] ?? 'config.yml'
+  }
+
+  /** 取某键当前有效值 */
+  function valueOf(key: string): unknown {
+    return effective.value[key]
+  }
+
+  async function fetchAll(): Promise<void> {
+    loading.value = true
+    try {
+      const http = useHttp()
+      const env = await http.get<{ data: Snapshot }>('/system/settings')
+      applySnapshot((env as { data?: Snapshot }).data ?? (env as unknown as Snapshot))
+    }
+    catch (err) {
+      // 未登录 / 服务未就绪：保持未加载，UI 显示占位
+      console.warn('[runtime-config] 读取设置失败:', err)
+    }
+    finally {
+      loading.value = false
+    }
+  }
+
+  function applySnapshot(snap: Snapshot): void {
+    descriptors.value = snap.descriptors ?? []
+    effective.value = snap.effective ?? {}
+    overrides.value = snap.overrides ?? {}
+    sources.value = snap.sources ?? {}
+    settingsPath.value = snap.settingsPath ?? ''
+    loaded.value = true
+  }
+
+  /**
+   * 保存一组覆盖（同 PATCH 语义；值为 null 表示清除该键覆盖）。
+   * @returns 服务端返回 { changed, restartRequired, effective, sources }
+   */
+  async function patch(patchMap: Record<string, unknown | null>): Promise<{ changed: string[], restartRequired: string[], effective: Record<string, unknown> }> {
+    const http = useHttp()
+    const env = await http.request<{ data: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }>({
+      method: 'PATCH',
+      url: '/system/settings',
+      data: { override: patchMap },
+    })
+    const res = ((env as { data?: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }).data != null
+      ? (env as { data: { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> } }).data
+      : env as unknown as { ok: boolean, changed: string[], restartRequired: string[], effective: Record<string, unknown>, sources: Record<string, string> })
+    if (res.effective) effective.value = res.effective
+    if (res.sources) sources.value = res.sources
+    return res
+  }
+
+  /** 清空全部运行时覆盖（回落 config.yml） */
+  async function resetAll(): Promise<{ changed: string[], restartRequired: string[] }> {
+    const http = useHttp()
+    const env = await http.post<{ data: { changed: string[], restartRequired: string[] } }>('/system/settings/reset')
+    const res = ((env as { data?: { changed: string[] } }).data ?? (env as unknown as { changed: string[] })) as { changed: string[], restartRequired: string[] }
+    if (res.changed?.length) await fetchAll()
+    return res
+  }
+
+  /* ---------------- SSE 订阅（fetch-based，携带 Authorization 头） ---------------- */
+  let controller: AbortController | null = null
+
+  function startEvents(): void {
+    stopEvents()
+    if (!import.meta.client) return
+    const rt = useRuntimeConfig().public
+    const base = (rt.apiBase as string) || '/api'
+    const token = useCookie<string | null>('token').value ?? ''
+    controller = new AbortController()
+
+    void (async () => {
+      try {
+        const res = await fetch(`${base}/system/settings/events`, {
+          headers: token ? { Authorization: `Bearer ${token}` } : {},
+          signal: controller?.signal,
+        })
+        if (!res.ok || !res.body) return
+        const reader = res.body.getReader()
+        const decoder = new TextDecoder()
+        let buf = ''
+        try {
+          for (;;) {
+            const { done, value } = await reader.read()
+            if (done) break
+            buf += decoder.decode(value, { stream: true })
+            let idx
+            while ((idx = buf.indexOf('\n\n')) >= 0) {
+              const chunk = buf.slice(0, idx)
+              buf = buf.slice(idx + 2)
+              const dataLine = chunk.split('\n').find(l => l.startsWith('data:'))
+              if (!dataLine) continue
+              const raw = dataLine.slice(5).trim()
+              if (!raw) continue
+              try {
+                applyEvent(JSON.parse(raw) as SettingsEvent)
+              }
+              catch { /* 非法载荷忽略 */ }
+            }
+          }
+        }
+        catch (err) {
+          if ((err as Error)?.name !== 'AbortError') console.warn('[runtime-config] SSE 读取中断:', err)
+        }
+      }
+      catch (err) {
+        if ((err as Error)?.name !== 'AbortError') console.warn('[runtime-config] SSE 连接失败:', err)
+      }
+    })()
+  }
+
+  function applyEvent(ev: SettingsEvent): void {
+    lastEvent.value = ev
+    if (ev.effective) effective.value = ev.effective
+    if (ev.sources) sources.value = ev.sources
+    if (ev.overrides) overrides.value = ev.overrides
+  }
+
+  function stopEvents(): void {
+    if (controller) {
+      controller.abort()
+      controller = null
+    }
+  }
+
+  return {
+    descriptors,
+    effective,
+    overrides,
+    sources,
+    settingsPath,
+    loaded,
+    loading,
+    lastEvent,
+    groups,
+    sourceOf,
+    valueOf,
+    fetchAll,
+    patch,
+    resetAll,
+    startEvents,
+    stopEvents,
+  }
+})

package/config.yml

@@ -1,70 +1,77 @@
-# ============================================================
-# AgentWorkShop 运行配置 —— 单一事实来源（Single Source of Truth）
-# ------------------------------------------------------------
-# 本文件由 nuxt.config.ts（构建/开发期）与 scripts/start.mjs（生产启动期）
-# 读取并解析，驱动整个运行时。修改后重启对应模式即可生效：
-#   开发：pnpm dev     -> 读取 server.dev
-#   生产：pnpm start   -> 读取 server.prod
-# ============================================================
-
-app:
-  name: AgentWorkShop
-  title: AgentWorkShop
-  version: 0.2.0
-  description: 基于 Nuxt 4 的配置驱动运行范式
-
-# 运行模式（dev/prod 实际由启动命令决定，此处仅作运行时展示）
-mode: dev
-
-# ------------------------------------------------------------
-# 服务端口：dev 与 prod 可分别自定义
-# ------------------------------------------------------------
-server:
-  host: 0.0.0.0
-  dev:
-    port: 3000
-  prod:
-    port: 3001
-
-# 后端 API（前端 axios 基址 + 服务端行为均由本段驱动）
-api:
-  baseURL: /api
-  timeout: 15000
-  pageSize: 20      # 服务端默认分页大小
-  maxPageSize: 100  # 服务端分页大小上限
-
-# 国际化
-i18n:
-  defaultLocale: zh-CN
-  locales:
-    - code: zh-CN
-      name: 简体中文
-    - code: en
-      name: English
-
-# 主题
-theme:
-  # Agent Harness · Digital Twin 控制室色板:品牌绿(交互/确认/DAQ)+ 数据青,见 TownView.vue --hud-*
-  primaryColor: "#35e0a0"
-  mode: light # light | dark
-
-# 安全配置
-# 数据采集基础设施(数采 DAQ;地址与 docker-compose.yml 默认一致)
-# startInfrastructure: never=启动探测,不通且有 Docker 则自动 docker compose 拉起;
-#   always=仅 Docker 拉起;never=只直连。连接失败降级并警告,可前端一键重连。
-daq:
-  startInfrastructure: auto
-  mqtt:
-    host: 127.0.0.1
-    port: 1883
-  timescale:
-    host: 127.0.0.1
-    port: 5432
-    user: postgres
-    password: awshop
-    database: awshop
-
-security:
-  # Session cookie 加密密钥（nuxt-auth-utils 使用）
-  # 生产环境必须修改为强随机值；可用环境变量 NUXT_SESSION_PASSWORD 覆盖
-  sessionPassword: awshop-dev-secret-change-me-0123456789
+# ============================================================
+# AgentWorkShop 运行配置 —— 单一事实来源（Single Source of Truth）
+# ------------------------------------------------------------
+# 本文件由 nuxt.config.ts（构建/开发期）与 scripts/start.mjs（生产启动期）
+# 读取并解析，驱动整个运行时。修改后重启对应模式即可生效：
+#   开发：pnpm dev     -> 读取 server.dev
+#   生产：pnpm start   -> 读取 server.prod
+# ============================================================
+
+app:
+  name: AgentWorkShop
+  title: AgentWorkShop
+  version: 0.2.0
+  description: 基于 Nuxt 4 的配置驱动运行范式
+
+# 运行模式（dev/prod 实际由启动命令决定，此处仅作运行时展示）
+mode: dev
+
+# ------------------------------------------------------------
+# 服务端口：dev 与 prod 可分别自定义
+# ------------------------------------------------------------
+server:
+  host: 0.0.0.0
+  dev:
+    port: 3000
+  prod:
+    port: 3001
+
+# 后端 API（前端 axios 基址 + 服务端行为均由本段驱动）
+api:
+  baseURL: /api
+  timeout: 15000
+  pageSize: 20      # 服务端默认分页大小
+  maxPageSize: 100  # 服务端分页大小上限
+
+# 国际化
+i18n:
+  defaultLocale: zh-CN
+  locales:
+    - code: zh-CN
+      name: 简体中文
+    - code: en
+      name: English
+
+# 主题
+theme:
+  # Agent Harness · Digital Twin 控制室色板:品牌绿(交互/确认/DAQ)+ 数据青,见 TownView.vue --hud-*
+  primaryColor: "#35e0a0"
+  mode: light # light | dark
+
+# 安全配置
+# 数据采集基础设施(数采 DAQ;地址与 docker-compose.yml 默认一致)
+# startInfrastructure: never=启动探测,不通且有 Docker 则自动 docker compose 拉起;
+#   always=仅 Docker 拉起;never=只直连。连接失败降级并警告,可前端一键重连。
+daq:
+  startInfrastructure: auto
+  mqtt:
+    host: 127.0.0.1
+    port: 1883
+  timescale:
+    host: 127.0.0.1
+    port: 5432
+    user: postgres
+    password: awshop
+    database: awshop
+  # 对象存储(图像帧;MinIO,S3 兼容)。不可达时自动降级本地磁盘 data/daq-objects/,采集不中断。
+  objectstore:
+    host: 127.0.0.1
+    port: 9000
+    accessKey: awshop
+    secretKey: awshop-secret
+    bucket: daq
+
+security:
+  # Session cookie 加密密钥（nuxt-auth-utils 使用）
+  # 生产环境必须修改为强随机值；可用环境变量 NUXT_SESSION_PASSWORD 覆盖
+  sessionPassword: awshop-dev-secret-change-me-0123456789

package/docker-compose.yml

@@ -2,9 +2,10 @@
 # AgentWorkShop 数采基础设施(DAQ infrastructure)
 # ------------------------------------------------------------
 # 与 config.yml `daq:` 段默认一致;项目启动时若端口不通且存在 Docker,
-# 服务端自动执行 `docker compose up -d daq-mosquitto daq-timescale`。
+# 服务端自动执行 `docker compose up -d daq-mosquitto daq-timescale daq-minio`。
 #   - daq-mosquitto:标准 MQTT 3.1.1/5 broker(数采下沉队列)
-#   - daq-timescale:TimescaleDB(时序数据持久化;named volume 常驻)
+#   - daq-timescale:TimescaleDB(时序数据/帧元数据持久化;named volume 常驻)
+#   - daq-minio:    S3 兼容对象存储(图像帧像素;named volume 常驻)
 # 手动启动:docker compose up -d
 # ============================================================
 services:
@@ -30,5 +31,21 @@ services:
       - awshop-daq-tsdata:/var/lib/postgresql/data
     restart: unless-stopped
 
+  daq-minio:
+    image: minio/minio:latest
+    container_name: awshop-daq-minio
+    # S3 兼容对象存储:图像帧像素落这里,Timescale 只存元数据(daq_frames.meta.objectKey)
+    command: ["server", "/data", "--console-address", ":9001"]
+    environment:
+      MINIO_ROOT_USER: awshop            # config.yml daq.objectstore.accessKey
+      MINIO_ROOT_PASSWORD: awshop-secret # config.yml daq.objectstore.secretKey
+    ports:
+      - "9000:9000"                  # S3 API(与 config.yml daq.objectstore.port 一致)
+      - "9001:9001"                  # Web 控制台(开发态观察用)
+    volumes:
+      - awshop-daq-objdata:/data
+    restart: unless-stopped
+
 volumes:
   awshop-daq-tsdata:
+  awshop-daq-objdata: