Implement socket/tcp for daemon command

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 9f6f1340766d4a51c8209d56eb12b04b32cc57f7..c9099c0b1d66406c01c5ee08ee571040a4268bda 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -2,6 +2,7 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 
 import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;

+import org.asamk.signal.DbusReceiveMessageHandler;

 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;


@@ -60,26 +61,40 @@ public class DbusSignalImpl implements Signal {
     private final Manager m;
     private final DBusConnection connection;
     private final String objectPath;
     private final Manager m;
     private final DBusConnection connection;
     private final String objectPath;

+    private final boolean noReceiveOnStart;

 
     private DBusPath thisDevice;
     private final List<StructDevice> devices = new ArrayList<>();
     private final List<StructGroup> groups = new ArrayList<>();
 
     private DBusPath thisDevice;
     private final List<StructDevice> devices = new ArrayList<>();
     private final List<StructGroup> groups = new ArrayList<>();

+    private DbusReceiveMessageHandler dbusMessageHandler;
+    private int subscriberCount;

 
     private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
 

-    public DbusSignalImpl(final Manager m, DBusConnection connection, final String objectPath) {
+    public DbusSignalImpl(
+            final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
+    ) {

         this.m = m;
         this.connection = connection;
         this.objectPath = objectPath;
         this.m = m;
         this.connection = connection;
         this.objectPath = objectPath;

+        this.noReceiveOnStart = noReceiveOnStart;

     }
 
     public void initObjects() {
     }
 
     public void initObjects() {

+        if (!noReceiveOnStart) {
+            subscribeReceive();
+        }
+

         updateDevices();
         updateGroups();
         updateConfiguration();
     }
 
     public void close() {
         updateDevices();
         updateGroups();
         updateConfiguration();
     }
 
     public void close() {

+        if (dbusMessageHandler != null) {
+            m.removeReceiveHandler(dbusMessageHandler);
+            dbusMessageHandler = null;
+        }

         unExportDevices();
         unExportGroups();
         unExportConfiguration();
         unExportDevices();
         unExportGroups();
         unExportConfiguration();


@@ -95,6 +110,24 @@ public class DbusSignalImpl implements Signal {
         return m.getSelfNumber();
     }
 
         return m.getSelfNumber();
     }
 

+    @Override
+    public void subscribeReceive() {
+        if (dbusMessageHandler == null) {
+            dbusMessageHandler = new DbusReceiveMessageHandler(m, connection, objectPath);
+            m.addReceiveHandler(dbusMessageHandler);
+        }
+        subscriberCount++;
+    }
+
+    @Override
+    public void unsubscribeReceive() {
+        subscriberCount = Math.max(0, subscriberCount - 1);
+        if (subscriberCount == 0 && dbusMessageHandler != null) {
+            m.removeReceiveHandler(dbusMessageHandler);
+            dbusMessageHandler = null;
+        }
+    }
+

     @Override
     public void submitRateLimitChallenge(String challenge, String captchaString) {
         final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");
     @Override
     public void submitRateLimitChallenge(String challenge, String captchaString) {
         final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");