fix: IoT消息优化&非hello消息处理逻辑调整到MessageHandler中

ed · ed · commit 33d46a67c771 · 2025-06-09T11:10:46.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,7 @@
             <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
+
         <!--
         <dependency>
             <groupId>org.springframework.ai</groupId>
@@ -282,6 +283,7 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
             <!-- 添加 Surefire 插件配置 -->
diff --git a/src/main/java/com/xiaozhi/communication/common/ChatSession.java b/src/main/java/com/xiaozhi/communication/common/ChatSession.java
@@ -1,6 +1,6 @@
 package com.xiaozhi.communication.common;
 
-import com.xiaozhi.dialogue.iot.IotDescriptor;
+import com.xiaozhi.communication.domain.IotDescriptor;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
diff --git a/src/main/java/com/xiaozhi/communication/common/MessageHandler.java b/src/main/java/com/xiaozhi/communication/common/MessageHandler.java
@@ -1,9 +1,6 @@
 package com.xiaozhi.communication.common;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.xiaozhi.communication.domain.AbortMessage;
-import com.xiaozhi.communication.domain.GoodbyeMessage;
-import com.xiaozhi.communication.domain.ListenMessage;
+import com.xiaozhi.communication.domain.*;
 import com.xiaozhi.dialogue.llm.ChatService;
 import com.xiaozhi.dialogue.llm.factory.ChatModelFactory;
 import com.xiaozhi.dialogue.llm.tool.ToolsGlobalRegistry;
