import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.asamk.signal.JsonReceiveMessageHandler;
-import org.asamk.signal.JsonWriter;
import org.asamk.signal.commands.Command;
import org.asamk.signal.commands.Commands;
import org.asamk.signal.commands.JsonRpcMultiCommand;
+import org.asamk.signal.commands.JsonRpcRegistrationCommand;
import org.asamk.signal.commands.JsonRpcSingleCommand;
-import org.asamk.signal.commands.SignalCreator;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonReceiveMessageHandler;
import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.util.Util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.nio.channels.OverlappingFileLockException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
private final JsonRpcReader jsonRpcReader;
private final boolean noReceiveOnStart;
- private SignalCreator c;
+ private MultiAccountManager c;
private final Map<Manager, Manager.ReceiveMessageHandler> receiveHandlers = new HashMap<>();
private Manager m;
this.jsonRpcReader = new JsonRpcReader(jsonRpcSender, lineSupplier);
}
- public void handleConnection(final SignalCreator c) {
+ public void handleConnection(final MultiAccountManager c) {
this.c = c;
if (!noReceiveOnStart) {
c.getAccountNumbers().stream().map(c::getManager).filter(Objects::nonNull).forEach(this::subscribeReceive);
+ c.addOnManagerAddedHandler(this::subscribeReceive);
+ c.addOnManagerRemovedHandler(this::unsubscribeReceive);
}
handleConnection();
subscribeReceive(m);
}
+ final var currentThread = Thread.currentThread();
+ m.addClosedListener(currentThread::interrupt);
+
handleConnection();
}
final ObjectMapper objectMapper, final String method, ContainerNode<?> params
) throws JsonRpcException {
var command = getCommand(method);
- // TODO implement listAccounts, register, verify, link
- if (c != null && command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
- return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
+ if (c != null) {
+ if (command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
+ return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
+ }
+ if (command instanceof JsonRpcRegistrationCommand<?> jsonRpcCommand) {
+ try (var manager = getRegistrationManagerFromParams(params)) {
+ if (manager != null) {
+ return runCommand(objectMapper,
+ params,
+ new RegistrationCommandRunnerImpl<>(manager, c, jsonRpcCommand));
+ } else {
+ throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+ "Method requires valid account parameter",
+ null));
+ }
+ } catch (IOException e) {
+ logger.warn("Failed to close registration manager", e);
+ }
+ }
}
if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
if (m != null) {
return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
}
- if (params.has("account")) {
- Manager manager = c.getManager(params.get("account").asText());
- if (manager != null) {
- return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
- }
+ final var manager = getManagerFromParams(params);
+ if (manager != null) {
+ return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
} else {
throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
"Method requires valid account parameter",
null));
}
+ private Manager getManagerFromParams(final ContainerNode<?> params) {
+ if (params != null && params.has("account")) {
+ final var manager = c.getManager(params.get("account").asText());
+ ((ObjectNode) params).remove("account");
+ return manager;
+ }
+ return null;
+ }
+
+ private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
+ if (params != null && params.has("account")) {
+ try {
+ final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
+ ((ObjectNode) params).remove("account");
+ return registrationManager;
+ } catch (OverlappingFileLockException e) {
+ logger.warn("Account is already in use");
+ return null;
+ } catch (IOException | IllegalStateException e) {
+ logger.warn("Failed to load registration manager", e);
+ return null;
+ }
+ }
+ return null;
+ }
+
private Command getCommand(final String method) {
if ("subscribeReceive".equals(method)) {
return new SubscribeReceiveCommand();
}
}
+ private record RegistrationCommandRunnerImpl<T>(
+ RegistrationManager m, MultiAccountManager c, JsonRpcRegistrationCommand<T> command
+ ) implements CommandRunner<T> {
+
+ @Override
+ public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+ command.handleCommand(request, m, jsonWriter);
+ }
+
+ @Override
+ public TypeReference<T> getRequestType() {
+ return command.getRequestType();
+ }
+ }
+
private record MultiCommandRunnerImpl<T>(
- SignalCreator c, JsonRpcMultiCommand<T> command
+ MultiAccountManager c, JsonRpcMultiCommand<T> command
) implements CommandRunner<T> {
@Override
e.getMessage(),
null));
} catch (UserErrorException e) {
- throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR, e.getMessage(), null));
+ throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
+ e.getMessage(),
+ getErrorDataNode(objectMapper, result)));
} catch (IOErrorException e) {
- throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR, e.getMessage(), null));
+ throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
+ e.getMessage(),
+ getErrorDataNode(objectMapper, result)));
} catch (UntrustedKeyErrorException e) {
- throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR, e.getMessage(), null));
+ throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR,
+ e.getMessage(),
+ getErrorDataNode(objectMapper, result)));
} catch (Throwable e) {
logger.error("Command execution failed", e);
throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
e.getMessage(),
- null));
+ getErrorDataNode(objectMapper, result)));
}
Object output = result[0] == null ? Map.of() : result[0];
return objectMapper.valueToTree(output);
}
+ private JsonNode getErrorDataNode(final ObjectMapper objectMapper, final Object[] result) {
+ if (result[0] == null) {
+ return null;
+ }
+ return objectMapper.valueToTree(Map.of("response", result[0]));
+ }
+
private <T> void parseParamsAndRunCommand(
final ObjectMapper objectMapper,
final TreeNode params,
git.nmode.ca / signal-cli / blobdiff
