Merge pull request #7 from 4627488/feat/monitor-arena-view

Author: undefined-moe

README.md

@@ -103,6 +103,37 @@ const serverSchema = Schema.intersect([
 #### Commands
 服务支持通过 `ssh` 执行命令，如您需要执行命令，内置的命令分别为 重启、根据 `config.seatFile` 选手座位绑定文件更新选手机机器名称、显示选手机座位信息。如您需要执行其他命令，请直接在 UI 界面中输入指令，系统会自动向所有选手机发送指令，并返回结果。
 
+#### Arena Layouts
+监视大屏的座位图布局可在 Arena View 中通过 **Import JSON** 导入，数据会保存在浏览器 `localStorage` 中，无需重启或重新构建即可生效。
+- 顶层字段：`id`（唯一标识，缺省使用文件名）、`name`、`description`(可选)、`seatKey`(默认匹配 `hostname`)、`normalize`(`none`/`upper`/`lower`/`trim`/`trim-upper`/`trim-lower`)、`default`(可选，用于默认选中)、`sections`。
+- `sections` 数组中的每个对象需包含 `grid` 二维数组（元素只能是座位号字符串或 `null` 表示空位），可选字段包括 `title`、`rowLabels`、`seatSize`、`gapSize`、`meta` 等。
+- 同一个 JSON 可携带一个布局对象或布局数组，`default: true` 的布局会在导入后默认选中，可随时使用 **Clear Layouts** 清除本地缓存。
+
+```json
+{
+  "id": "sample-layout",
+  "name": "Sample Venue",
+  "description": "Short note shown in the selector",
+  "seatKey": "hostname",
+  "normalize": "trim-upper",
+  "default": true,
+  "sections": [
+    {
+      "id": "main-hall",
+      "title": "Main Hall",
+      "rowLabels": ["3", "2", "1"],
+      "seatSize": 40,
+      "gapSize": 10,
+      "grid": [
+        ["A0301", "A0302", null],
+        ["A0201", null, "A0203"],
+        ["A0101", "A0102", "A0103"]
+      ]
+    }
+  ]
+}
+```
+
 ### Client
 
 Client 端分为打印代码和打印小票两个功能，支持 Windows, Linux, macOS 三大平台，支持打印机自动检测，支持自动分散打印机任务，为了方便使用， Server 与 Client 一同打包为单文件，启动时仅需添加 `--client` 参数即可启动 Client 。

packages/server/handler/monitor.ts

@@ -102,36 +102,47 @@ async function saveMonitorInfo(ctx: Context, monitor: any, config) {
     const {
         mac, version, uptime, seats, ip,
         os, kernel, cpu, cpuused, mem, memused, load,
+        wifi_signal, wifi_bssid,
         window_cmdline, window_exe, window_name,
     } = monitor;
     logger.debug('save monitor info %o', monitor);
     actions.write(`${Date.now()},${seats},"${escape(window_cmdline)}","${escape(window_exe)}","${escape(window_name)}"\n`);
     const monitors = await ctx.db.monitor.find({ mac });
     const warn = monitors.length > 1 || (monitors.length && monitors[0].ip !== ip);
     if (warn) ctx.logger('monitor').warn(`Duplicate monitor ${mac} from (${ip}, ${monitors.length ? monitors[0].ip : 'null'})`);
+    const hasWifiSignal = wifi_signal !== undefined && wifi_signal !== '';
+    const wifiSignalValue = hasWifiSignal ? Number.parseFloat(String(wifi_signal)) : Number.NaN;
+    const normalizedBssid = typeof wifi_bssid === 'string' ? wifi_bssid.trim() : '';
+    const shouldSetBssid = normalizedBssid && !/^not-?associated$/i.test(normalizedBssid);
     const autoGroupPayload = (config.autoGroup && /^[A-Z][0-9]+$/.test(seats)) ? {
         group: seats[0],
         name: seats,
     } : {};
-    await ctx.db.monitor.updateOne({ mac }, {
-        $set: {
-            mac,
-            ip,
-            version,
-            uptime,
-            hostname: seats,
-            oldMonitor: true,
-            updateAt: new Date().getTime(),
-            ...os && { os },
-            ...kernel && { kernel },
-            ...cpu && { cpu: cpu.replaceAll('_', ' ') },
-            ...cpuused && { cpuUsed: cpuused },
-            ...mem && { mem },
-            ...mem && { memUsed: memused },
-            ...load && { load },
-            ...autoGroupPayload,
-        },
-    }, { upsert: true });
+    const setPayload: Record<string, any> = {
+        mac,
+        ip,
+        version,
+        uptime,
+        hostname: seats,
+        oldMonitor: true,
+        updateAt: new Date().getTime(),
+        ...os && { os },
+        ...kernel && { kernel },
+        ...cpu && { cpu: cpu.replaceAll('_', ' ') },
+        ...cpuused && { cpuUsed: cpuused },
+        ...mem && { mem },
+        ...mem && { memUsed: memused },
+        ...load && { load },
+        ...(hasWifiSignal && !Number.isNaN(wifiSignalValue) && { wifiSignal: wifiSignalValue }),
+        ...(shouldSetBssid && { wifiBssid: normalizedBssid.toUpperCase() }),
+        ...autoGroupPayload,
+    };
+    const unsetPayload: Record<string, 1> = {};
+    if (!hasWifiSignal || Number.isNaN(wifiSignalValue)) unsetPayload.wifiSignal = 1;
+    if (!shouldSetBssid) unsetPayload.wifiBssid = 1;
+    const updateDoc: Record<string, any> = { $set: setPayload };
+    if (Object.keys(unsetPayload).length) updateDoc.$unset = unsetPayload;
+    await ctx.db.monitor.updateOne({ mac }, updateDoc, { upsert: true });
 }
 
 export const Config = Schema.object({

packages/server/interface.ts

@@ -46,6 +46,8 @@ export interface MonitorDoc {
     memoryUsed?: number;
     camera?: string;
     desktop?: string;
+    wifiSignal?: number;
+    wifiBssid?: string;
 }
 
 export interface CommandTask {

packages/ui/app/arena/types.ts

@@ -0,0 +1,28 @@
+export type ArenaNormalizerId =
+  | 'none'
+  | 'upper'
+  | 'lower'
+  | 'trim'
+  | 'trim-upper'
+  | 'trim-lower';
+
+export interface ArenaLayoutSectionDocument {
+  id: string;
+  title?: string;
+  rowLabels?: (string | null)[];
+  grid: (string | null)[][];
+  seatSize?: number;
+  gapSize?: number;
+  meta?: Record<string, unknown>;
+}
+
+export interface ArenaLayoutDocument {
+  id: string;
+  name: string;
+  description?: string;
+  seatKey?: string;
+  normalize?: ArenaNormalizerId | string;
+  default?: boolean;
+  sections: ArenaLayoutSectionDocument[];
+  meta?: Record<string, unknown>;
+}