Use improved shutdown for daemon command

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index cec7cd03e622117dc62b3333874dee0c65d22cfe..209b071c9f4045259a7e1cfcff504bdba99b75bb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,17 +7,18 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;

+import org.asamk.signal.Shutdown;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
 import org.asamk.signal.dbus.DbusSignalImpl;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
 import org.asamk.signal.dbus.DbusSignalImpl;

+import org.asamk.signal.http.HttpServerHandler;

 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;

-import org.asamk.signal.manager.api.ReceiveConfig;

 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;


@@ -31,16 +32,22 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

+import java.net.InetSocketAddress;

 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;

+import java.nio.channels.ClosedChannelException;

 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;

+import java.util.ArrayList;

 import java.util.List;
 import java.util.List;

+import java.util.concurrent.Executors;

 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 

+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
+

 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);


@@ -69,6 +76,10 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 .nargs("?")
                 .setConst("localhost:7583")
                 .help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");
                 .nargs("?")
                 .setConst("localhost:7583")
                 .help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");

+        subparser.addArgument("--http")
+                .nargs("?")
+                .setConst("localhost:8080")
+                .help("Expose a JSON-RPC interface as http endpoint (default localhost:8080).");

         subparser.addArgument("--no-receive-stdout")
                 .help("Don’t print received messages to stdout.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--no-receive-stdout")
                 .help("Don’t print received messages to stdout.")
                 .action(Arguments.storeTrue());


@@ -79,6 +90,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());

+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());

         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());


@@ -93,60 +107,22 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

+        Shutdown.installHandler();

         logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");

-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        final var receiveConfig = getReceiveConfig(ns);

 
 

-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));
+        m.setReceiveConfig(receiveConfig);

         addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
 
         addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
 

