Server Driver completed

NintenSAGA · NintenSAGA · commit a3e113d53550 · 2022-05-22T21:46:55.000+08:00
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
 # HTTP Client/Server for Java
 
 由Java Socket API实现的简单HTTP Client与Http Server
+
+## 1. 概览
+
+
diff --git a/src/main/java/client/ClientDriver.java b/src/main/java/client/ClientDriver.java
@@ -1,6 +1,8 @@
 package client;
 
+import exception.InvalidCommandException;
 import message.consts.WebMethods;
+import util.ArgIterator;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -21,7 +23,7 @@ public class ClientDriver {
                 The default value of the port number is 80.
                 Only support HTTP protocol (not HTTPS).
                 
-            OPTIONS                                
+            OPTIONS
                 -m <METHOD>     Send with the specified web method.
                                 Only supports GET and POST.
                                 The default value is GET.
@@ -35,55 +37,9 @@ Only support HTTP protocol (not HTTPS).
                                 e.g.: User-Agent:AbaAba/0.1
             """;
 
-    private static class InvalidCommandException extends Exception {
-        public InvalidCommandException(String message) {
-            super(message);
-        }
-    }
-
-    private static class ArgIterator {
-        private final
-        String[] args;
-        private
-        int idx;
-
-        public ArgIterator(String[] args) {
-            this.args = args;
-            this.idx = 0;
-            for (String first; (first = peek()) != null && !first.startsWith("http://"); )
-                next();
-
-        }
-
-        public boolean hasNext() {
-            return idx < args.length;
-        }
-
-        public String peek() {
-            if (hasNext())
-                return args[idx];
-            else
-                return null;
-        }
-
-        public String next() {
-            if (hasNext())
-                return args[idx++];
-            else
-                return null;
-        }
-
-        public String[] nextValues() {
-            ArrayList<String> as = new ArrayList<>();
-            for (String token; (token = peek()) != null && !token.startsWith("-"); next())
-                as.add(token);
-            return as.toArray(new String[0]);
-        }
-    }
-
     public static void main(String[] args) {
         try {
-            ArgIterator ai = new ArgIterator(args);
+            ArgIterator ai = new ArgIterator(args, "http://");
 
             String raw = ai.next();
             if (raw == null || raw.startsWith("-"))
@@ -92,12 +48,8 @@ public static void main(String[] args) {
             URI u = new URI(raw);
 
             String hostName     = u.getHost();
-            String query        = u.getQuery();
             int port            = u.getPort();
-            String path         = u.getPath();
-
             if (port == -1) port = 80;
-            if (path == null || path.length() == 0) path = "/";
 
             String method       = WebMethods.GET;
             boolean keepAlive   = false;
@@ -116,21 +68,13 @@ public static void main(String[] args) {
                                 || WebMethods.POST.equals(method);
                     }
 
-                    case "--keep-alive" -> {
-                        keepAlive = true;
-                    }
+                    case "--keep-alive" -> keepAlive = true;
 
-                    case "-b" -> {
-                        body = ai.next();
-                    }
+                    case "-b" -> body = ai.next();
 
-                    case "-h" -> {
-                        headers = ai.nextValues();
-                    }
+                    case "-h" -> headers = ai.nextValues();
 
-                    default -> {
-                        throw new InvalidCommandException("Invalid token at \"%s\"".formatted(opt));
-                    }
+                    default -> throw new InvalidCommandException("Invalid token at \"%s\"".formatted(opt));
                 }
             }
 
diff --git a/src/main/java/exception/InvalidCommandException.java b/src/main/java/exception/InvalidCommandException.java
@@ -0,0 +1,7 @@
+package exception;
+
+public class InvalidCommandException extends Exception {
+    public InvalidCommandException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/message/HttpMessage.java b/src/main/java/message/HttpMessage.java
@@ -201,7 +201,7 @@ public void setBodyAsPlainText(String body) {
         setBodyWithType(body, "%s; %s".formatted(TEXT_PLAIN, CHARSET_UTF8));
     }
 
-    private void setBodyAsFile(String path, String time, long fileSize, InputStream stream) {
+    private void setBodyAsFile(String path, long fileSize, InputStream stream) {
         String[] a = path.split("\\.");
         String suffix = a[a.length - 1];
         MediaType mediaType = suffixToMime.getOrDefault(suffix, suffixToMime.get("default"));
@@ -223,7 +223,9 @@ private void setBodyAsFile(String path, String time, long fileSize, InputStream
             size = "%.2fKB".formatted((double) fileSize / (1 << 10));
         }
 
-        Log.logPrompt("File packed: ", "[%s][%s][Last modified: %s]".formatted(path, size, time));
+        String pathS = path.replace(Config.USER_DIR, ".");
+
+        Log.logPrompt("File packed", "[%s][%s]".formatted(pathS, size));
 
         setBodyType(type);
         setBody(stream, fileSize);
@@ -235,7 +237,7 @@ public void setBodyAsFileWithAbsPath(Path path) {
             long fileSize = Config.getSizeOfResource(path);
             InputStream stream = Files.newInputStream(path);
 
-            setBodyAsFile(path.toString(), time, fileSize, stream);
+            setBodyAsFile(path.toString(), fileSize, stream);
         } catch (IOException e) {
             e.printStackTrace();
             Log.debug("Setting failed!");
diff --git a/src/main/java/server/HttpServer.java b/src/main/java/server/HttpServer.java
@@ -27,8 +27,6 @@
 import static message.consts.Headers.KEEP_ALIVE;
 
 public class HttpServer {
-    private final static boolean    DEFAULT_KEEP_ALIVE      = false;
-    private final static int        DEFAULT_TIMEOUT         = 10000;
 
     private final AsynchronousServerSocketChannel aServerSocket;
     private final TargetHandler handler;
@@ -66,7 +64,7 @@ public HttpServer() throws IOException {
      * @param timeOut timeout for long connection
      */
     public void launch(boolean keepAlive, int timeOut) {
-        Log.logServer("The server is starting up....");
+        Log.logServer("The server is now running");
 
         try {
             while (true) {
@@ -97,7 +95,7 @@ public void failed(Throwable exc, Object attachment) {
      * Long connection is disabled by default
      */
     public void launch() {
-        launch(DEFAULT_KEEP_ALIVE, DEFAULT_TIMEOUT);
+        launch(Config.DEFAULT_KEEP_ALIVE, Config.DEFAULT_TIMEOUT);
     }
 
     /**
diff --git a/src/main/java/server/ServerDriver.java b/src/main/java/server/ServerDriver.java
@@ -1,7 +1,54 @@
 package server;
 
+import exception.InvalidCommandException;
+import util.ArgIterator;
+import util.Config;
+
+import java.io.IOException;
+
 public class ServerDriver {
+    public static final String HELP = """
+            SYNOPSIS
+                ~   [-p <PORT>] [--keep-alive]
+                    [-t <TIMEOUT>]
+                    
+            OPTIONS
+                -p <PORT>       Set up the server with the specified port number.
+                                The default value is 8080
+                                
+                --keep-alive    Enable keep-alive.
+                
+                -t <TIMEOUT>    Socket timeout.
+                                The default value is 10000
+            """;
+
     public static void main(String[] args) {
+        try {
+            ArgIterator ai = new ArgIterator(args, "-");
+
+            int port = 8080;
+            boolean keepAlive = Config.DEFAULT_KEEP_ALIVE;
+            int timeout = Config.DEFAULT_TIMEOUT;
+
+            while (ai.hasNext()) {
+                String opt = ai.next();
+                switch (opt) {
+                    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);
+            server.launch(keepAlive, timeout);
 
+        } catch (InvalidCommandException e) {
+            System.err.println("Error: " + e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            System.err.println(HELP);
+        }
     }
 }
diff --git a/src/main/java/util/ArgIterator.java b/src/main/java/util/ArgIterator.java
@@ -0,0 +1,43 @@
+package util;
+
+import java.util.ArrayList;
+
+public class ArgIterator {
+    private final
+    String[] args;
+    private
+    int idx;
+
+    public ArgIterator(String[] args, String prefix) {
+        this.args = args;
+        this.idx = 0;
+        for (String first; (first = peek()) != null && !first.startsWith(prefix); )
+            next();
+
+    }
+
+    public boolean hasNext() {
+        return idx < args.length;
+    }
+
+    public String peek() {
+        if (hasNext())
+            return args[idx];
+        else
+            return null;
+    }
+
+    public String next() {
+        if (hasNext())
+            return args[idx++];
+        else
+            return null;
+    }
+
+    public String[] nextValues() {
+        ArrayList<String> as = new ArrayList<>();
+        for (String token; (token = peek()) != null && !token.startsWith("-"); next())
+            as.add(token);
+        return as.toArray(new String[0]);
+    }
+}
diff --git a/src/main/java/util/Config.java b/src/main/java/util/Config.java
@@ -23,10 +23,11 @@ public class Config {
     public final static String TARGET_PATH          = "target_path.json";
     public final static String MIME                 = "mime.json";
 
-    public static final String DATA_DIR;
+    public static final String USER_DIR;
     static {
-        DATA_DIR = System.getProperty("user.dir") + "/Data";
+        USER_DIR = System.getProperty("user.dir");
     }
+    public static final String DATA_DIR     = USER_DIR + "/Data";
     public static final String CLIENT_PATH  = DATA_DIR + "/Client";
     public static final String SERVER_PATH  = DATA_DIR + "/Server";
     public static final String TEST_PATH    = DATA_DIR + "/Test";
@@ -42,7 +43,9 @@ public class Config {
 
     public final static String[] TRANSFER_ENCODINGS = { CHUNKED };
 
-    public final static int SOCKET_BUFFER_SIZE = 1 << 10;
+    public final static int DEFAULT_TIMEOUT         = 10000;
+    public final static boolean DEFAULT_KEEP_ALIVE  = false;
+    public final static int SOCKET_BUFFER_SIZE      = 1 << 10;
 
     private static Path getPath(String resource) {
         URL url = ClassLoader.getSystemClassLoader().getResource(resource);
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: client.ClientDriver
+Main-Class: server.ServerDriver
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`Manifest-Version: 1.0`
`2`		`-Main-Class: client.ClientDriver`
	`2`	`+Main-Class: server.ServerDriver`
`3`	`3`