Prevent a stale jsonrpc connection from interfering with message receiving

[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 1e5bdca1d95449fdab4acc806cd5e82841ac431a..7c972496dc919dacf57dd440d538c3af3e8fb0a7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -35,9 +35,8 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
@@ -155,7 +154,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
 
-        c.getAccountNumbers().stream().map(c::getManager).filter(Objects::nonNull).forEach(m -> {
+        c.getManagers().forEach(m -> {
             m.setIgnoreAttachments(ignoreAttachments);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
@@ -235,15 +234,18 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         });
     }
 
+    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+
     private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-        new Thread(() -> {
+        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: " + clientString);
+                    logger.info("Accepted new client connection {}: {}", connectionId, clientString);
                 } catch (IOException e) {
                     logger.error("Failed to accept new socket connection", e);
                     synchronized (this) {
@@ -251,16 +253,22 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                     break;
                 }
-                new Thread(() -> {
+                final var connectionThread = new Thread(() -> {
                     try (final var c = channel) {
                         socketHandler.accept(c);
-                        logger.info("Connection closed: " + clientString);
                     } catch (IOException e) {
                         logger.warn("Failed to close channel", e);
+                    } catch (Throwable e) {
+                        logger.warn("Connection handler failed, closing connection", e);
                     }
-                }).start();
+                    logger.info("Connection {} closed: {}", connectionId, clientString);
+                });
+                connectionThread.setName("daemon-connection-" + connectionId);
+                connectionThread.start();
             }
-        }).start();
+        });
+        thread.setName("daemon-listener");
+        thread.start();
     }
 
     private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
@@ -292,11 +300,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
             c.addOnManagerAddedHandler(m -> {
                 final var thread = exportMultiAccountManager(connection, m, noReceiveOnStart);
-                if (thread != null) {
-                    try {
-                        thread.join();
-                    } catch (InterruptedException ignored) {
-                    }
+                try {
+                    thread.join();
+                } catch (InterruptedException ignored) {
                 }
             });
             c.addOnManagerRemovedHandler(m -> {
@@ -308,16 +314,12 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                 } catch (DBusException ignored) {
                 }
-                connection.unExportObject(path);
             });
 
-            final var initThreads = c.getAccountNumbers()
+            final var initThreads = c.getManagers()
                     .stream()
-                    .map(c::getManager)
-                    .filter(Objects::nonNull)
                     .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+                    .toList();
 
             for (var t : initThreads) {
                 try {
@@ -337,41 +339,39 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         } else {
             busType = DBusConnection.DBusBusType.SESSION;
         }
+        DBusConnection conn;
         try {
-            var conn = DBusConnection.getConnection(busType);
+            conn = DBusConnection.getConnection(busType);
             dbusRunner.run(conn, DbusConfig.getObjectPath());
+        } catch (DBusException e) {
+            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
+        }
 
+        try {
             conn.requestBusName(DbusConfig.getBusname());
-
-            logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
         } catch (DBusException e) {
-            logger.error("Dbus command failed", e);
-            throw new UnexpectedErrorException("Dbus command failed", e);
+            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
+                    + e.getMessage(), e);
         }
+
+        logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
     }
 
     private Thread exportMultiAccountManager(
             final DBusConnection conn, final Manager m, final boolean noReceiveOnStart
     ) {
-        try {
-            final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-            return exportDbusObject(conn, objectPath, m, noReceiveOnStart);
-        } catch (DBusException e) {
-            logger.error("Failed to export object", e);
-            return null;
-        }
+        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+        return exportDbusObject(conn, objectPath, m, noReceiveOnStart);
     }
 
     private Thread exportDbusObject(
             final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
-    ) throws DBusException {
+    ) {
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
-        conn.exportObject(signal);
         final var initThread = new Thread(signal::initObjects);
+        initThread.setName("dbus-init");
         initThread.start();
 
-        logger.debug("Exported dbus object: " + objectPath);
-
         return initThread;
     }