X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b2efef4d8c3238b413fe9fe758bd6a5c428498a2..b8a0901fbd9071f54d97e8d61fdabdfc0d4f0a7d:/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 9025aa55..acb3a662 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -6,106 +6,166 @@ 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.PlainTextWriterImpl; import org.asamk.signal.ReceiveMessageHandler; +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.manager.Manager; import org.asamk.signal.util.DateUtils; -import org.freedesktop.dbus.DBusConnection; -import org.freedesktop.dbus.DBusSigHandler; +import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; -import org.whispersystems.signalservice.internal.util.Base64; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.Base64; +import java.util.Map; +import java.util.Set; 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.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("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) { - if (dbusconnection != null) { - try { - dbusconnection.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler() { - @Override - public void handle(Signal.MessageReceived s) { - System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n", - s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage())); - if (s.getGroupId().length > 0) { - System.out.println("Group info:"); - System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId())); - } - if (s.getAttachments().size() > 0) { - System.out.println("Attachments: "); - for (String attachment : s.getAttachments()) { - System.out.println("- Stored plaintext in: " + attachment); - } + @Override + public Set getSupportedOutputTypes() { + return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON); + } + + public void handleCommand( + final Namespace ns, final Signal signal, DBusConnection dbusconnection + ) 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 { + if (inJson) { + final var jsonWriter = new JsonWriter(System.out); + + dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> { + var envelope = new JsonMessageEnvelope(messageReceived); + final var object = Map.of("envelope", envelope); + jsonWriter.write(object); + }); + + dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> { + var envelope = new JsonMessageEnvelope(receiptReceived); + final var object = Map.of("envelope", envelope); + jsonWriter.write(object); + }); + + dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> { + var envelope = new JsonMessageEnvelope(syncReceived); + final var object = Map.of("envelope", envelope); + jsonWriter.write(object); + }); + } else { + final var writer = new PlainTextWriterImpl(System.out); + + dbusconnection.addSigHandler(Signal.MessageReceived.class, 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())); + } + if (messageReceived.getAttachments().size() > 0) { + writer.println("Attachments:"); + for (var attachment : messageReceived.getAttachments()) { + writer.println("- Stored plaintext in: {}", attachment); } - System.out.println(); } + writer.println(); }); - dbusconnection.addSigHandler(Signal.ReceiptReceived.class, new DBusSigHandler() { - @Override - public void handle(Signal.ReceiptReceived s) { - System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n", - s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()))); + + dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> { + writer.println("Receipt from: {}", receiptReceived.getSender()); + writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp())); + }); + + dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, 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())); } + if (syncReceived.getAttachments().size() > 0) { + writer.println("Attachments:"); + for (var attachment : syncReceived.getAttachments()) { + writer.println("- Stored plaintext in: {}", attachment); + } + } + writer.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; - } + } catch (DBusException e) { + logger.error("Dbus client failed", e); + throw new UnexpectedErrorException("Dbus client failed"); + } + while (true) { + try { + Thread.sleep(10000); + } catch (InterruptedException ignored) { + return; } } - return 0; } @Override - public int handleCommand(final Namespace ns, final Manager m) { - if (!m.isRegistered()) { - System.err.println("User is not registered."); - return 1; - } - double timeout = 5; - if (ns.getDouble("timeout") != null) { - timeout = ns.getDouble("timeout"); + 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."); } - boolean returnOnTimeout = true; + + double timeout = ns.getDouble("timeout"); + var returnOnTimeout = true; if (timeout < 0) { returnOnTimeout = false; timeout = 3600; } - boolean ignoreAttachments = ns.getBoolean("ignore_attachments"); + 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); - return 0; + final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m); + m.receiveMessages((long) (timeout * 1000), + TimeUnit.MILLISECONDS, + returnOnTimeout, + ignoreAttachments, + 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()); } } }