Add listAccounts command

[signal-cli] / src / main / java / org / asamk / signal / jsonrpc / SignalJsonRpcDispatcherHandler.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index c33cd9a5057e6fa796da55c20002d2aa37834607..d2debfe0e1871c87b9b267f235fba1a06e010943 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.node.ContainerNode;
 
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;
 
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;

-import org.asamk.signal.OutputWriter;

 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;

-import org.asamk.signal.commands.JsonRpcCommand;
+import org.asamk.signal.commands.JsonRpcMultiCommand;
+import org.asamk.signal.commands.JsonRpcSingleCommand;

 import org.asamk.signal.commands.SignalCreator;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.SignalCreator;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;


@@ -48,11 +48,11 @@ public class SignalJsonRpcDispatcherHandler {
     private Manager m;
 
     public SignalJsonRpcDispatcherHandler(
     private Manager m;
 
     public SignalJsonRpcDispatcherHandler(

-            final JsonWriter outputWriter, final Supplier<String> lineSupplier, final boolean noReceiveOnStart
+            final JsonWriter jsonWriter, final Supplier<String> lineSupplier, final boolean noReceiveOnStart

     ) {
         this.noReceiveOnStart = noReceiveOnStart;
         this.objectMapper = Util.createJsonObjectMapper();
     ) {
         this.noReceiveOnStart = noReceiveOnStart;
         this.objectMapper = Util.createJsonObjectMapper();

-        this.jsonRpcSender = new JsonRpcSender(outputWriter);
+        this.jsonRpcSender = new JsonRpcSender(jsonWriter);

         this.jsonRpcReader = new JsonRpcReader(jsonRpcSender, lineSupplier);
     }
 
         this.jsonRpcReader = new JsonRpcReader(jsonRpcSender, lineSupplier);
     }
 


@@ -119,8 +119,11 @@ public class SignalJsonRpcDispatcherHandler {
             final ObjectMapper objectMapper, final String method, ContainerNode<?> params
     ) throws JsonRpcException {
         var command = getCommand(method);
             final ObjectMapper objectMapper, final String method, ContainerNode<?> params
     ) throws JsonRpcException {
         var command = getCommand(method);

-        // TODO implement listAccounts, register, verify, link
-        if (command instanceof JsonRpcCommand<?> jsonRpcCommand) {
+        // TODO implement register, verify, link
+        if (c != null && command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
+            return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
+        }
+        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {

             if (m != null) {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
             }
             if (m != null) {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
             }


@@ -152,11 +155,26 @@ public class SignalJsonRpcDispatcherHandler {
         return Commands.getCommand(method);
     }
 
         return Commands.getCommand(method);
     }
 

-    private record CommandRunnerImpl<T>(Manager m, JsonRpcCommand<T> command) implements CommandRunner<T> {
+    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, m, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    private record MultiCommandRunnerImpl<T>(
+            SignalCreator c, JsonRpcMultiCommand<T> command
+    ) implements CommandRunner<T> {

 
         @Override
 
         @Override

-        public void handleCommand(final T request, final OutputWriter outputWriter) throws CommandException {
-            command.handleCommand(request, m, outputWriter);
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, c, jsonWriter);

         }
 
         @Override
         }
 
         @Override


@@ -167,7 +185,7 @@ public class SignalJsonRpcDispatcherHandler {
 
     interface CommandRunner<T> {
 
 
     interface CommandRunner<T> {
 

-        void handleCommand(T request, OutputWriter outputWriter) throws CommandException;
+        void handleCommand(T request, JsonWriter jsonWriter) throws CommandException;

 
         TypeReference<T> getRequestType();
     }
 
         TypeReference<T> getRequestType();
     }


@@ -176,7 +194,7 @@ public class SignalJsonRpcDispatcherHandler {
             final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
     ) throws JsonRpcException {
         final Object[] result = {null};
             final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
     ) throws JsonRpcException {
         final Object[] result = {null};

-        final JsonWriter commandOutputWriter = s -> {
+        final JsonWriter commandJsonWriter = s -> {

             if (result[0] != null) {
                 throw new AssertionError("Command may only write one json result");
             }
             if (result[0] != null) {
                 throw new AssertionError("Command may only write one json result");
             }


@@ -185,7 +203,7 @@ public class SignalJsonRpcDispatcherHandler {
         };
 
         try {
         };
 
         try {

-            parseParamsAndRunCommand(objectMapper, params, commandOutputWriter, command);
+            parseParamsAndRunCommand(objectMapper, params, commandJsonWriter, command);

         } catch (JsonMappingException e) {
             throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                     e.getMessage(),
         } catch (JsonMappingException e) {
             throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                     e.getMessage(),


@@ -210,7 +228,7 @@ public class SignalJsonRpcDispatcherHandler {
     private <T> void parseParamsAndRunCommand(
             final ObjectMapper objectMapper,
             final TreeNode params,
     private <T> void parseParamsAndRunCommand(
             final ObjectMapper objectMapper,
             final TreeNode params,

-            final OutputWriter outputWriter,
+            final JsonWriter jsonWriter,

             final CommandRunner<T> command
     ) throws CommandException, JsonMappingException {
         T requestParams = null;
             final CommandRunner<T> command
     ) throws CommandException, JsonMappingException {
         T requestParams = null;


@@ -224,10 +242,10 @@ public class SignalJsonRpcDispatcherHandler {
                 throw new AssertionError(e);
             }
         }
                 throw new AssertionError(e);
             }
         }

-        command.handleCommand(requestParams, outputWriter);
+        command.handleCommand(requestParams, jsonWriter);

     }
 
     }
 

-    private class SubscribeReceiveCommand implements JsonRpcCommand<Void> {
+    private class SubscribeReceiveCommand implements JsonRpcSingleCommand<Void> {

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


@@ -236,13 +254,13 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
 
         @Override
         public void handleCommand(

-                final Void request, final Manager m, final OutputWriter outputWriter
+                final Void request, final Manager m, final JsonWriter jsonWriter

         ) throws CommandException {
             subscribeReceive(m);
         }
     }
 
         ) throws CommandException {
             subscribeReceive(m);
         }
     }
 

-    private class UnsubscribeReceiveCommand implements JsonRpcCommand<Void> {
+    private class UnsubscribeReceiveCommand implements JsonRpcSingleCommand<Void> {

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


@@ -251,7 +269,7 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
 
         @Override
         public void handleCommand(

-                final Void request, final Manager m, final OutputWriter outputWriter
+                final Void request, final Manager m, final JsonWriter jsonWriter

         ) throws CommandException {
             unsubscribeReceive(m);
         }
         ) throws CommandException {
             unsubscribeReceive(m);
         }