mirror of
https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
synced 2026-03-22 05:07:17 +08:00
feat(iot):【协议改造】tcp 初步改造(70%)
This commit is contained in:
@@ -42,6 +42,7 @@ public class IotHttpProtocol implements IotProtocol {
|
||||
/**
|
||||
* 运行状态
|
||||
*/
|
||||
@Getter
|
||||
private volatile boolean running = false;
|
||||
|
||||
/**
|
||||
@@ -61,6 +62,8 @@ public class IotHttpProtocol implements IotProtocol {
|
||||
public IotHttpProtocol(ProtocolInstanceProperties properties, IotMessageBus messageBus) {
|
||||
this.properties = properties;
|
||||
this.serverId = IotDeviceMessageUtils.generateServerId(properties.getPort());
|
||||
|
||||
// 初始化下行消息订阅者
|
||||
this.downstreamSubscriber = new IotHttpDownstreamSubscriber(this, messageBus);
|
||||
}
|
||||
|
||||
@@ -169,9 +172,4 @@ public class IotHttpProtocol implements IotProtocol {
|
||||
log.info("[stop][IoT HTTP 协议 {} 已停止]", getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRunning() {
|
||||
return running;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package cn.iocoder.yudao.module.iot.gateway.protocol.tcp;
|
||||
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import cn.iocoder.yudao.module.iot.core.enums.IotProtocolTypeEnum;
|
||||
import cn.iocoder.yudao.module.iot.core.enums.IotSerializeTypeEnum;
|
||||
import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
|
||||
@@ -14,8 +13,6 @@ import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.handler.upstream.IotTcpU
|
||||
import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.manager.IotTcpConnectionManager;
|
||||
import cn.iocoder.yudao.module.iot.gateway.serialize.IotMessageSerializer;
|
||||
import cn.iocoder.yudao.module.iot.gateway.serialize.IotMessageSerializerManager;
|
||||
import cn.iocoder.yudao.module.iot.gateway.service.device.IotDeviceService;
|
||||
import cn.iocoder.yudao.module.iot.gateway.service.device.message.IotDeviceMessageService;
|
||||
import io.vertx.core.Vertx;
|
||||
import io.vertx.core.net.NetServer;
|
||||
import io.vertx.core.net.NetServerOptions;
|
||||
@@ -46,6 +43,7 @@ public class IotTcpProtocol implements IotProtocol {
|
||||
/**
|
||||
* 运行状态
|
||||
*/
|
||||
@Getter
|
||||
private volatile boolean running = false;
|
||||
|
||||
/**
|
||||
@@ -72,6 +70,11 @@ public class IotTcpProtocol implements IotProtocol {
|
||||
*/
|
||||
private final IotTcpFrameCodec frameCodec;
|
||||
|
||||
/**
|
||||
* TCP 连接管理器(每个 Protocol 实例独立)
|
||||
*/
|
||||
private final IotTcpConnectionManager connectionManager;
|
||||
|
||||
public IotTcpProtocol(ProtocolInstanceProperties properties, IotMessageBus messageBus,
|
||||
IotMessageSerializerManager serializerManager) {
|
||||
this.properties = properties;
|
||||
@@ -83,14 +86,15 @@ public class IotTcpProtocol implements IotProtocol {
|
||||
serializeType = IotSerializeTypeEnum.JSON; // 默认 JSON
|
||||
}
|
||||
this.serializer = serializerManager.get(serializeType);
|
||||
|
||||
// 初始化帧编解码器
|
||||
IotTcpConfig tcpConfig = properties.getTcp();
|
||||
IotTcpConfig.CodecConfig codecConfig = tcpConfig != null ? tcpConfig.getCodec() : null;
|
||||
this.frameCodec = IotTcpFrameCodec.create(codecConfig);
|
||||
|
||||
// 初始化连接管理器
|
||||
this.connectionManager = new IotTcpConnectionManager();
|
||||
|
||||
// 初始化下行消息订阅者
|
||||
IotTcpConnectionManager connectionManager = SpringUtil.getBean(IotTcpConnectionManager.class);
|
||||
IotTcpDownstreamHandler downstreamHandler = new IotTcpDownstreamHandler(connectionManager, frameCodec, serializer);
|
||||
this.downstreamSubscriber = new IotTcpDownstreamSubscriber(this, downstreamHandler, messageBus);
|
||||
}
|
||||
@@ -131,12 +135,8 @@ public class IotTcpProtocol implements IotProtocol {
|
||||
|
||||
// 1.3 创建服务器并设置连接处理器
|
||||
tcpServer = vertx.createNetServer(options);
|
||||
IotDeviceService deviceService = SpringUtil.getBean(IotDeviceService.class);
|
||||
IotDeviceMessageService messageService = SpringUtil.getBean(IotDeviceMessageService.class);
|
||||
IotTcpConnectionManager connectionManager = SpringUtil.getBean(IotTcpConnectionManager.class);
|
||||
tcpServer.connectHandler(socket -> {
|
||||
IotTcpUpstreamHandler handler = new IotTcpUpstreamHandler(this, messageService, deviceService,
|
||||
connectionManager, frameCodec, serializer);
|
||||
IotTcpUpstreamHandler handler = new IotTcpUpstreamHandler(serverId, frameCodec, serializer, connectionManager);
|
||||
handler.handle(socket);
|
||||
});
|
||||
|
||||
@@ -197,9 +197,4 @@ public class IotTcpProtocol implements IotProtocol {
|
||||
log.info("[stop][IoT TCP 协议 {} 已停止]", getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRunning() {
|
||||
return running;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package cn.iocoder.yudao.module.iot.gateway.protocol.tcp.handler.upstream;
|
||||
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import cn.hutool.core.util.BooleanUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
@@ -15,7 +13,6 @@ import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity;
|
||||
import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO;
|
||||
import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO;
|
||||
import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils;
|
||||
import cn.iocoder.yudao.module.iot.gateway.protocol.IotProtocol;
|
||||
import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.codec.IotTcpFrameCodec;
|
||||
import cn.iocoder.yudao.module.iot.gateway.protocol.tcp.manager.IotTcpConnectionManager;
|
||||
import cn.iocoder.yudao.module.iot.gateway.serialize.IotMessageSerializer;
|
||||
@@ -26,8 +23,10 @@ import io.vertx.core.buffer.Buffer;
|
||||
import io.vertx.core.net.NetSocket;
|
||||
import io.vertx.core.parsetools.RecordParser;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import java.util.Map;
|
||||
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
|
||||
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
|
||||
|
||||
/**
|
||||
* TCP 上行消息处理器
|
||||
@@ -39,14 +38,6 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
|
||||
private static final String AUTH_METHOD = "auth";
|
||||
|
||||
private final IotDeviceMessageService deviceMessageService;
|
||||
|
||||
private final IotDeviceService deviceService;
|
||||
|
||||
private final IotTcpConnectionManager connectionManager;
|
||||
|
||||
private final IotDeviceCommonApi deviceApi;
|
||||
|
||||
private final String serverId;
|
||||
|
||||
/**
|
||||
@@ -57,20 +48,30 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* 消息序列化器(处理业务消息序列化/反序列化)
|
||||
*/
|
||||
private final IotMessageSerializer serializer;
|
||||
/**
|
||||
* TCP 连接管理器(每个 Protocol 实例独立)
|
||||
*/
|
||||
private final IotTcpConnectionManager connectionManager;
|
||||
|
||||
public IotTcpUpstreamHandler(IotProtocol protocol,
|
||||
IotDeviceMessageService deviceMessageService,
|
||||
IotDeviceService deviceService,
|
||||
IotTcpConnectionManager connectionManager,
|
||||
// ===================== Spring 依赖(构造时注入) =====================
|
||||
|
||||
private final IotDeviceMessageService deviceMessageService;
|
||||
private final IotDeviceService deviceService;
|
||||
private final IotDeviceCommonApi deviceApi;
|
||||
|
||||
public IotTcpUpstreamHandler(String serverId,
|
||||
IotTcpFrameCodec codec,
|
||||
IotMessageSerializer serializer) {
|
||||
this.serverId = protocol.getServerId();
|
||||
IotMessageSerializer serializer,
|
||||
IotTcpConnectionManager connectionManager) {
|
||||
Assert.notNull(codec, "TCP FrameCodec 必须配置");
|
||||
Assert.notNull(serializer, "消息序列化器必须配置");
|
||||
Assert.notNull(connectionManager, "连接管理器不能为空");
|
||||
this.serverId = serverId;
|
||||
this.codec = codec;
|
||||
this.serializer = serializer;
|
||||
this.connectionManager = connectionManager;
|
||||
// TODO @AI:都通过 springutil 获取下;
|
||||
this.deviceMessageService = deviceMessageService;
|
||||
this.deviceService = deviceService;
|
||||
this.deviceMessageService = SpringUtil.getBean(IotDeviceMessageService.class);
|
||||
this.deviceService = SpringUtil.getBean(IotDeviceService.class);
|
||||
this.deviceApi = SpringUtil.getBean(IotDeviceCommonApi.class);
|
||||
}
|
||||
|
||||
@@ -79,42 +80,30 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
String clientId = IdUtil.simpleUUID();
|
||||
log.debug("[handle][设备连接,客户端 ID: {},地址: {}]", clientId, socket.remoteAddress());
|
||||
|
||||
// 设置异常和关闭处理器
|
||||
// 1. 设置异常和关闭处理器
|
||||
socket.exceptionHandler(ex -> {
|
||||
log.warn("[handle][连接异常,客户端 ID: {},地址: {}]", clientId, socket.remoteAddress());
|
||||
cleanupConnection(socket);
|
||||
socket.close();
|
||||
});
|
||||
socket.closeHandler(v -> {
|
||||
log.debug("[handle][连接关闭,客户端 ID: {},地址: {}]", clientId, socket.remoteAddress());
|
||||
cleanupConnection(socket);
|
||||
});
|
||||
|
||||
// 设置消息处理器(带拆包支持)
|
||||
// 2.1 设置消息处理器
|
||||
Handler<Buffer> messageHandler = buffer -> {
|
||||
// TODO @AI:需要跟 AI 讨论。哪些情况关闭;哪些情况,发送异常消息;
|
||||
try {
|
||||
processMessage(clientId, buffer, socket);
|
||||
} catch (Exception e) {
|
||||
// TODO @AI:这里能合并到 exceptionHandler 么?还是怎么搞好点;
|
||||
log.error("[handle][消息解码失败,断开连接,客户端 ID: {},地址: {},错误: {}]",
|
||||
log.error("[handle][消息处理失败,客户端 ID: {},地址: {},错误: {}]",
|
||||
clientId, socket.remoteAddress(), e.getMessage());
|
||||
cleanupConnection(socket);
|
||||
socket.close();
|
||||
}
|
||||
};
|
||||
|
||||
// 根据是否配置了 FrameCodec 来决定是否使用拆包器
|
||||
// TODO @AI:必须配置!
|
||||
if (codec != null) {
|
||||
// 使用拆包器处理粘包/拆包
|
||||
RecordParser parser = codec.createDecodeParser(messageHandler);
|
||||
socket.handler(parser);
|
||||
log.debug("[handle][启用 {} 拆包器,客户端 ID: {}]", codec.getType(), clientId);
|
||||
} else {
|
||||
// 未配置拆包器,直接处理原始数据(可能存在粘包问题)
|
||||
socket.handler(messageHandler);
|
||||
log.debug("[handle][未配置拆包器,客户端 ID: {}]", clientId);
|
||||
}
|
||||
// 2.2 使用拆包器处理粘包/拆包
|
||||
RecordParser parser = codec.createDecodeParser(messageHandler);
|
||||
socket.handler(parser);
|
||||
log.debug("[handle][启用 {} 拆包器,客户端 ID: {}]", codec.getType(), clientId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -123,49 +112,22 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @param clientId 客户端 ID
|
||||
* @param buffer 消息
|
||||
* @param socket 网络连接
|
||||
* @throws Exception 消息解码失败时抛出异常
|
||||
*/
|
||||
private void processMessage(String clientId, Buffer buffer, NetSocket socket) throws Exception {
|
||||
// 1. 基础检查
|
||||
// TODO @AI:不太应该为空?!
|
||||
if (buffer == null || buffer.length() == 0) {
|
||||
return;
|
||||
}
|
||||
private void processMessage(String clientId, Buffer buffer, NetSocket socket) {
|
||||
// 1. 反序列化消息
|
||||
IotDeviceMessage message = serializer.deserialize(buffer.getBytes());
|
||||
Assert.notNull(message, "反序列化后消息为空");
|
||||
|
||||
// 2. 反序列化消息
|
||||
IotDeviceMessage message;
|
||||
try {
|
||||
message = serializer.deserialize(buffer.getBytes());
|
||||
if (message == null) {
|
||||
throw new IllegalArgumentException("反序列化后消息为空");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO @AI:是不是不用 try catch?
|
||||
throw new Exception("消息反序列化失败: " + e.getMessage(), e);
|
||||
}
|
||||
|
||||
// 3. 根据消息类型路由处理
|
||||
try {
|
||||
if (AUTH_METHOD.equals(message.getMethod())) {
|
||||
// 认证请求
|
||||
handleAuthenticationRequest(clientId, message, socket);
|
||||
} else if (IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod().equals(message.getMethod())) {
|
||||
// 设备动态注册请求
|
||||
handleRegisterRequest(clientId, message, socket);
|
||||
} else {
|
||||
// 业务消息
|
||||
handleBusinessRequest(clientId, message, socket);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO @AI:如果参数不正确,不断开连接;
|
||||
log.error("[processMessage][处理消息失败,客户端 ID: {},消息方法: {}]", clientId, message.getMethod(), e);
|
||||
// 发送错误响应,避免客户端一直等待
|
||||
// TODO @AI:发送失败,是不是不用 try catch?
|
||||
try {
|
||||
sendErrorResponse(socket, message.getRequestId(), "消息处理失败");
|
||||
} catch (Exception responseEx) {
|
||||
log.error("[processMessage][发送错误响应失败,客户端 ID: {}]", clientId, responseEx);
|
||||
}
|
||||
// 2. 根据消息类型路由处理
|
||||
if (AUTH_METHOD.equals(message.getMethod())) {
|
||||
// 认证请求
|
||||
handleAuthenticationRequest(clientId, message, socket);
|
||||
} else if (IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod().equals(message.getMethod())) {
|
||||
// 设备动态注册请求
|
||||
handleRegisterRequest(clientId, message, socket);
|
||||
} else {
|
||||
// 业务消息
|
||||
handleBusinessRequest(clientId, message, socket);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,51 +139,33 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @param socket 网络连接
|
||||
*/
|
||||
private void handleAuthenticationRequest(String clientId, IotDeviceMessage message, NetSocket socket) {
|
||||
try {
|
||||
// 1.1 解析认证参数
|
||||
// TODO @AI:直接 JsonUtils.convertObject(params, IotDeviceAuthReqDTO.class);然后,校验参数,不正确抛出 invalid exception;和 http 那一样;
|
||||
IotDeviceAuthReqDTO authParams = parseAuthParams(message.getParams());
|
||||
if (authParams == null) {
|
||||
log.warn("[handleAuthenticationRequest][认证参数解析失败,客户端 ID: {}]", clientId);
|
||||
sendErrorResponse(socket, message.getRequestId(), "认证参数不完整");
|
||||
return;
|
||||
}
|
||||
// 1.2 执行认证
|
||||
if (!validateDeviceAuth(authParams)) {
|
||||
log.warn("[handleAuthenticationRequest][认证失败,客户端 ID: {},username: {}]",
|
||||
clientId, authParams.getUsername());
|
||||
sendErrorResponse(socket, message.getRequestId(), "认证失败");
|
||||
return;
|
||||
}
|
||||
// 1. 解析认证参数
|
||||
IotDeviceAuthReqDTO authParams = JsonUtils.convertObject(message.getParams(), IotDeviceAuthReqDTO.class);
|
||||
Assert.notNull(authParams, "认证参数不能为空");
|
||||
Assert.hasText(authParams.getUsername(), "username 不能为空");
|
||||
Assert.hasText(authParams.getPassword(), "password 不能为空");
|
||||
|
||||
// 2.1 解析设备信息
|
||||
IotDeviceIdentity deviceInfo = IotDeviceAuthUtils.parseUsername(authParams.getUsername());
|
||||
// TODO @AI:这里就断言 deviceInfo 不为空了?!
|
||||
if (deviceInfo == null) {
|
||||
sendErrorResponse(socket, message.getRequestId(), "解析设备信息失败");
|
||||
return;
|
||||
}
|
||||
// 2.2 获取设备信息
|
||||
IotDeviceRespDTO device = deviceService.getDeviceFromCache(deviceInfo.getProductKey(), deviceInfo.getDeviceName());
|
||||
// TODO @AI:这里就断言 device 不为空了?!
|
||||
if (device == null) {
|
||||
sendErrorResponse(socket, message.getRequestId(), "设备不存在");
|
||||
return;
|
||||
}
|
||||
|
||||
// 3.1 注册连接
|
||||
registerConnection(socket, device, clientId);
|
||||
// 3.2 发送上线消息
|
||||
sendOnlineMessage(device);
|
||||
// 3.3 发送成功响应
|
||||
sendSuccessResponse(socket, message.getRequestId(), "认证成功");
|
||||
log.info("[handleAuthenticationRequest][认证成功,设备 ID: {},设备名: {}]",
|
||||
device.getId(), device.getDeviceName());
|
||||
} catch (Exception e) {
|
||||
// TODO @AI:最大化去掉 try catch;(这个方法里的)
|
||||
log.error("[handleAuthenticationRequest][认证处理异常,客户端 ID: {}]", clientId, e);
|
||||
sendErrorResponse(socket, message.getRequestId(), "认证处理异常");
|
||||
// 2.1 执行认证
|
||||
CommonResult<Boolean> authResult = deviceApi.authDevice(authParams);
|
||||
if (authResult.isError()) {
|
||||
log.warn("[handleAuthenticationRequest][认证失败,客户端 ID: {},username: {}]", clientId, authParams.getUsername());
|
||||
sendErrorResponse(socket, message.getRequestId(), AUTH_METHOD, authResult.getCode(), authResult.getMsg());
|
||||
return;
|
||||
}
|
||||
// 2.2 解析设备信息
|
||||
IotDeviceIdentity deviceInfo = IotDeviceAuthUtils.parseUsername(authParams.getUsername());
|
||||
Assert.notNull(deviceInfo, "解析设备信息失败");
|
||||
// 2.3 获取设备信息
|
||||
IotDeviceRespDTO device = deviceService.getDeviceFromCache(deviceInfo.getProductKey(), deviceInfo.getDeviceName());
|
||||
Assert.notNull(device, "设备不存在");
|
||||
|
||||
// 3.1 注册连接
|
||||
registerConnection(socket, device, clientId);
|
||||
// 3.2 发送上线消息
|
||||
sendOnlineMessage(device);
|
||||
// 3.3 发送成功响应
|
||||
sendSuccessResponse(socket, message.getRequestId(), AUTH_METHOD, "认证成功");
|
||||
log.info("[handleAuthenticationRequest][认证成功,设备 ID: {},设备名: {}]", device.getId(), device.getDeviceName());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -233,31 +177,25 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @see <a href="https://help.aliyun.com/zh/iot/user-guide/unique-certificate-per-product-verification">阿里云 - 一型一密</a>
|
||||
*/
|
||||
private void handleRegisterRequest(String clientId, IotDeviceMessage message, NetSocket socket) {
|
||||
try {
|
||||
// 1. 解析注册参数
|
||||
IotDeviceRegisterReqDTO params = parseRegisterParams(message.getParams());
|
||||
if (params == null) {
|
||||
log.warn("[handleRegisterRequest][注册参数解析失败,客户端 ID: {}]", clientId);
|
||||
sendErrorResponse(socket, message.getRequestId(), "注册参数不完整");
|
||||
return;
|
||||
}
|
||||
// 1. 解析注册参数
|
||||
IotDeviceRegisterReqDTO params = JsonUtils.convertObject(message.getParams(), IotDeviceRegisterReqDTO.class);
|
||||
Assert.notNull(params, "注册参数不能为空");
|
||||
Assert.hasText(params.getProductKey(), "productKey 不能为空");
|
||||
Assert.hasText(params.getDeviceName(), "deviceName 不能为空");
|
||||
|
||||
// 2. 调用动态注册
|
||||
CommonResult<IotDeviceRegisterRespDTO> result = deviceApi.registerDevice(params);
|
||||
if (result.isError()) {
|
||||
log.warn("[handleRegisterRequest][注册失败,客户端 ID: {},错误: {}]", clientId, result.getMsg());
|
||||
sendErrorResponse(socket, message.getRequestId(), result.getMsg());
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. 发送成功响应(包含 deviceSecret)
|
||||
sendRegisterSuccessResponse(socket, message.getRequestId(), result.getData());
|
||||
log.info("[handleRegisterRequest][注册成功,客户端 ID: {},设备名: {}]",
|
||||
clientId, params.getDeviceName());
|
||||
} catch (Exception e) {
|
||||
log.error("[handleRegisterRequest][注册处理异常,客户端 ID: {}]", clientId, e);
|
||||
sendErrorResponse(socket, message.getRequestId(), "注册处理异常");
|
||||
// 2. 调用动态注册
|
||||
CommonResult<IotDeviceRegisterRespDTO> result = deviceApi.registerDevice(params);
|
||||
if (result.isError()) {
|
||||
log.warn("[handleRegisterRequest][注册失败,客户端 ID: {},错误: {}]", clientId, result.getMsg());
|
||||
sendErrorResponse(socket, message.getRequestId(), IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod(),
|
||||
result.getCode(), result.getMsg());
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. 发送成功响应
|
||||
sendSuccessResponse(socket, message.getRequestId(),
|
||||
IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod(), result.getData());
|
||||
log.info("[handleRegisterRequest][注册成功,客户端 ID: {},设备名: {}]", clientId, params.getDeviceName());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -268,25 +206,19 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @param socket 网络连接
|
||||
*/
|
||||
private void handleBusinessRequest(String clientId, IotDeviceMessage message, NetSocket socket) {
|
||||
try {
|
||||
// 1. 检查认证状态
|
||||
if (connectionManager.isNotAuthenticated(socket)) {
|
||||
log.warn("[handleBusinessRequest][设备未认证,客户端 ID: {}]", clientId);
|
||||
sendErrorResponse(socket, message.getRequestId(), "请先进行认证");
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. 获取认证信息并处理业务消息
|
||||
IotTcpConnectionManager.ConnectionInfo connectionInfo = connectionManager.getConnectionInfo(socket);
|
||||
|
||||
// 3. 发送消息到消息总线
|
||||
deviceMessageService.sendDeviceMessage(message, connectionInfo.getProductKey(),
|
||||
connectionInfo.getDeviceName(), serverId);
|
||||
log.info("[handleBusinessRequest][发送消息到消息总线,客户端 ID: {},消息: {}",
|
||||
clientId, message.toString());
|
||||
} catch (Exception e) {
|
||||
log.error("[handleBusinessRequest][业务请求处理异常,客户端 ID: {}]", clientId, e);
|
||||
// 1. 获取认证信息并处理业务消息
|
||||
IotTcpConnectionManager.ConnectionInfo connectionInfo = connectionManager.getConnectionInfo(socket);
|
||||
if (connectionInfo == null) {
|
||||
log.error("[handleBusinessRequest][无法获取连接信息,客户端 ID: {}]", clientId);
|
||||
sendErrorResponse(socket, message.getRequestId(), message.getMethod(),
|
||||
UNAUTHORIZED.getCode(), "设备未认证,无法处理业务消息");
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. 发送消息到消息总线
|
||||
deviceMessageService.sendDeviceMessage(message, connectionInfo.getProductKey(),
|
||||
connectionInfo.getDeviceName(), serverId);
|
||||
log.info("[handleBusinessRequest][发送消息到消息总线,客户端 ID: {},消息: {}", clientId, message);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -302,7 +234,6 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
.setProductKey(device.getProductKey())
|
||||
.setDeviceName(device.getDeviceName())
|
||||
.setClientId(clientId);
|
||||
// 注册连接
|
||||
connectionManager.registerConnection(socket, device.getId(), connectionInfo);
|
||||
}
|
||||
|
||||
@@ -312,13 +243,9 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @param device 设备信息
|
||||
*/
|
||||
private void sendOnlineMessage(IotDeviceRespDTO device) {
|
||||
try {
|
||||
IotDeviceMessage onlineMessage = IotDeviceMessage.buildStateUpdateOnline();
|
||||
deviceMessageService.sendDeviceMessage(onlineMessage, device.getProductKey(),
|
||||
device.getDeviceName(), serverId);
|
||||
} catch (Exception e) {
|
||||
log.error("[sendOnlineMessage][发送上线消息失败,设备: {}]", device.getDeviceName(), e);
|
||||
}
|
||||
IotDeviceMessage onlineMessage = IotDeviceMessage.buildStateUpdateOnline();
|
||||
deviceMessageService.sendDeviceMessage(onlineMessage, device.getProductKey(),
|
||||
device.getDeviceName(), serverId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -327,70 +254,31 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
* @param socket 网络连接
|
||||
*/
|
||||
private void cleanupConnection(NetSocket socket) {
|
||||
try {
|
||||
// 1. 发送离线消息(如果已认证)
|
||||
IotTcpConnectionManager.ConnectionInfo connectionInfo = connectionManager.getConnectionInfo(socket);
|
||||
if (connectionInfo != null) {
|
||||
IotDeviceMessage offlineMessage = IotDeviceMessage.buildStateOffline();
|
||||
deviceMessageService.sendDeviceMessage(offlineMessage, connectionInfo.getProductKey(),
|
||||
connectionInfo.getDeviceName(), serverId);
|
||||
}
|
||||
|
||||
// 2. 注销连接
|
||||
connectionManager.unregisterConnection(socket);
|
||||
} catch (Exception e) {
|
||||
log.error("[cleanupConnection][清理连接失败]", e);
|
||||
// 1. 发送离线消息
|
||||
IotTcpConnectionManager.ConnectionInfo connectionInfo = connectionManager.getConnectionInfo(socket);
|
||||
if (connectionInfo != null) {
|
||||
IotDeviceMessage offlineMessage = IotDeviceMessage.buildStateOffline();
|
||||
deviceMessageService.sendDeviceMessage(offlineMessage, connectionInfo.getProductKey(),
|
||||
connectionInfo.getDeviceName(), serverId);
|
||||
}
|
||||
|
||||
// 2. 注销连接
|
||||
connectionManager.unregisterConnection(socket);
|
||||
}
|
||||
|
||||
// ===================== 发送响应消息 =====================
|
||||
|
||||
/**
|
||||
* 发送响应消息
|
||||
* 发送成功响应
|
||||
*
|
||||
* @param socket 网络连接
|
||||
* @param success 是否成功
|
||||
* @param message 消息
|
||||
* @param requestId 请求 ID
|
||||
* @param method 方法名
|
||||
* @param data 响应数据
|
||||
*/
|
||||
private void sendResponse(NetSocket socket, boolean success, String message, String requestId) {
|
||||
try {
|
||||
// TODO @AI:是不是不用
|
||||
Object responseData = MapUtil.builder()
|
||||
.put("success", success)
|
||||
.put("message", message)
|
||||
.build();
|
||||
|
||||
int code = success ? 0 : 401;
|
||||
IotDeviceMessage responseMessage = IotDeviceMessage.replyOf(requestId, AUTH_METHOD, responseData,
|
||||
code, message);
|
||||
|
||||
// 序列化 + 帧编码
|
||||
byte[] serializedData = serializer.serialize(responseMessage);
|
||||
Buffer frameData = codec.encode(serializedData);
|
||||
socket.write(frameData);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("[sendResponse][发送响应失败,requestId: {}]", requestId, e);
|
||||
}
|
||||
}
|
||||
|
||||
// TODO @AI:合并到 handleAuthenticationRequest 里;
|
||||
/**
|
||||
* 验证设备认证信息
|
||||
*
|
||||
* @param authParams 认证参数
|
||||
* @return 是否认证成功
|
||||
*/
|
||||
private boolean validateDeviceAuth(IotDeviceAuthReqDTO authParams) {
|
||||
try {
|
||||
CommonResult<Boolean> result = deviceApi.authDevice(new IotDeviceAuthReqDTO()
|
||||
.setClientId(authParams.getClientId()).setUsername(authParams.getUsername())
|
||||
.setPassword(authParams.getPassword()));
|
||||
result.checkError();
|
||||
return BooleanUtil.isTrue(result.getData());
|
||||
} catch (Exception e) {
|
||||
log.error("[validateDeviceAuth][设备认证异常,username: {}]", authParams.getUsername(), e);
|
||||
return false;
|
||||
}
|
||||
private void sendSuccessResponse(NetSocket socket, String requestId, String method, Object data) {
|
||||
IotDeviceMessage responseMessage = IotDeviceMessage.replyOf(requestId, method, data, SUCCESS.getCode(), null);
|
||||
writeResponse(socket, responseMessage);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -398,111 +286,25 @@ public class IotTcpUpstreamHandler implements Handler<NetSocket> {
|
||||
*
|
||||
* @param socket 网络连接
|
||||
* @param requestId 请求 ID
|
||||
* @param errorMessage 错误消息
|
||||
* @param method 方法名
|
||||
* @param code 错误码
|
||||
* @param msg 错误消息
|
||||
*/
|
||||
private void sendErrorResponse(NetSocket socket, String requestId, String errorMessage) {
|
||||
sendResponse(socket, false, errorMessage, requestId);
|
||||
private void sendErrorResponse(NetSocket socket, String requestId, String method, Integer code, String msg) {
|
||||
IotDeviceMessage responseMessage = IotDeviceMessage.replyOf(requestId, method, null, code, msg);
|
||||
writeResponse(socket, responseMessage);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送成功响应
|
||||
* 写入响应到 Socket
|
||||
*
|
||||
* @param socket 网络连接
|
||||
* @param requestId 请求 ID
|
||||
* @param message 消息
|
||||
* @param socket 网络连接
|
||||
* @param responseMessage 响应消息
|
||||
*/
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
private void sendSuccessResponse(NetSocket socket, String requestId, String message) {
|
||||
sendResponse(socket, true, message, requestId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析认证参数
|
||||
*
|
||||
* @param params 参数对象(通常为 Map 类型)
|
||||
* @return 认证参数 DTO,解析失败时返回 null
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "DuplicatedCode"})
|
||||
private IotDeviceAuthReqDTO parseAuthParams(Object params) {
|
||||
if (params == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// 参数默认为 Map 类型,直接转换
|
||||
if (params instanceof Map) {
|
||||
Map<String, Object> paramMap = (Map<String, Object>) params;
|
||||
return new IotDeviceAuthReqDTO()
|
||||
.setClientId(MapUtil.getStr(paramMap, "clientId"))
|
||||
.setUsername(MapUtil.getStr(paramMap, "username"))
|
||||
.setPassword(MapUtil.getStr(paramMap, "password"));
|
||||
}
|
||||
// 如果已经是目标类型,直接返回
|
||||
if (params instanceof IotDeviceAuthReqDTO) {
|
||||
return (IotDeviceAuthReqDTO) params;
|
||||
}
|
||||
|
||||
// 其他情况尝试 JSON 转换
|
||||
return JsonUtils.convertObject(params, IotDeviceAuthReqDTO.class);
|
||||
} catch (Exception e) {
|
||||
log.error("[parseAuthParams][解析认证参数({})失败]", params, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析注册参数
|
||||
*
|
||||
* @param params 参数对象(通常为 Map 类型)
|
||||
* @return 注册参数 DTO,解析失败时返回 null
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "DuplicatedCode"})
|
||||
private IotDeviceRegisterReqDTO parseRegisterParams(Object params) {
|
||||
if (params == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// 参数默认为 Map 类型,直接转换
|
||||
if (params instanceof Map) {
|
||||
Map<String, Object> paramMap = (Map<String, Object>) params;
|
||||
return new IotDeviceRegisterReqDTO()
|
||||
.setProductKey(MapUtil.getStr(paramMap, "productKey"))
|
||||
.setDeviceName(MapUtil.getStr(paramMap, "deviceName"))
|
||||
.setProductSecret(MapUtil.getStr(paramMap, "productSecret"));
|
||||
}
|
||||
// 如果已经是目标类型,直接返回
|
||||
if (params instanceof IotDeviceRegisterReqDTO) {
|
||||
return (IotDeviceRegisterReqDTO) params;
|
||||
}
|
||||
|
||||
// 其他情况尝试 JSON 转换
|
||||
String jsonStr = JsonUtils.toJsonString(params);
|
||||
return JsonUtils.parseObject(jsonStr, IotDeviceRegisterReqDTO.class);
|
||||
} catch (Exception e) {
|
||||
log.error("[parseRegisterParams][解析注册参数({})失败]", params, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送注册成功响应(包含 deviceSecret)
|
||||
*
|
||||
* @param socket 网络连接
|
||||
* @param requestId 请求 ID
|
||||
* @param registerResp 注册响应
|
||||
*/
|
||||
private void sendRegisterSuccessResponse(NetSocket socket, String requestId,
|
||||
IotDeviceRegisterRespDTO registerResp) {
|
||||
try {
|
||||
// 1. 构建响应消息(参考 HTTP 返回格式,直接返回 IotDeviceRegisterRespDTO)
|
||||
IotDeviceMessage responseMessage = IotDeviceMessage.replyOf(requestId,
|
||||
IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod(), registerResp, 0, null);
|
||||
// 2. 序列化 + 帧编码
|
||||
byte[] serializedData = serializer.serialize(responseMessage);
|
||||
Buffer frameData = codec.encode(serializedData);
|
||||
socket.write(frameData);
|
||||
} catch (Exception e) {
|
||||
log.error("[sendRegisterSuccessResponse][发送注册成功响应失败,requestId: {}]", requestId, e);
|
||||
}
|
||||
private void writeResponse(NetSocket socket, IotDeviceMessage responseMessage) {
|
||||
byte[] serializedData = serializer.serialize(responseMessage);
|
||||
Buffer frameData = codec.encode(serializedData);
|
||||
socket.write(frameData);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import io.vertx.core.buffer.Buffer;
|
||||
import io.vertx.core.net.NetSocket;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
@@ -20,7 +19,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
* @author 芋道源码
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class IotTcpConnectionManager {
|
||||
|
||||
/**
|
||||
@@ -73,22 +71,6 @@ public class IotTcpConnectionManager {
|
||||
log.info("[unregisterConnection][注销设备连接,设备 ID: {},连接: {}]", deviceId, socket.remoteAddress());
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查连接是否已认证
|
||||
*/
|
||||
public boolean isAuthenticated(NetSocket socket) {
|
||||
ConnectionInfo info = connectionMap.get(socket);
|
||||
return info != null;
|
||||
}
|
||||
|
||||
// TODO @AI:是不是可以去掉;因为现在只有认证成功的,才会注册连接;
|
||||
/**
|
||||
* 检查连接是否未认证
|
||||
*/
|
||||
public boolean isNotAuthenticated(NetSocket socket) {
|
||||
return !isAuthenticated(socket);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取连接信息
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user