]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/App.java
git.nmode.ca / signal-cli / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add CommandException to abstract cli return codes for errors
[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 6dc3d799c2a9c52c9a75ffd998fcfeab5f23745f..5b2c91c6a2faca1d56478f8bca6313b73c3ea746 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -3,10 +3,7 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-import net.sourceforge.argparse4j.inf.Subparsers;
 
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
 
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
@@ -17,25 +14,26 @@ import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotRegisteredException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotRegisteredException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
-import org.asamk.signal.manager.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class App {
 
 
 public class App {
 
@@ -44,7 +42,7 @@ public class App {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {
-        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+        var parser = ArgumentParsers.newFor("signal-cli")
                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
@@ -59,7 +57,7 @@ public class App {
 
         parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
 
 
         parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
 
-        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
+        var mut = parser.addMutuallyExclusiveGroup();
         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
         mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
 
         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
         mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
 
@@ -68,11 +66,11 @@ public class App {
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 
-        Subparsers subparsers = parser.addSubparsers().title("subcommands").dest("command");
+        var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
 
-        final Map<String, Command> commands = Commands.getCommands();
-        for (Map.Entry<String, Command> entry : commands.entrySet()) {
-            Subparser subparser = subparsers.addParser(entry.getKey());
+        final var commands = Commands.getCommands();
+        for (var entry : commands.entrySet()) {
+            var subparser = subparsers.addParser(entry.getKey());
             entry.getValue().attachToSubparser(subparser);
         }
 
             entry.getValue().attachToSubparser(subparser);
         }
 
@@ -83,184 +81,174 @@ public class App {
         this.ns = ns;
     }
 
         this.ns = ns;
     }
 
-    public int init() {
-        String commandKey = ns.getString("command");
-        Command command = Commands.getCommand(commandKey);
+    public void init() throws CommandException {
+        var commandKey = ns.getString("command");
+        var command = Commands.getCommand(commandKey);
         if (command == null) {
         if (command == null) {
-            logger.error("Command not implemented!");
-            return 1;
+            throw new UserErrorException("Command not implemented!");
         }
 
         OutputType outputType = ns.get("output");
         if (!command.getSupportedOutputTypes().contains(outputType)) {
         }
 
         OutputType outputType = ns.get("output");
         if (!command.getSupportedOutputTypes().contains(outputType)) {
-            logger.error("Command doesn't support output type {}", outputType.toString());
-            return 1;
+            throw new UserErrorException("Command doesn't support output type " + outputType.toString());
         }
 
         }
 
-        String username = ns.getString("username");
+        var username = ns.getString("username");
 
         final boolean useDbus = ns.getBoolean("dbus");
         final boolean useDbusSystem = ns.getBoolean("dbus_system");
         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
 
         final boolean useDbus = ns.getBoolean("dbus");
         final boolean useDbusSystem = ns.getBoolean("dbus_system");
         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
-            return initDbusClient(command, username, useDbusSystem);
+            initDbusClient(command, username, useDbusSystem);
+            return;
         }
 
         final File dataPath;
         }
 
         final File dataPath;
-        String config = ns.getString("config");
+        var config = ns.getString("config");
         if (config != null) {
             dataPath = new File(config);
         } else {
             dataPath = getDefaultDataPath();
         }
 
         if (config != null) {
             dataPath = new File(config);
         } else {
             dataPath = getDefaultDataPath();
         }
 
-        final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
-                BaseConfig.USER_AGENT);
+        final var serviceEnvironment = ServiceEnvironment.LIVE;
 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"
                     + " because the required native library dependency is missing: libzkgroup");
         }
 
 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"
                     + " because the required native library dependency is missing: libzkgroup");
         }
 
+        if (!ServiceConfig.isSignalClientAvailable()) {
+            throw new UserErrorException("Missing required native library dependency: libsignal-client");
+        }
+
         if (command instanceof ProvisioningCommand) {
             if (username != null) {
         if (command instanceof ProvisioningCommand) {
             if (username != null) {
-                System.err.println("You cannot specify a username (phone number) when linking");
-                return 1;
+                throw new UserErrorException("You cannot specify a username (phone number) when linking");
             }
 
             }
 
-            return handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceConfiguration);
+            handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceEnvironment);
+            return;
         }
 
         if (username == null) {
         }
 
         if (username == null) {
-            List<String> usernames = Manager.getAllLocalUsernames(dataPath);
+            var usernames = Manager.getAllLocalUsernames(dataPath);
             if (usernames.size() == 0) {
             if (usernames.size() == 0) {
-                System.err.println("No local users found, you first need to register or link an account");
-                return 1;
+                throw new UserErrorException("No local users found, you first need to register or link an account");
             }
 
             if (command instanceof MultiLocalCommand) {
             }
 
             if (command instanceof MultiLocalCommand) {
-                return handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceConfiguration, usernames);
+                handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceEnvironment, usernames);
+                return;
             }
 
             if (usernames.size() > 1) {
             }
 
             if (usernames.size() > 1) {
-                System.err.println("Multiple users found, you need to specify a username (phone number) with -u");
-                return 1;
+                throw new UserErrorException(
+                        "Multiple users found, you need to specify a username (phone number) with -u");
             }
 
             username = usernames.get(0);
         } else if (!PhoneNumberFormatter.isValidNumber(username, null)) {
             }
 
             username = usernames.get(0);
         } else if (!PhoneNumberFormatter.isValidNumber(username, null)) {
-            System.err.println("Invalid username (phone number), make sure you include the country code.");
-            return 1;
+            throw new UserErrorException("Invalid username (phone number), make sure you include the country code.");
         }
 
         if (command instanceof RegistrationCommand) {
         }
 
         if (command instanceof RegistrationCommand) {
-            return handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceConfiguration);
+            handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment);
+            return;
         }
 
         if (!(command instanceof LocalCommand)) {
         }
 
         if (!(command instanceof LocalCommand)) {
-            System.err.println("Command only works via dbus");
-            return 1;
+            throw new UserErrorException("Command only works via dbus");
         }
 
         }
 
