Server supports large file transfer

Author: NintenSAGA

src/main/java/edu/nju/http/message/packer/MessagePacker.java

@@ -33,13 +33,16 @@ public class MessagePacker {
     HttpMessage message;
     private final
     String[]    transferEncodings;
+    private final
+    String acceptEncoding;
+
+    private final
+    ByteBuffer bb;
 
     private
     AsynchronousSocketChannel socket;
     private
     Queue<byte[]> byteArrayQueue;
-    private
-    String acceptEncoding;
 
     // ==================== Constructors ==================== //
 
@@ -62,9 +65,9 @@ public MessagePacker(HttpMessage message, String[] transferEncodings, String acc
         this.transferEncodings = transferEncodings;
         this.socket = null;
         this.acceptEncoding = Objects.requireNonNullElseGet(acceptEncoding, ()->"");
+        this.bb = ByteBuffer.allocate(Config.SOCKET_BUFFER_SIZE);
 
         strategyMap = new HashMap<>();
-        strategyMap.put( CONTENT_LENGTH,    new TransContentLengthEncodeStrategy() );
         strategyMap.put( CHUNKED,           new TransChunkedEncodeStrategy() );
     }
 
@@ -140,40 +143,42 @@ private int send()
         }
 
         // -------------------- 3. Send out start line and headers -------------------- //
-        written += flush(message.getStartLineAndHeadersAsStream());
+        written += flush(
+                new SourceEncodeStrategy(message.getStartLineAndHeadersAsStream())
+        );
 
         // -------------------- 4. Send out -------------------- //
-        for (byte[] bytes; (bytes = upperStrategy.readBytes()).length != 0; ) {
-            ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-            written += flush(stream);
-        }
+        written += flush(upperStrategy);
 
         if (socket != null)
             Log.logSocket(socket,"Message sent %f KB ".formatted((double) written / (1 << 10)));
 
         return written;
     }
 
-    private int flush(InputStream stream)
+    private int flush(EncodeStrategy strategy)
             throws ExecutionException, InterruptedException, IOException {
         int written = 0;
 
         if (socket != null) {
-            for (byte[] bytes; (bytes = stream.readNBytes(Config.SOCKET_BUFFER_SIZE)).length != 0; ) {
+            for (byte[] bytes ; (bytes = strategy.readBytes()).length != 0; ) {
+                bb.clear();
+                bb.put(bytes);
+                bb.flip();
                 try {
-                    var future = socket.write(
-                            ByteBuffer.wrap(bytes)
-                    );
-                    int delta = future.get();
-                    assert Log.testExpect("Bytes sent", bytes.length, delta);
-                    written += delta;
+                    for (int cur = 0, delta; cur < bb.limit(); cur += delta) {
+                        bb.position(cur);
+                        var future = socket.write(bb);
+                        delta = future.get();
+                    }
+                    written += bb.limit();
                 } catch (WritePendingException e) {
                     e.printStackTrace();
                 }
             }
         } else {
             assert byteArrayQueue != null;
-            byte[] bytes = stream.readAllBytes();
+            byte[] bytes = strategy.readAllBytes();
             byteArrayQueue.offer(bytes);
             written = bytes.length;
         }

src/main/java/edu/nju/http/message/packer/encode/ContentGzipEncodeStrategy.java

@@ -18,7 +18,7 @@ private void prepare() throws IOException {
             try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(
                     outputStream
             )) {
-                byte[] bytes = upper.readBytes();
+                byte[] bytes = upper.readAllBytes();
                 gzipOutputStream.write(bytes, 0, bytes.length);
                 gzipOutputStream.finish();
             }

src/main/java/edu/nju/http/message/packer/encode/SourceEncodeStrategy.java

@@ -1,5 +1,7 @@
 package edu.nju.http.message.packer.encode;
 
+import edu.nju.http.util.Config;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,7 +11,7 @@ public class SourceEncodeStrategy extends EncodeStrategy {
     InputStream inputStream;
 
     private SourceEncodeStrategy(){
-        inputStream = new ByteArrayInputStream(new byte[0]);
+        this.inputStream = new ByteArrayInputStream(new byte[0]);
     }
 
     public SourceEncodeStrategy(InputStream inputStream) {
@@ -23,7 +25,7 @@ public byte[] readAllBytes() throws IOException {
 
     @Override
     public byte[] readBytes() throws IOException {
-        return inputStream.readAllBytes();
+        return inputStream.readNBytes(Config.SOCKET_BUFFER_SIZE);
     }
 
     @Override

src/main/java/edu/nju/http/message/packer/encode/TransContentLengthEncodeStrategy.java

@@ -8,6 +8,7 @@
 
 import static edu.nju.http.message.consts.Headers.CONTENT_LENGTH;
 
+@Deprecated
 public class TransContentLengthEncodeStrategy extends EncodeStrategy {
     private ByteArrayInputStream bis;
 

src/main/java/edu/nju/http/util/Config.java

@@ -45,7 +45,7 @@ public class Config {
 
     public final static int DEFAULT_TIMEOUT         = 10000;
     public final static boolean DEFAULT_KEEP_ALIVE  = false;
-    public final static int SOCKET_BUFFER_SIZE      = 1 << 30;
+    public final static int SOCKET_BUFFER_SIZE      = 1 << 20;
 
     private static Path getPath(String resource) {
         URL url = ClassLoader.getSystemClassLoader().getResource(resource);