fix: 1. 添加消息编解码单元测试 2. 解决消息编解码逻辑错误问题

Author: meethigher

src/main/java/top/meethigher/proxy/tcp/tunnel/codec/TunnelMessageParser.java

@@ -69,7 +69,12 @@ public void handle(Buffer buffer) {
     }
 
     private void parse() {
+        // 获取消息的预设总长度
         int totalLength = buf.getInt(lengthFieldOffset);
+        // 校验预设总长度
+        if (buf.length() < totalLength) {
+            return;
+        }
         // 校验最大长度
         if (totalLength > maxLength) {
             log.warn("too many bytes in length field, {} > {}, connection {} will be closed",
@@ -89,18 +94,12 @@ private void parse() {
                 return;
             }
         }
-
-        // 校验是否达到预设总长度
-        if (buf.length() < totalLength) {
-            return;
-        } else {
-            outputHandler.handle(buf.getBuffer(0, totalLength));
-            buf = buf.getBuffer(totalLength, buf.length());
-            // 缓冲区未清空时，要将数据进一步解析。https://github.com/meethigher/tcp-reverse-proxy/issues/7
-            if (buf.length() > 0) {
-                parse();
-            }
-            return;
+        // 将数据写出
+        outputHandler.handle(buf.getBuffer(0, totalLength));
+        buf = buf.getBuffer(totalLength, buf.length());
+        // 缓冲区未清空时，要将数据进一步解析。https://github.com/meethigher/tcp-reverse-proxy/issues/7
+        if (buf.length() > lengthFieldLength) {
+            parse();
         }
     }
 }

src/test/java/top/meethigher/proxy/tcp/tunnel/codec/TunnelMessageParserTest.java

@@ -0,0 +1,29 @@
+package top.meethigher.proxy.tcp.tunnel.codec;
+
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+
+public class TunnelMessageParserTest {
+
+    @Test
+    public void handle() {
+
+        Buffer buffer1 = TunnelMessageCodec.encode((short) 1, "first message".getBytes(StandardCharsets.UTF_8));
+        Buffer buffer2 = TunnelMessageCodec.encode((short) 2, "second message".getBytes(StandardCharsets.UTF_8));
+        Buffer buffer3 = TunnelMessageCodec.encode((short) 3, "third message".getBytes(StandardCharsets.UTF_8));
+        Buffer buffer4 = TunnelMessageCodec.encode((short) 4, "forth message".getBytes(StandardCharsets.UTF_8));
+
+        Buffer buffer = Buffer.buffer().appendBuffer(buffer1).appendBuffer(buffer2).appendBuffer(buffer3).appendBuffer(buffer4);
+        Handler<Buffer> handler = buf -> {
+            TunnelMessageCodec.DecodedMessage decodedMessage = TunnelMessageCodec.decode(buf);
+            System.out.println(new String(decodedMessage.body));
+        };
+
+        TunnelMessageParser parser = new TunnelMessageParser(handler, null);
+
+        parser.handle(buffer);
+    }
+}