-        return handleLocalCommand((LocalCommand) command, username, dataPath, serviceConfiguration);
+        handleLocalCommand((LocalCommand) command, username, dataPath, serviceEnvironment);
     }
 
     }
 
-    private int handleProvisioningCommand(
-            final ProvisioningCommand command,
-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
-        ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
-        return command.handleCommand(ns, pm);
+    private void handleProvisioningCommand(
+            final ProvisioningCommand command, final File dataPath, final ServiceEnvironment serviceEnvironment
+    ) throws CommandException {
+        var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+        command.handleCommand(ns, pm);
     }
 
     }
 
-    private int handleRegistrationCommand(
+    private void handleRegistrationCommand(
             final RegistrationCommand command,
             final String username,
             final File dataPath,
             final RegistrationCommand command,
             final String username,
             final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
+            final ServiceEnvironment serviceEnvironment
+    ) throws CommandException {
         final RegistrationManager manager;
         try {
         final RegistrationManager manager;
         try {
-            manager = RegistrationManager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            manager = RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
         } catch (Throwable e) {
         } catch (Throwable e) {
-            logger.error("Error loading or creating state file: {}", e.getMessage());
-            return 2;
+            throw new UnexpectedErrorException("Error loading or creating state file: " + e.getMessage());
         }
         }
-        try (RegistrationManager m = manager) {
-            return command.handleCommand(ns, m);
+        try (var m = manager) {
+            command.handleCommand(ns, m);
         } catch (IOException e) {
         } catch (IOException e) {
-            logger.error("Cleanup failed", e);
-            return 2;
+            logger.warn("Cleanup failed", e);
         }
     }
 
         }
     }
 
-    private int handleLocalCommand(
+    private void handleLocalCommand(
             final LocalCommand command,
             final String username,
             final File dataPath,
             final LocalCommand command,
             final String username,
             final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
-    ) {
-        try (Manager m = loadManager(username, dataPath, serviceConfiguration)) {
-            if (m == null) {
-                return 2;
-            }
-
-            return command.handleCommand(ns, m);
+            final ServiceEnvironment serviceEnvironment
+    ) throws CommandException {
+        try (var m = loadManager(username, dataPath, serviceEnvironment)) {
+            command.handleCommand(ns, m);
         } catch (IOException e) {
         } catch (IOException e) {
-            logger.error("Cleanup failed", e);
-            return 2;
+            logger.warn("Cleanup failed", e);
         }
     }
 
         }
     }
 