-        final Channel inheritedChannel;
-        try {
-            inheritedChannel = System.inheritedChannel();
-            if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
-                logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
-                runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-            }
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to use inherited socket", e);
-        }
-        final var socketFile = ns.<File>get("socket");
-        if (socketFile != null) {
-            final var address = UnixDomainSocketAddress.of(socketFile.toPath());
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var tcpAddress = ns.getString("tcp");
-        if (tcpAddress != null) {
-            final var address = IOUtils.parseInetSocketAddress(tcpAddress);
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
-        if (isDbusSystem) {
-            runDbusSingleAccount(m, true, receiveMode != ReceiveMode.ON_START);
-        }
-        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
-        if (isDbusSession || (
-                !isDbusSystem
-                        && socketFile == null
-                        && tcpAddress == null
-                        && !(inheritedChannel instanceof ServerSocketChannel)
-        )) {
-            runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
-        }
+        try (final var daemonHandler = new SingleAccountDaemonHandler(m, receiveMode)) {
+            setup(ns, daemonHandler);

 
 

-        m.addClosedListener(() -> {
-            synchronized (this) {
-                notifyAll();
-            }
-        });
+            m.addClosedListener(Shutdown::triggerShutdown);

 
 

-        synchronized (this) {

             try {
             try {

-                wait();
+                Shutdown.waitForShutdown();

             } catch (InterruptedException ignored) {
             }
         }
             } catch (InterruptedException ignored) {
             }
         }


@@ -156,13 +132,11 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     public void handleCommand(
             final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
     ) throws CommandException {

+        Shutdown.installHandler();

         logger.info("Starting daemon in multi-account mode");
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         logger.info("Starting daemon in multi-account mode");
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");

-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-
-        final var receiveConfig = new ReceiveConfig(ignoreAttachments, sendReadReceipts);
+        final var receiveConfig = getReceiveConfig(ns);

         c.getManagers().forEach(m -> {
             m.setReceiveConfig(receiveConfig);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         c.getManagers().forEach(m -> {
             m.setReceiveConfig(receiveConfig);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);


@@ -172,222 +146,307 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
 
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
 

+        try (final var daemonHandler = new MultiAccountDaemonHandler(c, receiveMode)) {
+            setup(ns, daemonHandler);
+
+            synchronized (this) {
+                try {
+                    Shutdown.waitForShutdown();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        }
+    }
+
+    private static void setup(final Namespace ns, final DaemonHandler daemonHandler) throws CommandException {

         final Channel inheritedChannel;
         try {
             inheritedChannel = System.inheritedChannel();
             if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
                 logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
         final Channel inheritedChannel;
         try {
             inheritedChannel = System.inheritedChannel();
             if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
                 logger.info("Using inherited socket: " + serverChannel.getLocalAddress());

-                runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+                daemonHandler.runSocket(serverChannel);

             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to use inherited socket", e);
         }
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to use inherited socket", e);
         }

+

         final var socketFile = ns.<File>get("socket");
         if (socketFile != null) {
             final var address = UnixDomainSocketAddress.of(socketFile.toPath());
             final var serverChannel = IOUtils.bindSocket(address);
         final var socketFile = ns.<File>get("socket");
         if (socketFile != null) {
             final var address = UnixDomainSocketAddress.of(socketFile.toPath());
             final var serverChannel = IOUtils.bindSocket(address);

-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+            daemonHandler.runSocket(serverChannel);

         }
         }

+

         final var tcpAddress = ns.getString("tcp");
         if (tcpAddress != null) {
             final var address = IOUtils.parseInetSocketAddress(tcpAddress);
             final var serverChannel = IOUtils.bindSocket(address);
         final var tcpAddress = ns.getString("tcp");
         if (tcpAddress != null) {
             final var address = IOUtils.parseInetSocketAddress(tcpAddress);
             final var serverChannel = IOUtils.bindSocket(address);

-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+            daemonHandler.runSocket(serverChannel);
+        }
+
+        final var httpAddress = ns.getString("http");
+        if (httpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(httpAddress);
+            daemonHandler.runHttp(address);

         }
         }

+

         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {
         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {

-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, true);
+            daemonHandler.runDbus(true);

         }
         }

+

         final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
         if (isDbusSession || (
                 !isDbusSystem
                         && socketFile == null
                         && tcpAddress == null
         final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
         if (isDbusSession || (
                 !isDbusSystem
                         && socketFile == null
                         && tcpAddress == null

+                        && httpAddress == null

                         && !(inheritedChannel instanceof ServerSocketChannel)
         )) {
                         && !(inheritedChannel instanceof ServerSocketChannel)
         )) {

-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, false);
-        }
-
-        synchronized (this) {
-            try {
-                wait();
-            } catch (InterruptedException ignored) {
-            }
+            daemonHandler.runDbus(false);

         }
     }
 
     private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {
         }
     }
 
     private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {

-        final var handler = outputWriter instanceof JsonWriter o
-                ? new JsonReceiveMessageHandler(m, o)
-                : outputWriter instanceof PlainTextWriter o
-                        ? new ReceiveMessageHandler(m, o)
-                        : Manager.ReceiveMessageHandler.EMPTY;
+        final var handler = switch (outputWriter) {
+            case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+            case null -> Manager.ReceiveMessageHandler.EMPTY;
+        };

         m.addReceiveHandler(handler, isWeakListener);
     }
 
         m.addReceiveHandler(handler, isWeakListener);
     }
 

-    private void runSocketSingleAccount(
-            final Manager m, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(m);
-        });
-    }
+    private static abstract class DaemonHandler implements AutoCloseable {

 
 

-    private void runSocketMultiAccount(
-            final MultiAccountManager c, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(c);
-        });
-    }
+        protected final ReceiveMode receiveMode;
+        protected final List<AutoCloseable> closeables = new ArrayList<>();

 
 

-    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+        private static final AtomicInteger threadNumber = new AtomicInteger(0);

 
 

-    private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-        final var thread = new Thread(() -> {
-            while (true) {
-                final var connectionId = threadNumber.getAndIncrement();
-                final SocketChannel channel;
-                final String clientString;
-                try {
-                    channel = serverChannel.accept();
-                    clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
-                    logger.info("Accepted new client connection {}: {}", connectionId, clientString);
-                } catch (IOException e) {
-                    logger.error("Failed to accept new socket connection", e);
-                    synchronized (this) {
-                        notifyAll();
+        public DaemonHandler(final ReceiveMode receiveMode) {
+            this.receiveMode = receiveMode;
+        }
+
+        public abstract void runSocket(ServerSocketChannel serverChannel) throws CommandException;
+
+        public abstract void runDbus(boolean isDbusSystem) throws CommandException;
+
+        public abstract void runHttp(InetSocketAddress address) throws CommandException;
+
+        protected void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
+            final List<AutoCloseable> channels = new ArrayList<>();
+            final var thread = Thread.ofPlatform().name("daemon-listener").start(() -> {
+                try (final var executor = Executors.newCachedThreadPool()) {
+                    while (true) {
+                        final var connectionId = threadNumber.getAndIncrement();
+                        final SocketChannel channel;
+                        final String clientString;
+                        try {
+                            channel = serverChannel.accept();
+                            clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+                            logger.info("Accepted new client connection {}: {}", connectionId, clientString);
+                        } catch (ClosedChannelException ignored) {
+                            logger.trace("Listening socket has been closed");
+                            break;
+                        } catch (IOException e) {
+                            logger.error("Failed to accept new socket connection", e);
+                            break;
+                        }
+                        channels.add(channel);
+                        executor.submit(() -> {
+                            try (final var c = channel) {
+                                socketHandler.accept(c);
+                            } catch (IOException e) {
+                                logger.warn("Failed to close channel", e);
+                            } catch (Throwable e) {
+                                logger.warn("Connection handler failed, closing connection", e);
+                            }
+                            logger.info("Connection {} closed: {}", connectionId, clientString);
+                            channels.remove(channel);
+                        });

                     }
                     }

-                    break;

                 }
                 }

-                final var connectionThread = new Thread(() -> {
-                    try (final var c = channel) {
-                        socketHandler.accept(c);
-                    } catch (IOException e) {
-                        logger.warn("Failed to close channel", e);
-                    } catch (Throwable e) {
-                        logger.warn("Connection handler failed, closing connection", e);
-                    }
-                    logger.info("Connection {} closed: {}", connectionId, clientString);
-                });
-                connectionThread.setName("daemon-connection-" + connectionId);
-                connectionThread.start();
-            }
-        });
-        thread.setName("daemon-listener");
-        thread.start();
-    }
+            });
+            closeables.add(() -> {
+                serverChannel.close();
+                for (final var c : new ArrayList<>(channels)) {
+                    c.close();
+                }
+                thread.join();
+            });
+        }

 
 

