Extract JsonWriter for json output

[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 f85aea8b77857cd841d812639ecf10496ddc787f..445b17c92388a4e472b3e914b2e43f31106b604c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,32 +1,33 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-

 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 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.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;

-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;

 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 import java.io.IOException;
 
 import java.io.IOException;

+import java.util.Base64;
+import java.util.Map;

 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
 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);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")


@@ -36,37 +37,37 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")

-                .help("Output received messages in json format, one json object per line.")
+                .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());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {

-        final ObjectMapper jsonProcessor;
+        boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+
+        // TODO delete later when "json" variable is removed

         if (ns.getBoolean("json")) {
         if (ns.getBoolean("json")) {

-            jsonProcessor = new ObjectMapper();
-            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
-            jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
-        } else {
-            jsonProcessor = null;
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
         }

+
+        final JsonWriter jsonWriter = inJson ? new JsonWriter(System.out) : null;

         try {
             dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
         try {
             dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {

-                if (jsonProcessor != null) {
+                if (jsonWriter != null) {

                     JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived);
                     JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived);

-                    ObjectNode result = jsonProcessor.createObjectNode();
-                    result.putPOJO("envelope", envelope);
+                    final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);

                     try {
                     try {

-                        jsonProcessor.writeValue(System.out, result);
-                        System.out.println();
+                        jsonWriter.write(object);

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

-                        e.printStackTrace();
+                        logger.error("Failed to write json object: {}", e.getMessage());

                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",

-                            messageReceived.getSender(), DateUtils.formatTimestamp(messageReceived.getTimestamp()), messageReceived.getMessage()));
+                            messageReceived.getSender(),
+                            DateUtils.formatTimestamp(messageReceived.getTimestamp()),
+                            messageReceived.getMessage()));

                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(messageReceived.getGroupId()));

                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");


@@ -78,41 +79,40 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 }
             });
 
                 }
             });
 

-            dbusconnection.addSigHandler(Signal.ReceiptReceived.class,
-                    receiptReceived -> {
-                        if (jsonProcessor != null) {
-                            JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
-                            ObjectNode result = jsonProcessor.createObjectNode();
-                            result.putPOJO("envelope", envelope);
-                            try {
-                                jsonProcessor.writeValue(System.out, result);
-                                System.out.println();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        } else {
-                            System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
-                                    receiptReceived.getSender(), DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
-                        }
-                    });
+            dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                if (jsonWriter != null) {
+                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
+                    final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);
+                    try {
+                        jsonWriter.write(object);
+                    } catch (IOException e) {
+                        logger.error("Failed to write json object: {}", e.getMessage());
+                    }
+                } else {
+                    System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+                            receiptReceived.getSender(),
+                            DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
+                }
+            });

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

-                if (jsonProcessor != null) {
+                if (jsonWriter != null) {

                     JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived);
                     JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived);

-                    ObjectNode result = jsonProcessor.createObjectNode();
-                    result.putPOJO("envelope", envelope);
+                    final Map<String, JsonMessageEnvelope> object = Map.of("envelope", envelope);

                     try {
                     try {

-                        jsonProcessor.writeValue(System.out, result);
-                        System.out.println();
+                        jsonWriter.write(object);

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

-                        e.printStackTrace();
+                        logger.error("Failed to write json object: {}", e.getMessage());

                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",

-                            syncReceived.getSource(), syncReceived.getDestination(), DateUtils.formatTimestamp(syncReceived.getTimestamp()), syncReceived.getMessage()));
+                            syncReceived.getSource(),
+                            syncReceived.getDestination(),
+                            DateUtils.formatTimestamp(syncReceived.getTimestamp()),
+                            syncReceived.getMessage()));

                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(syncReceived.getGroupId()));

                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");


@@ -123,12 +123,9 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     System.out.println();
                 }
             });
                     System.out.println();
                 }
             });

-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
-            return 1;

         } catch (DBusException e) {
             e.printStackTrace();
         } catch (DBusException e) {
             e.printStackTrace();

-            return 1;
+            return 2;

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


@@ -141,10 +138,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+        boolean 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.");

         }
         }

+

         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");
         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");


@@ -156,8 +156,14 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {

-            final Manager.ReceiveMessageHandler handler = ns.getBoolean("json") ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
-            m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, handler);
+            final Manager.ReceiveMessageHandler handler = inJson
+                    ? new JsonReceiveMessageHandler(m)
+                    : new ReceiveMessageHandler(m);
+            m.receiveMessages((long) (timeout * 1000),
+                    TimeUnit.MILLISECONDS,
+                    returnOnTimeout,
+                    ignoreAttachments,
+                    handler);

             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());
             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());