X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f0834c7a47dc165ef906d4964ad62003b85e0c87..62687d103fab1ade650b920008060c220361d581:/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 4d4fdc10..0a38ad4e 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -1,197 +1,68 @@ 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.OutputType; import org.asamk.signal.ReceiveMessageHandler; -import org.asamk.signal.json.JsonMessageEnvelope; +import org.asamk.signal.commands.exceptions.CommandException; +import org.asamk.signal.commands.exceptions.IOErrorException; +import org.asamk.signal.json.JsonReceiveMessageHandler; 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.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 org.whispersystems.util.Base64; import java.io.IOException; +import java.util.List; import java.util.concurrent.TimeUnit; -import static org.asamk.signal.util.ErrorUtils.handleAssertionError; +public class ReceiveCommand implements LocalCommand { -public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { + private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); - // TODO delete later when "json" variable is removed - final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); + @Override + public String getName() { + return "receive"; + } @Override public void attachToSubparser(final Subparser subparser) { + subparser.help("Query the server for new messages."); 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()); - 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()); } - public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) { - final ObjectMapper jsonProcessor; - - boolean inJson = ns.getString("output").equals("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."); - } - - if (inJson) { - jsonProcessor = new ObjectMapper(); - jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); - } else { - jsonProcessor = null; - } - try { - dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> { - if (jsonProcessor != null) { - JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived); - 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("Envelope from: %s\nTimestamp: %s\nBody: %s\n", - messageReceived.getSender(), - DateUtils.formatTimestamp(messageReceived.getTimestamp()), - messageReceived.getMessage())); - if (messageReceived.getGroupId().length > 0) { - System.out.println("Group info:"); - System.out.println(" Id: " + Base64.encodeBytes(messageReceived.getGroupId())); - } - if (messageReceived.getAttachments().size() > 0) { - System.out.println("Attachments: "); - for (String attachment : messageReceived.getAttachments()) { - System.out.println("- Stored plaintext in: " + attachment); - } - } - System.out.println(); - } - }); - - 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.SyncMessageReceived.class, syncReceived -> { - if (jsonProcessor != null) { - JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived); - 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("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n", - syncReceived.getSource(), - syncReceived.getDestination(), - DateUtils.formatTimestamp(syncReceived.getTimestamp()), - syncReceived.getMessage())); - if (syncReceived.getGroupId().length > 0) { - System.out.println("Group info:"); - System.out.println(" Id: " + Base64.encodeBytes(syncReceived.getGroupId())); - } - if (syncReceived.getAttachments().size() > 0) { - System.out.println("Attachments: "); - for (String attachment : syncReceived.getAttachments()) { - System.out.println("- Stored plaintext in: " + attachment); - } - } - 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; - } - while (true) { - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - return 0; - } - } + @Override + public List getSupportedOutputTypes() { + return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } @Override - public int handleCommand(final Namespace ns, final Manager m) { - boolean inJson = ns.getString("output").equals("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"); - } - boolean returnOnTimeout = true; - if (timeout < 0) { - returnOnTimeout = false; - timeout = 3600; - } - boolean ignoreAttachments = ns.getBoolean("ignore_attachments"); + 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 { - final Manager.ReceiveMessageHandler handler = inJson - ? new JsonReceiveMessageHandler(m) - : new ReceiveMessageHandler(m); - m.receiveMessages((long) (timeout * 1000), - TimeUnit.MILLISECONDS, - returnOnTimeout, - ignoreAttachments, - handler); - return 0; + 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) { - System.err.println("Error while receiving messages: " + e.getMessage()); - return 3; - } catch (AssertionError e) { - handleAssertionError(e); - return 1; + throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e); } } }