-    private int handleMultiLocalCommand(
+    private void handleMultiLocalCommand(
             final MultiLocalCommand command,
             final File dataPath,
             final MultiLocalCommand command,
             final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration,
+            final ServiceEnvironment serviceEnvironment,
             final List<String> usernames
             final List<String> usernames
-    ) {
-        final List<Manager> managers = usernames.stream()
-                .map(u -> loadManager(u, dataPath, serviceConfiguration))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+    ) throws CommandException {
+        final var managers = new ArrayList<Manager>();
+        for (String u : usernames) {
+            managers.add(loadManager(u, dataPath, serviceEnvironment));
+        }
 
 
-        int result = command.handleCommand(ns, managers);
+        command.handleCommand(ns, managers);
 
 
-        for (Manager m : managers) {
+        for (var m : managers) {
             try {
                 m.close();
             } catch (IOException e) {
                 logger.warn("Cleanup failed", e);
             }
         }
             try {
                 m.close();
             } catch (IOException e) {
                 logger.warn("Cleanup failed", e);
             }
         }
-        return result;
     }
 
     private Manager loadManager(
     }
 
     private Manager loadManager(
-            final String username, final File dataPath, final SignalServiceConfiguration serviceConfiguration
-    ) {
+            final String username, final File dataPath, final ServiceEnvironment serviceEnvironment
+    ) throws CommandException {
         Manager manager;
         try {
         Manager manager;
         try {
-            manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            manager = Manager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
         } catch (NotRegisteredException e) {
         } catch (NotRegisteredException e) {
-            logger.error("User " + username + " is not registered.");
-            return null;
+            throw new UserErrorException("User " + username + " is not registered.");
         } catch (Throwable e) {
         } catch (Throwable e) {
-            logger.error("Error loading state file for user " + username + ": {}", e.getMessage());
-            return null;
+            throw new UnexpectedErrorException("Error loading state file for user " + username + ": " + e.getMessage());
         }
 
         try {
             manager.checkAccountState();
         } catch (IOException e) {
         }
 
         try {
             manager.checkAccountState();
         } catch (IOException e) {
-            logger.error("Error while checking account " + username + ": {}", e.getMessage());
-            return null;
+            throw new UnexpectedErrorException("Error while checking account " + username + ": " + e.getMessage());
         }
 
         return manager;
     }
 
         }
 
         return manager;
     }
 
-    private int initDbusClient(final Command command, final String username, final boolean systemBus) {
+    private void initDbusClient(
+            final Command command, final String username, final boolean systemBus
+    ) throws CommandException {
         try {
             DBusConnection.DBusBusType busType;
             if (systemBus) {
         try {
             DBusConnection.DBusBusType busType;
             if (systemBus) {
@@ -268,27 +256,26 @@ public class App {
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
-            try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
-                Signal ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+            try (var dBusConn = DBusConnection.getConnection(busType)) {
+                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
                         DbusConfig.getObjectPath(username),
                         Signal.class);
 
                         DbusConfig.getObjectPath(username),
                         Signal.class);
 
-                return handleCommand(command, ts, dBusConn);
+                handleCommand(command, ts, dBusConn);
             }
         } catch (DBusException | IOException e) {
             logger.error("Dbus client failed", e);
             }
         } catch (DBusException | IOException e) {
             logger.error("Dbus client failed", e);
-            return 2;
+            throw new UnexpectedErrorException("Dbus client failed");
         }
     }
 
         }
     }
 
-    private int handleCommand(Command command, Signal ts, DBusConnection dBusConn) {
+    private void handleCommand(Command command, Signal ts, DBusConnection dBusConn) throws CommandException {
         if (command instanceof ExtendedDbusCommand) {
         if (command instanceof ExtendedDbusCommand) {
-            return ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn);
+            ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn);
         } else if (command instanceof DbusCommand) {
         } else if (command instanceof DbusCommand) {
-            return ((DbusCommand) command).handleCommand(ns, ts);
+            ((DbusCommand) command).handleCommand(ns, ts);
         } else {
         } else {
-            System.err.println("Command is not yet implemented via dbus");
-            return 1;
+            throw new UserErrorException("Command is not yet implemented via dbus");
         }
     }
 
         }
     }
 
@@ -300,14 +287,14 @@ public class App {
      * @return the data directory to be used by signal-cli.
      */
     private static File getDefaultDataPath() {
      * @return the data directory to be used by signal-cli.
      */
     private static File getDefaultDataPath() {
-        File dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
+        var dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
         if (dataPath.exists()) {
             return dataPath;
         }
 
         if (dataPath.exists()) {
             return dataPath;
         }
 
-        File configPath = new File(System.getProperty("user.home"), ".config");
+        var configPath = new File(System.getProperty("user.home"), ".config");
 
 
-        File legacySettingsPath = new File(configPath, "signal");
+        var legacySettingsPath = new File(configPath, "signal");
         if (legacySettingsPath.exists()) {
             return legacySettingsPath;
         }
         if (legacySettingsPath.exists()) {
             return legacySettingsPath;
         }
[GitHub/AsamK] signal-cli provides an unofficial commandline, JSON-RPC and dbus interface for the Signal messenger.

Codeberg
GitHub
GitLab
SourceHut