-    private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
-            final SocketChannel c, final boolean noReceiveOnStart
-    ) {
-        final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
-        final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
+        protected SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
+            final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
+            final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));

 
 

-        return new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, noReceiveOnStart);
-    }
+            return new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                    lineSupplier,
+                    receiveMode == ReceiveMode.MANUAL);
+        }

 
 

-    private void runDbusSingleAccount(
-            final Manager m, final boolean isDbusSystem, final boolean noReceiveOnStart
-    ) throws CommandException {
-        runDbus(isDbusSystem, (conn, objectPath) -> {
+        protected Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
+            final var signal = new DbusSignalImpl(m, conn, objectPath, receiveMode != ReceiveMode.ON_START);
+            closeables.add(signal);
+
+            return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
+        }
+
+        protected void runDbus(
+                final boolean isDbusSystem, MultiAccountDaemonHandler.DbusRunner dbusRunner
+        ) throws CommandException {
+            DBusConnection.DBusBusType busType;
+            if (isDbusSystem) {
+                busType = DBusConnection.DBusBusType.SYSTEM;
+            } else {
+                busType = DBusConnection.DBusBusType.SESSION;
+            }
+            DBusConnection conn;

             try {
             try {

-                exportDbusObject(conn, objectPath, m, noReceiveOnStart).join();
-            } catch (InterruptedException ignored) {
+                conn = DBusConnectionBuilder.forType(busType).build();
+                dbusRunner.run(conn, DbusConfig.getObjectPath());
+            } catch (DBusException e) {
+                throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
+            } catch (UnsupportedOperationException e) {
+                throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);

             }
             }

-        });
-    }

 
 

