X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/90f5cd79c982c9d9f5f5103ca9af4ee289ee9ba1..03bf0439593dc1c5e02bdd49e18d649d1c24e721:/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 f7a49157..445b17c9 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -1,38 +1,32 @@ 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 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.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; -import org.whispersystems.util.Base64; - -// TODO delete later when "json" variable is removed import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 { - // TODO delete later when "json" variable is removed - final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); + private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); @Override public void attachToSubparser(final Subparser subparser) { @@ -43,38 +37,28 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { .help("Don’t download attachments of received messages.") .action(Arguments.storeTrue()); subparser.addArgument("--json") - .help("WARNING: This parameter is now deprecated! Please use the \"output\" option instead.\n\nOutput 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) { - final ObjectMapper jsonProcessor; - - boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json"); + 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 \"output\" instead."); + logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead."); } - if (inJson) { - jsonProcessor = new ObjectMapper(); - jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); - } else { - jsonProcessor = null; - } + final JsonWriter jsonWriter = inJson ? new JsonWriter(System.out) : null; try { dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> { - if (jsonProcessor != null) { + if (jsonWriter != null) { JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived); - ObjectNode result = jsonProcessor.createObjectNode(); - result.putPOJO("envelope", envelope); + final Map object = Map.of("envelope", envelope); try { - jsonProcessor.writeValue(System.out, result); - System.out.println(); + jsonWriter.write(object); } 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", @@ -83,7 +67,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { messageReceived.getMessage())); 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: "); @@ -96,15 +80,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { }); dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> { - if (jsonProcessor != null) { + if (jsonWriter != null) { JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived); - ObjectNode result = jsonProcessor.createObjectNode(); - result.putPOJO("envelope", envelope); + final Map object = Map.of("envelope", envelope); try { - jsonProcessor.writeValue(System.out, result); - System.out.println(); + jsonWriter.write(object); } catch (IOException e) { - e.printStackTrace(); + logger.error("Failed to write json object: {}", e.getMessage()); } } else { System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n", @@ -114,15 +96,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { }); dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> { - if (jsonProcessor != null) { + if (jsonWriter != null) { JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived); - ObjectNode result = jsonProcessor.createObjectNode(); - result.putPOJO("envelope", envelope); + final Map object = Map.of("envelope", envelope); try { - jsonProcessor.writeValue(System.out, result); - System.out.println(); + jsonWriter.write(object); } 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", @@ -132,7 +112,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { syncReceived.getMessage())); 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: "); @@ -143,12 +123,9 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { 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(); - return 1; + return 2; } while (true) { try { @@ -161,11 +138,11 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { @Override public int handleCommand(final Namespace ns, final Manager m) { - boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json"); + 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 \"output\" instead."); + logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead."); } double timeout = 5;