Add speedy CSS and JS

Author: alexDickhans

src/main/java/dev/hdprojects/HttpServer/HttpServer.java

@@ -28,7 +28,7 @@ public static void main(String[] args){
 
         ServerListenerThread serverListenerThread = null;
         try {
-            serverListenerThread = new ServerListenerThread(conf.getPort(), conf.getWebroot());
+            serverListenerThread = new ServerListenerThread(conf);
             serverListenerThread.start();
         } catch (IOException e) {
             e.printStackTrace();

src/main/java/dev/hdprojects/HttpServer/config/Configuration.java

@@ -6,8 +6,17 @@ public class Configuration {
     private String webroot;
     private String style_replace;
     private String js_replace;
-    private String[] css;
-    private String[] js;
+    private String page_404;
+    private String css;
+    private String js;
+
+    public String getPage_404() {
+        return page_404;
+    }
+
+    public void setPage_404(String page_404) {
+        this.page_404 = page_404;
+    }
 
     public String getStyle_replace() {
         return style_replace;
@@ -25,19 +34,19 @@ public void setJs_replace(String js_replace) {
         this.js_replace = js_replace;
     }
 
-    public String[] getCss() {
+    public String getCss() {
         return css;
     }
 
-    public void setCss(String[] css) {
+    public void setCss(String css) {
         this.css = css;
     }
 
-    public String[] getJs() {
+    public String getJs() {
         return js;
     }
 
-    public void setJs(String[] js) {
+    public void setJs(String js) {
         this.js = js;
     }
 

src/main/java/dev/hdprojects/HttpServer/core/HttpConnectionWorkerThread.java

@@ -1,5 +1,6 @@
 package dev.hdprojects.HttpServer.core;
 
+import dev.hdprojects.HttpServer.config.Configuration;
 import dev.hdprojects.http.GenerateHttpHeader;
 import dev.hdprojects.http.HttpParser;
 import dev.hdprojects.website.HtmlParser;
@@ -17,10 +18,13 @@ public class HttpConnectionWorkerThread extends Thread {
 
     private String webRoot;
     private Socket socket;
+    private Configuration conf;
 
-    public HttpConnectionWorkerThread(Socket socket, String webRoot) {
+    public HttpConnectionWorkerThread(Socket socket, String webRoot, Configuration conf) {
         this.webRoot = webRoot;
         this.socket = socket;
+
+        this.conf = conf;
     }
 
     @Override
@@ -38,7 +42,7 @@ public void run() {
             LOGGER.info("Starting HTTP Parser ... ");
             HttpParser httpParser = new HttpParser(inputStream);
             httpParser.parseHttpRequest();
-            HtmlParser htmlParser = new HtmlParser(webRoot + httpParser.getRequestedPage(), "", "", "", "");
+            HtmlParser htmlParser = new HtmlParser(webRoot + httpParser.getRequestedPage(), conf);
             LOGGER.info("Done With HTTP Parser.");
 
             // Set HTML variable
@@ -52,7 +56,8 @@ public void run() {
 
             // Generate an HTTP Header and response
             LOGGER.info("Generating HTTP Header ... ");
-            GenerateHttpHeader httpHeader = new GenerateHttpHeader(200, contentLength, "text/html", "hd");
+            LOGGER.info("error: " + htmlParser.getError());
+            GenerateHttpHeader httpHeader = new GenerateHttpHeader(htmlParser.getError(), contentLength, "text/html", "hd");
             String response = httpHeader.toString() + html + CRLF + CRLF;
             LOGGER.info("Done Generating HTTP Header.");
 

src/main/java/dev/hdprojects/HttpServer/core/ServerListenerThread.java

@@ -1,5 +1,6 @@
 package dev.hdprojects.HttpServer.core;
 
+import dev.hdprojects.HttpServer.config.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,10 +15,12 @@ public class ServerListenerThread extends Thread {
     private int port;
     private String webroot;
     private ServerSocket serverSocket;
+    private Configuration configuration;
 
-    public ServerListenerThread(int port, String webroot) throws IOException {
-        this.port = port;
-        this.webroot = webroot;
+    public ServerListenerThread(Configuration configuration) throws IOException {
+        this.port = configuration.getPort();
+        this.webroot = configuration.getWebroot();
+        this.configuration = configuration;
 
         this.serverSocket = new ServerSocket(this.port);
     }
@@ -31,7 +34,7 @@ public void run() {
 
                 LOGGER.info("Connection accepted" + socket.getInetAddress());
 
-                HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket, webroot);
+                HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket, webroot, configuration);
                 workerThread.start();
 
             }

src/main/java/dev/hdprojects/website/HtmlParser.java

@@ -1,23 +1,28 @@
 package dev.hdprojects.website;
 
-import dev.hdprojects.HttpServer.HttpServer;
+import dev.hdprojects.HttpServer.config.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
 
 public class HtmlParser {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(HttpServer.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(HtmlParser.class);
 
     private File file;
     private String filePath;
+    private String css;
+    private String JS;
+    private int error = 200;
     private String contents = "";
     private String html = "";
+    private Configuration configuration;
 
-    public HtmlParser(String filePath, String css, String cssReplace, String JS, String JSReplace) {
+    public HtmlParser(String filePath, Configuration conf) {
         this.file = new File(filePath);
         this.filePath = filePath;
+        this.configuration = conf;
 
         // Read the file
         try {
@@ -62,36 +67,118 @@ public HtmlParser(String filePath, String css, String cssReplace, String JS, Str
                     // can throw a IOException
                     while ((charValue = bufferedReader.read()) != -1) contents += (char) charValue;
                 } catch (FileNotFoundException exception1) {
-                    // ERROR: 404
+                    contents = error(404);
                     LOGGER.error("File Not Found: " + exception);
                 } catch (IOException exception1) {
-                    // ERROR: 500
+                    contents = error(500);
                     LOGGER.error("Error reading file: " + exception);
                 }
             } else {
-                // ERROR: 404
+                contents = error(404);
                 LOGGER.error("File Not Found: " + exception);
             }
         } catch (IOException exception) {
-            // ERROR: 500
+            contents = error(500);
             LOGGER.error("File Not Found: " + exception);
         }
-        LOGGER.info(contents);
+
+        try {
+            // Open the file
+            BufferedReader tempBufferedReader = new BufferedReader(new FileReader(new File(configuration.getWebroot() + "/" + configuration.getJs())));
+
+            int charValue;
+
+            JS = "";
+
+            // Loop through the characters of
+            // the file and store them to the contents String
+            // can throw a IOException
+            while ((charValue = tempBufferedReader.read()) != -1) JS += (char) charValue;
+
+            // Set the html tags
+            JS = "<script>" + JS + "</script>";
+        } catch (Exception exception) {
+            JS = "/* Unknown Error */";
+            JS = "<script>" + JS + "</script>";
+            LOGGER.info("Error opening JS");
+        }
+
+        try {
+            // Open the file
+            BufferedReader tempBufferedReader = new BufferedReader(new FileReader(new File(configuration.getWebroot() + "/" + configuration.getCss())));
+
+            int charValue;
+
+            css = "";
+
+            // Loop through the characters of
+            // the file and store them to the contents String
+            // can throw a IOException
+            while ((charValue = tempBufferedReader.read()) != -1) css += (char) charValue;
+
+            // Set the html tags
+            css = "<style>" + css + "</style>";
+        } catch (Exception exception) {
+            css = "/* Unknown Error */";
+            css = "<style>" + css + "</style>";
+            LOGGER.info("Error opening css");
+        }
 
         // Replace the style
-        //Replacer styleReplace = new Replacer(cssReplace, css);
+        contents = contents.replaceAll(configuration.getStyle_replace(), css);
 
         // And the js
-        //Replacer jsReplace = new Replacer(styleReplace.toString(), JS);
+        contents = contents.replaceAll(configuration.getJs_replace(), JS);
 
         html = contents;
     }
 
+    private String error(int error) {
+        LOGGER.info("Error: " + 404);
+        switch (error) {
+            case 404:
+                error = 404;
+                File file = new File(configuration.getWebroot() + "/" + error + ".html");
+
+                BufferedReader bufferedReader = null;
+                try {
+                    bufferedReader = new BufferedReader(new FileReader(file));
+                } catch (FileNotFoundException exception) {
+                    LOGGER.error(exception.getMessage());
+                    return "Error: 500 INTERNAL SERVER ERROR";
+                }
+
+                int charValue;
+
+                while (true) {
+                    try {
+                        if (!((charValue = bufferedReader.read()) != -1)) break;
+                    } catch (IOException exception) {
+                        LOGGER.error(exception.getMessage());
+                        return "Error: 500 INTERNAL SERVER ERROR";
+                    }
+                    contents += (char) charValue;
+                }
+                return contents;
+            default:
+                error = 500;
+                return "Error: 500 INTERNAL SERVER ERROR";
+        }
+    }
+
     @Override
     public String toString() {
         return html;
     }
 
+    public int getError() {
+        return error;
+    }
+
+    public void setError(int error) {
+        this.error = error;
+    }
+
     public String getHtml() {
         return html;
     }

src/main/java/dev/hdprojects/website/Replacer.java

@@ -3,10 +3,7 @@
   "webroot": "src/main/resources/webroot",
   "style_replace": "<!--STYLE_REPLACE-->",
   "js_replace": "<!--JS_REPLACE-->",
-  "css": [
-    "style.css"
-    ],
-  "js": [
-    "script.js"
-    ]
+  "css": "style.css",
+  "js": "script.js",
+  "page_404": "404.html"
 }

src/main/resources/http.json

@@ -0,0 +1 @@
+test

src/main/resources/webroot/404.html

@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
+<!--STYLE_REPLACE-->
     <title>Test</title>
 </head>
 <body>
+<!--JS_REPLACE-->
 <h1>Hope this works!</h1>
 </body>
 </html>

src/main/resources/webroot/favicon.ico

@@ -0,0 +1 @@
+/*TEST*/

src/main/resources/webroot/index.html

@@ -0,0 +1,3 @@
+h1 {
+    font-weight: bolder;
+}

src/main/resources/webroot/script.js

@@ -3,10 +3,7 @@
   "webroot": "src/main/resources/webroot",
   "style_replace": "<!--STYLE_REPLACE-->",
   "js_replace": "<!--JS_REPLACE-->",
-  "css": [
-    "style.css"
-    ],
-  "js": [
-    "script.js"
-    ]
+  "css": "style.css",
+  "js": "script.js",
+  "page_404": "404.html"
 }

src/main/resources/webroot/style.css

@@ -0,0 +1 @@
+test

target/classes/dev/hdprojects/HttpServer/HttpServer.class

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!--STYLE_REPLACE-->
+    <title>Test</title>
+</head>
+<body>
+<!--JS_REPLACE-->
+<h1>Hope this works!</h1>
+</body>
+</html>