From 6c4c700c43a6f0ebe3096955ee9e00990786d6e9 Mon Sep 17 00:00:00 2001
From: Katsute <58778985+Katsute@users.noreply.github.com>
Date: Thu, 20 Oct 2022 19:17:06 -0400
Subject: [PATCH 1/5] timeout except tests

---
 .../simplehttpserver/SimpleHttpHandler.java   |   1 +
 .../handler/TimeoutHandler.java               | 110 ++++++++++++++++++
 src/main/java9/module-info.java               |   1 +
 .../handler/TimeoutTests.java                 |  84 +++++++++++++
 4 files changed, 196 insertions(+)
 create mode 100644 src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
 create mode 100644 src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java

diff --git a/src/main/java/dev/katsute/simplehttpserver/SimpleHttpHandler.java b/src/main/java/dev/katsute/simplehttpserver/SimpleHttpHandler.java
index 8d7187a..42d78d2 100644
--- a/src/main/java/dev/katsute/simplehttpserver/SimpleHttpHandler.java
+++ b/src/main/java/dev/katsute/simplehttpserver/SimpleHttpHandler.java
@@ -37,6 +37,7 @@
  * @see dev.katsute.simplehttpserver.handler.RootHandler
  * @see dev.katsute.simplehttpserver.handler.SSEHandler
  * @see dev.katsute.simplehttpserver.handler.TemporaryHandler
