X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..c1775913b9c54c84b45154aa841a0ba475c7c9fd:/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 62b3164b..ba126f7e 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -1,36 +1,36 @@ package org.asamk.signal.commands; +import com.fasterxml.jackson.core.type.TypeReference; + 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.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.ReceiveMessageHandler; +import org.asamk.signal.Shutdown; 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.commands.exceptions.UserErrorException; +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.manager.api.AlreadyReceivingException; +import org.asamk.signal.manager.api.ReceiveConfig; +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 java.io.IOException; -import java.util.Base64; +import java.time.Duration; +import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; +import java.util.Optional; -public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { +public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand { - private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); + private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); @Override public String getName() { @@ -44,9 +44,19 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { .type(double.class) .setDefault(3.0) .help("Number of seconds to wait for new messages (negative values disable timeout)"); + subparser.addArgument("--max-messages") + .type(int.class) + .setDefault(-1) + .help("Maximum number of messages to receive, before returning."); subparser.addArgument("--ignore-attachments") .help("Don’t download attachments of received messages.") .action(Arguments.storeTrue()); + subparser.addArgument("--ignore-stories") + .help("Don’t receive story messages from the server.") + .action(Arguments.storeTrue()); + subparser.addArgument("--send-read-receipts") + .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)") + .action(Arguments.storeTrue()); } @Override @@ -54,110 +64,58 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } + @Override public void handleCommand( - final Namespace ns, final Signal signal, DBusConnection dbusconnection, final OutputWriter outputWriter + final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { + Shutdown.installHandler(); + final var timeout = ns.getDouble("timeout"); + final var maxMessagesRaw = ns.getInt("max-messages"); + final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments")); + final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories")); + final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts")); + m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts)); try { - if (outputWriter instanceof JsonWriter) { - final var jsonWriter = (JsonWriter) outputWriter; - - dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> { - var envelope = new JsonMessageEnvelope(messageReceived); - final var object = Map.of("envelope", envelope); - jsonWriter.write(object); - }); - - dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> { - var envelope = new JsonMessageEnvelope(receiptReceived); - final var object = Map.of("envelope", envelope); - jsonWriter.write(object); - }); - - dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> { - var envelope = new JsonMessageEnvelope(syncReceived); - final var object = Map.of("envelope", envelope); - jsonWriter.write(object); - }); - } else { - 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(); - }); - - 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, 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 (DBusException e) { - logger.error("Dbus client failed", e); - throw new UnexpectedErrorException("Dbus client failed", e); - } - while (true) { - try { - Thread.sleep(10000); - } catch (InterruptedException ignored) { - return; - } + final var handler = switch (outputWriter) { + case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer); + case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer); + }; + final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000)); + final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw; + Shutdown.registerShutdownListener(m::stopReceiveMessages); + m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler); + } catch (IOException e) { + throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e); + } catch (AlreadyReceivingException e) { + throw new UserErrorException("Receive command cannot be used if messages are already being received.", e); } } + @Override + public TypeReference getRequestType() { + return new TypeReference<>() {}; + } + @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final ReceiveParams request, final Manager m, final JsonWriter jsonWriter ) throws CommandException { - double timeout = ns.getDouble("timeout"); - var returnOnTimeout = true; - if (timeout < 0) { - returnOnTimeout = false; - timeout = 3600; - } - boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); + final var timeout = request.timeout() == null ? 3.0 : request.timeout(); + final var maxMessagesRaw = request.maxMessages() == null ? -1 : request.maxMessages(); + try { - final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m, - (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter); - m.receiveMessages((long) (timeout * 1000), - TimeUnit.MILLISECONDS, - returnOnTimeout, - ignoreAttachments, - handler); + final var messages = new ArrayList<>(); + final var handler = new JsonReceiveMessageHandler(m, messages::add); + final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000)); + final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw; + m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler); + jsonWriter.write(messages); } catch (IOException e) { throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e); + } catch (AlreadyReceivingException e) { + throw new UserErrorException("Receive command cannot be used if messages are already being received.", e); } } + + public record ReceiveParams(Double timeout, Integer maxMessages) {} }