Implement jsonRpc command

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index f54f3bf67b03488427926a08a3a006fe844aa415..7b6f243d74c24cdc66d6378b3ebd4cd7217c25c9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,9 +7,13 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;
 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.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.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.asamk.signal.dbus.DbusSignalImpl;
 import org.asamk.signal.manager.Manager;
 import org.freedesktop.dbus.connections.impl.DBusConnection;


@@ -18,7 +22,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 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;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;


@@ -26,18 +29,20 @@ import java.util.concurrent.TimeUnit;
 public class DaemonCommand implements MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 public class DaemonCommand implements MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);

+    private final OutputWriter outputWriter;

 
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    public static 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("--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());
+    }
+
+    public DaemonCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;

     }
 
     @Override
     }
 
     @Override


@@ -47,13 +52,6 @@ public class DaemonCommand implements MultiLocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
 
     @Override
     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 ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;
         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;


@@ -65,7 +63,7 @@ public class DaemonCommand implements MultiLocalCommand {
 
         try (var conn = DBusConnection.getConnection(busType)) {
             var objectPath = DbusConfig.getObjectPath();
 
         try (var conn = DBusConnection.getConnection(busType)) {
             var objectPath = DbusConfig.getObjectPath();

-            var t = run(conn, objectPath, m, ignoreAttachments, inJson);
+            var t = run(conn, objectPath, m, ignoreAttachments);

 
             conn.requestBusName(DbusConfig.getBusname());
 
 
             conn.requestBusName(DbusConfig.getBusname());
 


@@ -80,14 +78,9 @@ public class DaemonCommand implements MultiLocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final List<Manager> managers) 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.");
-        }
-
+    public void handleCommand(
+            final Namespace ns, final List<Manager> managers, SignalCreator c
+    ) throws CommandException {

         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;
         boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;


@@ -98,21 +91,24 @@ public class DaemonCommand implements MultiLocalCommand {
         }
 
         try (var conn = DBusConnection.getConnection(busType)) {
         }
 
         try (var conn = DBusConnection.getConnection(busType)) {

-            var receiveThreads = new ArrayList<Thread>();
+            final var signalControl = new DbusSignalControlImpl(c, m -> {
+                try {
+                    final var objectPath = DbusConfig.getObjectPath(m.getUsername());
+                    return run(conn, objectPath, m, ignoreAttachments);
+                } catch (DBusException e) {
+                    logger.error("Failed to export object", e);
+                    return null;
+                }
+            }, DbusConfig.getObjectPath());
+            conn.exportObject(signalControl);
+

             for (var m : managers) {
             for (var m : managers) {

-                var objectPath = DbusConfig.getObjectPath(m.getUsername());
-                var thread = run(conn, objectPath, m, ignoreAttachments, inJson);
-                receiveThreads.add(thread);
+                signalControl.addManager(m);

             }
 
             conn.requestBusName(DbusConfig.getBusname());
 
             }
 
             conn.requestBusName(DbusConfig.getBusname());
 

-            for (var t : receiveThreads) {
-                try {
-                    t.join();
-                } catch (InterruptedException ignored) {
-                }
-            }
+            signalControl.run();

         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);
             throw new UnexpectedErrorException("Dbus command failed");
         } catch (DBusException | IOException e) {
             logger.error("Dbus command failed", e);
             throw new UnexpectedErrorException("Dbus command failed");


@@ -120,28 +116,28 @@ public class DaemonCommand implements MultiLocalCommand {
     }
 
     private Thread run(
     }
 
     private Thread run(

-            DBusConnection conn, String objectPath, Manager m, boolean ignoreAttachments, boolean inJson
+            DBusConnection conn, String objectPath, Manager m, boolean ignoreAttachments

     ) throws DBusException {
     ) throws DBusException {

-        conn.exportObject(objectPath, new DbusSignalImpl(m));
+        conn.exportObject(new DbusSignalImpl(m, objectPath));
+
+        logger.info("Exported dbus object: " + objectPath);

 
         final var thread = new Thread(() -> {
 
         final var thread = new Thread(() -> {

-            while (true) {
+            while (!Thread.interrupted()) {

                 try {
                 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(1, TimeUnit.HOURS, false, ignoreAttachments, receiveMessageHandler);
+                    break;

                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);
                 } catch (IOException e) {
                     logger.warn("Receiving messages failed, retrying", e);

+                } catch (InterruptedException ignored) {
+                    break;

                 }
             }
         });
 
                 }
             }
         });
 

-        logger.info("Exported dbus object: " + objectPath);
-

         thread.start();
 
         return thread;
         thread.start();
 
         return thread;