+ * @see dev.katsute.simplehttpserver.handler.TimeoutHandler
  * @see dev.katsute.simplehttpserver.handler.throttler.ThrottledHandler
  * @see dev.katsute.simplehttpserver.handler.file.FileHandler
  * @since 5.0.0
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
new file mode 100644
index 0000000..585a7ab
--- /dev/null
+++ b/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2022 Katsute <https://github.com/Katsute>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package dev.katsute.simplehttpserver.handler;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import dev.katsute.simplehttpserver.SimpleHttpExchange;
+import dev.katsute.simplehttpserver.SimpleHttpHandler;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.Objects;
+import java.util.concurrent.*;
+
+/**
+ * The timeout handler runs a handler and times out after a set time.
+ *
+ * @since 5.0.0
+ * @version 5.0.0
+ * @author Katsute
+ */
+public class TimeoutHandler implements SimpleHttpHandler {
+
+    private final HttpHandler handler;
+
+    private final TimeUnit unit;
+    private final double timeout;
+
+    private final ExecutorService service = Executors.newCachedThreadPool();
+
+    /**
+     * Creates a timeout handler.
+     *
+     * @param handler handler
+     * @param timeout how long until timeout in seconds
+     *
+     * @since 5.0.0
+     */
+    public TimeoutHandler(final HttpHandler handler, final double timeout){
+        this(handler, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Creates a timeout handler.
+     *
+     * @param handler handler
+     * @param timeout how long until timeout
+     * @param unit timeout units
+     *
+     * @see TimeUnit
+     * @since 5.0.0
+     */
+    public TimeoutHandler(final HttpHandler handler, final double timeout, final TimeUnit unit){
+        this.handler = Objects.requireNonNull(handler);
+        this.timeout = timeout;
+        this.unit = Objects.requireNonNull(unit);
+    }
+
+    @Override
+    public final void handle(final HttpExchange exchange) throws IOException{
+        SimpleHttpHandler.super.handle(exchange);
+    }
+
+    @Override
+    public final void handle(final SimpleHttpExchange exchange) throws IOException{
+        final Future<?> future = service.submit(() -> {
+            try{
+                handler.handle(exchange);
+            }catch(final IOException e){
+                throw new RuntimeException(e);
+            }
+        });
+        try{
+            future.get((long) timeout, unit);
+        }catch(final Throwable e){
+            future.cancel(true);
+            exchange.send(HttpURLConnection.HTTP_CLIENT_TIMEOUT);
+            if(!(e instanceof TimeoutException))
+                throw new RuntimeException(e);
+        }finally{
+            exchange.close();
+        }
+    }
+
+    @Override
+    public String toString(){
+        return "TimeoutHandler{" +
+               "handler=" + handler +
+               ", timeout=" + timeout +
+               ", unit=" + unit +
+               '}';
+    }
+
+}
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
index a09f82d..07b3b5d 100644
--- a/src/main/java9/module-info.java
+++ b/src/main/java9/module-info.java
@@ -39,6 +39,7 @@
  *     <li>{@link dev.katsute.simplehttpserver.handler.RootHandler}</li>
  *     <li>{@link dev.katsute.simplehttpserver.handler.SSEHandler}</li>
  *     <li>{@link dev.katsute.simplehttpserver.handler.TemporaryHandler}</li>
+ *     <li>{@link dev.katsute.simplehttpserver.handler.TimeoutHandler}</li>
  *     <li>
  *         {@link dev.katsute.simplehttpserver.handler.file.FileHandler}
  *         <ul>
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
new file mode 100644
index 0000000..7f64e91
--- /dev/null
+++ b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
@@ -0,0 +1,84 @@
+package dev.katsute.simplehttpserver.handler;
+
+import dev.katsute.simplehttpserver.*;
+import org.junit.jupiter.api.*;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+final class TimeoutTests {
+
+    private static SimpleHttpServer server;
+
+    @BeforeAll
+    static void beforeAll() throws IOException{
+        server = SimpleHttpServer.create(8080);
+        server.start();
+    }
+
+    @AfterAll
+    static void afterAll(){
+        server.stop();
+    }
+
+    @Test
+    final void testTimeout(){
+        server.createContext("timeout/timeout", new TimeoutHandler(
+            (SimpleHttpHandler) exchange -> {
+                try{
+                    Thread.sleep(4000);
+                }catch(InterruptedException ignored){
+
+                }
+            },
+            2,
+            TimeUnit.SECONDS
+        ));
+
+        Assertions.assertTimeoutPreemptively(
+            Duration.of((long) 2.1, TimeUnit.SECONDS.toChronoUnit()),
+            () ->Requests.getBody("http://localhost:8080/timeout/timeout")
+        );
+    }
+
+    @Test
+    final void testTimeoutSeconds(){
+        server.createContext("timeout/unit", new TimeoutHandler(
+            (SimpleHttpHandler) exchange -> {
+                try{
+                    Thread.sleep(4000);
+                }catch(final InterruptedException ignored){
+
+                }
+            },
+            2
+        ));
+
+        Assertions.assertTimeoutPreemptively(
+            Duration.of((long) 2.1, TimeUnit.SECONDS.toChronoUnit()),
+            () ->Requests.getBody("http://localhost:8080/timeout/unit")
+        );
+    }
+
+    @Test
+    final void testTimeoutPass(){
+        server.createContext("timeout/pass", new TimeoutHandler(
+            (SimpleHttpHandler) exchange -> {
+                try{
+                    Thread.sleep(4000);
+                }catch(InterruptedException ignored){
+
+                }
+            },
+            5,
+            TimeUnit.SECONDS
+        ));
+
+        Assertions.assertTimeout(
+            Duration.of((long) 4.1, TimeUnit.SECONDS.toChronoUnit()),
+            () ->Requests.getBody("http://localhost:8080/timeout/pass")
+        );
+    }
+
+}

From 5556658263e71a9759e77438876dd29491de2b34 Mon Sep 17 00:00:00 2001
From: Katsute <58778985+Katsute@users.noreply.github.com>
Date: Thu, 20 Oct 2022 20:51:47 -0400
Subject: [PATCH 2/5] fix bad test case

---
 .../handler/TimeoutTests.java                 | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
index 7f64e91..6642216 100644
--- a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
+++ b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 final class TimeoutTests {
 
@@ -28,37 +29,43 @@ final void testTimeout(){
             (SimpleHttpHandler) exchange -> {
                 try{
                     Thread.sleep(4000);
-                }catch(InterruptedException ignored){
-
-                }
+                    exchange.send(200);
+                }catch(InterruptedException ignored){}
             },
             2,
             TimeUnit.SECONDS
         ));
 
+        final AtomicInteger code = new AtomicInteger();
+
         Assertions.assertTimeoutPreemptively(
-            Duration.of((long) 2.1, TimeUnit.SECONDS.toChronoUnit()),
-            () ->Requests.getBody("http://localhost:8080/timeout/timeout")
+            Duration.of(3, TimeUnit.SECONDS.toChronoUnit()),
+            () -> code.set(Requests.getCode("http://localhost:8080/timeout/timeout"))
         );
+
+        Assertions.assertEquals(408, code.get());
     }
 
     @Test
     final void testTimeoutSeconds(){
-        server.createContext("timeout/unit", new TimeoutHandler(
+        server.createContext("timeout/nou", new TimeoutHandler(
             (SimpleHttpHandler) exchange -> {
                 try{
                     Thread.sleep(4000);
-                }catch(final InterruptedException ignored){
-
-                }
+                    exchange.send(200);
+                }catch(InterruptedException ignored){}
             },
             2
         ));
 
+        final AtomicInteger code = new AtomicInteger();
+
         Assertions.assertTimeoutPreemptively(
-            Duration.of((long) 2.1, TimeUnit.SECONDS.toChronoUnit()),
-            () ->Requests.getBody("http://localhost:8080/timeout/unit")
+            Duration.of(3, TimeUnit.SECONDS.toChronoUnit()),
+            () -> code.set(Requests.getCode("http://localhost:8080/timeout/nou"))
         );
+
+        Assertions.assertEquals(408, code.get());
     }
 
     @Test
@@ -67,18 +74,21 @@ final void testTimeoutPass(){
             (SimpleHttpHandler) exchange -> {
                 try{
                     Thread.sleep(4000);
-                }catch(InterruptedException ignored){
-
-                }
+                    exchange.send(200);
+                }catch(InterruptedException ignored){}
             },
             5,
             TimeUnit.SECONDS
         ));
 
