Cleanup manager package

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

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index a20b14e39efb231f429949a6212dd7063a98d709..4e5b1e9fcb9be3d3d7a61f3b4132133a099f12c0 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -18,11 +18,15 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.dbus.DbusManagerImpl;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.dbus.DbusManagerImpl;

+import org.asamk.signal.dbus.DbusMultiAccountManagerImpl;
+import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
+import org.asamk.signal.dbus.DbusRegistrationManagerImpl;

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

-import org.asamk.signal.manager.MultiAccountManagerImpl;
-import org.asamk.signal.manager.NotRegisteredException;
+import org.asamk.signal.manager.MultiAccountManager;

 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;

+import org.asamk.signal.manager.api.AccountCheckException;
+import org.asamk.signal.manager.api.NotRegisteredException;

 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.storage.identities.TrustNewIdentity;


@@ -43,8 +47,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;

-import java.util.ArrayList;
-import java.util.List;

 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
 
 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
 


@@ -64,8 +66,11 @@ public class App {
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
         parser.addArgument("--verbose")
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
         parser.addArgument("--verbose")

-                .help("Raise log level and include lib signal logs.")
-                .action(Arguments.storeTrue());
+                .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
+                .action(Arguments.count());
+        parser.addArgument("--log-file")
+                .type(File.class)
+                .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.");

         parser.addArgument("-c", "--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 
         parser.addArgument("-c", "--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 


@@ -137,22 +142,22 @@ public class App {
             return;
         }
 
             return;
         }
 

-        final File dataPath;
+        if (!ServiceConfig.isSignalClientAvailable()) {
+            throw new UserErrorException("Missing required native library dependency: libsignal-client");
+        }
+
+        final File configPath;

         var config = ns.getString("config");
         if (config != null) {
         var config = ns.getString("config");
         if (config != null) {

-            dataPath = new File(config);
+            configPath = new File(config);

         } else {
         } else {

-            dataPath = getDefaultDataPath();
-        }
-
-        if (!ServiceConfig.isSignalClientAvailable()) {
-            throw new UserErrorException("Missing required native library dependency: libsignal-client");
+            configPath = getDefaultConfigPath();

         }
 
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE
         }
 
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE

-                : ServiceEnvironment.SANDBOX;
+                : ServiceEnvironment.STAGING;

 
         final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
         final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE
 
         final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
         final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE


@@ -164,23 +169,21 @@ public class App {
                 throw new UserErrorException("You cannot specify a account (phone number) when linking");
             }
 
                 throw new UserErrorException("You cannot specify a account (phone number) when linking");
             }
 

-            handleProvisioningCommand(provisioningCommand, dataPath, serviceEnvironment, outputWriter);
+            handleProvisioningCommand(provisioningCommand, configPath, serviceEnvironment, outputWriter);

             return;
         }
 
         if (account == null) {
             return;
         }
 
         if (account == null) {

-            var accounts = Manager.getAllLocalAccountNumbers(dataPath);
-

             if (command instanceof MultiLocalCommand multiLocalCommand) {
                 handleMultiLocalCommand(multiLocalCommand,
             if (command instanceof MultiLocalCommand multiLocalCommand) {
                 handleMultiLocalCommand(multiLocalCommand,

-                        dataPath,
+                        configPath,

                         serviceEnvironment,
                         serviceEnvironment,

-                        accounts,

                         outputWriter,
                         trustNewIdentity);
                 return;
             }
 
                         outputWriter,
                         trustNewIdentity);
                 return;
             }
 

+            var accounts = MultiAccountManager.getAllLocalAccountNumbers(configPath);

             if (accounts.size() == 0) {
                 throw new UserErrorException("No local users found, you first need to register or link an account");
             } else if (accounts.size() > 1) {
             if (accounts.size() == 0) {
                 throw new UserErrorException("No local users found, you first need to register or link an account");
             } else if (accounts.size() > 1) {


@@ -194,7 +197,7 @@ public class App {
         }
 
         if (command instanceof RegistrationCommand registrationCommand) {
         }
 
         if (command instanceof RegistrationCommand registrationCommand) {

-            handleRegistrationCommand(registrationCommand, account, dataPath, serviceEnvironment);
+            handleRegistrationCommand(registrationCommand, account, configPath, serviceEnvironment);

             return;
         }
 
             return;
         }
 


@@ -204,7 +207,7 @@ public class App {
 
         handleLocalCommand((LocalCommand) command,
                 account,
 
         handleLocalCommand((LocalCommand) command,
                 account,

-                dataPath,
+                configPath,

                 serviceEnvironment,
                 outputWriter,
                 trustNewIdentity);
                 serviceEnvironment,
                 outputWriter,
                 trustNewIdentity);


@@ -212,23 +215,39 @@ public class App {
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,

-            final File dataPath,
+            final File configPath,

             final ServiceEnvironment serviceEnvironment,
             final OutputWriter outputWriter
     ) throws CommandException {
             final ServiceEnvironment serviceEnvironment,
             final OutputWriter outputWriter
     ) throws CommandException {

-        var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+        var pm = ProvisioningManager.init(configPath, serviceEnvironment, BaseConfig.USER_AGENT);

         command.handleCommand(ns, pm, outputWriter);
     }
 
         command.handleCommand(ns, pm, outputWriter);
     }
 

+    private void handleProvisioningCommand(
+            final ProvisioningCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
+        try {
+            c.handleCommand(ns, provisioningManager, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+

     private void handleRegistrationCommand(
             final RegistrationCommand command,
             final String account,
     private void handleRegistrationCommand(
             final RegistrationCommand command,
             final String account,

-            final File dataPath,
+            final File configPath,

             final ServiceEnvironment serviceEnvironment
     ) throws CommandException {
         final RegistrationManager manager;
         try {
             final ServiceEnvironment serviceEnvironment
     ) throws CommandException {
         final RegistrationManager manager;
         try {

-            manager = RegistrationManager.init(account, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+            manager = RegistrationManager.init(account, configPath, serviceEnvironment, BaseConfig.USER_AGENT);

         } catch (Throwable e) {
             throw new UnexpectedErrorException("Error loading or creating state file: "
                     + e.getMessage()
         } catch (Throwable e) {
             throw new UnexpectedErrorException("Error loading or creating state file: "
                     + e.getMessage()


@@ -243,58 +262,98 @@ public class App {
         }
     }
 
         }
     }
 

+    private void handleRegistrationCommand(
+            final RegistrationCommand c, String account, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
+            c.handleCommand(ns, registrationManager);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+

     private void handleLocalCommand(
             final LocalCommand command,
             final String account,
     private void handleLocalCommand(
             final LocalCommand command,
             final String account,

-            final File dataPath,
+            final File configPath,

             final ServiceEnvironment serviceEnvironment,
             final OutputWriter outputWriter,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {
             final ServiceEnvironment serviceEnvironment,
             final OutputWriter outputWriter,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {

-        try (var m = loadManager(account, dataPath, serviceEnvironment, trustNewIdentity)) {
+        try (var m = loadManager(account, configPath, serviceEnvironment, trustNewIdentity)) {

             command.handleCommand(ns, m, outputWriter);
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
     }
 
             command.handleCommand(ns, m, outputWriter);
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
     }
 

+    private void handleLocalCommand(
+            final LocalCommand c,
+            String accountObjectPath,
+            final DBusConnection dBusConn,
+            final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
+        try (final var m = new DbusManagerImpl(signal, dBusConn)) {
+            c.handleCommand(ns, m, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+

     private void handleMultiLocalCommand(
             final MultiLocalCommand command,
     private void handleMultiLocalCommand(
             final MultiLocalCommand command,

-            final File dataPath,
+            final File configPath,

             final ServiceEnvironment serviceEnvironment,
             final ServiceEnvironment serviceEnvironment,

-            final List<String> accounts,

             final OutputWriter outputWriter,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {
             final OutputWriter outputWriter,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {

-        final var managers = new ArrayList<Manager>();
-        for (String a : accounts) {
-            try {
-                managers.add(loadManager(a, dataPath, serviceEnvironment, trustNewIdentity));
-            } catch (CommandException e) {
-                logger.warn("Ignoring {}: {}", a, e.getMessage());
-            }
-        }
-
-        try (var multiAccountManager = new MultiAccountManagerImpl(managers,
-                dataPath,
+        try (var multiAccountManager = MultiAccountManager.init(configPath,

                 serviceEnvironment,
                 serviceEnvironment,

-                BaseConfig.USER_AGENT)) {
+                BaseConfig.USER_AGENT,
+                trustNewIdentity)) {

             command.handleCommand(ns, multiAccountManager, outputWriter);
         }
     }
 
             command.handleCommand(ns, multiAccountManager, outputWriter);
         }
     }
 

+    private void handleMultiLocalCommand(
+            final MultiLocalCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
+            c.handleCommand(ns, multiAccountManager, outputWriter);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        }
+    }
+

     private Manager loadManager(
             final String account,
     private Manager loadManager(
             final String account,

-            final File dataPath,
+            final File configPath,

             final ServiceEnvironment serviceEnvironment,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {
             final ServiceEnvironment serviceEnvironment,
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {

-        Manager manager;

         logger.trace("Loading account file for {}", account);
         try {
         logger.trace("Loading account file for {}", account);
         try {

-            manager = Manager.init(account, dataPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity);
+            return Manager.init(account, configPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity);

         } catch (NotRegisteredException e) {
             throw new UserErrorException("User " + account + " is not registered.");
         } catch (NotRegisteredException e) {
             throw new UserErrorException("User " + account + " is not registered.");

+        } catch (AccountCheckException ace) {
+            if (ace.getCause() instanceof IOException e) {
+                throw new IOErrorException("Error while checking account " + account + ": " + e.getMessage(), e);
+            } else {
+                throw new UnexpectedErrorException("Error while checking account " + account + ": " + ace.getMessage(),
+                        ace);
+            }

         } catch (Throwable e) {
             throw new UnexpectedErrorException("Error loading state file for user "
                     + account
         } catch (Throwable e) {
             throw new UnexpectedErrorException("Error loading state file for user "
                     + account


@@ -304,20 +363,6 @@ public class App {
                     + e.getClass().getSimpleName()
                     + ")", e);
         }
                     + e.getClass().getSimpleName()
                     + ")", e);
         }

-
-        logger.trace("Checking account state");
-        try {
-            manager.checkAccountState();
-        } catch (IOException e) {
-            try {
-                manager.close();
-            } catch (IOException ie) {
-                logger.warn("Failed to close broken account", ie);
-            }
-            throw new IOErrorException("Error while checking account " + account + ": " + e.getMessage(), e);
-        }
-
-        return manager;

     }
 
     private void initDbusClient(
     }
 
     private void initDbusClient(


@@ -331,13 +376,32 @@ public class App {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             try (var dBusConn = DBusConnection.getConnection(busType)) {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             try (var dBusConn = DBusConnection.getConnection(busType)) {

+                if (command instanceof ProvisioningCommand c) {
+                    if (account != null) {
+                        throw new UserErrorException("You cannot specify a account (phone number) when linking");
+                    }
+
+                    handleProvisioningCommand(c, dBusConn, outputWriter);
+                    return;
+                }
+
+                if (account == null && command instanceof MultiLocalCommand c) {
+                    handleMultiLocalCommand(c, dBusConn, outputWriter);
+                    return;
+                }
+                if (account != null && command instanceof RegistrationCommand c) {
+                    handleRegistrationCommand(c, account, dBusConn, outputWriter);
+                    return;
+                }
+                if (!(command instanceof LocalCommand localCommand)) {
+                    throw new UserErrorException("Command only works in multi-account mode");
+                }
+

                 var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
                 if (accountObjectPath == null) {
                     accountObjectPath = DbusConfig.getObjectPath(account);
                 }
                 var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
                 if (accountObjectPath == null) {
                     accountObjectPath = DbusConfig.getObjectPath(account);
                 }

-                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
-
-                handleCommand(command, ts, dBusConn, outputWriter);
+                handleLocalCommand(localCommand, accountObjectPath, dBusConn, outputWriter);

             }
         } catch (ServiceUnknown e) {
             throw new UserErrorException("signal-cli DBus daemon not running on "
             }
         } catch (ServiceUnknown e) {
             throw new UserErrorException("signal-cli DBus daemon not running on "


@@ -369,26 +433,10 @@ public class App {
         }
     }
 
         }
     }
 

-    private void handleCommand(
-            Command command, Signal ts, DBusConnection dBusConn, OutputWriter outputWriter
-    ) throws CommandException {
-        if (command instanceof LocalCommand localCommand) {
-            try (final var m = new DbusManagerImpl(ts, dBusConn)) {
-                localCommand.handleCommand(ns, m, outputWriter);
-            } catch (UnsupportedOperationException e) {
-                throw new UserErrorException("Command is not yet implemented via dbus", e);
-            } catch (IOException | DBusExecutionException e) {
-                throw new UnexpectedErrorException(e.getMessage(), e);
-            }
-        } else {
-            throw new UserErrorException("Command is not yet implemented via dbus");
-        }
-    }
-

     /**
      * @return the default data directory to be used by signal-cli.
      */
     /**
      * @return the default data directory to be used by signal-cli.
      */

-    private static File getDefaultDataPath() {
+    private static File getDefaultConfigPath() {

         return new File(IOUtils.getDataHomeDir(), "signal-cli");
     }
 }
         return new File(IOUtils.getDataHomeDir(), "signal-cli");
     }
 }