Add Pair record

[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 8612a71b631d27a6d1632ef07b6cde58857e736e..a69be7de90e60213b87680fd0a6003d7f52c2861 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -8,7 +8,8 @@ import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;

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

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


@@ -16,76 +17,72 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.json.JsonMessageEnvelope;
 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.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;

+import org.freedesktop.dbus.types.Variant;

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

+import java.util.List;

 import java.util.Map;
 import java.util.Map;

-import java.util.Set;

 import java.util.concurrent.TimeUnit;
 
 import java.util.concurrent.TimeUnit;
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-

 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 

+    @Override
+    public String getName() {
+        return "receive";
+    }
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

+        subparser.help("Query the server for new messages.");

         subparser.addArgument("-t", "--timeout")
                 .type(double.class)
         subparser.addArgument("-t", "--timeout")
                 .type(double.class)

+                .setDefault(3.0)

                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());

-        subparser.addArgument("--json")
-                .help("WARNING: This parameter is now deprecated! Please use the global \"--output=json\" option instead.\n\nOutput received messages in json format, one json object per line.")
-                .action(Arguments.storeTrue());

     }
 
     @Override
     }
 
     @Override

-    public Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    public List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);

     }
 
     public void handleCommand(
     }
 
     public void handleCommand(

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

     ) throws CommandException {
     ) throws CommandException {

-        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
-        }
-

         try {
         try {

-            if (inJson) {
-                final var jsonWriter = new JsonWriter(System.out);
+            if (outputWriter instanceof JsonWriter jsonWriter) {

 
 

-                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
-                    var envelope = new JsonMessageEnvelope(messageReceived);
+                dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> {
+                    var envelope = JsonMessageEnvelope.from(messageReceived);

                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 

-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
-                    var envelope = new JsonMessageEnvelope(receiptReceived);
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {
+                    var envelope = JsonMessageEnvelope.from(receiptReceived);

                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 

-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
-                    var envelope = new JsonMessageEnvelope(syncReceived);
+                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 object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
             } else {

-                final var writer = new PlainTextWriterImpl(System.out);
+                final var writer = (PlainTextWriter) outputWriter;

 
 

-                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
+                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());
                     writer.println("Envelope from: {}", messageReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
                     writer.println("Body: {}", messageReceived.getMessage());


@@ -94,21 +91,18 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                         writer.indentedWriter()
                                 .println("Id: {}", Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
                     }
                         writer.indentedWriter()
                                 .println("Id: {}", Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
                     }

-                    if (messageReceived.getAttachments().size() > 0) {
-                        writer.println("Attachments:");
-                        for (var attachment : messageReceived.getAttachments()) {
-                            writer.println("- Stored plaintext in: {}", attachment);
-                        }
-                    }
+                    final var extras = messageReceived.getExtras();
+                    printMessageExtras(writer, extras);

                     writer.println();
                 });
 
                     writer.println();
                 });
 

-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                dbusconnection.addSigHandler(Signal.ReceiptReceivedV2.class, signal, receiptReceived -> {

                     writer.println("Receipt from: {}", receiptReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
                     writer.println("Receipt from: {}", receiptReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));

+                    writer.println("Type: {}", receiptReceived.getReceiptType());

                 });
 
                 });
 

-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                dbusconnection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, syncReceived -> {

                     writer.println("Sync Envelope from: {} to: {}",
                             syncReceived.getSource(),
                             syncReceived.getDestination());
                     writer.println("Sync Envelope from: {} to: {}",
                             syncReceived.getSource(),
                             syncReceived.getDestination());


@@ -119,59 +113,66 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                         writer.indentedWriter()
                                 .println("Id: {}", Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
                     }
                         writer.indentedWriter()
                                 .println("Id: {}", Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
                     }

-                    if (syncReceived.getAttachments().size() > 0) {
-                        writer.println("Attachments:");
-                        for (var attachment : syncReceived.getAttachments()) {
-                            writer.println("- Stored plaintext in: {}", attachment);
-                        }
-                    }
+                    final var extras = syncReceived.getExtras();
+                    printMessageExtras(writer, extras);

                     writer.println();
                 });
             }
         } catch (DBusException e) {
             logger.error("Dbus client failed", e);
                     writer.println();
                 });
             }
         } catch (DBusException e) {
             logger.error("Dbus client failed", e);

-            throw new UnexpectedErrorException("Dbus client failed");
+            throw new UnexpectedErrorException("Dbus client failed", e);

         }
         }

+
+        double timeout = ns.getDouble("timeout");
+        long timeoutMilliseconds = timeout < 0 ? 10000 : (long) (timeout * 1000);
+

         while (true) {
             try {
         while (true) {
             try {

-                Thread.sleep(10000);
+                Thread.sleep(timeoutMilliseconds);

             } catch (InterruptedException ignored) {
             } catch (InterruptedException ignored) {

-                return;
+                break;
+            }
+            if (timeout >= 0) {
+                break;

             }
         }
     }
 
             }
         }
     }
 

-    @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
+    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);
+                }
+            }

         }
         }

+    }

 
 

-        double timeout = 5;
-        if (ns.getDouble("timeout") != null) {
-            timeout = ns.getDouble("timeout");
-        }
-        var returnOnTimeout = true;
-        if (timeout < 0) {
-            returnOnTimeout = false;
-            timeout = 3600;
-        }
-        boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
+    @SuppressWarnings("unchecked")
+    private <T> T getValue(final Map<String, Variant<?>> stringVariantMap, final String field) {
+        return (T) stringVariantMap.get(field).getValue();
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        double timeout = ns.getDouble("timeout");
+        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        m.setIgnoreAttachments(ignoreAttachments);

         try {
         try {

-            final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
-            m.receiveMessages((long) (timeout * 1000),
-                    TimeUnit.MILLISECONDS,
-                    returnOnTimeout,
-                    ignoreAttachments,
-                    handler);
+            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);
+            }

         } catch (IOException e) {
         } catch (IOException e) {

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

         }
     }
 }
         }
     }
 }