关服消息

Peng Hu · Peng Hu · commit b0187636d62c · 2021-02-23T21:50:08.000+09:00
diff --git a/src/main/java/info/xiaomo/gengine/config/AbstractFileConfigDataManager.java b/src/main/java/info/xiaomo/gengine/config/AbstractFileConfigDataManager.java
@@ -143,7 +143,7 @@ private void parseFileConfig() throws Exception {
 		Map<String, Object> tempCaches = new HashMap<>(10);
 		cacheClz.forEach((clzName, clz) -> {
 			try {
-				Object obj = clz.newInstance();
+				Object obj = clz.getConstructor().newInstance();
 				if (IConfigCache.class.isAssignableFrom(clz)) {
 					IConfigCache cache = (IConfigCache) obj;
 					cache.build();
diff --git a/src/main/java/info/xiaomo/gengine/config/excel/ExcelConfigWrapper.java b/src/main/java/info/xiaomo/gengine/config/excel/ExcelConfigWrapper.java
@@ -1,10 +1,12 @@
 package info.xiaomo.gengine.config.excel;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+
 import info.xiaomo.gengine.config.ConfigContainer;
 import info.xiaomo.gengine.config.IConfigWrapper;
 import info.xiaomo.gengine.config.beans.ColumnDesc;
@@ -101,7 +103,7 @@ public ExcelConfigWrapper build() {
         Map<Integer, String> header = table.remove(tableDesc.getHeader());
         table.forEach((rowIndex, rowData) -> {
             try {
-                Object config = clz.newInstance();
+                Object config = clz.getConstructor().newInstance();
                 header.forEach((columnIndex, columnName) -> {
                     String cellData = rowData.get(columnIndex);
                     ColumnDesc columnDesc = columns.get(columnName);
@@ -164,7 +166,7 @@ public ExcelConfigWrapper build() {
                     container.getConfigMap().put(sb.toString(), config);
                 }
                 container.getConfigList().add(config);
-            } catch (InstantiationException | IllegalAccessException e) {
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                 e.printStackTrace();
             }
         });
diff --git a/src/main/java/info/xiaomo/gengine/config/excel/parser/DataConfigXmlParser.java b/src/main/java/info/xiaomo/gengine/config/excel/parser/DataConfigXmlParser.java
@@ -149,10 +149,10 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t
 							String[] converters = convertersStr.split(",");
 							if (converters.length > 0) {
 								Class<? extends IConverter> converterClz = (Class<? extends IConverter>) Class.forName(converters[0]);
-								IConverter converter = converterClz.newInstance();
+								IConverter converter = converterClz.getConstructor().newInstance();
 								for (int i = 1; i < converters.length; i++) {
 									converterClz = (Class<? extends IConverter>) Class.forName(converters[i]);
-									converter = converter.andThen(converterClz.newInstance());
+									converter = converter.andThen(converterClz.getConstructor().newInstance());
 								}
 								columnDesc.setConverter(converter);
 							}
@@ -173,7 +173,7 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t
 							}
 
 							Class<? extends IConverter> converterClz = (Class<? extends IConverter>) Class.forName(converterClzName);
-							IConverter converter = converterClz.newInstance();
+							IConverter converter = converterClz.getConstructor().newInstance();
 							for (int i = 1; i < converters.size(); i++) {
 								converterElement = (Element) converters.get(i);
 
@@ -186,7 +186,7 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t
 									throw new RuntimeException(String.format("【%s】的属性字段【%s】存在一个空的converter配置", clz.getName(), fieldName));
 								}
 								converterClz = (Class<? extends IConverter>) Class.forName(converterClzName);
-								converter = converter.andThen(converterClz.newInstance());
+								converter = converter.andThen(converterClz.getConstructor().newInstance());
 							}
 							columnDesc.setConverter(converter);
 						}
diff --git a/src/main/java/info/xiaomo/gengine/config/util/ReflectUtils.java b/src/main/java/info/xiaomo/gengine/config/util/ReflectUtils.java
@@ -87,9 +87,9 @@ public static ColumnDesc getColumnDesc(Field field) throws Exception {
 				// 将多个转换器转为一个
 				Class<? extends IConverter>[] converters = column.value();
 				if (converters.length > 0) {
-					IConverter converter = converters[0].newInstance();
+					IConverter converter = converters[0].getConstructor().newInstance();
 					for (int i = 1; i < converters.length; i++) {
-						converter = converter.andThen(converters[i].newInstance());
+						converter = converter.andThen(converters[i].getConstructor().newInstance());
 					}
 					columnDesc.setConverter(converter);
 				}
diff --git a/src/main/java/info/xiaomo/gengine/logger/LogService.java b/src/main/java/info/xiaomo/gengine/logger/LogService.java
@@ -42,7 +42,7 @@ public static void init(String dsConfig, int coreThreadPoolSize, int maximumThre
 
 		Set<Class<AbstractLog>> ret = LogBeanUtil.getSubClasses("info.xiaomo.gengine.log", AbstractLog.class);
 		for (Class<AbstractLog> logClass : ret) {
-			AbstractLog log = logClass.newInstance();
+			AbstractLog log = logClass.getConstructor().newInstance();
 			log.init();
 		}
 		INSTANCE = new LogService();
diff --git a/src/main/java/info/xiaomo/gengine/network/NetworkServiceBuilder.java b/src/main/java/info/xiaomo/gengine/network/NetworkServiceBuilder.java
@@ -11,6 +11,10 @@
 @Data
 public class NetworkServiceBuilder {
 
+    private int upLimit = 2048;//解码大小限制
+
+    private int downLimit = 5120;//编码大小限制
+
     /**
      * 网络线程池线程数量
      */
diff --git a/src/main/java/info/xiaomo/gengine/network/NetworkServiceImpl.java b/src/main/java/info/xiaomo/gengine/network/NetworkServiceImpl.java
@@ -97,7 +97,7 @@ protected void initChannel(Channel ch) {
             pip.addLast(new WebSocketServerProtocolHandler("/"));
             pip.addLast(new WebSocketDecoder());
             pip.addLast(new WebSocketEncoder());
-            pip.addLast(new MessageDecoder(builder.getImessageandhandler()));
+            pip.addLast(new MessageDecoder(builder.getUpLimit()));
             pip.addLast(new MessageExecutor(builder.getConsumer(), builder.getListener()));
             for (ChannelHandler handler : builder.getExtraHandlers()) {
                 pip.addLast(handler);
@@ -123,10 +123,10 @@ protected void initChannel(Channel ch) {
             int lengthFieldLength = 4;
             int ignoreLength = -4;
             int offset = 0;
-            pip.addLast(new LengthFieldBasedFrameDecoder(maxLength, offset, lengthFieldLength, ignoreLength, lengthFieldLength));
-            pip.addLast(new MessageDecoder(builder.getImessageandhandler()));
-            pip.addLast(new LengthFieldPrepender(4, true));
-            pip.addLast(new MessageEncoder(builder.getImessageandhandler()));
+//            pip.addLast(new LengthFieldBasedFrameDecoder(maxLength, offset, lengthFieldLength, ignoreLength, lengthFieldLength));
+            pip.addLast(new MessageDecoder(builder.getUpLimit()));
+//            pip.addLast(new LengthFieldPrepender(4, true));
+            pip.addLast(new MessageEncoder(builder.getDownLimit()));
             pip.addLast(new MessageExecutor(builder.getConsumer(), builder.getListener()));
             for (ChannelHandler handler : builder.getExtraHandlers()) {
                 pip.addLast(handler);
diff --git a/src/main/java/info/xiaomo/gengine/network/Packet.java b/src/main/java/info/xiaomo/gengine/network/Packet.java
@@ -0,0 +1,29 @@
+package info.xiaomo.gengine.network;
+
+import lombok.Data;
+
+@Data
+public class Packet {
+    public static final byte HEAD_TCP = -128;
+    public static final byte HEAD_UDP = 0;
+    public static final byte HEAD_NEED_ACK = 64;
+    public static final byte HEAD_ACK = 44;
+    public static final byte HEAD_PROTOCOL_MASK = 3;
+    public static final byte PROTOCOL_PROTOBUF = 0;
+    public static final byte PROTOCOL_JSON = 1;
+    private final byte head;
+    private final short sid;
+    private final int cmd;
+    private final byte[] bytes;
+
+    public Packet(byte head, int cmd, byte[] bytes) {
+        this(head, (short) 0, cmd, bytes);
+    }
+
+    public Packet(byte head, short sid, int cmd, byte[] bytes) {
+        this.cmd = cmd;
+        this.bytes = bytes;
+        this.head = head;
+        this.sid = sid;
+    }
+}
diff --git a/src/main/java/info/xiaomo/gengine/network/client/Client.java b/src/main/java/info/xiaomo/gengine/network/client/Client.java
@@ -1,6 +1,9 @@
 package info.xiaomo.gengine.network.client;
 
 import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.Message;
+import info.xiaomo.gengine.network.Packet;
 import info.xiaomo.gengine.network.handler.MessageDecoder;
 import info.xiaomo.gengine.network.handler.MessageEncoder;
 import info.xiaomo.gengine.network.pool.MessageAndHandlerPool;
@@ -17,6 +20,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.*;
 
 /**
@@ -89,8 +93,8 @@ protected void initChannel(SocketChannel ch) throws Exception {
                 if (idleCheck) {
                     pip.addLast("Idle", new IdleStateHandler(builder.getMaxIdleTime(), 0, 0));
                 }
-                pip.addLast("NettyMessageDecoder", new MessageDecoder(builder.getMsgPool()));
-                pip.addLast("NettyMessageEncoder", new MessageEncoder(new MessageAndHandlerPool()));
+                pip.addLast("NettyMessageDecoder", new MessageDecoder(builder.getUpLimit()));
+                pip.addLast("NettyMessageEncoder", new MessageEncoder(builder.getDownLimit()));
                 pip.addLast("NettyMessageExecutor", new ClientMessageExecutor(
                         builder.getConsumer(),
                         builder.getEventListener(),
@@ -147,12 +151,24 @@ public boolean sendMsg(List<AbstractMessage> list) {
     public boolean sendMsg(AbstractMessage message) {
         Channel channel = getChannel(Thread.currentThread().getId());
         if (channel != null && channel.isActive()) {
-            channel.writeAndFlush(message);
+            int cmd = getMessageID(message);
+            Packet packet = new Packet(Packet.HEAD_TCP, cmd, message.toByteArray());
+            channel.writeAndFlush(packet);
             return true;
         }
         return false;
     }
 
+    public static int getMessageID(Message msg) {
+        for (Map.Entry<Descriptors.FieldDescriptor, Object> fieldDescriptorObjectEntry : msg.getAllFields().entrySet()) {
+            if (fieldDescriptorObjectEntry.getKey().getName().equals("msgId")) {
+                return ((Descriptors.EnumValueDescriptor) fieldDescriptorObjectEntry.getValue()).getNumber();
+            }
+        }
+        LOGGER.error("在消息体中没有找到对应的消息id:{}", msg);
+        return 0;
+    }
+
     /**
      * 发送同步消息，只有clientBuilder.validate = true的时候才能发送同步消息
      *
diff --git a/src/main/java/info/xiaomo/gengine/network/client/ClientBuilder.java b/src/main/java/info/xiaomo/gengine/network/client/ClientBuilder.java
@@ -15,6 +15,10 @@
 @Data
 public class ClientBuilder {
 
+    private int upLimit = 2048;//解码大小限制
+
+    private int downLimit = 5120;//编码大小限制
+
     /**
      * 网络线程池线程数量
      */
diff --git a/src/main/java/info/xiaomo/gengine/network/client/ClientMessageExecutor.java b/src/main/java/info/xiaomo/gengine/network/client/ClientMessageExecutor.java
@@ -35,15 +35,15 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 //                f.result(m);
 //            }
 //        } else {
-            super.channelRead(ctx, msg);
+        super.channelRead(ctx, msg);
 //        }
 
     }
 
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
 
-        if ( evt instanceof IdleStateEvent) {
+        if (evt instanceof IdleStateEvent) {
             IdleStateEvent idleStateEvent = (IdleStateEvent) evt;
             IdleState state = idleStateEvent.state();
             if (state == IdleState.READER_IDLE) {
diff --git a/src/main/java/info/xiaomo/gengine/network/handler/MessageDecoder.java b/src/main/java/info/xiaomo/gengine/network/handler/MessageDecoder.java
@@ -1,41 +1,43 @@
 package info.xiaomo.gengine.network.handler;
 
-import com.google.protobuf.AbstractMessage;
-import java.util.List;
-import info.xiaomo.gengine.network.IMessageAndHandler;
+import info.xiaomo.gengine.network.Packet;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
 
 /**
  * @author xiaomo
  */
+@Slf4j
 public class MessageDecoder extends ByteToMessageDecoder {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MessageDecoder.class);
-
-    private IMessageAndHandler msgPool;
+    private final int upLimit;
 
-    public MessageDecoder(IMessageAndHandler msgPool) {
-        this.msgPool = msgPool;
+    public MessageDecoder(int upLimit) {
+        this.upLimit = upLimit;
     }
 
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        // int占4个字节
-        int messageId = in.readInt();
-        // 消息体的长度(假设长度为20)
-        byte[] bytes = new byte[in.readableBytes()];
-        in.readBytes(bytes);
-        // 4+20 =24
-        AbstractMessage message = msgPool.getMessage(messageId);
-        if (message == null) {
-            LOGGER.error("未注册的消息id{}", messageId);
+        if (in.readableBytes() < 7) {
             return;
         }
 
-        out.add(message.getParserForType().parseFrom(bytes));
+        in.markReaderIndex();
+        byte head = in.readByte();
+        short length = in.readShort();
+        if ((length <= 0) || (length > this.upLimit))
+            throw new IllegalArgumentException();
+        int cmd = in.readInt();
+        if (in.readableBytes() < length - 4) {
+            in.resetReaderIndex();
+            return;
+        }
+        byte[] bytes = new byte[length - 4];
+        in.readBytes(bytes);
+        out.add(new Packet(head, cmd, bytes));
     }
 }
diff --git a/src/main/java/info/xiaomo/gengine/network/handler/MessageEncoder.java b/src/main/java/info/xiaomo/gengine/network/handler/MessageEncoder.java
@@ -1,45 +1,37 @@
 package info.xiaomo.gengine.network.handler;
 
-import com.google.protobuf.AbstractMessage;
-import info.xiaomo.gengine.network.IMessageAndHandler;
+import info.xiaomo.gengine.network.Packet;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author xiaomo
+ * 我们的数据包（即一条游戏前后端通信的消息长度）可以定义如下：
+ * 数据包 = 1字节标志位 + 2字节消息体长度 + 4字节协议号长度 + N消息体
+ * 比如客户端请求登录的Protobuf协议如下：
  */
-public class MessageEncoder extends MessageToByteEncoder<AbstractMessage> {
+@Slf4j
+public class MessageEncoder extends MessageToByteEncoder<Packet> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MessageEncoder.class);
 
-    private IMessageAndHandler msgPool;
+    private final int downLimit;
 
-    public MessageEncoder(IMessageAndHandler msgPool) {
-        this.msgPool = msgPool;
+    public MessageEncoder(int downLimit) {
+        this.downLimit = downLimit;
     }
 
 
     @Override
-    protected void encode(ChannelHandlerContext ctx, AbstractMessage msg, ByteBuf out) {
-        int messageId = msgPool.getMessageId(msg);
-        if (messageId == 0) {
-            LOGGER.error("编码到未知的消息{}", messageId);
-        }
-        byte[] bytes = msg.toByteArray();
-        int length = Integer.BYTES + bytes.length;
-        boolean writeAble = out.isWritable(length);
-        if (!writeAble) {
-            LOGGER.error("消息过大，编码失败 {} -> {}", messageId, length);
-            return;
-        }
-        // int->4
-        out.writeInt(messageId);
-        // ->20(假设)
-        out.writeBytes(bytes);
-
+    protected void encode(ChannelHandlerContext ctx, Packet packet, ByteBuf buf) {
+        if ((packet.getBytes().length > this.downLimit) && (log.isWarnEnabled()))
+            log.warn("packet size[" + packet.getBytes().length + "] is over limit[" + this.downLimit + "]");
+
+        buf.writeByte(packet.getHead());
+        buf.writeShort(packet.getBytes().length + 4);
+        buf.writeInt(packet.getCmd());
+        buf.writeBytes(packet.getBytes());
     }
 
     @Override
diff --git a/src/main/java/info/xiaomo/gengine/network/handler/MessageExecutor.java b/src/main/java/info/xiaomo/gengine/network/handler/MessageExecutor.java
diff --git a/src/main/java/info/xiaomo/gengine/network/pool/MessageAndHandlerPool.java b/src/main/java/info/xiaomo/gengine/network/pool/MessageAndHandlerPool.java
diff --git a/src/main/java/info/xiaomo/gengine/persist/mysql/jdbc/SerializerUtil.java b/src/main/java/info/xiaomo/gengine/persist/mysql/jdbc/SerializerUtil.java
diff --git a/src/main/java/info/xiaomo/gengine/script/ScriptEngine.java b/src/main/java/info/xiaomo/gengine/script/ScriptEngine.java

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,10 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t`
`149`	`149`	`String[] converters = convertersStr.split(",");`
`150`	`150`	`if (converters.length > 0) {`
`151`	`151`	`Class<? extends IConverter> converterClz = (Class<? extends IConverter>) Class.forName(converters[0]);`
`152`		`- IConverter converter = converterClz.newInstance();`
	`152`	`+ IConverter converter = converterClz.getConstructor().newInstance();`
`153`	`153`	`for (int i = 1; i < converters.length; i++) {`
`154`	`154`	`converterClz = (Class<? extends IConverter>) Class.forName(converters[i]);`
`155`		`- converter = converter.andThen(converterClz.newInstance());`
	`155`	`+ converter = converter.andThen(converterClz.getConstructor().newInstance());`
`156`	`156`	`}`
`157`	`157`	`columnDesc.setConverter(converter);`
`158`	`158`	`}`
`@@ -173,7 +173,7 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`Class<? extends IConverter> converterClz = (Class<? extends IConverter>) Class.forName(converterClzName);`
`176`		`- IConverter converter = converterClz.newInstance();`
	`176`	`+ IConverter converter = converterClz.getConstructor().newInstance();`
`177`	`177`	`for (int i = 1; i < converters.size(); i++) {`
`178`	`178`	`converterElement = (Element) converters.get(i);`
`179`	`179`
`@@ -186,7 +186,7 @@ public static Map<String, TableDesc<IConfig>> parseConfigs(String xmlFilePath) t`
`186`	`186`	`throw new RuntimeException(String.format("【%s】的属性字段【%s】存在一个空的converter配置", clz.getName(), fieldName));`
`187`	`187`	`}`
`188`	`188`	`converterClz = (Class<? extends IConverter>) Class.forName(converterClzName);`
`189`		`- converter = converter.andThen(converterClz.newInstance());`
	`189`	`+ converter = converter.andThen(converterClz.getConstructor().newInstance());`
`190`	`190`	`}`
`191`	`191`	`columnDesc.setConverter(converter);`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ public static ColumnDesc getColumnDesc(Field field) throws Exception {`
`87`	`87`	`// 将多个转换器转为一个`
`88`	`88`	`Class<? extends IConverter>[] converters = column.value();`
`89`	`89`	`if (converters.length > 0) {`
`90`		`- IConverter converter = converters[0].newInstance();`
	`90`	`+ IConverter converter = converters[0].getConstructor().newInstance();`
`91`	`91`	`for (int i = 1; i < converters.length; i++) {`
`92`		`- converter = converter.andThen(converters[i].newInstance());`
	`92`	`+ converter = converter.andThen(converters[i].getConstructor().newInstance());`
`93`	`93`	`}`
`94`	`94`	`columnDesc.setConverter(converter);`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static void init(String dsConfig, int coreThreadPoolSize, int maximumThre`
`42`	`42`
`43`	`43`	`Set<Class<AbstractLog>> ret = LogBeanUtil.getSubClasses("info.xiaomo.gengine.log", AbstractLog.class);`
`44`	`44`	`for (Class<AbstractLog> logClass : ret) {`
`45`		`- AbstractLog log = logClass.newInstance();`
	`45`	`+ AbstractLog log = logClass.getConstructor().newInstance();`
`46`	`46`	`log.init();`
`47`	`47`	`}`
`48`	`48`	`INSTANCE = new LogService();`