Use httpserver.Filter / remove old middleware schema

Author: simonwep

src/express/Express.java

@@ -1,71 +1,77 @@
 package express;
 
-import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.*;
 import express.events.Action;
 import express.events.HttpRequest;
+import express.http.Request;
+import express.http.Response;
+import express.middleware.ExpressMiddleware;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Collections;
+import java.util.List;
 
 public class Express {
 
-  protected final ConcurrentHashMap<String, ArrayList<ExpressHandler>> MITTLEWARE = new ConcurrentHashMap<>();
-  protected final ConcurrentHashMap<String, ArrayList<ExpressHandler>> REQUEST = new ConcurrentHashMap<>();
+  private final List<Filter> FILTER = Collections.synchronizedList(new ArrayList<>());
 
-  protected HttpServer httpServer;
+  private HttpServer httpServer;
+  private HttpContext httpContext;
+  private HttpRequest request404;
 
   public Express() {
+
   }
 
   public void use(HttpRequest request) {
-    addToRouteMap(MITTLEWARE, "*", "*", request);
+    add("*", "*", request);
   }
 
   public void use(String context, HttpRequest request) {
-    addToRouteMap(MITTLEWARE, "*", context, request);
+    add("*", context, request);
   }
 
   public void use(String method, String context, HttpRequest request) {
-    addToRouteMap(MITTLEWARE, method.toUpperCase(), context, request);
+    add(method.toUpperCase(), context, request);
   }
 
   public void on(String method, String context, HttpRequest request) {
-    addToRouteMap(REQUEST, method.toUpperCase(), context, request);
+    add(method.toUpperCase(), context, request);
   }
 
   public void all(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "*", context, request);
+    add("*", context, request);
   }
 
   public void get(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "GET", context, request);
+    add("GET", context, request);
   }
 
   public void post(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "POST", context, request);
+    add("POST", context, request);
   }
 
   public void put(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "PUT", context, request);
+    add("PUT", context, request);
   }
 
   public void delete(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "DELETE", context, request);
+    add("DELETE", context, request);
   }
 
   public void patch(String context, HttpRequest request) {
-    addToRouteMap(REQUEST, "PATCH", context, request);
+    add("PATCH", context, request);
   }
 
-  private void addToRouteMap(ConcurrentHashMap<String, ArrayList<ExpressHandler>> routemap, String key, String context, HttpRequest request) {
-
-    if (!routemap.containsKey(key))
-      routemap.put(key, new ArrayList<>());
-
-    routemap.get(key).add(new ExpressHandler(context, request));
+  private void add(String requestMethod, String context, HttpRequest request) {
+    ExpressMiddleware handler = new ExpressMiddleware(requestMethod, context, request);
+    if (httpContext == null) {
+      FILTER.add(handler);
+    } else {
+      httpContext.getFilters().add(handler);
+    }
   }
 
   public void listen() throws IOException {
@@ -85,12 +91,26 @@ public void listen(int port, Action action) throws IOException {
     launch(action, port);
   }
 
+  public void set404(HttpRequest request) {
+    this.request404 = request;
+  }
+
   private void launch(Action action, int port) throws IOException {
     new Thread(() -> {
       try {
         httpServer = HttpServer.create(new InetSocketAddress("localhost", port), 0);
         httpServer.setExecutor(null);
-        httpServer.createContext("/", new ExpressContext(this));
+        httpContext = httpServer.createContext("/", httpExchange -> {
+          if (request404 != null) {
+            Request request = new Request(httpExchange);
+            Response response = new Response(httpExchange);
+            request404.handle(request, response);
+          } else {
+            System.err.println("Not 404 Handler specified");
+          }
+        });
+
+        httpContext.getFilters().addAll(FILTER);
 
         httpServer.start();
         action.action();
@@ -101,16 +121,4 @@ private void launch(Action action, int port) throws IOException {
     }).start();
   }
 
-  public static HttpRequest statics(String path) {
-    return (req, res) -> {
-      File reqFile = new File(path + req.getURI().getPath());
-
-      if (reqFile.exists()) {
-        String extension = reqFile.getAbsolutePath().replaceAll("^(.*\\.|.*\\\\|.+$)", "");
-        String contentType = ExpressUtils.getContentType(extension);
-        res.send(reqFile, contentType);
-      }
-    };
-  }
-
 }

src/express/ExpressContext.java

@@ -0,0 +1,73 @@
+package express.middleware;
+
+import com.sun.net.httpserver.Filter;
+import com.sun.net.httpserver.HttpExchange;
+import express.events.HttpRequest;
+import express.http.Request;
+import express.http.Response;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ExpressMiddleware extends Filter {
+
+  private final HttpRequest REQUEST;
+  private final String REQUEST_METHOD;
+  private final String[] CONTEXT_PARAMS;
+  private final String CONTEXT_REGEX;
+  private final Pattern CONTEXT_PATTERN;
+
+  private String description;
+
+  public ExpressMiddleware(String requestMethod, String context, HttpRequest httpRequest) {
+    this.REQUEST_METHOD = requestMethod;
+    this.REQUEST = httpRequest;
+    this.CONTEXT_PARAMS = context.split("(/)(:|[^:]+|)(:|)");
+    this.CONTEXT_REGEX = "\\Q" + context.replaceAll(":([^/]+)", "\\\\E([^/]+)\\\\Q") + "\\E";
+    this.CONTEXT_PATTERN = Pattern.compile(CONTEXT_REGEX);
+  }
+
+  @Override
+  public void doFilter(HttpExchange httpExchange, Chain chain) throws IOException {
+    Request request = new Request(httpExchange);
+    Response response = new Response(httpExchange);
+
+    String requestMethod = httpExchange.getRequestMethod();
+    String requestPath = request.getURI().getRawPath();
+
+    if (!requestMethod.equals(REQUEST_METHOD) || !requestPath.matches(CONTEXT_REGEX)) {
+      chain.doFilter(httpExchange);
+      return;
+    }
+
+    HashMap<String, String> params = new HashMap<>();
+    Matcher matcher = CONTEXT_PATTERN.matcher(requestPath);
+
+    if (matcher.find()) {
+
+      for (int i = 1; i <= matcher.groupCount() && i < CONTEXT_PARAMS.length; i++) {
+        String g = matcher.group(i);
+        params.put(CONTEXT_PARAMS[i], g);
+      }
+
+    } else {
+      chain.doFilter(httpExchange);
+      return;
+    }
+
+    request.setParams(params);
+    REQUEST.handle(request, response);
+  }
+
+
+  @Override
+  public String description() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+}