fixed reading/writing data thought ssl

Author: JavaSaBr

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java

@@ -210,7 +210,8 @@ protected int decryptAndRead(@NotNull ByteBuffer receivedBuffer) {
 
         switch (result.getStatus()) {
             case OK:
-                sslNetworkBuffer.clear();
+                sslDataBuffer.flip();
+                LOGGER.debug(sslDataBuffer, buf -> "Decrypted data:\n" + hexDump(buf));
                 return readPackets(sslDataBuffer, pendingBuffer);
             case BUFFER_OVERFLOW:
                 increaseDataBuffer();

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java

@@ -82,7 +82,7 @@ public AbstractSSLPacketWriter(
                     // peerAppData = enlargeApplicationBuffer(engine, peerAppData);
                     break;
                 case OK:
-                    break;
+                    return sslNetworkBuffer.flip();
                 case CLOSED:
                     closeConnection();
                     return EMPTY_BUFFER;

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringReadablePacket.java

@@ -1,6 +1,6 @@
 package com.ss.rlib.network.packet.impl;
 
-import com.ss.rlib.network.impl.StringDataConnection;
+import com.ss.rlib.network.Connection;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -11,15 +11,15 @@
  * @author JavaSaBr
  */
 @Getter
-public class StringReadablePacket extends AbstractReadablePacket<StringDataConnection> {
+public class StringReadablePacket extends AbstractReadablePacket<Connection<?, ?>> {
 
     /**
      * Read data.
      */
     private volatile @Nullable String data;
 
     @Override
-    protected void readImpl(@NotNull StringDataConnection connection, @NotNull ByteBuffer buffer) {
+    protected void readImpl(@NotNull Connection<?, ?> connection, @NotNull ByteBuffer buffer) {
         this.data = readString(buffer);
     }
 

rlib-network/src/test/java/com/ss/rlib/network/test/StringSSLNetworkTest.java

@@ -9,10 +9,7 @@
 import com.ss.rlib.network.Connection;
 import com.ss.rlib.network.ServerNetworkConfig;
 import com.ss.rlib.network.impl.DefaultBufferAllocator;
-import com.ss.rlib.network.packet.impl.AbstractPacketWriter;
-import com.ss.rlib.network.packet.impl.AbstractSSLPacketReader;
-import com.ss.rlib.network.packet.impl.AbstractSSLPacketWriter;
-import com.ss.rlib.network.packet.impl.StringWritablePacket;
+import com.ss.rlib.network.packet.impl.*;
 import com.ss.rlib.network.util.NetworkUtils;
 import lombok.SneakyThrows;
 import org.jetbrains.annotations.NotNull;
@@ -26,6 +23,7 @@
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.ByteBuffer;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -106,17 +104,31 @@ void echoNetworkTest() {
         var sslSocketFactory = clientSslContext.getSocketFactory();
         var sslSocket = (SSLSocket) sslSocketFactory.createSocket(serverAddress.getHostName(), serverAddress.getPort());
 
-        var out = new PrintWriter(sslSocket.getOutputStream());
-        out.println("Hello SSL");
+        var buffer = ByteBuffer.allocate(1024);
+        buffer.position(2);
+
+        new StringWritablePacket("Hello SSL").write(buffer);
+        buffer.putShort(0, (short) buffer.position());
+        buffer.flip();
+
+        LOGGER.info("Send hello message:\n" + NetworkUtils.hexDump(buffer));
+
+        var out = sslSocket.getOutputStream();
+        out.write(buffer.array(), 0, buffer.limit());
         out.flush();
 
-       // var in = new Scanner(sslSocket.getInputStream());
-        //String next = in.next();
+        buffer.clear();
 
-        Assertions.assertTrue(
-            counter.await(1000000, TimeUnit.MILLISECONDS),
-            "Still wait for " + counter.getCount() + " packets..."
-        );
+        var in = sslSocket.getInputStream();
+        var readBytes = in.read(buffer.array());
+
+        buffer.position(readBytes).flip();
+        var packetLength = buffer.getShort();
+
+        var response = new StringReadablePacket();
+        response.read(null, buffer, packetLength - 2);
+
+        LOGGER.info("Response: " + response.getData());
 
         serverNetwork.shutdown();