-    private void runDbusMultiAccount(
-            final MultiAccountManager c, final boolean noReceiveOnStart, final boolean isDbusSystem
-    ) throws CommandException {
-        runDbus(isDbusSystem, (connection, objectPath) -> {
-            final var signalControl = new DbusSignalControlImpl(c, objectPath);
-            connection.exportObject(signalControl);
+            try {
+                conn.requestBusName(DbusConfig.getBusname());
+            } catch (DBusException e) {
+                throw new UnexpectedErrorException(
+                        "Dbus command failed, maybe signal-cli dbus daemon is already running: " + e.getMessage(),
+                        e);
+            }
+            closeables.add(conn);

 
 

-            c.addOnManagerAddedHandler(m -> {
-                final var thread = exportMultiAccountManager(connection, m, noReceiveOnStart);
-                try {
-                    thread.join();
-                } catch (InterruptedException ignored) {
-                }
-            });
-            c.addOnManagerRemovedHandler(m -> {
-                final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+            logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
+        }
+
+        @Override
+        public void close() {
+            for (final var closeable : new ArrayList<>(closeables)) {

                 try {
                 try {

-                    final var object = connection.getExportedObject(null, path);
-                    if (object instanceof DbusSignalImpl dbusSignal) {
-                        dbusSignal.close();
-                    }
-                } catch (DBusException ignored) {
+                    closeable.close();
+                } catch (Exception e) {
+                    logger.warn("Failed to close daemon handler", e);

                 }
                 }

-            });
+            }
+            closeables.clear();
+        }
+    }
+
+    private static final class SingleAccountDaemonHandler extends DaemonHandler {

 
 

-            final var initThreads = c.getManagers()
-                    .stream()
-                    .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
-                    .toList();
+        private final Manager m;

 
 

-            for (var t : initThreads) {
+        private SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.m = m;
+        }
+
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(serverChannel, channel -> {
+                final var handler = getSignalJsonRpcDispatcherHandler(channel);
+                handler.handleConnection(m);
+            });
+        }
+
+        @Override
+        public void runDbus(final boolean isDbusSystem) throws CommandException {
+            runDbus(isDbusSystem, (conn, objectPath) -> {

                 try {
                 try {

-                    t.join();
+                    exportDbusObject(conn, objectPath, m).join();

                 } catch (InterruptedException ignored) {
                 }
                 } catch (InterruptedException ignored) {
                 }

+            });
+        }
+
+        @Override
+        public void runHttp(InetSocketAddress address) throws CommandException {
+            final var handler = new HttpServerHandler(address, m);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);

             }
             }

-        });
+            this.closeables.add(handler);
+        }

     }
 
     }
 

-    private void runDbus(
-            final boolean isDbusSystem, DbusRunner dbusRunner
-    ) throws CommandException {
-        DBusConnection.DBusBusType busType;
-        if (isDbusSystem) {
-            busType = DBusConnection.DBusBusType.SYSTEM;
-        } else {
-            busType = DBusConnection.DBusBusType.SESSION;
-        }
-        DBusConnection conn;
-        try {
-            conn = DBusConnectionBuilder.forType(busType).build();
-            dbusRunner.run(conn, DbusConfig.getObjectPath());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+    private static final class MultiAccountDaemonHandler extends DaemonHandler {
+
+        private final MultiAccountManager c;
+
+        private MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.c = c;

         }
 
         }
 

-        try {
-            conn.requestBusName(DbusConfig.getBusname());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
-                    + e.getMessage(), e);
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(serverChannel, channel -> {
+                final var handler = getSignalJsonRpcDispatcherHandler(channel);
+                handler.handleConnection(c);
+            });

         }
 
         }
 

-        logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
-    }
+        public void runDbus(final boolean isDbusSystem) throws CommandException {
+            runDbus(isDbusSystem, (connection, objectPath) -> {
+                final var signalControl = new DbusSignalControlImpl(c, objectPath);
+                connection.exportObject(signalControl);

 
 

-    private Thread exportMultiAccountManager(
-            final DBusConnection conn, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-        return exportDbusObject(conn, objectPath, m, noReceiveOnStart);
-    }
+                c.addOnManagerAddedHandler(m -> {
+                    final var thread = exportManager(connection, m);
+                    try {
+                        thread.join();
+                    } catch (InterruptedException ignored) {
+                    }
+                });
+                c.addOnManagerRemovedHandler(m -> {
+                    final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+                    try {
+                        final var object = connection.getExportedObject(null, path);
+                        if (object instanceof DbusSignalImpl dbusSignal) {
+                            dbusSignal.close();
+                            closeables.remove(dbusSignal);
+                        }
+                    } catch (DBusException ignored) {
+                    }
+                });

 
 

-    private Thread exportDbusObject(
-            final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
-        final var initThread = new Thread(signal::initObjects);
-        initThread.setName("dbus-init");
-        initThread.start();
+                final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();

 
 

-        return initThread;
-    }
+                for (var t : initThreads) {
+                    try {
+                        t.join();
+                    } catch (InterruptedException ignored) {
+                    }
+                }
+            });
+        }
+
+        @Override
+        public void runHttp(final InetSocketAddress address) throws CommandException {
+            final var handler = new HttpServerHandler(address, c);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
+            }
+            this.closeables.add(handler);
+        }
+
+        private Thread exportManager(
+                final DBusConnection conn, final Manager m
+        ) {
+            final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+            return exportDbusObject(conn, objectPath, m);
+        }

 
 

-    interface DbusRunner {
+        interface DbusRunner {

 
 

-        void run(DBusConnection connection, String objectPath) throws DBusException;
+            void run(DBusConnection connection, String objectPath) throws DBusException;
+        }

     }
 }
     }
 }