修复客户端处理器

Author: Evan Hu

pom.xml

@@ -142,6 +142,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.22</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>13.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/info/xiaomo/gengine/network/client/ClientBuilder.java

@@ -13,10 +13,6 @@
 @Data
 public class ClientBuilder {
 
-    private int upLimit = 2048; // 解码大小限制
-
-    private int downLimit = 5120; // 编码大小限制
-
     /** 网络线程池线程数量 */
     private int nioEventLoopCount;
 

src/main/java/info/xiaomo/gengine/network/client/ClientMessageExecutor.java

@@ -2,10 +2,9 @@
 
 import com.google.protobuf.Message;
 import java.util.Map;
-import info.xiaomo.gengine.network.IMessagePool;
-import info.xiaomo.gengine.network.INetworkConsumer;
-import info.xiaomo.gengine.network.INetworkEventListener;
+import info.xiaomo.gengine.network.*;
 import info.xiaomo.gengine.network.handler.MessageExecutor;
+import info.xiaomo.gengine.utils.AttributeUtil;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -16,8 +15,6 @@ public class ClientMessageExecutor extends MessageExecutor {
 
     protected Map<Short, ClientFuture<Message>> futureMap;
 
-    protected IMessagePool pool;
-
     protected boolean idleCheck;
 
     public ClientMessageExecutor(
@@ -31,17 +28,30 @@ public ClientMessageExecutor(
         this.idleCheck = idleCheck;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void channelRead0(ChannelHandlerContext ctx, Message msg) {
+        Integer msgId = pool.getMessageId(msg);
+
+        if (msgId == null) {
+            log.error("消息未注册:{}", msg);
+            return;
+        }
 
-        //        ClientFuture<MsgPack> f = futureMap.get(m.getSequence());
-        //        if (f != null) {
-        //            if (!f.isCancelled()) {
-        //                f.result(m);
-        //            }
-        //        } else {
-        //            super.channelRead(ctx, msg);
-        //        }
+        ISession session = AttributeUtil.get(ctx.channel(), SessionKey.SESSION);
+
+        if (session == null) {
+            return;
+        }
+        AbstractHandler handler = pool.getHandler(msgId);
+        if (handler == null) {
+            log.error("msgId:{} 未注册handler", msgId);
+            return;
+        }
+        handler.setMessage(msg);
+        handler.setParam(session);
+        handler.setSession(session);
+        handler.doAction();
     }
 
     @Override

src/main/java/info/xiaomo/gengine/network/handler/MessageExecutor.java

@@ -13,8 +13,8 @@
 public class MessageExecutor extends SimpleChannelInboundHandler<Message> {
 
     protected final INetworkEventListener listener;
-    private final INetworkConsumer consumer;
-    private final IMessagePool pool;
+    protected final INetworkConsumer consumer;
+    protected final IMessagePool pool;
 
     public MessageExecutor(
             INetworkConsumer consumer, INetworkEventListener listener, IMessagePool pool) {