From 6c69c8a2817a3135bb09abcf609c696ceb236fe2 Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Tue, 18 Mar 2025 15:47:10 +0800 Subject: [PATCH] 170 --- .../DecenterClientTransfer.cs | 2 +- .../messenger/DecenterMessenger.cs | 46 ++++++++++++------- version.txt | 2 +- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/linker.messenger.decenter/DecenterClientTransfer.cs b/src/linker.messenger.decenter/DecenterClientTransfer.cs index f00a53d0..1c5cf0be 100644 --- a/src/linker.messenger.decenter/DecenterClientTransfer.cs +++ b/src/linker.messenger.decenter/DecenterClientTransfer.cs @@ -58,7 +58,7 @@ namespace linker.messenger.decenter } return Helper.EmptyArray; } - public Memory Sync(DecenterSyncInfo170 decenterSyncInfo) + public Memory Sync170(DecenterSyncInfo170 decenterSyncInfo) { IDecenter sync = syncs.FirstOrDefault(c => c.Name == decenterSyncInfo.Name); if (sync != null) diff --git a/src/linker.messenger.decenter/messenger/DecenterMessenger.cs b/src/linker.messenger.decenter/messenger/DecenterMessenger.cs index 33ccdb52..4e23dcad 100644 --- a/src/linker.messenger.decenter/messenger/DecenterMessenger.cs +++ b/src/linker.messenger.decenter/messenger/DecenterMessenger.cs @@ -141,27 +141,41 @@ namespace linker.messenger.decenter connection.Write(syncTreansfer.Sync(info)); } - [MessengerId((ushort)DecenterMessengerIds.Sync170)] + [MessengerId((ushort)DecenterMessengerIds.Sync170)] public async void Sync170(IConnection connection) { - DecenterSyncInfo170 info = serializer.Deserialize(connection.ReceiveRequestWrap.Payload.Span); - Memory memory = syncTreansfer.Sync(info); - - //群发来的,我就回复 - if (string.IsNullOrWhiteSpace(info.ToMachineId)) + try { - await sender.SendOnly(new MessageRequestWrap + DecenterSyncInfo170 info = serializer.Deserialize(connection.ReceiveRequestWrap.Payload.Span); + Memory memory = syncTreansfer.Sync170(info); + + //群发来的,我就回复 + if (string.IsNullOrWhiteSpace(info.ToMachineId)) { - Connection = signInClientState.Connection, - MessengerId = (ushort)DecenterMessengerIds.SyncForward170, - Payload = serializer.Serialize(new DecenterSyncInfo170 + await sender.SendOnly(new MessageRequestWrap { - Data = memory, - FromMachineId = signInClientState.Connection.Id, - ToMachineId = info.FromMachineId, - Name = info.Name - }) - }); + Connection = signInClientState.Connection, + MessengerId = (ushort)DecenterMessengerIds.SyncForward170, + Payload = serializer.Serialize(new DecenterSyncInfo170 + { + Data = memory, + FromMachineId = signInClientState.Connection.Id, + ToMachineId = info.FromMachineId, + Name = info.Name + }) + }); + } + } + catch (Exception) + { + try + { + DecenterSyncInfo info = serializer.Deserialize(connection.ReceiveRequestWrap.Payload.Span); + LoggerHelper.Instance.Warning(info.Name); + } + catch (Exception) + { + } } } } diff --git a/version.txt b/version.txt index 6f259eed..8cb9e3d8 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ v1.7.0 -2025-03-18 14:28:31 +2025-03-18 15:47:09 1. 优化linux下路由跟踪问题,提高启动速度 2. 优化linux下获取本机IP问题,提升虚拟网卡稳定性 3. 增加中继cdkey,使用cdkey解锁公开中继节点的带宽、流量、连接数限制