Merge branch 'fix/read-packets' into development

src/main/java/mc/protocol/io/NetInputStream.java

@@ -49,7 +49,7 @@ public abstract class NetInputStream extends InputStream {
 
         byte[] bytes = new byte[length * 4];
         int readbleBytes = 0;
-        for (int i = 0; i < length; i++) {
+        for (int i = 0; i < length && readableBytes() > 0; i++) {
             byte b = readByte();
             bytes[readbleBytes++] = b;
 

src/main/java/mc/protocol/io/coder/ByteArrayNetInputStream.java

@@ -1,8 +1,10 @@
-package mc.protocol.io;
+package mc.protocol.io.coder;
+
+import mc.protocol.io.NetInputStream;
 
 import java.nio.ByteBuffer;
 
-class ByteArrayNetInputStream extends NetInputStream {
+public class ByteArrayNetInputStream extends NetInputStream {
 
     private final ByteBuffer byteBuffer;
     private int index = 0;

src/main/java/mc/protocol/io/coder/ByteArrayNetOutputStream.java

@@ -1,4 +1,6 @@
-package mc.protocol.io;
+package mc.protocol.io.coder;
+
+import mc.protocol.io.NetOutputStream;
 
 import java.io.ByteArrayOutputStream;
 

src/main/java/mc/protocol/io/coder/ProtocolDecoder.java

@@ -10,9 +10,6 @@ public class ProtocolDecoder {
     private final PacketDirection direction;
 
     public Packet decode(State state, NetInputStream netInputStream) {
-        //TODO необходим механизм пропуска необработанных байтов
-        int sizePacket = netInputStream.readVarInt();
-
         int packetId = netInputStream.readVarInt();
         Class<? extends Packet> packetClass = state.getPacketById(direction, packetId);
         if (packetClass == null) {
@@ -20,7 +17,7 @@ public class ProtocolDecoder {
             UnknownPacket packet = new UnknownPacket(
                     state,
                     packetId,
-                    sizePacket - Utils.sizeOfVarInt(packetId)
+                    netInputStream.readableBytes()
             );
             packet.readSelf(netInputStream);
             return packet;

src/main/java/mc/protocol/io/coder/ProtocolEncoder.java

@@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor;
 import mc.protocol.Packet;
 import mc.protocol.PacketDirection;
 import mc.protocol.State;
-import mc.protocol.io.ByteArrayNetOutputStream;
 import mc.protocol.io.NetOutputStream;
 
 import java.util.Objects;

src/main/java/mc/protocol/io/coder/ProtocolSplitter.java

@@ -0,0 +1,32 @@
+package mc.protocol.io.coder;
+
+import mc.protocol.io.NetInputStream;
+
+public class ProtocolSplitter {
+
+    public NetInputStream split(NetInputStream netInputStream) {
+        netInputStream.markReadIndex();
+        byte[] buff = new byte[3];
+
+        for (int i = 0; i < buff.length; ++i) {
+            buff[i] = netInputStream.readByte();
+
+            if (buff[i] >= 0) {
+                NetInputStream nis = new ByteArrayNetInputStream(buff);
+                int sizePacket = nis.readVarInt();
+
+                if (netInputStream.readableBytes() >= sizePacket) {
+                    buff = new byte[sizePacket];
+                    netInputStream.readBytes(buff);
+
+                    return new ByteArrayNetInputStream(buff);
+                }
+
+                netInputStream.resetReadIndex();
+                break;
+            }
+        }
+
+        return null;
+    }
+}

src/test/java/mc/protocol/io/NetInputStreamTest.java

@@ -1,5 +1,6 @@
 package mc.protocol.io;
 
+import mc.protocol.io.coder.ByteArrayNetInputStream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

src/test/java/mc/protocol/io/NetOutputStreamTest.java

@@ -1,5 +1,7 @@
 package mc.protocol.io;
 
+import mc.protocol.io.coder.ByteArrayNetInputStream;
+import mc.protocol.io.coder.ByteArrayNetOutputStream;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;