dg-lab-mcp-sse-server 1.0.3 → 1.1.3

package/README.md

@@ -10,6 +10,7 @@
 - **波形管理**: 支持解析、保存、发送 DG-LAB 波形数据
 - **持续播放**: 支持波形持续循环播放
 - **会话管理**: 支持设备别名、多设备管理
+- **断线重连**: 设备断开后保留会话，支持在超时时间内重连而不丢失设置
 
 ## 安装
 
@@ -69,7 +70,8 @@ PORT=8080 npx dg-lab-mcp-sse-server
       "env": {
         "PUBLIC_IP": "your.public.ip",
         "PORT": "3323",
-        "CONNECTION_TIMEOUT_MINUTES": "10"
+        "CONNECTION_TIMEOUT_MINUTES": "10",
+        "RECONNECTION_TIMEOUT_MINUTES": "5"
       }
     }
   }
@@ -87,10 +89,28 @@ PORT=8080 npx dg-lab-mcp-sse-server
 | `SSE_PATH` | /sse | SSE 端点路径 |
 | `POST_PATH` | /message | POST 端点路径 |
 | `CONNECTION_TIMEOUT_MINUTES` | 5 | 未绑定设备的超时时间（分钟） |
+| `RECONNECTION_TIMEOUT_MINUTES` | 5 | 已绑定设备断开后的重连等待时间（分钟），超时后会话将被删除 |
 | `HEARTBEAT_INTERVAL` | 30000 | WebSocket 心跳间隔 (ms) |
 | `STALE_DEVICE_TIMEOUT` | 3600000 | 设备活跃超时 (ms)，默认 1 小时 |
 | `WAVEFORM_STORE_PATH` | ./data/waveforms.json | 波形存储路径 |
 
+## 会话管理机制
+
+### 连接超时 (CONNECTION_TIMEOUT_MINUTES)
+- 创建设备后，如果在指定时间内未完成 APP 绑定，会话将自动销毁
+- 默认 5 分钟，可通过环境变量配置
+
+### 重连超时 (RECONNECTION_TIMEOUT_MINUTES)
+- 已绑定的设备断开连接后，会话会保留一段时间等待重连
+- 在此期间设备可以重新连接而不丢失设置（强度、波形等）
+- 超时后会话将被自动删除
+- 默认 5 分钟，可通过环境变量配置
+- **注意**: 未绑定的设备断开后会立即删除，不会等待重连
+
+### 状态查询
+- 使用 `dg_list_devices` 可以看到设备的连接状态和剩余重连时间
+- 使用 `dg_get_device_status` 可以获取详细的连接信息，包括 `disconnectedAt` 和 `reconnectionTimeRemaining`
+
 ## 使用流程
 
 1. **创建设备**: 调用 `dg_create_device` 获取二维码内容

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAuC,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAwB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAiB,MAAM,oBAAoB,CAAC;AAGpE;;GAEG;AACH,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,aAAa,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,IAAI,GAAG,CA+C/B;AA4HD;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBtD"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAuC,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAwB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAiB,MAAM,oBAAoB,CAAC;AAGpE;;GAEG;AACH,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,aAAa,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,IAAI,GAAG,CAkD/B;AA4HD;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBtD"}

package/dist/cli.js

@@ -91,7 +91,8 @@ function loadConfig() {
     waveformStorePath: getEnvString("WAVEFORM_STORE_PATH", "./data/waveforms.json"),
     heartbeatInterval: getEnvNumber("HEARTBEAT_INTERVAL", 3e4),
     staleDeviceTimeout: getEnvNumber("STALE_DEVICE_TIMEOUT", 36e5),
-    connectionTimeoutMinutes: getEnvNumber("CONNECTION_TIMEOUT_MINUTES", 5)
+    connectionTimeoutMinutes: getEnvNumber("CONNECTION_TIMEOUT_MINUTES", 5),
+    reconnectionTimeoutMinutes: getEnvNumber("RECONNECTION_TIMEOUT_MINUTES", 5)
   };
   validateConfig(config);
   return config;
@@ -146,6 +147,12 @@ function validateConfig(config) {
       context: { connectionTimeoutMinutes: config.connectionTimeoutMinutes }
     });
   }
