X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c6395b9f35a4229d297aef063597bc96919a7f36..9b102c49d06bd6dcd59f032ddd17663f47991118:/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 834bc5eb..6b2e497e 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -8,8 +8,12 @@ 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.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.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.json.JsonMessageEnvelope; import org.asamk.signal.manager.Manager; import org.asamk.signal.util.DateUtils; @@ -20,180 +24,143 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Base64; +import java.util.List; 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 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()); } @Override - public Set getSupportedOutputTypes() { - return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON); + public List getSupportedOutputTypes() { + return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } - public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) { - 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."); - } - + public void handleCommand( + final Namespace ns, final Signal signal, DBusConnection dbusconnection, final OutputWriter outputWriter + ) throws CommandException { try { - if (inJson) { - final var jsonWriter = new JsonWriter(System.out); + if (outputWriter instanceof JsonWriter) { + final var jsonWriter = (JsonWriter) outputWriter; - dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> { + dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> { var envelope = new JsonMessageEnvelope(messageReceived); final var object = Map.of("envelope", envelope); - try { - jsonWriter.write(object); - } catch (IOException e) { - logger.error("Failed to write json object: {}", e.getMessage()); - } + jsonWriter.write(object); }); - dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> { + dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> { var envelope = new JsonMessageEnvelope(receiptReceived); final var object = Map.of("envelope", envelope); - try { - jsonWriter.write(object); - } catch (IOException e) { - logger.error("Failed to write json object: {}", e.getMessage()); - } + jsonWriter.write(object); }); - dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> { + dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> { var envelope = new JsonMessageEnvelope(syncReceived); final var object = Map.of("envelope", envelope); - try { - jsonWriter.write(object); - } catch (IOException e) { - logger.error("Failed to write json object: {}", e.getMessage()); - } + jsonWriter.write(object); }); } else { - final var writer = new PlainTextWriterImpl(System.out); - - dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> { - try { - 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); - } + final var writer = (PlainTextWriter) outputWriter; + + dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, 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); } - writer.println(); - } catch (IOException e) { - e.printStackTrace(); } + writer.println(); }); - dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> { - try { - writer.println("Receipt from: {}", receiptReceived.getSender()); - writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp())); - } catch (IOException e) { - e.printStackTrace(); - } + dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> { + writer.println("Receipt from: {}", receiptReceived.getSender()); + writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp())); }); - dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> { - try { - 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); - } + dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, 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 (IOException e) { - e.printStackTrace(); } + writer.println(); }); } } catch (DBusException e) { - e.printStackTrace(); - return 2; + logger.error("Dbus client failed", e); + throw new UnexpectedErrorException("Dbus client failed", e); } + + double timeout = ns.getDouble("timeout"); + long timeoutMilliseconds = timeout < 0 ? 10000 : (long) (timeout * 1000); + while (true) { try { - Thread.sleep(10000); - } catch (InterruptedException e) { - return 0; + Thread.sleep(timeoutMilliseconds); + } catch (InterruptedException ignored) { + break; + } + if (timeout >= 0) { + break; } } } @Override - public int handleCommand(final Namespace ns, final Manager m) { - 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."); - } - - 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"); + 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 var 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); } } }