Improve JSON-RPC subscribeReceive method with subscription id

[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..043b19c2095714f7fcca282ba31e47017a2596ad 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -36,8 +36,8 @@ 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 +155,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,8 +235,10 @@ 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 SocketChannel channel;
                 final String clientString;
@@ -251,16 +253,20 @@ 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);
                     }
-                }).start();
+                });
+                connectionThread.setName("daemon-connection-" + threadNumber.getAndIncrement());
+                connectionThread.start();
             }
-        }).start();
+        });
+        thread.setName("daemon-listener");
+        thread.start();
     }
 
     private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
@@ -311,13 +317,11 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 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 {
@@ -368,6 +372,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         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);