Update gradle

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

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 166dfcef9cc6661648602480fdd58585d9f89f64..5ce9daf46a399cc5829c5ed9a5462d8c4536969e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -5,24 +5,29 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;

+import org.asamk.signal.Shutdown;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.commands.exceptions.CommandException;
 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.OutputWriter;
 import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+import java.io.FileDescriptor;
+import java.io.FileInputStream;

 import java.io.InputStreamReader;
 import java.io.InputStreamReader;

+import java.nio.channels.Channels;

 import java.util.List;
 import java.util.function.Supplier;
 
 import java.util.List;
 import java.util.function.Supplier;
 

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

 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 

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

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -54,8 +59,11 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
 
     @Override
     public void handleCommand(
 
     @Override
     public void handleCommand(

-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

+        Shutdown.installHandler();

         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         m.setReceiveConfig(receiveConfig);
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         m.setReceiveConfig(receiveConfig);


@@ -66,13 +74,18 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);

+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);

         handler.handleConnection(m);
     }
 
     @Override
     public void handleCommand(
         handler.handleConnection(m);
     }
 
     @Override
     public void handleCommand(

-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

+        Shutdown.installHandler();

         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));


@@ -84,17 +97,14 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);

+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);

         handler.handleConnection(c);
     }
 
         handler.handleConnection(c);
     }
 

-    private static ReceiveConfig getReceiveConfig(final Namespace ns) {
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
-        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
-    }
-

     private static Supplier<String> getLineSupplier() {
     private static Supplier<String> getLineSupplier() {

-        return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
+        // Use FileChannel for stdin, because System.in is uninterruptible
+        final var stdInCh = Channels.newInputStream((new FileInputStream(FileDescriptor.in)).getChannel());
+        return IOUtils.getLineSupplier(new InputStreamReader(stdInCh, IOUtils.getConsoleCharset()));

     }
 }
     }
 }