+  if (config.reconnectionTimeoutMinutes < 1 || config.reconnectionTimeoutMinutes > 60) {
+    throw new ConfigError(`\u91CD\u8FDE\u8D85\u65F6\u65F6\u95F4\u65E0\u6548: ${config.reconnectionTimeoutMinutes}\uFF0C\u5FC5\u987B\u5728 1-60 \u5206\u949F\u8303\u56F4\u5185`, {
+      code: "CONFIG_LOAD_FAILED" /* CONFIG_LOAD_FAILED */,
+      context: { reconnectionTimeoutMinutes: config.reconnectionTimeoutMinutes }
+    });
+  }
 }
 var configInstance = null;
 function getConfig() {
@@ -754,10 +761,14 @@ var SessionManager = class {
   cleanupTimer = null;
   /** 连接超时时间（毫秒） */
   connectionTimeoutMs;
-  constructor(connectionTimeoutMinutes = 5) {
+  /** 重连超时时间（毫秒） */
+  reconnectionTimeoutMs;
+  constructor(connectionTimeoutMinutes = 5, reconnectionTimeoutMinutes = 5) {
     this.connectionTimeoutMs = connectionTimeoutMinutes * 60 * 1e3;
+    this.reconnectionTimeoutMs = reconnectionTimeoutMinutes * 60 * 1e3;
     this.startCleanupTimer();
     console.log(`[\u4F1A\u8BDD] \u8FDE\u63A5\u8D85\u65F6\u8BBE\u7F6E: ${connectionTimeoutMinutes} \u5206\u949F`);
+    console.log(`[\u4F1A\u8BDD] \u91CD\u8FDE\u8D85\u65F6\u8BBE\u7F6E: ${reconnectionTimeoutMinutes} \u5206\u949F`);
   }
   /**
    * 创建新的设备会话
@@ -785,7 +796,9 @@ var SessionManager = class {
       strengthLimitB: 200,
       lastActive: now,
       createdAt: now,
-      connectionTimeoutId: null
+      connectionTimeoutId: null,
+      reconnectionTimeoutId: null,
+      disconnectedAt: null
     };
     session.connectionTimeoutId = setTimeout(() => {
       const currentSession = this.sessions.get(deviceId);
@@ -858,6 +871,10 @@ var SessionManager = class {
         clearTimeout(session.connectionTimeoutId);
         session.connectionTimeoutId = null;
       }
+      if (session.reconnectionTimeoutId) {
+        clearTimeout(session.reconnectionTimeoutId);
+        session.reconnectionTimeoutId = null;
+      }
       if (session.ws) {
         try {
           session.ws.close();
@@ -985,6 +1002,83 @@ var SessionManager = class {
     }
     return false;
   }
+  /**
+   * 处理设备断开连接
+   * 
+   * 如果设备已绑定，启动重连超时计时器并保留会话。
+   * 如果设备未绑定，立即删除会话。
+   * 
+   * @param deviceId - 设备 ID
+   * @returns 是否保留会话等待重连（true=保留，false=已删除）
+   */
+  handleDisconnection(deviceId) {
+    const session = this.sessions.get(deviceId);
+    if (!session) return false;
+    if (session.connectionTimeoutId) {
+      clearTimeout(session.connectionTimeoutId);
+      session.connectionTimeoutId = null;
+    }
+    if (!session.boundToApp) {
+      console.log(`[\u4F1A\u8BDD] \u672A\u7ED1\u5B9A\u8BBE\u5907\u65AD\u5F00: ${deviceId}\uFF0C\u7ACB\u5373\u5220\u9664`);
+      this.deleteSession(deviceId);
+      return false;
+    }
+    session.connected = false;
+    session.disconnectedAt = /* @__PURE__ */ new Date();
+    session.ws = null;
+    session.reconnectionTimeoutId = setTimeout(() => {
+      const currentSession = this.sessions.get(deviceId);
+      if (currentSession && !currentSession.connected) {
+        console.log(`[\u4F1A\u8BDD] \u91CD\u8FDE\u8D85\u65F6: ${deviceId} (${this.reconnectionTimeoutMs / 6e4} \u5206\u949F\u5185\u672A\u91CD\u8FDE)`);
+        this.deleteSession(deviceId);
+      }
+    }, this.reconnectionTimeoutMs);
+    console.log(`[\u4F1A\u8BDD] \u8BBE\u5907\u65AD\u5F00: ${deviceId}\uFF0C\u7B49\u5F85\u91CD\u8FDE (${this.reconnectionTimeoutMs / 6e4} \u5206\u949F)`);
+    return true;
+  }
+  /**
+   * 处理设备重新连接
+   * 
+   * 恢复会话到已连接状态，取消重连超时计时器。
+   * 保留所有会话数据（别名、强度等）。
+   * 
+   * @param deviceId - 设备 ID
+   * @param ws - 新的 WebSocket 连接
+   * @param clientId - WebSocket 服务器分配的新 clientId
+   * @returns 是否成功重连
+   */
+  handleReconnection(deviceId, ws, clientId) {
+    const session = this.sessions.get(deviceId);
+    if (!session) return false;
+    if (session.reconnectionTimeoutId) {
+      clearTimeout(session.reconnectionTimeoutId);
+      session.reconnectionTimeoutId = null;
+    }
+    session.ws = ws;
+    session.clientId = clientId;
+    session.connected = true;
+    session.disconnectedAt = null;
+    session.lastActive = /* @__PURE__ */ new Date();
+    console.log(`[\u4F1A\u8BDD] \u8BBE\u5907\u91CD\u8FDE\u6210\u529F: ${deviceId}`);
+    return true;
+  }
+  /**
+   * 获取剩余重连时间
+   * 
+   * 计算设备断开后还有多少时间可以重连。
+   * 
+   * @param deviceId - 设备 ID
+   * @returns 剩余时间（毫秒），如果设备已连接或不存在则返回 null
+   */
+  getReconnectionTimeRemaining(deviceId) {
+    const session = this.sessions.get(deviceId);
+    if (!session || session.connected || !session.disconnectedAt) {
+      return null;
+    }
+    const elapsed = Date.now() - session.disconnectedAt.getTime();
+    const remaining = this.reconnectionTimeoutMs - elapsed;
+    return remaining > 0 ? remaining : 0;
+  }
   /**
    * 获取当前会话数量
    */
@@ -1059,6 +1153,9 @@ var SessionManager = class {
       if (session.connectionTimeoutId) {
         clearTimeout(session.connectionTimeoutId);
       }
+      if (session.reconnectionTimeoutId) {
+        clearTimeout(session.reconnectionTimeoutId);
+      }
       if (session.ws) {
         try {
           session.ws.close();
@@ -1071,13 +1168,8 @@ var SessionManager = class {
 };
 
 // src/ws-server.ts
-import { WebSocketServer, WebSocket as WebSocket2 } from "ws";
+import { WebSocketServer, WebSocket } from "ws";
 import { v4 as uuidv43 } from "uuid";
-
-// src/ws-bridge.ts
-import WebSocket from "ws";
-
-// src/ws-server.ts
 var DGLabWSServer = class {
   wss = null;
   clients = /* @__PURE__ */ new Map();
@@ -1385,7 +1477,7 @@ var DGLabWSServer = class {
   }
   /** 发送消息到 WebSocket */
   send(ws, msg) {
-    if (ws.readyState === WebSocket2.OPEN) {
+    if (ws.readyState === WebSocket.OPEN) {
       ws.send(JSON.stringify(msg));
     }
   }
@@ -1408,7 +1500,7 @@ var DGLabWSServer = class {
   /** 创建内部控制器的模拟 WebSocket */
   createMockWebSocket(clientId) {
     return {
-      readyState: WebSocket2.OPEN,
+      readyState: WebSocket.OPEN,
       send: (data) => {
         console.log(`[WS \u670D\u52A1\u5668] \u53D1\u9001\u7ED9\u63A7\u5236\u5668 ${clientId}: ${data}`);
       },
@@ -1475,7 +1567,7 @@ var DGLabWSServer = class {
     }
     if (client.boundTo) {
       const appClient = this.clients.get(client.boundTo);
-      if (appClient && appClient.ws.readyState === WebSocket2.OPEN) {
+      if (appClient && appClient.ws.readyState === WebSocket.OPEN) {
         this.send(appClient.ws, {
           type: "break",
           clientId: controllerId,
@@ -1491,7 +1583,7 @@ var DGLabWSServer = class {
         this.options.onBindChange(controllerId, null);
       }
     }
-    if (client.ws.readyState === WebSocket2.OPEN) {
+    if (client.ws.readyState === WebSocket.OPEN) {
       client.ws.close(1e3, "Disconnected by user");
     }
     this.clients.delete(controllerId);
@@ -1720,6 +1812,7 @@ function registerDeviceTools(toolManager, sessionManager, wsServer, publicIp) {
 - boundToApp: APP\u662F\u5426\u5DF2\u626B\u7801\u7ED1\u5B9A\uFF08\u5FC5\u987B\u4E3Atrue\u624D\u80FD\u63A7\u5236\u8BBE\u5907\uFF09
 - strengthA/B: \u5F53\u524DA/B\u901A\u9053\u5F3A\u5EA6(0-200)
 - strengthLimitA/B: A/B\u901A\u9053\u5F3A\u5EA6\u4E0A\u9650\uFF08\u7531APP\u8BBE\u7F6E\uFF09
+- reconnectionTimeRemaining: \u5269\u4F59\u91CD\u8FDE\u65F6\u95F4\uFF08\u79D2\uFF09\uFF0C\u4EC5\u5728\u8BBE\u5907\u65AD\u5F00\u65F6\u663E\u793A\uFF0Cnull\u8868\u793A\u8BBE\u5907\u5DF2\u8FDE\u63A5
 \u53EF\u9009\u53C2\u6570alias\u7528\u4E8E\u6309\u522B\u540D\u8FC7\u6EE4\u8BBE\u5907\u3002`,
     {
       type: "object",
@@ -1739,6 +1832,8 @@ function registerDeviceTools(toolManager, sessionManager, wsServer, publicIp) {
       }
       const devices = sessions.map((s) => {
         const isBound = s.clientId ? wsServer.isControllerBound(s.clientId) : false;
+        const reconnectionTimeRemaining = sessionManager.getReconnectionTimeRemaining(s.deviceId);
+        const reconnectionTimeRemainingSeconds = reconnectionTimeRemaining !== null ? Math.ceil(reconnectionTimeRemaining / 1e3) : null;
         return {
           deviceId: s.deviceId,
           alias: s.alias,
@@ -1747,7 +1842,8 @@ function registerDeviceTools(toolManager, sessionManager, wsServer, publicIp) {
           strengthA: s.strengthA,
           strengthB: s.strengthB,
           strengthLimitA: s.strengthLimitA,
-          strengthLimitB: s.strengthLimitB
+          strengthLimitB: s.strengthLimitB,
+          reconnectionTimeRemaining: reconnectionTimeRemainingSeconds
         };
       });
       return createToolResult(JSON.stringify({ devices, count: devices.length }));
@@ -1818,6 +1914,8 @@ function registerDeviceTools(toolManager, sessionManager, wsServer, publicIp) {
       const sessions = sessionManager.findByAlias(alias);
       const devices = sessions.map((s) => {
         const isBound = s.clientId ? wsServer.isControllerBound(s.clientId) : false;
+        const reconnectionTimeRemaining = sessionManager.getReconnectionTimeRemaining(s.deviceId);
+        const reconnectionTimeRemainingSeconds = reconnectionTimeRemaining !== null ? Math.ceil(reconnectionTimeRemaining / 1e3) : null;
         return {
           deviceId: s.deviceId,
           alias: s.alias,
@@ -1826,7 +1924,8 @@ function registerDeviceTools(toolManager, sessionManager, wsServer, publicIp) {
           strengthA: s.strengthA,
           strengthB: s.strengthB,
           strengthLimitA: s.strengthLimitA,
-          strengthLimitB: s.strengthLimitB
+          strengthLimitB: s.strengthLimitB,
+          reconnectionTimeRemaining: reconnectionTimeRemainingSeconds
         };
       });
       return createToolResult(
@@ -2785,8 +2884,11 @@ function registerControlTools(toolManager, sessionManager, wsServer) {
     `\u83B7\u53D6\u8BBE\u5907\u5B8C\u6574\u72B6\u6001\u4FE1\u606F\u3002
 \u5173\u952E\u5B57\u6BB5\uFF1A
 - boundToApp: \u662F\u5426\u5DF2\u7ED1\u5B9AAPP\uFF08\u5FC5\u987B\u4E3Atrue\u624D\u80FD\u63A7\u5236\u8BBE\u5907\uFF09
+- connected: \u8BBE\u5907\u662F\u5426\u5DF2\u8FDE\u63A5
 - strengthA/B: \u5F53\u524DA/B\u901A\u9053\u5F3A\u5EA6
 - strengthLimitA/B: A/B\u901A\u9053\u5F3A\u5EA6\u4E0A\u9650\uFF08\u7531APP\u8BBE\u7F6E\uFF0C\u4E0D\u53EF\u8D85\u8FC7\uFF09
+- disconnectedAt: \u8BBE\u5907\u65AD\u5F00\u8FDE\u63A5\u7684\u65F6\u95F4\u6233\uFF08\u4EC5\u5728\u65AD\u5F00\u65F6\u663E\u793A\uFF09
+- reconnectionTimeRemaining: \u5269\u4F59\u91CD\u8FDE\u65F6\u95F4\uFF08\u79D2\uFF09\uFF0C\u4EC5\u5728\u8BBE\u5907\u65AD\u5F00\u65F6\u663E\u793A
 \u5EFA\u8BAE\u5728dg_connect\u540E\u5728\u7528\u6237\u8BF4\u5DF2\u5B8C\u6210\u540E\u4F7F\u7528\u6B64\u63A5\u53E3\u68C0\u67E5boundToApp\u72B6\u6001\u3002`,
     {
       type: "object",
@@ -2805,6 +2907,8 @@ function registerControlTools(toolManager, sessionManager, wsServer) {
       if ("error" in deviceResult) return createToolError(deviceResult.error);
       const session = deviceResult.session;
       const isBound = session.clientId ? wsServer.isControllerBound(session.clientId) : false;
+      const reconnectionTimeRemaining = sessionManager.getReconnectionTimeRemaining(session.deviceId);
+      const reconnectionTimeRemainingSeconds = reconnectionTimeRemaining !== null ? Math.ceil(reconnectionTimeRemaining / 1e3) : null;
       return createToolResult(
         JSON.stringify({
           deviceId: session.deviceId,
@@ -2814,7 +2918,9 @@ function registerControlTools(toolManager, sessionManager, wsServer) {
           strengthA: session.strengthA,
           strengthB: session.strengthB,
           strengthLimitA: session.strengthLimitA,
-          strengthLimitB: session.strengthLimitB
+          strengthLimitB: session.strengthLimitB,
+          disconnectedAt: session.disconnectedAt ? session.disconnectedAt.toISOString() : null,
+          reconnectionTimeRemaining: reconnectionTimeRemainingSeconds
         })
       );
     }
@@ -3017,8 +3123,11 @@ function createApp() {
   const toolManager = new ToolManager(() => {
     broadcastNotification(server, "notifications/tools/list_changed");
   });
-  const sessionManager = new SessionManager(config.connectionTimeoutMinutes);
-  console.log(`[\u4F1A\u8BDD] \u4EC5\u5185\u5B58\u6A21\u5F0F\uFF08\u8FDE\u63A5\u8D85\u65F6: ${config.connectionTimeoutMinutes} \u5206\u949F\uFF0C\u6D3B\u8DC3\u8D85\u65F6: 1 \u5C0F\u65F6\uFF09`);
+  const sessionManager = new SessionManager(
+    config.connectionTimeoutMinutes,
+    config.reconnectionTimeoutMinutes
+  );
+  console.log(`[\u4F1A\u8BDD] \u4EC5\u5185\u5B58\u6A21\u5F0F\uFF08\u8FDE\u63A5\u8D85\u65F6: ${config.connectionTimeoutMinutes} \u5206\u949F\uFF0C\u91CD\u8FDE\u8D85\u65F6: ${config.reconnectionTimeoutMinutes} \u5206\u949F\uFF0C\u6D3B\u8DC3\u8D85\u65F6: 1 \u5C0F\u65F6\uFF09`);
   const wsServer = createWSServer(config, sessionManager);
   const waveformStorage2 = initWaveforms(config);
   registerProtocolAndTools(server, toolManager, sessionManager, wsServer, config);