X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/af292d8f0ea897ea13470489d51c40acca50fc3e..7b0744ec758b1ccbe3c9ce5a1e6dea5d7e2313da:/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 6b5361e5..0eb99351 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java @@ -1,47 +1,33 @@ package org.asamk.signal.commands; -import com.fasterxml.jackson.core.TreeNode; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ContainerNode; - import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonReceiveMessageHandler; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; -import org.asamk.signal.OutputWriter; +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.UntrustedKeyErrorException; -import org.asamk.signal.commands.exceptions.UserErrorException; -import org.asamk.signal.jsonrpc.JsonRpcException; -import org.asamk.signal.jsonrpc.JsonRpcReader; -import org.asamk.signal.jsonrpc.JsonRpcRequest; -import org.asamk.signal.jsonrpc.JsonRpcResponse; -import org.asamk.signal.jsonrpc.JsonRpcSender; +import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler; import org.asamk.signal.manager.Manager; -import org.asamk.signal.util.Util; +import org.asamk.signal.manager.MultiAccountManager; +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.BufferedReader; -import java.io.IOException; +import java.io.FileDescriptor; +import java.io.FileInputStream; import java.io.InputStreamReader; +import java.nio.channels.Channels; import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; -public class JsonRpcDispatcherCommand implements LocalCommand { +import static org.asamk.signal.util.CommandUtil.getReceiveConfig; - private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class); +public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand { - private static final int USER_ERROR = -1; - private static final int IO_ERROR = -3; - private static final int UNTRUSTED_KEY_ERROR = -4; + private static final Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class); @Override public String getName() { @@ -54,6 +40,16 @@ public class JsonRpcDispatcherCommand implements LocalCommand { 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("--receive-mode") + .help("Specify when to start receiving messages.") + .type(Arguments.enumStringType(ReceiveMode.class)) + .setDefault(ReceiveMode.ON_START); } @Override @@ -65,117 +61,46 @@ public class JsonRpcDispatcherCommand implements LocalCommand { public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - final boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); - - final var objectMapper = Util.createJsonObjectMapper(); - final var jsonRpcSender = new JsonRpcSender((JsonWriter) outputWriter); - - final var receiveThread = receiveMessages(s -> jsonRpcSender.sendRequest(JsonRpcRequest.forNotification( - "receive", - objectMapper.valueToTree(s), - null)), m, ignoreAttachments); - - final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); - - final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, () -> { - try { - return reader.readLine(); - } catch (IOException e) { - throw new AssertionError(e); - } - }); - jsonRpcReader.readRequests((method, params) -> handleRequest(m, objectMapper, method, params), - response -> logger.debug("Received unexpected response for id {}", response.getId())); - - receiveThread.interrupt(); - try { - receiveThread.join(); - } catch (InterruptedException ignored) { - } - } - - private JsonNode handleRequest( - final Manager m, final ObjectMapper objectMapper, final String method, ContainerNode params - ) throws JsonRpcException { - final Object[] result = {null}; - final JsonWriter commandOutputWriter = s -> { - if (result[0] != null) { - throw new AssertionError("Command may only write one json result"); - } - - result[0] = s; - }; - - var command = Commands.getCommand(method); - if (!(command instanceof JsonRpcCommand)) { - throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND, - "Method not implemented", - null)); - } - - try { - parseParamsAndRunCommand(m, objectMapper, params, commandOutputWriter, (JsonRpcCommand) command); - } catch (JsonMappingException e) { - throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST, - e.getMessage(), - null)); - } catch (UserErrorException e) { - throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR, e.getMessage(), null)); - } catch (IOErrorException e) { - throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR, e.getMessage(), null)); - } catch (UntrustedKeyErrorException e) { - throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR, e.getMessage(), null)); - } catch (Throwable e) { - logger.error("Command execution failed", e); - throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR, - e.getMessage(), - null)); - } - - Object output = result[0] == null ? Map.of() : result[0]; - return objectMapper.valueToTree(output); + Shutdown.installHandler(); + final var receiveMode = ns.get("receive-mode"); + final var receiveConfig = getReceiveConfig(ns); + m.setReceiveConfig(receiveConfig); + + final var jsonOutputWriter = (JsonWriter) outputWriter; + final var lineSupplier = getLineSupplier(); + + final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, + lineSupplier, + receiveMode == ReceiveMode.MANUAL); + final var thread = Thread.currentThread(); + Shutdown.registerShutdownListener(thread::interrupt); + handler.handleConnection(m); } - private void parseParamsAndRunCommand( - final Manager m, - final ObjectMapper objectMapper, - final TreeNode params, - final OutputWriter outputWriter, - final JsonRpcCommand command - ) throws CommandException, JsonMappingException { - T requestParams = null; - final var requestType = command.getRequestType(); - if (params != null && requestType != null) { - try { - requestParams = objectMapper.readValue(objectMapper.treeAsTokens(params), requestType); - } catch (JsonMappingException e) { - throw e; - } catch (IOException e) { - throw new AssertionError(e); - } - } - command.handleCommand(requestParams, m, outputWriter); + @Override + public void handleCommand( + final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + ) throws CommandException { + Shutdown.installHandler(); + final var receiveMode = ns.get("receive-mode"); + final var receiveConfig = getReceiveConfig(ns); + c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig)); + c.addOnManagerAddedHandler(m -> m.setReceiveConfig(receiveConfig)); + + final var jsonOutputWriter = (JsonWriter) outputWriter; + final var lineSupplier = getLineSupplier(); + + final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, + lineSupplier, + receiveMode == ReceiveMode.MANUAL); + final var thread = Thread.currentThread(); + Shutdown.registerShutdownListener(thread::interrupt); + handler.handleConnection(c); } - private Thread receiveMessages( - JsonWriter jsonWriter, Manager m, boolean ignoreAttachments - ) { - final var thread = new Thread(() -> { - while (!Thread.interrupted()) { - try { - final var receiveMessageHandler = new JsonReceiveMessageHandler(m, jsonWriter); - m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, receiveMessageHandler); - break; - } catch (IOException e) { - logger.warn("Receiving messages failed, retrying", e); - } catch (InterruptedException e) { - break; - } - } - }); - - thread.start(); - - return thread; + private static Supplier getLineSupplier() { + // 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())); } }