一次大的提交
This commit is contained in:
@@ -36,9 +36,15 @@ class TcpClient {
|
||||
|
||||
final ILoggerService _logger = GetIt.I<ILoggerService>();
|
||||
|
||||
// 新增:心跳定时器
|
||||
// 心跳超时定时器(收到服务端心跳后重置,超时则判定连接断开)
|
||||
Timer? _heartbeatTimer;
|
||||
Timer? _heartbeatSendTimer; // 🔥 主动发送心跳定时器:每5秒给服务端发一次,防止服务端判定客户端失效
|
||||
Timer? _reconnectTimer; // 重连定时器
|
||||
int _reconnectAttempt = 0; // 🔥 重连尝试次数,用于退避计算
|
||||
int _reconnectFailCount = 0; // 🔥 连续重连失败次数(含心跳超时),达到阈值后停止重连
|
||||
/// 🔥 重连耗尽回调:连续4次重连失败(含心跳超时)后触发,通知上层弹窗提示用户
|
||||
VoidCallback? onReconnectExhausted;
|
||||
static const Duration _heartbeatTimeout = Duration(seconds: 15); // 心跳超时时间
|
||||
|
||||
String? _lastHost;
|
||||
int? _lastPort;
|
||||
@@ -46,6 +52,7 @@ class TcpClient {
|
||||
bool _isSwitching = false;
|
||||
bool _connecting = false; // 🔥 是否正在建立连接(防止 connect() 和 connectBySwitch() 并发竞争)
|
||||
Completer<void>? _connectionCompleter; // 🔥 用于通知连接就绪
|
||||
int _connectionId = 0; // 🔥 连接代数:每次新建连接递增,旧socket回调发现ID不匹配则忽略
|
||||
|
||||
// 🔥 关键标志:记录客户端最后一次发送 0x03 认证包的时间
|
||||
// 用于区分"自身认证触发的 have_logged_in"和"真正的异地登录"
|
||||
@@ -95,6 +102,7 @@ class TcpClient {
|
||||
|
||||
bool get isConnected => _socket != null;
|
||||
void disconnects({bool forSwitch = false}) {
|
||||
_connectionId++; // 🔥 使旧socket回调失效
|
||||
if (forSwitch) {
|
||||
_isSwitching = true;
|
||||
//debugPrint('🚫 [TCP] 标记为切换断开,将禁止自动重连');
|
||||
@@ -103,7 +111,7 @@ class TcpClient {
|
||||
|
||||
// 🔥 关键:立即取消可能已经存在或即将触发的重连定时器
|
||||
_reconnectTimer?.cancel();
|
||||
_heartbeatTimer?.cancel();
|
||||
stopHeartbeat();
|
||||
|
||||
if (_socket != null) {
|
||||
//debugPrint('🔌 [TCP] 物理断开 Socket...');
|
||||
@@ -123,6 +131,7 @@ class TcpClient {
|
||||
/// 🔥 彻底断开 TCP(用于退出登录),清除所有重连能力
|
||||
void forceDisconnect() {
|
||||
_logger.logWithLevel('🛑 [TCP] 强制断开并清除重连能力', shouldLog: true);
|
||||
_connectionId++; // 🔥 使旧socket回调失效
|
||||
|
||||
// 1. 停止心跳
|
||||
stopHeartbeat();
|
||||
@@ -141,6 +150,8 @@ class TcpClient {
|
||||
_connecting = false;
|
||||
_connectionCompleter = null;
|
||||
_lastAuthPacketSentAt = null;
|
||||
_reconnectAttempt = 0; // 🔥 重置重连退避
|
||||
_reconnectFailCount = 0; // 🔥 重置重连失败计数
|
||||
|
||||
// 5. 销毁 Socket
|
||||
if (_socket != null) {
|
||||
@@ -187,7 +198,9 @@ class TcpClient {
|
||||
|
||||
_connecting = true;
|
||||
_connectionCompleter = Completer<void>();
|
||||
debugPrint('🔌 [TCP-connect] 设置 _connecting=true');
|
||||
_connectionId++; // 🔥 新一代连接,旧socket的回调将自动失效
|
||||
final myConnId = _connectionId;
|
||||
debugPrint('🔌 [TCP-connect] 设置 _connecting=true, connectionId=$myConnId');
|
||||
|
||||
_logger.logWithLevel('🔌 [TCP] 开始连接:$host:$port', shouldLog: true);
|
||||
|
||||
@@ -207,6 +220,9 @@ class TcpClient {
|
||||
timeout: const Duration(seconds: 5),
|
||||
);
|
||||
_connecting = false; // 🔥 连接成功,重置标志
|
||||
// 🔥 关键:在重置退避计数前,记住本次是否是重连(用于后续检测服务端残留session)
|
||||
final bool wasReconnecting = _reconnectAttempt > 0;
|
||||
_reconnectAttempt = 0; // 🔥 连接成功,重置重连退避
|
||||
if (_connectionCompleter != null && !_connectionCompleter!.isCompleted) {
|
||||
_connectionCompleter!.complete();
|
||||
debugPrint('✅ [TCP-connect] 连接就绪,通知等待方');
|
||||
@@ -225,6 +241,8 @@ class TcpClient {
|
||||
|
||||
// 开始认证tcp
|
||||
await _sendAuthPacket();
|
||||
// 🔥 启动心跳超时检测:等待服务端心跳,超时则触发重连
|
||||
startHeartbeat();
|
||||
_socket!.listen(
|
||||
(data) {
|
||||
//debugPrint('📥 [TCP] 收到原始数据:${data.length} 字节, 内容:$data');
|
||||
@@ -248,12 +266,23 @@ class TcpClient {
|
||||
shouldLog: false,
|
||||
);
|
||||
for (var packet in packets) {
|
||||
// 🔥 最根部日志:收到任何推送都打印
|
||||
// debugPrint('📥 [TCP-ROOT] 收到推送 CMD: 0x${packet.command.toRadixString(16).toUpperCase()}, Payload长度: ${packet.payload.length}');
|
||||
// _logger.logWithLevel(
|
||||
// '📥 [TCP-ROOT] 收到推送 CMD: 0x${packet.command.toRadixString(16).toUpperCase()}, Payload长度: ${packet.payload.length}',
|
||||
// shouldLog: true,
|
||||
// );
|
||||
// 🔥 关键修复:重连期间收到 have_logged_in,拦截不分发给 AuthCubit
|
||||
// 必须在 _controller.add 之前检查,否则 AuthCubit 会判定为异地登录弹出退出弹窗
|
||||
if (packet.command == 0x12 && wasReconnecting) {
|
||||
try {
|
||||
final payloadStr = utf8.decode(packet.payload.length > 2
|
||||
? packet.payload.sublist(0, packet.payload.length - 2)
|
||||
: packet.payload);
|
||||
if (payloadStr.contains('have_logged_in')) {
|
||||
debugPrint('🔄 [TCP] 重连后收到 have_logged_in,服务端session残留!立即断开让服务端清理session');
|
||||
_logger.logWithLevel('🔄 [TCP] 重连后收到 have_logged_in,服务端session残留,强制重连', shouldLog: true);
|
||||
_handleReconnectSessionReset(myConnId);
|
||||
return; // 停止处理后续数据,不分发给任何监听器
|
||||
}
|
||||
} catch (_) {
|
||||
// 解析失败不影响主流程
|
||||
}
|
||||
}
|
||||
|
||||
if (!_controller.isClosed) {
|
||||
_controller.add(packet);
|
||||
@@ -264,12 +293,9 @@ class TcpClient {
|
||||
);
|
||||
}
|
||||
if (packet.command == 0xFF) {
|
||||
//debugPrint('收到服务端心跳,自动回复...');
|
||||
_logger.logWithLevel(
|
||||
'✅ [TCP] 收到服务端心跳,自动回复...',
|
||||
shouldLog: false,
|
||||
);
|
||||
debugPrint('📥 [TCP] ✅ 收到服务端心跳 0xFF,重置超时计时器');
|
||||
sendHeartbeat(); // 回复 AB AA FF AA AB
|
||||
_resetHeartbeatTimeout(); // 重置超时计时器
|
||||
}
|
||||
if (packet.command == 0x03) {
|
||||
// debugPrint('⚠️ 收到认证响应:${packet.payload}');
|
||||
@@ -289,24 +315,28 @@ class TcpClient {
|
||||
}
|
||||
},
|
||||
onDone: () {
|
||||
// TODO: 断线重连
|
||||
// debugPrint('来到断线重连!');
|
||||
// 🔥 关键修复:检查 connectionId,防止旧socket的回调污染新连接
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onDone] 旧连接 #$myConnId 的回调,当前 #$_connectionId,忽略');
|
||||
_logger.logWithLevel('⏭️ [TCP-onDone] 旧连接 #$myConnId 回调,忽略', shouldLog: true);
|
||||
return;
|
||||
}
|
||||
if (!_isSwitching) {
|
||||
//debugPrint('onDone❌ [TCP] 连接已断开!');
|
||||
_logger.logWithLevel('❌ [TCP] 连接已断开!', shouldLog: false);
|
||||
_logger.logWithLevel('❌ [TCP] 连接已断开!', shouldLog: true);
|
||||
_handleDisconnect();
|
||||
}
|
||||
_isSwitching = false; // 重置标志,以免影响下次
|
||||
_isSwitching = false;
|
||||
},
|
||||
onError: (e) {
|
||||
//debugPrint('来到断线重连!error');
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onError] 旧连接 #$myConnId 的回调,当前 #$_connectionId,忽略');
|
||||
return;
|
||||
}
|
||||
_logger.logWithLevel('❌ [TCP] 发生错误:$e', shouldLog: true);
|
||||
if (!_isSwitching) {
|
||||
//debugPrint('❌ [TCP] 发生错误:$e');
|
||||
_logger.logWithLevel('❌ [TCP] 发生错误:$e', shouldLog: true);
|
||||
_handleDisconnect();
|
||||
} // 统一走重连逻辑,保护 Controller 不被关闭
|
||||
_isSwitching = false; // 重置标志,以免影响下次
|
||||
}
|
||||
_isSwitching = false;
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
@@ -318,13 +348,46 @@ class TcpClient {
|
||||
}
|
||||
}
|
||||
|
||||
/// 🔥 重连后服务端session残留处理:立即销毁连接,等待服务端清理session后再重连
|
||||
/// 这是解决"退出登录重连就好"问题的核心:
|
||||
/// 退出登录 → forceDisconnect → 服务端有足够时间清理session → 重新登录 → 新session → 心跳正常
|
||||
/// 自动重连 → 5秒内重连 → 服务端session还在 → have_logged_in → 不重启心跳 → 超时循环
|
||||
void _handleReconnectSessionReset(int myConnId) {
|
||||
_connectionId++; // 使旧socket回调失效
|
||||
stopHeartbeat();
|
||||
if (_socket != null) {
|
||||
_socket!.destroy();
|
||||
_socket = null;
|
||||
}
|
||||
// 🔥 服务端session残留也算一次重连失败
|
||||
_reconnectFailCount++;
|
||||
debugPrint('📊 [TCP] session残留,重连失败计数: $_reconnectFailCount/4');
|
||||
if (_reconnectFailCount >= 4) {
|
||||
debugPrint('🛑 [TCP] 重连失败已达 4 次,停止重连,通知用户退出登录');
|
||||
_logger.logWithLevel('🛑 [TCP] 重连失败已达 4 次,停止重连', shouldLog: true);
|
||||
onReconnectExhausted?.call();
|
||||
return;
|
||||
}
|
||||
// 🔥 递增重连尝试次数,让下次重连等待更长时间
|
||||
_reconnectAttempt++;
|
||||
_scheduleReconnect();
|
||||
}
|
||||
|
||||
//
|
||||
void _handleDisconnect() {
|
||||
_connectionId++; // 🔥 使旧socket的所有回调立即失效,防止onDone/onError污染新连接
|
||||
debugPrint('🔌 [TCP] _handleDisconnect, connectionId→$_connectionId');
|
||||
_logger.logWithLevel('🔌 [TCP] _handleDisconnect, connectionId→$_connectionId', shouldLog: true);
|
||||
stopHeartbeat();
|
||||
|
||||
_socket = null;
|
||||
// 注意:这里不要关闭 _controller!否则监听者会丢失数据流
|
||||
// _controller?.close();
|
||||
// 🔥 连续失败达到4次,停止重连,通知上层弹窗
|
||||
if (_reconnectFailCount >= 4) {
|
||||
debugPrint('🛑 [TCP] 重连失败已达 4 次,停止重连,通知用户退出登录');
|
||||
_logger.logWithLevel('🛑 [TCP] 重连失败已达 4 次,停止重连', shouldLog: true);
|
||||
onReconnectExhausted?.call();
|
||||
return;
|
||||
}
|
||||
_scheduleReconnect();
|
||||
}
|
||||
|
||||
@@ -333,15 +396,16 @@ class TcpClient {
|
||||
if (isUserSwitch) return;
|
||||
if (_reconnectTimer != null) return;
|
||||
|
||||
// debugPrint('⏳ 调度重连:Host=${_lastHost}, Port=${_lastPort}'); // ✅ 检查 Host/Port 是否为空
|
||||
_logger.logWithLevel('⏳ 调度重连:Host=${_lastHost}, Port=${_lastPort}');
|
||||
// 🔥 重连退避:5s → 10s → 20s → 30s(max)
|
||||
final delay = [5, 10, 20, 30][_reconnectAttempt.clamp(0, 3)];
|
||||
_reconnectAttempt++;
|
||||
_logger.logWithLevel('⏳ 调度重连:第$_reconnectAttempt次,${delay}s后重连,Host=${_lastHost}, Port=${_lastPort}');
|
||||
if (_lastHost == null || _lastPort == null) {
|
||||
//debugPrint('❌ 无法重连:Host 或 Port 为空!');
|
||||
_logger.logWithLevel('❌ 无法重连:Host 或 Port 为空!', shouldLog: true);
|
||||
return;
|
||||
}
|
||||
|
||||
_reconnectTimer = Timer(const Duration(seconds: 5), () {
|
||||
_reconnectTimer = Timer(Duration(seconds: delay), () async {
|
||||
_reconnectTimer = null;
|
||||
// 🔥 关键修复:定时器触发时检查是否已有连接,避免重复创建
|
||||
if (_socket != null) {
|
||||
@@ -355,7 +419,29 @@ class TcpClient {
|
||||
return;
|
||||
}
|
||||
_logger.logWithLevel('⏰ 定时器触发,开始执行重连...', shouldLog: true);
|
||||
connect(host: _lastHost!, port: _lastPort!);
|
||||
try {
|
||||
await connect(host: _lastHost!, port: _lastPort!);
|
||||
_reconnectAttempt = 0; // 🔥 重连成功,重置退避计数
|
||||
// 🔥 重连成功后,补调 HTTP switchDevice 告知服务端推送目标设备
|
||||
try {
|
||||
final remoteControlCubit = GetIt.I<RemoteControlCubit>();
|
||||
final targetDevice = remoteControlCubit.state.targetDevice;
|
||||
if (targetDevice != null) {
|
||||
debugPrint('🔄 [TCP-重连] 补调 HTTP switchDevice: ${targetDevice.deviceName}');
|
||||
_logger.logWithLevel('🔄 [TCP-重连] 补调 HTTP switchDevice: ${targetDevice.deviceName}', shouldLog: true);
|
||||
await switchDeviceUseCase.deviceRepository.switchDevice('app', targetDevice.deviceName);
|
||||
debugPrint('✅ [TCP-重连] HTTP switchDevice 成功');
|
||||
} else {
|
||||
debugPrint('⚠️ [TCP-重连] targetDevice 为 null,跳过 switchDevice');
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('❌ [TCP-重连] HTTP switchDevice 失败: $e');
|
||||
_logger.logWithLevel('❌ [TCP-重连] HTTP switchDevice 失败: $e', shouldLog: true);
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('❌ [TCP-重连] connect 失败: $e');
|
||||
_logger.logWithLevel('❌ [TCP-重连] connect 失败: $e', shouldLog: true);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -446,19 +532,47 @@ class TcpClient {
|
||||
..addByte(0xAA)
|
||||
..addByte(0xAB);
|
||||
_socket!.add(builder.takeBytes());
|
||||
debugPrint('💓 [TCP] 发送心跳 AB AA FF AA AB');
|
||||
}
|
||||
|
||||
// 新增:启动心跳(每 4 秒发送一次 0xFF 指令)
|
||||
/// 启动心跳:主动定时发送 + 超时检测
|
||||
/// 1. 每5秒主动给服务端发心跳,防止服务端判定客户端失效
|
||||
/// 2. 15秒内没收到服务端心跳,判定连接断开并重连
|
||||
void startHeartbeat({Duration interval = const Duration(seconds: 4)}) {
|
||||
if (_heartbeatTimer != null) return; // 防止重复启动
|
||||
debugPrint('⏰ [TCP] 启动心跳定时器,间隔: ${interval.inSeconds}秒');
|
||||
_logger.logWithLevel('✅ [TCP] 收到服务端心跳,自动回复...', shouldLog: true);
|
||||
_heartbeatTimer = Timer.periodic(interval, (_) {
|
||||
// 发送心跳帧:AB AA FF AA AB
|
||||
debugPrint('💓 [TCP] 发送心跳包 0xFF');
|
||||
sendHeartbeat();
|
||||
debugPrint('⏰ [TCP] 启动心跳:主动发送(5s) + 超时检测(${_heartbeatTimeout.inSeconds}s)');
|
||||
_logger.logWithLevel('⏰ [TCP] 启动心跳:主动发送(5s) + 超时检测(${_heartbeatTimeout.inSeconds}s)', shouldLog: true);
|
||||
|
||||
// 🔥 主动定时发送心跳给服务端(每5秒)
|
||||
_heartbeatSendTimer?.cancel();
|
||||
_heartbeatSendTimer = Timer.periodic(const Duration(seconds: 5), (_) {
|
||||
if (_socket != null) {
|
||||
sendHeartbeat();
|
||||
}
|
||||
});
|
||||
|
||||
// 超时检测
|
||||
_resetHeartbeatTimeout();
|
||||
}
|
||||
|
||||
/// 重置心跳超时定时器
|
||||
/// 每次收到服务端心跳(0xFF)时调用,重新开始计时
|
||||
void _resetHeartbeatTimeout() {
|
||||
_heartbeatTimer?.cancel();
|
||||
_heartbeatTimer = Timer(_heartbeatTimeout, () {
|
||||
debugPrint('⚠️ [TCP] 心跳超时 ${_heartbeatTimeout.inSeconds}s 未收到服务端心跳,判定连接断开');
|
||||
_logger.logWithLevel('⚠️ [TCP] 心跳超时,判定连接断开', shouldLog: true);
|
||||
// 触发断开重连
|
||||
if (_socket != null) {
|
||||
_socket!.destroy();
|
||||
_socket = null;
|
||||
}
|
||||
// 🔥 累计重连失败次数(心跳超时 = 本次连接无效 = 一次失败)
|
||||
_reconnectFailCount++;
|
||||
debugPrint('📊 [TCP] 重连失败计数: $_reconnectFailCount/4');
|
||||
// 🔥 统一走普通断开重连路径(_scheduleReconnect 已包含 HTTP switchDevice)
|
||||
_handleDisconnect();
|
||||
});
|
||||
debugPrint("✅ TCP Connected - 心跳已启动");
|
||||
}
|
||||
|
||||
/// 🔥 封装完整的TCP初始化方法:连接 + 认证 + 心跳
|
||||
@@ -478,6 +592,8 @@ class TcpClient {
|
||||
|
||||
_connecting = true;
|
||||
_connectionCompleter = Completer<void>();
|
||||
_connectionId++; // 🔥 新一代连接,旧socket回调自动失效
|
||||
final myConnId = _connectionId;
|
||||
|
||||
try {
|
||||
// 更新状态为连接中
|
||||
@@ -516,7 +632,7 @@ class TcpClient {
|
||||
_logger.logWithLevel('✅ [TCP] 心跳已启动', shouldLog: true);
|
||||
|
||||
// 设置数据监听(复用现有的监听逻辑)
|
||||
_setupDataListener();
|
||||
_setupDataListener(myConnId);
|
||||
|
||||
_connecting = false;
|
||||
if (_connectionCompleter != null && !_connectionCompleter!.isCompleted) {
|
||||
@@ -538,7 +654,7 @@ class TcpClient {
|
||||
}
|
||||
|
||||
/// 设置数据监听器
|
||||
void _setupDataListener() {
|
||||
void _setupDataListener(int myConnId) {
|
||||
if (_socket == null) return;
|
||||
|
||||
_socket!.listen(
|
||||
@@ -557,7 +673,9 @@ class TcpClient {
|
||||
_controller.add(packet);
|
||||
}
|
||||
if (packet.command == 0xFF) {
|
||||
debugPrint('📥 [TCP] ✅ 收到服务端心跳 0xFF,重置超时计时器');
|
||||
sendHeartbeat();
|
||||
_resetHeartbeatTimeout(); // 重置超时计时器
|
||||
}
|
||||
if (packet.command == 0x03) {
|
||||
_logger.logWithLevel(
|
||||
@@ -574,13 +692,23 @@ class TcpClient {
|
||||
}
|
||||
},
|
||||
onDone: () {
|
||||
// 🔥 检查 connectionId,防止旧socket回调污染新连接
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onDone] 旧连接 #$myConnId 回调,当前 #$_connectionId,忽略');
|
||||
_logger.logWithLevel('⏭️ [TCP-onDone] 旧连接 #$myConnId 回调,忽略', shouldLog: true);
|
||||
return;
|
||||
}
|
||||
if (!_isSwitching) {
|
||||
_logger.logWithLevel('❌ [TCP] 连接已断开!', shouldLog: false);
|
||||
_logger.logWithLevel('❌ [TCP] 连接已断开!', shouldLog: true);
|
||||
_handleDisconnect();
|
||||
}
|
||||
_isSwitching = false;
|
||||
},
|
||||
onError: (e) {
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onError] 旧连接 #$myConnId 回调,当前 #$_connectionId,忽略');
|
||||
return;
|
||||
}
|
||||
_logger.logWithLevel('❌ [TCP] 发生错误:$e', shouldLog: true);
|
||||
if (!_isSwitching) {
|
||||
_handleDisconnect();
|
||||
@@ -590,10 +718,12 @@ class TcpClient {
|
||||
);
|
||||
}
|
||||
|
||||
// 新增:停止心跳
|
||||
// 停止心跳(主动发送 + 超时检测全部停止)
|
||||
void stopHeartbeat() {
|
||||
_heartbeatTimer?.cancel();
|
||||
_heartbeatTimer = null;
|
||||
_heartbeatSendTimer?.cancel();
|
||||
_heartbeatSendTimer = null;
|
||||
}
|
||||
|
||||
// void disconnect() {
|
||||
@@ -608,7 +738,8 @@ class TcpClient {
|
||||
//
|
||||
// }
|
||||
void disconnect() {
|
||||
debugPrint('🛑 [TCP] 主动断开连接...');
|
||||
_connectionId++; // 🔥 使旧socket回调失效
|
||||
debugPrint('🛑 [TCP] 主动断开连接... connectionId→$_connectionId');
|
||||
_logger.logWithLevel('🛑 [TCP] 主动断开连接...');
|
||||
|
||||
// 1. 停止心跳
|
||||
@@ -629,8 +760,8 @@ class TcpClient {
|
||||
_isSwitching = false;
|
||||
_connecting = false;
|
||||
_connectionCompleter = null;
|
||||
|
||||
// 5. 销毁 Socket
|
||||
_reconnectAttempt = 0; // 🔥 重置重连退避
|
||||
_reconnectFailCount = 0; // 🔥 重置重连失败计数
|
||||
if (_socket != null) {
|
||||
_socket!.destroy();
|
||||
_socket = null;
|
||||
@@ -736,7 +867,7 @@ class TcpClient {
|
||||
|
||||
_lastAuthPacketSentAt = DateTime.now(); // 🔥 记录发送 0x03 的时间
|
||||
_socket!.add(builder.takeBytes());
|
||||
//debugPrint('🔑 [TCP] 已发送认证包 (0x03): $authString');
|
||||
await _socket!.flush(); // 🔥 关键修复:强制 flush,确保认证包立即到达服务端
|
||||
_logger.logWithLevel('🔑 [TCP] 已发送认证包 (0x03): $authString');
|
||||
|
||||
// 🔥 关键修复:移除登录时自动获取设备列表和切换设备的逻辑
|
||||
@@ -850,7 +981,9 @@ class TcpClient {
|
||||
|
||||
isUserSwitch = true;
|
||||
_connecting = true; // 🔥 防止 connect() 并发创建新连接
|
||||
debugPrint('🔌 [TCP-connectBySwitch] 无现有连接,开始新建');
|
||||
_connectionId++; // 🔥 新一代连接,旧socket回调自动失效
|
||||
final myConnId = _connectionId;
|
||||
debugPrint('🔌 [TCP-connectBySwitch] 无现有连接,开始新建, connectionId=$myConnId');
|
||||
|
||||
// debugPrint('🔌被动 [TCP] 开始连接:$host:$port'); // ✅ 必须看到这条
|
||||
_logger.logWithLevel('🔌被动 [TCP] 开始连接:$host:$port');
|
||||
@@ -908,10 +1041,9 @@ class TcpClient {
|
||||
);
|
||||
}
|
||||
if (packet.command == 0xFF) {
|
||||
//debugPrint('收到服务端心跳,自动回复...');
|
||||
_logger.logWithLevel('✅ [TCP] 收到服务端心跳,自动回复...');
|
||||
//
|
||||
debugPrint('📥 [TCP] ✅ 收到服务端心跳 0xFF,重置超时计时器');
|
||||
sendHeartbeat(); // 回复 AB AA FF AA AB
|
||||
_resetHeartbeatTimeout(); // 重置超时计时器
|
||||
}
|
||||
if (packet.command == 0x03) {
|
||||
//debugPrint('⚠️ 收到认证响应:${packet.payload}');
|
||||
@@ -925,18 +1057,28 @@ class TcpClient {
|
||||
}
|
||||
},
|
||||
onDone: () {
|
||||
// 🔥 检查 connectionId,防止旧socket回调污染新连接
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onDone] 旧连接 #$myConnId 回调,当前 #$_connectionId,忽略');
|
||||
_logger.logWithLevel('⏭️ [TCP-onDone] 旧连接 #$myConnId 回调,忽略', shouldLog: true);
|
||||
return;
|
||||
}
|
||||
debugPrint('onDone [TCP] 被动连接已断开!_isSwitching=$_isSwitching');
|
||||
if (!_isSwitching) {
|
||||
_handleDisconnectBySwitch(deviceName);
|
||||
_handleDisconnect();
|
||||
} else {
|
||||
debugPrint('🚫 [TCP] 切换过程中的断开,忽略重连调度');
|
||||
_isSwitching = false;
|
||||
}
|
||||
},
|
||||
onError: (e) {
|
||||
if (myConnId != _connectionId) {
|
||||
debugPrint('⏭️ [TCP-onError] 旧连接 #$myConnId 回调,当前 #$_connectionId,忽略');
|
||||
return;
|
||||
}
|
||||
_logger.logWithLevel('❌ 被动[TCP] 发生错误:$e');
|
||||
if (!_isSwitching) {
|
||||
_handleDisconnectBySwitch(deviceName);
|
||||
_handleDisconnect();
|
||||
} else {
|
||||
debugPrint('🚫 [TCP] 切换过程中的错误,忽略重连调度');
|
||||
_isSwitching = false;
|
||||
@@ -951,8 +1093,9 @@ class TcpClient {
|
||||
rethrow; // 向上抛出连接异常
|
||||
}
|
||||
|
||||
// 🔥 关键修复:只有在所有操作成功后才重置 _connecting
|
||||
// 🔥 重置 _connecting 和 isUserSwitch
|
||||
_connecting = false;
|
||||
isUserSwitch = false; // 🔥 关键:切换完成后重置,后续超时走普通重连路径
|
||||
if (_connectionCompleter != null && !_connectionCompleter!.isCompleted) {
|
||||
_connectionCompleter!.complete();
|
||||
debugPrint('✅ [TCP-connectBySwitch] 连接就绪,通知等待方');
|
||||
@@ -1029,6 +1172,9 @@ class TcpClient {
|
||||
}
|
||||
|
||||
void _handleDisconnectBySwitch(String deviceName) {
|
||||
_connectionId++; // 🔥 使旧socket的所有回调立即失效
|
||||
debugPrint('🔌 [TCP] _handleDisconnectBySwitch, connectionId→$_connectionId');
|
||||
_logger.logWithLevel('🔌 [TCP] _handleDisconnectBySwitch, connectionId→$_connectionId', shouldLog: true);
|
||||
stopHeartbeat();
|
||||
|
||||
_socket = null;
|
||||
|
||||
Reference in New Issue
Block a user