Update ClientRequest.java

Author: jfullstackdev

src/xdvrx1_serverProject/ClientRequest.java

@@ -11,7 +11,6 @@
 import java.nio.file.Files;
 import java.io.*;
 import java.net.*;
-
 import java.util.logging.*;
 
 public class ClientRequest implements Runnable {
@@ -56,16 +55,21 @@ public ClientRequest(File rootDirectory,
       }
 
       this.connection = connection;
+      
    }
 
    @Override
    public void run() {
 
       try {
+         //remember, once the connection is established
+         //the server will use the Socket to pass
+         //data back and forth
+         
          //raw output stream,
          //in case it is not a text document
          //this will be used purely to pass
-         ///the data as bytes
+         //the data as bytes         
          OutputStream raw = 
             new BufferedOutputStream(connection.getOutputStream());
 
@@ -74,48 +78,86 @@ public void run() {
          Writer out = 
             new OutputStreamWriter(raw);
 
+         //needed to add new line correctly
+         //for different platforms
+         BufferedWriter bufferedOut = 
+            new BufferedWriter(out);
+         
+         BufferedInputStream bis =
+            new BufferedInputStream(connection.getInputStream()); 
+         
          //for reading the GET header from a browser
          Reader in = 
             new
-            InputStreamReader(new
-                                 BufferedInputStream(connection
-                                                        .getInputStream()),
-                              "US-ASCII");
+            InputStreamReader(bis, "US-ASCII");
 
-         //the request line of a client 
-         StringBuilder requestLine = new StringBuilder();
-         while (true) {
-            int c = in.read();
-            if (c == '\r' || c == '\n') break;
-            requestLine.append((char) c);
+         //the request send by a client 
+         //take note, this can be loaded into a data structure
+         //instead of using StringBuffer to generate string
+         //but, it's up to you, for demonstration
+         //I will just use the StringBuffer to build
+         //the string object
+         StringBuffer userRequest = new StringBuffer();
+         
+         //this will be the basis to get
+         //all the bytes from the stream
+         int bufferSize = bis.available();
+         
+         while (true) { 
+            if (userRequest.length() > bufferSize-1) {
+               //for performance, always shutdown
+               //after breaking from this loop
+               connection.shutdownInput();
+               break;
+            }
+            
+            //read() of Reader is actually a blocking
+            //method, and without proper algorithm
+            //this will hang the entire program
+            int c = in.read();             
+            userRequest.append((char) c);
+            
+            //ignore the line endings,
+            //the Reader will interpret this as end of buffer
+            //we need to read the entire content of the buffer
+            if (c == '\n' || c == '\r' || c == 1) continue;
          }
 
-         //just converted to string for further processing
-         String requestLineToString = requestLine.toString();         
+         //build a string object from StringBuffer
+         String userRequestToString = userRequest.toString();
+         
+         //get the first line through this index
+         int indexOfFirst = userRequestToString.indexOf("\r\n");         
+         String firstLine = userRequestToString
+            .substring(0,indexOfFirst);
+         
+         //express it in the logger, mostly for debugging purposes
          requestLogger
             .info(connection
-                     .getRemoteSocketAddress() + " " + requestLineToString);
+                     .getRemoteSocketAddress() + " " + firstLine);
 
-         //`_keywords` are the words separated from the
-         //request line,         
-         //`GET /data/ HTTP/1.1`
-         String[] _keywords = requestLineToString.split("\\s+");
-         String method = _keywords[0];
+         //`token` are the words separated from the request line,         
+         //for example, `GET /data/ HTTP/1.1`
+         String[] token = firstLine.split("\\s+");
+         //0 index tells the method
+         String method = token[0];
+         //null at first
          String http_version = "";
 
          if (method.equals("GET")) {
-            String fileName = _keywords[1];
+            String fileName = token[1];
 
             //add manually the default page
             if (fileName.endsWith("/")) {
                fileName = fileName + defaultPage;
             }
 
+            //get the content type for proper encoding of data
             String contentType =
                URLConnection.getFileNameMap().getContentTypeFor(fileName);
 
-            if (_keywords.length > 2) {               
-               http_version = _keywords[2];
+            if (token.length > 2) {               
+               http_version = token[2];
             }
 
             File actualFile = 
@@ -160,8 +202,33 @@ public void run() {
                out.write(message1.body);
                out.flush();
             }
-         } else { 
-            // method is not "GET"
+            
+         } else if(method.equals("POST")) { 
+            
+            //get the request body for POST method
+            //add 4, because the index that
+            //will be returned is relative to the 
+            //very first occurence of the string
+            String requestBody = 
+               userRequestToString
+               .substring(userRequestToString.lastIndexOf("\r\n\r\n") + 4);
+            
+            //just showing the input data back to the client
+            //a lot of things can be done for the request body
+            //it can go directly to a file or a database,
+            //or be loaded into an XML file for further processing
+            
+            //we use also the buffered out writer
+            //to make sure that the new line will be correct
+            //for all platforms
+            bufferedOut.write("data recorded:");
+            bufferedOut.newLine();
+            bufferedOut.write(requestBody);
+            bufferedOut.flush();
+            
+         } else {
+            
+            //not yet implemented methods
             if (http_version.startsWith("HTTP/")) { 
                // send a MIME header
                ServerHeader.serverHeader(out,
@@ -186,4 +253,4 @@ public void run() {
       }
    }
 
-}
+}