Added SSE (unstable and untested)

Katsute · Katsute · commit ff664ea74b82 · 2020-03-16T17:06:43.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,4 @@ out
 *.iml
 # Project ignore
 .docs
-src/LICENSE.txt
-_ignore.java
+src/LICENSE.txt
diff --git a/src/ktt/lib/httpserver/handler/FileHandler.java b/src/ktt/lib/httpserver/handler/FileHandler.java
@@ -7,6 +7,7 @@
 import java.io.*;
 import java.util.*;
 
+// todo: documentation
 public class FileHandler extends SimpleHttpHandler {
 
     private final FileHandlerAdapter adapter;
diff --git a/src/ktt/lib/httpserver/handler/PredicateHandler.java b/src/ktt/lib/httpserver/handler/PredicateHandler.java
@@ -24,7 +24,7 @@ public class PredicateHandler extends SimpleHttpHandler {
     private final Predicate<SimpleHttpExchange> predicate;
 
     /**
-     * Creates a predicate handler
+     * Creates a predicate handler.
      *
      * @param trueHandler handler to use if true
      * @param falseHandler handler to use if false
diff --git a/src/ktt/lib/httpserver/handler/SSEHandler.java b/src/ktt/lib/httpserver/handler/SSEHandler.java
@@ -1,14 +1,24 @@
 package ktt.lib.httpserver.handler;
 
 import ktt.lib.httpserver.http.RequestMethod;
-import ktt.lib.httpserver.server.*;
+import ktt.lib.httpserver.server.SimpleHttpExchange;
+import ktt.lib.httpserver.server.SimpleHttpHandler;
 
 import java.io.IOException;
 import java.util.*;
 
+/**
+ * This handler processes event-streams.
+ *
+ * @see SimpleHttpHandler
+ * @see com.sun.net.httpserver.HttpHandler
+ * @since 02.00.00
+ * @version 02.00.00
+ * @author Ktt Development
+ */
 public class SSEHandler extends SimpleHttpHandler {
 
-    private final List<HttpSession> listeners = new ArrayList<>(); // listeners
+    private final List<SimpleHttpExchange> listeners = new ArrayList<>(); // listeners
     private int id = -1;
     private final LinkedList<String> queue = new LinkedList<>(); // event queue
 
@@ -24,13 +34,36 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
             return;
         }
         exchange.getResponseHeaders().add("content-type","text/event-stream");
-        final int latest = exchange.getRequestHeaders().getFirst("Last-Event-ID")
-        exchange.send(200);
+        int latest = 0;
+        try{
+            latest = Integer.parseInt(exchange.getRequestHeaders().getFirst("Last-Event-ID"));
+        }catch(final NumberFormatException | NullPointerException ignored){ }
+
+        for(int index = latest; index < queue.size(); index++)
+            exchange.send(queue.get(index));
+
+        listeners.add(exchange);
     }
 
-    public final void addToEventQueue(final String s){
+    /**
+     * Pushes an event to the event stream.
+     *
+     * @param s event data
+     *
+     * @since 02.00.00
+     * @author Ktt Development
+     */
+    public final void push(final String s){
         id++;
         queue.add(s);
+        listeners.forEach(exchange -> {
+            final StringBuilder OUT = new StringBuilder();
+            OUT.append("id: ").append(id).append("\n");
+            OUT.append("data: ").append(s).append("\n\n");
+            try{
+                exchange.send(OUT.toString());
+            }catch(final IOException ignored){}
+        });
     }
 
 }
diff --git a/src/ktt/lib/httpserver/server/SimpleHttpExchange.java b/src/ktt/lib/httpserver/server/SimpleHttpExchange.java
@@ -12,7 +12,7 @@
 
 /**
  * <i>This class is a simplified implementation of {@link HttpExchange}</i>. <br>
- * This class provides methods to process requests from the client and send a response back. Each request can only send a single response. <br><br>
+ * This class provides methods to process requests from the client and send a response back. <br><br>
  * Get/post type requests for <code>application/x-www-form-urlencoded</code> (default) will be a simple key/value map. <br>
  * Get/post type requests for <code>multipart/form-data</code> will use an expanded map. <br>
  * Example:
diff --git a/src/ktt/lib/httpserver/server/SimpleHttpExchangeImpl.java b/src/ktt/lib/httpserver/server/SimpleHttpExchangeImpl.java
@@ -62,8 +62,6 @@ static SimpleHttpExchange createSimpleHttpExchange(final HttpExchange exchange){
 
             private final HashMap<String,String> cookies;
 
-            private boolean closed = false;
-
         //
 
             private final Function<String,HashMap<String,String>> parseWwwFormEnc = s -> {
@@ -368,9 +366,7 @@ public synchronized final HttpSession getHttpSession(){
 
             @Override
             public synchronized final void sendResponseHeaders(final int code, final long length) throws IOException{
-                if(closed) return;
                 httpExchange.sendResponseHeaders(code, length);
-                close();
             }
 
             @Override
@@ -395,8 +391,6 @@ public synchronized final void send(final byte[] response, final int responseCod
 
             @Override
             public void send(final byte[] response, final int responseCode, final boolean gzip) throws IOException{
-                if(closed) return;
-
                 if(gzip){
                     exchange.getResponseHeaders().set("Accept-Encoding","gzip");
                     exchange.getResponseHeaders().set("Content-Encoding","gzip");
@@ -405,17 +399,11 @@ public void send(final byte[] response, final int responseCode, final boolean gz
                     GZIPOutputStream OUT = new GZIPOutputStream(exchange.getResponseBody());
                     OUT.write(response);
                     OUT.finish();
-                    OUT.close();
-                    exchange.getResponseBody().close();
-
-                    close();
                 }else{
                     sendResponseHeaders(responseCode,response.length);
                     final OutputStream OUT = exchange.getResponseBody();
                     OUT.write(response);
-                    OUT.close();
-
-                    close();
+                    OUT.flush();
                 }
             }
 
@@ -443,10 +431,7 @@ public void send(final String response, final int responseCode, final boolean gz
 
             @Override
             public synchronized final void close(){
-                if(!closed){
-                    exchange.close();
-                    closed = true;
-                }
+                exchange.close();
             }
 
         //

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class PredicateHandler extends SimpleHttpHandler {`
`24`	`24`	`private final Predicate<SimpleHttpExchange> predicate;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * Creates a predicate handler`
	`27`	`+ * Creates a predicate handler.`
`28`	`28`	`*`
`29`	`29`	`* @param trueHandler handler to use if true`
`30`	`30`	`* @param falseHandler handler to use if false`