X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/a8bbdb54d006f157a009ece0cae5bf72fb636ced..9ffacfe90e54a86da289d3e6fb3c3df738f57abb:/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 dd0c7bee..34961bd3 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java @@ -1,174 +1,66 @@ 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.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.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 java.io.BufferedReader; -import java.io.IOException; import java.io.InputStreamReader; -import java.util.Set; -import java.util.concurrent.TimeUnit; +import java.util.List; +import java.util.function.Supplier; public class JsonRpcDispatcherCommand implements LocalCommand { private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class); - private static final int USER_ERROR = -1; - private static final int IO_ERROR = -3; - private static final int UNTRUSTED_KEY_ERROR = -4; - - private final OutputWriter outputWriter; + @Override + public String getName() { + return "jsonRpc"; + } - public static void attachToSubparser(final Subparser subparser) { + @Override + public void attachToSubparser(final Subparser subparser) { subparser.help("Take commands from standard input as line-delimited JSON RPC while receiving messages."); subparser.addArgument("--ignore-attachments") .help("Don’t download attachments of received messages.") .action(Arguments.storeTrue()); - } - - public JsonRpcDispatcherCommand(final OutputWriter outputWriter) { - this.outputWriter = outputWriter; + 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()); } @Override - public Set getSupportedOutputTypes() { - return Set.of(OutputType.JSON); + public List getSupportedOutputTypes() { + return List.of(OutputType.JSON); } @Override - public void handleCommand(final Namespace ns, final Manager m) 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, commandOutputWriter); - if (!(command instanceof JsonRpcCommand)) { - throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND, - "Method not implemented", - null)); - } - - try { - parseParamsAndRunCommand(m, objectMapper, params, (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 ? new Object() : result[0]; - return objectMapper.valueToTree(output); - } - - private void parseParamsAndRunCommand( - final Manager m, final ObjectMapper objectMapper, final TreeNode params, 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); - } - - 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; + public void handleCommand( + final Namespace ns, final Manager m, final OutputWriter outputWriter + ) throws CommandException { + 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")); + m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts)); + + final var jsonOutputWriter = (JsonWriter) outputWriter; + final Supplier lineSupplier = IOUtils.getLineSupplier(new InputStreamReader(System.in, + IOUtils.getConsoleCharset())); + + final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, false); + handler.handleConnection(m); } }