Implement dbus support for listIdentities

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

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index a69be7de90e60213b87680fd0a6003d7f52c2861..ba126f7ef585fa50a2dc74b94045f9d1e1223e0f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,38 +1,36 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import com.fasterxml.jackson.core.type.TypeReference;
+

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.Signal;
-import org.asamk.signal.JsonReceiveMessageHandler;
-import org.asamk.signal.JsonWriter;

 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputType;

-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriter;

 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.ReceiveMessageHandler;

+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.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;

-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
-import org.asamk.signal.json.JsonMessageEnvelope;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonReceiveMessageHandler;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.util.DateUtils;
-import org.freedesktop.dbus.DBusMap;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.freedesktop.dbus.types.Variant;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

-import java.util.Base64;
+import java.time.Duration;
+import java.util.ArrayList;

 import java.util.List;
 import java.util.List;

-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import java.util.Optional;

 
 

-public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
+public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {

 
 

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

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


@@ -46,9 +44,19 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .type(double.class)
                 .setDefault(3.0)
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
                 .type(double.class)
                 .setDefault(3.0)
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");

+        subparser.addArgument("--max-messages")
+                .type(int.class)
+                .setDefault(-1)
+                .help("Maximum number of messages to receive, before returning.");

         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         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());

     }
 
     @Override
     }
 
     @Override


@@ -56,123 +64,58 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 
         return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 

+    @Override

     public void handleCommand(
     public void handleCommand(

-            final Namespace ns, final Signal signal, DBusConnection dbusconnection, final OutputWriter outputWriter
+            final Namespace ns, final Manager m, final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

+        Shutdown.installHandler();
+        final var timeout = ns.getDouble("timeout");
+        final var maxMessagesRaw = ns.getInt("max-messages");
+        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));

         try {
         try {

-            if (outputWriter instanceof JsonWriter jsonWriter) {
-
-                dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> {
-                    var envelope = JsonMessageEnvelope.from(messageReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-
-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {
-                    var envelope = JsonMessageEnvelope.from(receiptReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-
-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {
-                    var envelope = JsonMessageEnvelope.from(syncReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-            } else {
-                final var writer = (PlainTextWriter) outputWriter;
-
-                dbusconnection.addSigHandler(Signal.MessageReceivedV2.class, signal, messageReceived -> {
-                    writer.println("Envelope from: {}", messageReceived.getSender());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
-                    writer.println("Body: {}", messageReceived.getMessage());
-                    if (messageReceived.getGroupId().length > 0) {
-                        writer.println("Group info:");
-                        writer.indentedWriter()
-                                .println("Id: {}", Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
-                    }
-                    final var extras = messageReceived.getExtras();
-                    printMessageExtras(writer, extras);
-                    writer.println();
-                });
-
-                dbusconnection.addSigHandler(Signal.ReceiptReceivedV2.class, signal, receiptReceived -> {
-                    writer.println("Receipt from: {}", receiptReceived.getSender());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
-                    writer.println("Type: {}", receiptReceived.getReceiptType());
-                });
-
-                dbusconnection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, syncReceived -> {
-                    writer.println("Sync Envelope from: {} to: {}",
-                            syncReceived.getSource(),
-                            syncReceived.getDestination());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(syncReceived.getTimestamp()));
-                    writer.println("Body: {}", syncReceived.getMessage());
-                    if (syncReceived.getGroupId().length > 0) {
-                        writer.println("Group info:");
-                        writer.indentedWriter()
-                                .println("Id: {}", Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
-                    }
-                    final var extras = syncReceived.getExtras();
-                    printMessageExtras(writer, extras);
-                    writer.println();
-                });
-            }
-        } catch (DBusException e) {
-            logger.error("Dbus client failed", e);
-            throw new UnexpectedErrorException("Dbus client failed", e);
-        }
-
-        double timeout = ns.getDouble("timeout");
-        long timeoutMilliseconds = timeout < 0 ? 10000 : (long) (timeout * 1000);
-
-        while (true) {
-            try {
-                Thread.sleep(timeoutMilliseconds);
-            } catch (InterruptedException ignored) {
-                break;
-            }
-            if (timeout >= 0) {
-                break;
-            }
-        }
-    }
-
-    private void printMessageExtras(final PlainTextWriter writer, final Map<String, Variant<?>> extras) {
-        if (extras.containsKey("attachments")) {
-            final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments");
-            if (attachments.size() > 0) {
-                writer.println("Attachments:");
-                for (var attachment : attachments) {
-                    final String value = getValue(attachment, "file");
-                    writer.println("- Stored plaintext in: {}", value);
-                }
-            }
+            final var handler = switch (outputWriter) {
+                case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+                case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            };
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            Shutdown.registerShutdownListener(m::stopReceiveMessages);
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
+        } catch (IOException e) {
+            throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);

         }
     }
 
         }
     }
 

-    @SuppressWarnings("unchecked")
-    private <T> T getValue(final Map<String, Variant<?>> stringVariantMap, final String field) {
-        return (T) stringVariantMap.get(field).getValue();
+    @Override
+    public TypeReference<ReceiveParams> getRequestType() {
+        return new TypeReference<>() {};

     }
 
     @Override
     public void handleCommand(
     }
 
     @Override
     public void handleCommand(

-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final ReceiveParams request, final Manager m, final JsonWriter jsonWriter

     ) throws CommandException {
     ) throws CommandException {

-        double timeout = ns.getDouble("timeout");
-        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        m.setIgnoreAttachments(ignoreAttachments);
+        final var timeout = request.timeout() == null ? 3.0 : request.timeout();
+        final var maxMessagesRaw = request.maxMessages() == null ? -1 : request.maxMessages();
+

         try {
         try {

-            final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
-                    (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
-            if (timeout < 0) {
-                m.receiveMessages(handler);
-            } else {
-                m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, handler);
-            }
+            final var messages = new ArrayList<>();
+            final var handler = new JsonReceiveMessageHandler(m, messages::add);
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
+            jsonWriter.write(messages);

         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);

+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);

         }
     }
         }
     }

+
+    public record ReceiveParams(Double timeout, Integer maxMessages) {}

 }
 }