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.PlainTextWriterImpl;
import org.asamk.signal.ReceiveMessageHandler;
import org.asamk.signal.json.JsonMessageEnvelope;
import org.asamk.signal.manager.Manager;
import org.freedesktop.dbus.exceptions.DBusException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.whispersystems.util.Base64;
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 {
- // 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) {
.action(Arguments.storeTrue());
}
- public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
- final ObjectMapper jsonProcessor;
+ @Override
+ public Set<OutputType> getSupportedOutputTypes() {
+ return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+ }
- boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("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.");
}
- 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);
+ 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);
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",
- 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()));
+ });
+
+ dbusconnection.addSigHandler(Signal.ReceiptReceived.class, 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());
}
- if (messageReceived.getAttachments().size() > 0) {
- System.out.println("Attachments: ");
- for (String attachment : messageReceived.getAttachments()) {
- System.out.println("- Stored plaintext in: " + attachment);
- }
+ });
+
+ dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, 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());
}
- 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);
+ });
+ } else {
+ final var writer = new PlainTextWriterImpl(System.out);
+
+ dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
try {
- jsonProcessor.writeValue(System.out, result);
- System.out.println();
+ 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();
}
- } 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);
+ });
+
+ dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
try {
- jsonProcessor.writeValue(System.out, result);
- System.out.println();
+ writer.println("Receipt from: {}", receiptReceived.getSender());
+ writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
} 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);
+ });
+
+ 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);
+ }
}
+ writer.println();
+ } catch (IOException e) {
+ e.printStackTrace();
}
- 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 {
@Override
public int handleCommand(final Namespace ns, final Manager m) {
- boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+ var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
// TODO delete later when "json" variable is removed
if (ns.getBoolean("json")) {
if (ns.getDouble("timeout") != null) {
timeout = ns.getDouble("timeout");
}
- boolean returnOnTimeout = true;
+ var returnOnTimeout = true;
if (timeout < 0) {
returnOnTimeout = false;
timeout = 3600;
}
boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- final Manager.ReceiveMessageHandler handler = inJson
- ? new JsonReceiveMessageHandler(m)
- : new ReceiveMessageHandler(m);
+ final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
m.receiveMessages((long) (timeout * 1000),
TimeUnit.MILLISECONDS,
returnOnTimeout,
git.nmode.ca / signal-cli / blobdiff
