Server: Bug fixed. Supports external connection.

Author: NintenSAGA

README.md

@@ -54,15 +54,18 @@ Data
 
 ```
 SYNOPSIS
-    ~   [-p <PORT>] [--keep-alive]
+    ~   [-a <ADDRESS>] [-p <PORT>] [--keep-alive]
         [-t <TIMEOUT>]
-
+        
 OPTIONS
-    -p <PORT>       Set up the server with the specified port number.
+    -a <ADDRESS>    Bind the server to the specified IPv4 address.
+                    The default value is 127.0.0.1
+    
+    -p <PORT>       Bind the server to the specified port number.
                     The default value is 8080
-
+                    
     --keep-alive    Enable keep-alive.
-
+    
     -t <TIMEOUT>    Socket timeout.
                     The default value is 10000
 ```
@@ -86,6 +89,7 @@ SERVER: Preset mappings:
 /test, methods: [GET]
 /missing, methods: [GET,POST]
 /moved, methods: [GET]
+SERVER: Server bound to /127.0.0.1:8080
 SERVER: Reading static files from: [file:///.../Data/Server/Static]
 SERVER: The server is now running
 ```

src/main/java/edu/nju/http/server/HttpServer.java

@@ -12,11 +12,16 @@
 import edu.nju.http.util.Log;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.net.StandardSocketOptions;
 import java.nio.channels.AsynchronousServerSocketChannel;
 import java.nio.channels.AsynchronousSocketChannel;
 import java.nio.channels.CompletionHandler;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -45,6 +50,8 @@ public HttpServer(String hostName, int port) throws IOException {
         this.handler = TargetHandler.getInstance();
         this.aServerSocket = AsynchronousServerSocketChannel.open();
         this.aServerSocket.bind(new InetSocketAddress(hostName, port));
+        Log.logServer("Server bound to " + this.aServerSocket.getLocalAddress().toString());
+
         this.globalHeaders = new HashMap<>();
 
         this.running = new Semaphore(0);
@@ -168,7 +175,6 @@ private void handleSocket(AsynchronousSocketChannel socket, boolean keepAlive, i
                         keepAlive = false;
                     }
 
-
                     // -------------------- 2. Handle the request and generate response -------------------- //
                     responseMessage = handler.handle(requestMessage);
 

src/main/java/edu/nju/http/server/ServerDriver.java

@@ -7,11 +7,14 @@
 public class ServerDriver {
     public static final String HELP = """
             SYNOPSIS
-                ~   [-p <PORT>] [--keep-alive]
+                ~   [-a <ADDRESS>] [-p <PORT>] [--keep-alive]
                     [-t <TIMEOUT>]
                     
             OPTIONS
-                -p <PORT>       Set up the server with the specified port number.
+                -a <ADDRESS>    Bind the server to the specified IPv4 address.
+                                The default value is 127.0.0.1
+                
+                -p <PORT>       Bind the server to the specified port number.
                                 The default value is 8080
                                 
                 --keep-alive    Enable keep-alive.
@@ -24,21 +27,23 @@ public static void main(String[] args) {
         try {
             ArgIterator ai = new ArgIterator(args, "-");
 
+            String hostname = "127.0.0.1";
             int port = 8080;
             boolean keepAlive = Config.DEFAULT_KEEP_ALIVE;
             int timeout = Config.DEFAULT_TIMEOUT;
 
             while (ai.hasNext()) {
                 String opt = ai.next();
                 switch (opt) {
+                    case "-a" -> hostname = ai.next();
                     case "-p" -> port = Integer.parseInt(ai.next());
                     case "--keep-alive" -> keepAlive = true;
                     case "-t" -> timeout = Integer.parseInt(ai.next());
                     default -> throw new InvalidCommandException("Invalid token at \"%s\"".formatted(opt));
                 }
             }
 
-            HttpServer server = new HttpServer("127.0.0.1", port);
+            HttpServer server = new HttpServer(hostname, port);
             server.launch(keepAlive, timeout);
 
         } catch (InvalidCommandException e) {

src/main/java/edu/nju/http/server/TargetHandler.java

@@ -129,10 +129,10 @@ public HttpResponseMessage handle(HttpRequestMessage msg) {
                 // -------------------- 1. Static Resource -------------------- //
                 Path path = getResourcePath(target);
 
-                Log.debug("Search resource in path: ", path);
+                Log.debug("Searching resource in path: ", path);
 
                 if (WebMethods.GET.equals(msg.getMethod())
-                        && Files.exists(path)
+                        && Files.exists(path) && !Files.isDirectory(path)
                 ) {
                     return loadStaticResource(path, msg);
                 } else {

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 << 10;
+    public final static int SOCKET_BUFFER_SIZE      = 1 << 30;
 
     private static Path getPath(String resource) {
         URL url = ClassLoader.getSystemClassLoader().getResource(resource);