import org.asamk.signal.DbusConfig;
import org.asamk.signal.DbusReceiveMessageHandler;
import org.asamk.signal.JsonDbusReceiveMessageHandler;
+import org.asamk.signal.JsonWriter;
import org.asamk.signal.OutputType;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.dbus.DbusSignalControlImpl;
import org.asamk.signal.dbus.DbusSignalImpl;
import org.asamk.signal.manager.Manager;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
public class DaemonCommand implements MultiLocalCommand {
private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+ @Override
+ public String getName() {
+ return "daemon";
+ }
+
@Override
public void attachToSubparser(final Subparser subparser) {
+ subparser.help("Run in daemon mode and provide an experimental dbus interface.");
subparser.addArgument("--system")
.action(Arguments.storeTrue())
.help("Use DBus system bus instead of user bus.");
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<OutputType> getSupportedOutputTypes() {
- return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+ public List<OutputType> getSupportedOutputTypes() {
+ return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
}
@Override
- public int handleCommand(final Namespace ns, final Manager m) {
- boolean 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 ignoreAttachments = ns.getBoolean("ignore_attachments");
+ public void handleCommand(
+ final Namespace ns, final Manager m, final OutputWriter outputWriter
+ ) throws CommandException {
+ boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+ m.setIgnoreAttachments(ignoreAttachments);
DBusConnection.DBusBusType busType;
- if (ns.getBoolean("system")) {
+ if (Boolean.TRUE.equals(ns.getBoolean("system"))) {
busType = DBusConnection.DBusBusType.SYSTEM;
} else {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (DBusConnection conn = DBusConnection.getConnection(busType)) {
- String objectPath = DbusConfig.getObjectPath();
- Thread t = run(conn, objectPath, m, ignoreAttachments, inJson);
+ try (var conn = DBusConnection.getConnection(busType)) {
+ var objectPath = DbusConfig.getObjectPath();
+ var t = run(conn, objectPath, m, outputWriter);
conn.requestBusName(DbusConfig.getBusname());
t.join();
} catch (InterruptedException ignored) {
}
- return 0;
} catch (DBusException | IOException e) {
logger.error("Dbus command failed", e);
- return 2;
+ throw new UnexpectedErrorException("Dbus command failed", e);
}
}
@Override
- public int handleCommand(final Namespace ns, final List<Manager> managers) {
- boolean 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 ignoreAttachments = ns.getBoolean("ignore_attachments");
+ public void handleCommand(
+ final Namespace ns, final List<Manager> managers, final SignalCreator c, final OutputWriter outputWriter
+ ) throws CommandException {
+ boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
DBusConnection.DBusBusType busType;
- if (ns.getBoolean("system")) {
+ if (Boolean.TRUE.equals(ns.getBoolean("system"))) {
busType = DBusConnection.DBusBusType.SYSTEM;
} else {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (DBusConnection conn = DBusConnection.getConnection(busType)) {
- List<Thread> receiveThreads = new ArrayList<>();
- for (Manager m : managers) {
- String objectPath = DbusConfig.getObjectPath(m.getUsername());
- Thread thread = run(conn, objectPath, m, ignoreAttachments, inJson);
- receiveThreads.add(thread);
+ try (var conn = DBusConnection.getConnection(busType)) {
+ final var signalControl = new DbusSignalControlImpl(c, m -> {
+ m.setIgnoreAttachments(ignoreAttachments);
+ try {
+ final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+ return run(conn, objectPath, m, outputWriter);
+ } catch (DBusException e) {
+ logger.error("Failed to export object", e);
+ return null;
+ }
+ }, DbusConfig.getObjectPath());
+ conn.exportObject(signalControl);
+
+ for (var m : managers) {
+ signalControl.addManager(m);
}
conn.requestBusName(DbusConfig.getBusname());
- for (Thread t : receiveThreads) {
- try {
- t.join();
- } catch (InterruptedException ignored) {
- }
- }
- return 0;
+ signalControl.run();
} catch (DBusException | IOException e) {
logger.error("Dbus command failed", e);
- return 2;
+ throw new UnexpectedErrorException("Dbus command failed", e);
}
}
private Thread run(
- DBusConnection conn, String objectPath, Manager m, boolean ignoreAttachments, boolean inJson
+ DBusConnection conn, String objectPath, Manager m, OutputWriter outputWriter
) throws DBusException {
- conn.exportObject(objectPath, new DbusSignalImpl(m));
+ final var signal = new DbusSignalImpl(m, conn, objectPath);
+ conn.exportObject(signal);
+ final var initThread = new Thread(signal::initObjects);
+ initThread.start();
+
+ logger.info("Exported dbus object: " + objectPath);
- final Thread thread = new Thread(() -> {
- while (true) {
+ final var thread = new Thread(() -> {
+ while (!Thread.interrupted()) {
try {
- m.receiveMessages(1,
- TimeUnit.HOURS,
- false,
- ignoreAttachments,
- inJson
- ? new JsonDbusReceiveMessageHandler(m, conn, objectPath)
- : new DbusReceiveMessageHandler(m, conn, objectPath));
+ final var receiveMessageHandler = outputWriter instanceof JsonWriter
+ ? new JsonDbusReceiveMessageHandler(m, (JsonWriter) outputWriter, conn, objectPath)
+ : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);
+ m.receiveMessages(receiveMessageHandler);
+ break;
} catch (IOException e) {
logger.warn("Receiving messages failed, retrying", e);
}
}
+ try {
+ initThread.join();
+ } catch (InterruptedException ignored) {
+ }
+ signal.close();
});
- logger.info("Exported dbus object: " + objectPath);
-
thread.start();
return thread;
git.nmode.ca / signal-cli / blobdiff
