I got it to send the right pages!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

alexDickhans · alexDickhans · commit 44f08a62de1b · 2020-09-30T20:22:41.000-06:00
diff --git a/src/main/java/dev/hdprojects/HttpServer/config/Configuration.java b/src/main/java/dev/hdprojects/HttpServer/config/Configuration.java
@@ -4,9 +4,27 @@ public class Configuration {
 
     private int port;
     private String webroot;
+    private String style_replace;
+    private String js_replace;
     private String[] css;
     private String[] js;
 
+    public String getStyle_replace() {
+        return style_replace;
+    }
+
+    public void setStyle_replace(String style_replace) {
+        this.style_replace = style_replace;
+    }
+
+    public String getJs_replace() {
+        return js_replace;
+    }
+
+    public void setJs_replace(String js_replace) {
+        this.js_replace = js_replace;
+    }
+
     public String[] getCss() {
         return css;
     }
diff --git a/src/main/java/dev/hdprojects/HttpServer/core/HttpConnectionWorkerThread.java b/src/main/java/dev/hdprojects/HttpServer/core/HttpConnectionWorkerThread.java
@@ -2,44 +2,63 @@
 
 import dev.hdprojects.http.GenerateHttpHeader;
 import dev.hdprojects.http.HttpParser;
+import dev.hdprojects.website.HtmlParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-public class HttpConnectionWorkerThread extends Thread{
+public class HttpConnectionWorkerThread extends Thread {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(HttpConnectionWorkerThread.class);
 
+    private String webRoot;
     private Socket socket;
 
-    public HttpConnectionWorkerThread(Socket socket) {
+    public HttpConnectionWorkerThread(Socket socket, String webRoot) {
+        this.webRoot = webRoot;
         this.socket = socket;
     }
 
     @Override
     public void run() {
+
         InputStream inputStream = null;
         OutputStream outputStream = null;
         try {
+
+            // Create the streams to write to
             inputStream = socket.getInputStream();
             outputStream = socket.getOutputStream();
 
+            // Create an instance of the HttpParser
+            LOGGER.info("Starting HTTP Parser ... ");
             HttpParser httpParser = new HttpParser(inputStream);
-
             httpParser.parseHttpRequest();
+            HtmlParser htmlParser = new HtmlParser(new File(webRoot + httpParser.getRequestedPage()), "", "", "", "");
+            LOGGER.info("Done With HTTP Parser.");
 
-            String html = "<html><head> <title>Simple Java HTTP Server</title></head><body><h1>Build this server with java HTTP</h1></body></html>";
+            // Set HTML variable
+            String html = htmlParser.toString();
 
-            final String CRLF = "\r\n"; // 13, 10 ASCII
+            /* 13, 10 ASCII */
+            final String CRLF = "\r\n";
 
-            GenerateHttpHeader httpHeader = new GenerateHttpHeader(200, html.length(), "text/html", "hd");
+            // Get the length of the html
+            int contentLength = html.getBytes().length;
 
-            String response = httpHeader + html + CRLF + CRLF;
+            // Generate an HTTP Header and response
+            LOGGER.info("Generating HTTP Header ... ");
+            GenerateHttpHeader httpHeader = new GenerateHttpHeader(200, contentLength, "text/html", "hd");
+            String response = httpHeader.toString() + html + CRLF + CRLF;
+            LOGGER.info("Done Generating HTTP Header.");
 
+            // Send the response
+            LOGGER.info("Sending response ... ");
             outputStream.write(response.getBytes());
 
             LOGGER.info("Connection processing finished");
diff --git a/src/main/java/dev/hdprojects/HttpServer/core/ServerListenerThread.java b/src/main/java/dev/hdprojects/HttpServer/core/ServerListenerThread.java
@@ -31,7 +31,7 @@ public void run() {
 
                 LOGGER.info("Connection accepted" + socket.getInetAddress());
 
-                HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket);
+                HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket, webroot);
                 workerThread.start();
 
             }
diff --git a/src/main/java/dev/hdprojects/http/GenerateHttpHeader.java b/src/main/java/dev/hdprojects/http/GenerateHttpHeader.java
@@ -39,7 +39,7 @@ public GenerateHttpHeader(int responseCode, int contentLength, String contentTyp
                 "Date: "+ new Date() + CRLF +
                 "Server: " + CRLF +
                 "Content-Length: " + this.contentLength + CRLF +
-                "Content-Type: " + this.contentType + CRLF;
+                "Content-Type: " + this.contentType + CRLF + CRLF;
     }
 
     private String generateResponseString(){
diff --git a/src/main/java/dev/hdprojects/http/HttpParser.java b/src/main/java/dev/hdprojects/http/HttpParser.java
@@ -34,15 +34,11 @@ public void parseHttpRequest() throws IOException {
 
         int _byte;
 
-        int lastChar;
-
         String tempString = "";
 
         while( (_byte = this.inputStream.read()) >= 0){
             tempString += (char) _byte;
 
-            lastChar = _byte;
-
             // This if statement checks if there is a newline and resets the string if there is
             if (tempString.indexOf("\r\n") > 0) {
                 tempString = "";
diff --git a/src/main/java/dev/hdprojects/website/CssReplacer.java b/src/main/java/dev/hdprojects/website/CssReplacer.java
diff --git a/src/main/java/dev/hdprojects/website/HtmlParser.java b/src/main/java/dev/hdprojects/website/HtmlParser.java
@@ -1,9 +1,68 @@
 package dev.hdprojects.website;
 
+import dev.hdprojects.HttpServer.HttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+
 public class HtmlParser {
 
-    private String file;
-    private String contents;
+    private final static Logger LOGGER = LoggerFactory.getLogger(HttpServer.class);
+
+    private File file;
+    private String contents = "";
+    private String html = "";
+
+    public HtmlParser(File file, String css, String cssReplace, String JS, String JSReplace) {
+        this.file = file;
+
+        // Read the file
+        try {
+            // Open buffered reader
+            // FileReader throws a FileNotFoundException
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
+
+            int charValue;
+
+            // Loop through the characters of
+            // the file and store them to the contents String
+            // can throw a IOException
+            while ((charValue = bufferedReader.read()) != -1) contents += (char) charValue;
+        } catch (FileNotFoundException exception) {
+            LOGGER.error("File Not Found: " + exception);
+        } catch (IOException exception) {
+            LOGGER.error("Can't Read File: " + exception);
+        }
+        LOGGER.info(contents);
+
+        // Replace the style
+        //Replacer styleReplace = new Replacer(cssReplace, css);
+
+        // And the js
+        //Replacer jsReplace = new Replacer(styleReplace.toString(), JS);
+
+        html = contents;
+    }
+
+    @Override
+    public String toString() {
+        return html;
+    }
+
+    public String getHtml() {
+        return html;
+    }
+
+    public void setHtml(String html) {
+        this.html = html;
+    }
 
+    public File getFile() {
+        return file;
+    }
 
+    public String getContents() {
+        return contents;
+    }
 }
diff --git a/src/main/java/dev/hdprojects/website/Replacer.java b/src/main/java/dev/hdprojects/website/Replacer.java
@@ -0,0 +1,43 @@
+package dev.hdprojects.website;
+
+public class Replacer {
+
+    private String replaceString;
+    private String contents;
+
+    public Replacer(String replaceString, String contents) {
+        this.contents = contents;
+        this.replaceString = replaceString;
+    }
+
+    private String replace() {
+        return this.replaceString.replaceAll(contents, replaceString);
+    }
+
+    @Override
+    public String toString() {
+        return contents;
+    }
+
+    /*
+     *
+     * Getters and Setters
+     *
+     */
+
+    public String getReplaceString() {
+        return replaceString;
+    }
+
+    public void setReplaceString(String replaceString) {
+        this.replaceString = replaceString;
+    }
+
+    public String getContents() {
+        return this.replace();
+    }
+
+    public void setContents(String contents) {
+        this.contents = contents;
+    }
+}
diff --git a/src/main/resources/http.json b/src/main/resources/http.json
@@ -1,6 +1,8 @@
 {
   "port": 80,
-  "webroot": "/tmp",
+  "webroot": "src/main/resources/webroot",
+  "style_replace": "/*STYLE_REPLACE*/",
+  "js_replace": "/*JS_REPLACE*/",
   "css": [
     "style.css"
     ],
diff --git a/src/main/resources/webroot/test.html b/src/main/resources/webroot/test.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Test</title>
+    </head>
+    <body>
+        <h1>Hope this works!</h1>
+    </body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void run() {`
`31`	`31`
`32`	`32`	`LOGGER.info("Connection accepted" + socket.getInetAddress());`
`33`	`33`
`34`		`- HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket);`
	`34`	`+ HttpConnectionWorkerThread workerThread = new HttpConnectionWorkerThread(socket, webroot);`
`35`	`35`	`workerThread.start();`
`36`	`36`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public GenerateHttpHeader(int responseCode, int contentLength, String contentTyp`
`39`	`39`	`"Date: "+ new Date() + CRLF +`
`40`	`40`	`"Server: " + CRLF +`
`41`	`41`	`"Content-Length: " + this.contentLength + CRLF +`
`42`		`- "Content-Type: " + this.contentType + CRLF;`
	`42`	`+ "Content-Type: " + this.contentType + CRLF + CRLF;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`private String generateResponseString(){`