@@ -69,7 +66,7 @@ public class MessageHandler {
     private ChatService chatService;
 
     @Resource
-    private ChatModelFactory  chatModelFactory;
+    private ChatModelFactory chatModelFactory;
 
     @Resource
     private ToolsGlobalRegistry toolsGlobalRegistry;
@@ -82,6 +79,7 @@ public class MessageHandler {
 
     /**
      * 处理连接建立事件.
+     *
      * @param chatSession
      * @param deviceIdAuth
      */
@@ -145,11 +143,12 @@ public void afterConnection(ChatSession chatSession, String deviceIdAuth) {
 
     /**
      * 处理连接关闭事件.
+     *
      * @param sessionId
      */
     public void afterConnectionClosed(String sessionId) {
         ChatSession chatSession = sessionManager.getSession(sessionId);
-        if(chatSession == null || !chatSession.isOpen()){
+        if (chatSession == null || !chatSession.isOpen()) {
             return;
         }
         // 连接关闭时清理资源
@@ -179,12 +178,13 @@ public void afterConnectionClosed(String sessionId) {
 
     /**
      * 处理音频数据
+     *
      * @param sessionId
      * @param opusData
      */
     public void handleBinaryMessage(String sessionId, byte[] opusData) {
         ChatSession chatSession = sessionManager.getSession(sessionId);
-        if((chatSession == null || !chatSession.isOpen()) && !vadService.isSessionInitialized(sessionId)){
+        if ((chatSession == null || !chatSession.isOpen()) && !vadService.isSessionInitialized(sessionId)) {
             return;
         }
         // 委托给DialogueService处理音频数据
@@ -195,7 +195,7 @@ public void handleBinaryMessage(String sessionId, byte[] opusData) {
     public void handleUnboundDevice(String sessionId, SysDevice device) {
         String deviceId = device.getDeviceId();
         ChatSession chatSession = sessionManager.getSession(sessionId);
-        if(chatSession == null || !chatSession.isOpen()){
+        if (chatSession == null || !chatSession.isOpen()) {
             return;
         }
         // 检查是否已经在处理中，使用CAS操作保证线程安全
@@ -257,7 +257,7 @@ public void handleUnboundDevice(String sessionId, SysDevice device) {
         });
     }
 
-    public void handleListenMessage(ChatSession chatSession, ListenMessage message) {
+    private void handleListenMessage(ChatSession chatSession, ListenMessage message) {
         String sessionId = chatSession.getSessionId();
         logger.info("收到listen消息 - SessionId: {}, State: {}, Mode: {}", sessionId, message.getState(), message.getMode());
         chatSession.setMode(message.getMode());
@@ -301,32 +301,42 @@ public void handleListenMessage(ChatSession chatSession, ListenMessage message)
         }
     }
 
-    public void handleAbortMessage(ChatSession session, AbortMessage message) {
+    private void handleAbortMessage(ChatSession session, AbortMessage message) {
         dialogueService.abortDialogue(session, message.getReason());
     }
 
-    public void handleIotMessage(ChatSession chatSession, JsonNode jsonNode) {
+    private void handleIotMessage(ChatSession chatSession, IotMessage message) {
         String sessionId = chatSession.getSessionId();
         logger.info("收到IoT消息 - SessionId: {}", sessionId);
 
         // 处理设备描述信息
-        if (jsonNode.has("descriptors")) {
-            JsonNode descriptors = jsonNode.path("descriptors");
-            logger.info("收到设备描述信息: {}", descriptors);
+        if (message.getDescriptors() != null) {
+            logger.info("收到设备描述信息: {}", message.getDescriptors());
             // 处理设备描述信息的逻辑
-            iotService.handleDeviceDescriptors(sessionId, descriptors);
+            iotService.handleDeviceDescriptors(sessionId, message.getDescriptors());
         }
 
         // 处理设备状态更新
-        if (jsonNode.has("states")) {
-            JsonNode states = jsonNode.path("states");
-            logger.info("收到设备状态更新: {}", states);
+        if (message.getStates() != null) {
+            logger.info("收到设备状态更新: {}", message.getStates());
             // 处理设备状态更新的逻辑
-            iotService.handleDeviceStates(sessionId, states);
+            iotService.handleDeviceStates(sessionId, message.getStates());
         }
     }
 
-    public void handleGoodbyeMessage(ChatSession session, GoodbyeMessage message) {
+    private void handleGoodbyeMessage(ChatSession session, GoodbyeMessage message) {
         sessionManager.closeSession(session);
     }
+
+    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);
+            default -> {
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/xiaozhi/communication/common/SessionManager.java b/src/main/java/com/xiaozhi/communication/common/SessionManager.java
@@ -1,6 +1,6 @@
 package com.xiaozhi.communication.common;
 
-import com.xiaozhi.dialogue.iot.IotDescriptor;
+import com.xiaozhi.communication.domain.IotDescriptor;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
diff --git a/src/main/java/com/xiaozhi/communication/domain/AbortMessage.java b/src/main/java/com/xiaozhi/communication/domain/AbortMessage.java
@@ -5,7 +5,7 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public final class AbortMessage extends Message{
+public final class AbortMessage extends Message {
     public AbortMessage() {
         super("abort");
     }
diff --git a/src/main/java/com/xiaozhi/communication/domain/IotDescriptor.java b/src/main/java/com/xiaozhi/communication/domain/IotDescriptor.java
@@ -0,0 +1,22 @@
+package com.xiaozhi.communication.domain;
+
+import com.xiaozhi.utils.JsonUtil;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * Iot设备描述信息
+ */
+@Data
+public class IotDescriptor {
+    private String name;
+    private String description;
+    private Map<String, IotProperty> properties;
+    private Map<String, IotMethod> methods;
+
+    @Override
+    public String toString() {
+        return JsonUtil.toJson(this);
+    }
+}
diff --git a/src/main/java/com/xiaozhi/communication/domain/IotMessage.java b/src/main/java/com/xiaozhi/communication/domain/IotMessage.java
@@ -1,6 +1,7 @@
 package com.xiaozhi.communication.domain;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,15 +13,14 @@ public IotMessage() {
         super("iot");
     }
 
-    private List<IotDescriptor> descriptors;
+    private boolean update;
+    private String sessionId;
     private List<IotState> states;
+    private List<IotDescriptor> descriptors;
 
-    public static class IotDescriptor {
-        // properties
-        // private List<IotMethod> methods;
-    }
-
+    @Data
     public static class IotState {
-
+        private String name;
+        private Map<String, Object> state;
     }
 }
diff --git a/src/main/java/com/xiaozhi/communication/domain/IotMethod.java b/src/main/java/com/xiaozhi/communication/domain/IotMethod.java
@@ -0,0 +1,26 @@
+package com.xiaozhi.communication.domain;
+
+import com.xiaozhi.utils.JsonUtil;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * function_call的方法定义
+ */
+@Data
+public class IotMethod {
+    /**
+     * 方法描述
+     */
+    private String description;
+    /**
+     * 方法参数
+     */
+    private Map<String, IotMethodParameter> parameters;
+
+    @Override
+    public String toString() {
+        return JsonUtil.toJson(this);
+    }
+}
diff --git a/src/main/java/com/xiaozhi/communication/domain/IotMethodParameter.java b/src/main/java/com/xiaozhi/communication/domain/IotMethodParameter.java
@@ -0,0 +1,24 @@
+package com.xiaozhi.communication.domain;
+
+import com.xiaozhi.utils.JsonUtil;
+import lombok.Data;
+
+/**
+ * function_call的参数定义
+ */
+@Data
+public class IotMethodParameter {
+    /**
+     * 参数描述
+     */
+    private String description;
+    /**
+     * 参数类型
+     */
+    private String type;
+
+    @Override
+    public String toString() {
+        return JsonUtil.toJson(this);
+    }
+}
diff --git a/src/main/java/com/xiaozhi/communication/domain/IotProperty.java b/src/main/java/com/xiaozhi/communication/domain/IotProperty.java
@@ -0,0 +1,28 @@
+package com.xiaozhi.communication.domain;
+
+import com.xiaozhi.utils.JsonUtil;
+import lombok.Data;
+
+/**
+ * function_call的参数定义
+ */
+@Data
+public class IotProperty {
+    /**
+     * 参数描述
+     */
+    private String description;
+    /**
+     * 参数类型
+     */
+    private String type;
+    /**
+     * 参数值
+     */
+    private Object value;
+
+    @Override
+    public String toString() {
+        return JsonUtil.toJson(this);
+    }
+}
diff --git a/src/main/java/com/xiaozhi/communication/domain/Message.java b/src/main/java/com/xiaozhi/communication/domain/Message.java
@@ -17,10 +17,15 @@
         @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 = GoodbyeMessage.class, name = "goodbye"),
+        @JsonSubTypes.Type(value = UnknownMessage.class, name = "unknown")
 })
 public sealed abstract class Message
-        permits AbortMessage, GoodbyeMessage, HelloMessage, IotMessage, ListenMessage {
+        permits AbortMessage, GoodbyeMessage, HelloMessage, IotMessage, ListenMessage, UnknownMessage {
+
+    public Message() {
+        this.type = "unknown";
+    }
 
     public Message(String type) {
         this.type = type;
diff --git a/src/main/java/com/xiaozhi/communication/domain/UnknownMessage.java b/src/main/java/com/xiaozhi/communication/domain/UnknownMessage.java
@@ -0,0 +1,12 @@
+package com.xiaozhi.communication.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public final class UnknownMessage extends Message {
+    public UnknownMessage() {
+        super("unknown");
+    }
+}
diff --git a/src/main/java/com/xiaozhi/communication/server/websocket/WebSocketHandler.java b/src/main/java/com/xiaozhi/communication/server/websocket/WebSocketHandler.java
@@ -18,6 +18,7 @@
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Component
 public class WebSocketHandler extends AbstractWebSocketHandler {
@@ -83,25 +84,21 @@ protected void handleTextMessage(org.springframework.web.socket.WebSocketSession
                 device = deviceService.selectDeviceById(deviceId);
             }
         }
-        if (device.getModelId() == null) {
-            // 设备未绑定，处理未绑定设备的消息
-            device = new SysDevice();
-            device.setDeviceId(deviceId);
-            messageHandler.handleUnboundDevice(sessionId, device);
-        } else {
-            sessionManager.registerDevice(sessionId, device);
-        }
-        // 首先尝试解析JSON消息
+
         try {
             var msg = JsonUtil.fromJson(payload, Message.class);
-            var chatSession = sessionManager.getSession(sessionId);
-            switch (msg) {
-                case HelloMessage m -> handleHelloMessage(session, m);
-                case ListenMessage m -> messageHandler.handleListenMessage(chatSession, m);
-                // case IotMessage m -> messageHandler.handleIotMessage(chatSession, m);
-                case IotMessage m -> messageHandler.handleIotMessage(chatSession, JsonUtil.OBJECT_MAPPER.readTree(payload));
-                case AbortMessage m -> messageHandler.handleAbortMessage(chatSession, m);
-                case GoodbyeMessage m -> messageHandler.handleGoodbyeMessage(chatSession, m);
+            if (Objects.requireNonNull(msg) instanceof HelloMessage m) {
+                handleHelloMessage(session, m);
+            } else {
+                if (device.getModelId() == null) {
+                    // 设备未绑定，处理未绑定设备的消息
+                    device = new SysDevice();
+                    device.setDeviceId(deviceId);
+                    messageHandler.handleUnboundDevice(sessionId, device);
+                } else {
+                    sessionManager.registerDevice(sessionId, device);
+                }
+                messageHandler.handleMessage(msg, sessionId);
             }
         } catch (Exception e) {
             logger.error("handleTextMessage处理失败", e);
diff --git a/src/main/java/com/xiaozhi/dialogue/iot/IotDescriptor.java b/src/main/java/com/xiaozhi/dialogue/iot/IotDescriptor.java
diff --git a/src/main/java/com/xiaozhi/dialogue/iot/IotMethod.java b/src/main/java/com/xiaozhi/dialogue/iot/IotMethod.java
diff --git a/src/main/java/com/xiaozhi/dialogue/iot/IotMethodParameter.java b/src/main/java/com/xiaozhi/dialogue/iot/IotMethodParameter.java
diff --git a/src/main/java/com/xiaozhi/dialogue/iot/IotProperty.java b/src/main/java/com/xiaozhi/dialogue/iot/IotProperty.java
diff --git a/src/main/java/com/xiaozhi/dialogue/service/IotService.java b/src/main/java/com/xiaozhi/dialogue/service/IotService.java

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`@Data`
`7`	`7`	`@EqualsAndHashCode(callSuper = true)`
`8`		`-public final class AbortMessage extends Message{`
	`8`	`+public final class AbortMessage extends Message {`
`9`	`9`	`public AbortMessage() {`
`10`	`10`	`super("abort");`
`11`	`11`	`}`