diff --git a/net/src/main/java/com/zfoo/net/packet/PacketService.java b/net/src/main/java/com/zfoo/net/packet/PacketService.java index e0b5fbb0..176a9c43 100644 --- a/net/src/main/java/com/zfoo/net/packet/PacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/PacketService.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.net.NetContext; import com.zfoo.net.router.attachment.IAttachment; +import com.zfoo.net.router.attachment.SignalOnlyAttachment; import com.zfoo.net.router.route.PacketBus; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; @@ -73,6 +74,7 @@ public class PacketService implements IPacketService { private final Predicate netGenerateProtocolFilter = registration -> ProtocolManager.moduleByModuleId(registration.module()).getName().matches(NET_COMMON_MODULE) + || registration.protocolConstructor().getDeclaringClass() == SignalOnlyAttachment.class || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_REQUEST_SUFFIX) || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_RESPONSE_SUFFIX) || registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_NOTICE_SUFFIX); diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index 2d2df049..4addb316 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -60,7 +60,7 @@ public class ProtocolAnalysis { // 临时变量,启动完成就会销毁,协议名称保留字符,即协议的名称不能用以下名称命名 private static Set protocolReserved = Set.of("Buffer", "ByteBuf", "ByteBuffer", "LittleEndianByteBuffer", "NormalByteBuffer" - , "IPacket", "IProtocolRegistration", "ProtocolManager", "IFieldRegistration" + , "IProtocol", "IProtocolRegistration", "ProtocolManager", "IFieldRegistration" , "ByteBufUtils", "ArrayUtils", "CollectionUtils" , "Boolean", "Byte", "Short", "Integer", "Long", "Float", "Double", "String", "Character", "Object" , "Collections", "Iterator", "List", "ArrayList", "Map", "HashMap", "Set", "HashSet"); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java index df29046b..5d8c8dc9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java @@ -265,7 +265,7 @@ public class CutDownListSerializer implements ICutDownSerializer { } break; default: - // List + // List if (listField.getListElementRegistration() instanceof ObjectProtocolField) { var protocolId = ((ObjectProtocolField) listField.getListElementRegistration()).getProtocolId(); switch (language) { diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java index 6fa73301..0f83311d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java @@ -279,7 +279,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { } break; default: - // Set + // Set if (setField.getSetElementRegistration() instanceof ObjectProtocolField) { var protocolId = ((ObjectProtocolField) setField.getSetElementRegistration()).getProtocolId(); switch (language) { diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java index bef3c2de..cb4118b5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java @@ -87,7 +87,7 @@ public abstract class GenerateCsUtils { public static void createProtocolManager() throws IOException { var list = List.of("csharp/ProtocolManager.cs" , "csharp/IProtocolRegistration.cs" - , "csharp/IPacket.cs" + , "csharp/IProtocol.cs" , "csharp/Buffer/ByteBuffer.cs" , "csharp/Buffer/LittleEndianByteBuffer.cs" , "csharp/Buffer/BigEndianByteBuffer.cs"); diff --git a/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs b/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs index 170222aa..2f8a5a1a 100644 --- a/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs +++ b/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs @@ -563,7 +563,7 @@ namespace CsProtocol.Buffer return Encoding.UTF8.GetString(value, 0, value.Length); } - public bool WritePacketFlag(IPacket packet) + public bool WritePacketFlag(IProtocol packet) { bool flag = packet == null; WriteBool(!flag); @@ -871,7 +871,7 @@ namespace CsProtocol.Buffer int length = array.Length; for (int index = 0; index < length; index++) { - protocolRegistration.Write(this, (IPacket) array[index]); + protocolRegistration.Write(this, (IProtocol) array[index]); } } } @@ -1193,7 +1193,7 @@ namespace CsProtocol.Buffer int length = list.Count; for (int index = 0; index < length; index++) { - protocolRegistration.Write(this, (IPacket) list[index]); + protocolRegistration.Write(this, (IProtocol) list[index]); } } } @@ -1474,7 +1474,7 @@ namespace CsProtocol.Buffer WriteInt(set.Count); foreach (var element in set) { - protocolRegistration.Write(this, (IPacket) element); + protocolRegistration.Write(this, (IProtocol) element); } } } @@ -1611,7 +1611,7 @@ namespace CsProtocol.Buffer foreach (var element in map) { WriteInt(element.Key); - protocolRegistration.Write(this, (IPacket) element.Value); + protocolRegistration.Write(this, (IProtocol) element.Value); } } } @@ -1750,7 +1750,7 @@ namespace CsProtocol.Buffer foreach (var element in map) { WriteLong(element.Key); - protocolRegistration.Write(this, (IPacket) element.Value); + protocolRegistration.Write(this, (IProtocol) element.Value); } } } @@ -1889,7 +1889,7 @@ namespace CsProtocol.Buffer foreach (var element in map) { WriteString(element.Key); - protocolRegistration.Write(this, (IPacket) element.Value); + protocolRegistration.Write(this, (IProtocol) element.Value); } } } @@ -1915,7 +1915,7 @@ namespace CsProtocol.Buffer public void WritePacket(T packet, short protocolId) { IProtocolRegistration protocolRegistration = ProtocolManager.GetProtocol(protocolId); - protocolRegistration.Write(this, (IPacket) packet); + protocolRegistration.Write(this, (IProtocol) packet); } public T ReadPacket(short protocolId) diff --git a/protocol/src/main/resources/csharp/IPacket.cs b/protocol/src/main/resources/csharp/IProtocol.cs similarity index 70% rename from protocol/src/main/resources/csharp/IPacket.cs rename to protocol/src/main/resources/csharp/IProtocol.cs index c4f5c8c5..58d238c7 100644 --- a/protocol/src/main/resources/csharp/IPacket.cs +++ b/protocol/src/main/resources/csharp/IProtocol.cs @@ -1,6 +1,6 @@ namespace CsProtocol.Buffer { - public interface IPacket + public interface IProtocol { short ProtocolId(); } diff --git a/protocol/src/main/resources/csharp/IProtocolRegistration.cs b/protocol/src/main/resources/csharp/IProtocolRegistration.cs index 7c257d33..1754b0f7 100644 --- a/protocol/src/main/resources/csharp/IProtocolRegistration.cs +++ b/protocol/src/main/resources/csharp/IProtocolRegistration.cs @@ -4,9 +4,9 @@ { short ProtocolId(); - void Write(ByteBuffer buffer, IPacket packet); + void Write(ByteBuffer buffer, IProtocol packet); - IPacket Read(ByteBuffer buffer); + IProtocol Read(ByteBuffer buffer); } } \ No newline at end of file diff --git a/protocol/src/main/resources/csharp/ProtocolManager.cs b/protocol/src/main/resources/csharp/ProtocolManager.cs index f35909ec..d3df135d 100644 --- a/protocol/src/main/resources/csharp/ProtocolManager.cs +++ b/protocol/src/main/resources/csharp/ProtocolManager.cs @@ -50,7 +50,7 @@ namespace CsProtocol return protocol; } - public static void Write(ByteBuffer buffer, IPacket packet) + public static void Write(ByteBuffer buffer, IProtocol packet) { var protocolId = packet.ProtocolId(); // 写入协议号 @@ -60,7 +60,7 @@ namespace CsProtocol GetProtocol(protocolId).Write(buffer, packet); } - public static IPacket Read(ByteBuffer buffer) + public static IProtocol Read(ByteBuffer buffer) { var protocolId = buffer.ReadShort(); return GetProtocol(protocolId).Read(buffer); diff --git a/protocol/src/main/resources/csharp/ProtocolTemplate.cs b/protocol/src/main/resources/csharp/ProtocolTemplate.cs index 16103c9d..244b45bf 100644 --- a/protocol/src/main/resources/csharp/ProtocolTemplate.cs +++ b/protocol/src/main/resources/csharp/ProtocolTemplate.cs @@ -5,7 +5,7 @@ using CsProtocol.Buffer; namespace CsProtocol { {} - public class {} : IPacket + public class {} : IProtocol { {} @@ -31,7 +31,7 @@ namespace CsProtocol return {}; } - public void Write(ByteBuffer buffer, IPacket packet) + public void Write(ByteBuffer buffer, IProtocol packet) { if (buffer.WritePacketFlag(packet)) { @@ -41,7 +41,7 @@ namespace CsProtocol {} } - public IPacket Read(ByteBuffer buffer) + public IProtocol Read(ByteBuffer buffer) { if (!buffer.ReadBool()) {