调整服务，支持mcp对设备进行调用

Author: dc444

src/main/java/com/xiaozhi/communication/common/ChatSession.java

@@ -2,6 +2,7 @@
 
 import com.xiaozhi.communication.domain.iot.IotDescriptor;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
+import com.xiaozhi.dialogue.llm.tool.mcp.device.DeviceMcpHolder;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
 import com.xiaozhi.enums.ListenMode;
@@ -77,6 +78,9 @@ public abstract class ChatSession {
      */
     protected final ConcurrentHashMap<String, Object> attributes = new ConcurrentHashMap<>();
 
+    //--------------------设备mcp-------------------------
+    private DeviceMcpHolder deviceMcpHolder = new DeviceMcpHolder();
+
     public ChatSession(String sessionId) {
         this.sessionId = sessionId;
         this.lastActivityTime = Instant.now();

src/main/java/com/xiaozhi/communication/common/MessageHandler.java

@@ -26,6 +26,7 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
@@ -328,13 +329,23 @@ private void handleGoodbyeMessage(ChatSession session, GoodbyeMessage message) {
         sessionManager.closeSession(session);
     }
 
+    private void handleDeviceMcpMessage(ChatSession chatSession, DeviceMcpMessage message) {
+        Long mcpRequestId = message.getPayload().getId();
+        CompletableFuture<DeviceMcpMessage> future = chatSession.getDeviceMcpHolder().getMcpPendingRequests().get(mcpRequestId);
+        if(future != null){
+            future.complete(message);
+            chatSession.getDeviceMcpHolder().getMcpPendingRequests().remove(mcpRequestId);
+        }
+    }
+
     public void handleMessage(Message msg, String sessionId) {
         var chatSession = sessionManager.getSession(sessionId);
         switch (msg) {
             case ListenMessage m -> handleListenMessage(chatSession, m);
             case IotMessage m -> handleIotMessage(chatSession, m);
             case AbortMessage m -> handleAbortMessage(chatSession, m);
             case GoodbyeMessage m -> handleGoodbyeMessage(chatSession, m);
+            case DeviceMcpMessage m -> handleDeviceMcpMessage(chatSession, m);
             default -> {
             }
         }

src/main/java/com/xiaozhi/communication/domain/DeviceMcpMessage.java

@@ -0,0 +1,20 @@
+package com.xiaozhi.communication.domain;
+
+import com.xiaozhi.communication.domain.mcp.device.DeviceMcpPayload;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * MCP请求类，用于处理向设备发送相关的MCP请求
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public final  class DeviceMcpMessage extends Message {
+    public DeviceMcpMessage() {
+        super("mcp");
+    }
+
+    private String sessionId;//会话id
+    private String type = "mcp";
+    private DeviceMcpPayload payload;
+}

src/main/java/com/xiaozhi/communication/domain/HelloFeatures.java

@@ -0,0 +1,15 @@
+package com.xiaozhi.communication.domain;
+
+import lombok.Data;
+
+@Data
+public class HelloFeatures {
+    /**
+     * 设备是否启用mcp
+     */
+    private Boolean mcp = false;
+    /**
+     * 设备是否启用服务端aec
+     */
+    private Boolean aec = false;
+}

src/main/java/com/xiaozhi/communication/domain/HelloMessage.java

@@ -10,5 +10,6 @@ public HelloMessage() {
         super("hello");
     }
 
+    private HelloFeatures features;
     private AudioParams audioParams;
 }

src/main/java/com/xiaozhi/communication/domain/Message.java

@@ -14,14 +14,15 @@
         visible = true)
 @JsonSubTypes({
         @JsonSubTypes.Type(value = HelloMessage.class, name = "hello"),
+        @JsonSubTypes.Type(value = DeviceMcpMessage.class, name = "mcp"),
         @JsonSubTypes.Type(value = ListenMessage.class, name = "listen"),
         @JsonSubTypes.Type(value = IotMessage.class, name = "iot"),
         @JsonSubTypes.Type(value = AbortMessage.class, name = "abort"),
         @JsonSubTypes.Type(value = GoodbyeMessage.class, name = "goodbye"),
         @JsonSubTypes.Type(value = UnknownMessage.class, name = "unknown")
 })
 public sealed abstract class Message
-        permits AbortMessage, GoodbyeMessage, HelloMessage, IotMessage, ListenMessage, UnknownMessage {
+        permits AbortMessage, GoodbyeMessage, HelloMessage, IotMessage, ListenMessage, DeviceMcpMessage, UnknownMessage {
 
     public Message() {
         this.type = "unknown";

src/main/java/com/xiaozhi/communication/domain/mcp/device/DeviceMcpPayload.java

@@ -0,0 +1,16 @@
+package com.xiaozhi.communication.domain.mcp.device;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class DeviceMcpPayload {
+    private String jsonrpc = "2.0";
+    private String method;//方法名称
+    private Object params;
+    private Long id;//请求id
+    private Map<String, Object> result;//请求结果
+    private Map<String, Object> error;//请求失败信息
+
+}

src/main/java/com/xiaozhi/communication/domain/mcp/device/initialize/DeviceMcpClientInfo.java

@@ -0,0 +1,9 @@
+package com.xiaozhi.communication.domain.mcp.device.initialize;
+
+import lombok.Data;
+
+@Data
+public class DeviceMcpClientInfo {
+    private String name = "xiaozhi-mqtt-client";
+    private String version = "1.0.0";
+}

src/main/java/com/xiaozhi/communication/domain/mcp/device/initialize/DeviceMcpInitialize.java

@@ -0,0 +1,13 @@
+package com.xiaozhi.communication.domain.mcp.device.initialize;
+
+import lombok.Data;
+
+import java.util.Collections;
+import java.util.Map;
+
+@Data
+public class DeviceMcpInitialize {
+    private String protocolVersion = "2024-11-05";
+    private Map<String, Object>  capabilities = Collections.emptyMap();
+    private DeviceMcpClientInfo clientInfo = new DeviceMcpClientInfo();
+}

src/main/java/com/xiaozhi/communication/domain/mcp/device/initialize/DeviceMcpVision.java

@@ -0,0 +1,12 @@
+package com.xiaozhi.communication.domain.mcp.device.initialize;
+
+import lombok.Data;
+
+/**
+ * 摄像头视觉相关
+ */
+@Data
+public class DeviceMcpVision {
+    private String url;//摄像头: 图片处理地址(必须是http地址, 不是websocket地址)
+    private String token;// url toke
+}