+        final AtomicInteger code = new AtomicInteger();
+
         Assertions.assertTimeout(
-            Duration.of((long) 4.1, TimeUnit.SECONDS.toChronoUnit()),
-            () ->Requests.getBody("http://localhost:8080/timeout/pass")
+            Duration.of(5, TimeUnit.SECONDS.toChronoUnit()),
+            () -> code.set(Requests.getCode("http://localhost:8080/timeout/pass"))
         );
+
+        Assertions.assertEquals(200, code.get());
     }
 
 }

From 0dc4b6934a7260818fed0cf7a64a43462e0027ac Mon Sep 17 00:00:00 2001
From: Katsute <58778985+Katsute@users.noreply.github.com>
Date: Thu, 20 Oct 2022 20:54:43 -0400
Subject: [PATCH 3/5] fix package failure on 8

---
 .../dev/katsute/simplehttpserver/handler/TimeoutTests.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
index 6642216..92e73a0 100644
--- a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
+++ b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -39,7 +40,7 @@ final void testTimeout(){
         final AtomicInteger code = new AtomicInteger();
 
         Assertions.assertTimeoutPreemptively(
-            Duration.of(3, TimeUnit.SECONDS.toChronoUnit()),
+            Duration.of(3, ChronoUnit.SECONDS),
             () -> code.set(Requests.getCode("http://localhost:8080/timeout/timeout"))
         );
 
@@ -61,7 +62,7 @@ final void testTimeoutSeconds(){
         final AtomicInteger code = new AtomicInteger();
 
         Assertions.assertTimeoutPreemptively(
-            Duration.of(3, TimeUnit.SECONDS.toChronoUnit()),
+            Duration.of(3, ChronoUnit.SECONDS),
             () -> code.set(Requests.getCode("http://localhost:8080/timeout/nou"))
         );
 
@@ -84,7 +85,7 @@ final void testTimeoutPass(){
         final AtomicInteger code = new AtomicInteger();
 
         Assertions.assertTimeout(
-            Duration.of(5, TimeUnit.SECONDS.toChronoUnit()),
+            Duration.of(5, ChronoUnit.SECONDS),
             () -> code.set(Requests.getCode("http://localhost:8080/timeout/pass"))
         );
 

From ce84b6b251dbc9d93b5cea5261cdad8bb291c02b Mon Sep 17 00:00:00 2001
From: Katsute <58778985+Katsute@users.noreply.github.com>
Date: Thu, 20 Oct 2022 21:01:08 -0400
Subject: [PATCH 4/5] Update TimeoutTests.java

---
 .../simplehttpserver/handler/TimeoutTests.java      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
index 92e73a0..a859984 100644
--- a/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
+++ b/src/test/java/dev/katsute/simplehttpserver/handler/TimeoutTests.java
@@ -39,7 +39,7 @@ final void testTimeout(){
 
         final AtomicInteger code = new AtomicInteger();
 
-        Assertions.assertTimeoutPreemptively(
+        Assertions.assertTimeout(
             Duration.of(3, ChronoUnit.SECONDS),
             () -> code.set(Requests.getCode("http://localhost:8080/timeout/timeout"))
         );
@@ -61,7 +61,7 @@ final void testTimeoutSeconds(){
 
         final AtomicInteger code = new AtomicInteger();
 
-        Assertions.assertTimeoutPreemptively(
+        Assertions.assertTimeout(
             Duration.of(3, ChronoUnit.SECONDS),
             () -> code.set(Requests.getCode("http://localhost:8080/timeout/nou"))
         );
@@ -82,14 +82,7 @@ final void testTimeoutPass(){
             TimeUnit.SECONDS
         ));
 
-        final AtomicInteger code = new AtomicInteger();
-
-        Assertions.assertTimeout(
-            Duration.of(5, ChronoUnit.SECONDS),
-            () -> code.set(Requests.getCode("http://localhost:8080/timeout/pass"))
-        );
-
-        Assertions.assertEquals(200, code.get());
+        Assertions.assertEquals(200, Requests.getCode("http://localhost:8080/timeout/pass"));
     }
 
 }

From 007e832d0f46b816aa572da3e880d2eaa3dade5b Mon Sep 17 00:00:00 2001
From: Katsute <58778985+Katsute@users.noreply.github.com>
Date: Thu, 20 Oct 2022 21:04:37 -0400
Subject: [PATCH 5/5] Update TimeoutHandler.java

---
 .../katsute/simplehttpserver/handler/TimeoutHandler.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
index 585a7ab..e8370fb 100644
--- a/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
+++ b/src/main/java/dev/katsute/simplehttpserver/handler/TimeoutHandler.java
@@ -40,7 +40,7 @@ public class TimeoutHandler implements SimpleHttpHandler {
     private final HttpHandler handler;
 
     private final TimeUnit unit;
-    private final double timeout;
+    private final long timeout;
 
     private final ExecutorService service = Executors.newCachedThreadPool();
 
@@ -68,7 +68,7 @@ public TimeoutHandler(final HttpHandler handler, final double timeout){
      */
     public TimeoutHandler(final HttpHandler handler, final double timeout, final TimeUnit unit){
         this.handler = Objects.requireNonNull(handler);
-        this.timeout = timeout;
+        this.timeout = (long) timeout;
         this.unit = Objects.requireNonNull(unit);
     }
 
@@ -87,7 +87,7 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
             }
         });
         try{
-            future.get((long) timeout, unit);
+            future.get(timeout, unit);
         }catch(final Throwable e){
             future.cancel(true);
             exchange.send(HttpURLConnection.HTTP_CLIENT_TIMEOUT);