Refactor DaemonCommand

[signal-cli] / src / main / java / org / asamk / signal / http / HttpServerHandler.java

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 39e7f51eaa87e363242c2ece255993e21a984f85..c9c8fa16bfe604d9cc19af567383dcc968eac4a6 100644 (file)
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -24,9 +24,9 @@ import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 

-public class HttpServerHandler {
+public class HttpServerHandler implements AutoCloseable {

 
 

-    private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);

 
     private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
 
 
     private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
 


@@ -35,6 +35,8 @@ public class HttpServerHandler {
     private final SignalJsonRpcCommandHandler commandHandler;
     private final MultiAccountManager c;
     private final Manager m;
     private final SignalJsonRpcCommandHandler commandHandler;
     private final MultiAccountManager c;
     private final Manager m;

+    private HttpServer server;
+    private final AtomicBoolean shutdown = new AtomicBoolean(false);

 
     public HttpServerHandler(final InetSocketAddress address, final Manager m) {
         this.address = address;
 
     public HttpServerHandler(final InetSocketAddress address, final Manager m) {
         this.address = address;


@@ -51,16 +53,34 @@ public class HttpServerHandler {
     }
 
     public void init() throws IOException {
     }
 
     public void init() throws IOException {

-        logger.info("Starting server on " + address.toString());
+        if (server != null) {
+            throw new AssertionError("HttpServerHandler already initialized");
+        }
+        logger.debug("Starting HTTP server on {}", address);

 
 

-        final var server = HttpServer.create(address, 0);
-        server.setExecutor(Executors.newFixedThreadPool(10));
+        server = HttpServer.create(address, 0);
+        server.setExecutor(Executors.newCachedThreadPool());

 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
         server.createContext("/api/v1/events", this::handleEventsEndpoint);
         server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();
 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
         server.createContext("/api/v1/events", this::handleEventsEndpoint);
         server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();

+        logger.info("Started HTTP server on {}", address);
+    }
+
+    @Override
+    public void close() {
+        if (server != null) {
+            shutdown.set(true);
+            synchronized (this) {
+                this.notifyAll();
+            }
+            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
+            server.stop(2);
+            server = null;
+            shutdown.set(false);
+        }

     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {


@@ -153,7 +173,7 @@ public class HttpServerHandler {
             final var handlers = subscribeReceiveHandlers(managers, sender, () -> {
                 shouldStop.set(true);
                 synchronized (this) {
             final var handlers = subscribeReceiveHandlers(managers, sender, () -> {
                 shouldStop.set(true);
                 synchronized (this) {

-                    this.notify();
+                    this.notifyAll();

                 }
             });
 
                 }
             });
 


@@ -162,7 +182,7 @@ public class HttpServerHandler {
                     synchronized (this) {
                         wait(15_000);
                     }
                     synchronized (this) {
                         wait(15_000);
                     }

-                    if (shouldStop.get()) {
+                    if (shouldStop.get() || shutdown.get()) {

                         break;
                     }
 
                         break;
                     }
 


@@ -201,22 +221,22 @@ public class HttpServerHandler {
     }
 
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {
     }
 
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {

-        List<Manager> managers;

         if (m != null) {
         if (m != null) {

-            managers = List.of(m);
-        } else {
+            return List.of(m);
+        }
+        if (c != null) {

             final var account = query.get("account");
             if (account == null || account.isEmpty()) {
             final var account = query.get("account");
             if (account == null || account.isEmpty()) {

-                managers = c.getManagers();
+                return c.getManagers();

             } else {
                 final var manager = c.getManager(account);
                 if (manager == null) {
                     return null;
                 }
             } else {
                 final var manager = c.getManager(account);
                 if (manager == null) {
                     return null;
                 }

-                managers = List.of(manager);
+                return List.of(manager);

             }
         }
             }
         }

-        return managers;
+        throw new AssertionError("Unreachable state");

     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(