import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.dbus.DbusSignalControlImpl;
import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.http.HttpServerHandler;
import org.asamk.signal.json.JsonReceiveMessageHandler;
import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.api.ReceiveConfig;
import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.JsonWriterImpl;
import org.asamk.signal.output.OutputWriter;
import java.nio.channels.SocketChannel;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
.nargs("?")
.setConst("localhost:7583")
.help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");
+ subparser.addArgument("--http")
+ .nargs("?")
+ .setConst("localhost:8080")
+ .help("Expose a JSON-RPC interface as http endpoint (default localhost:8080).");
subparser.addArgument("--no-receive-stdout")
.help("Don’t print received messages to stdout.")
.action(Arguments.storeTrue());
subparser.addArgument("--ignore-attachments")
.help("Don’t download attachments of received messages.")
.action(Arguments.storeTrue());
+ subparser.addArgument("--ignore-stories")
+ .help("Don’t receive story messages from the server.")
+ .action(Arguments.storeTrue());
+ subparser.addArgument("--send-read-receipts")
+ .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
+ .action(Arguments.storeTrue());
}
@Override
final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
final var receiveMode = ns.<ReceiveMode>get("receive-mode");
final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+ final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+ final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
- m.setIgnoreAttachments(ignoreAttachments);
+ m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
final Channel inheritedChannel;
final var serverChannel = IOUtils.bindSocket(address);
runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
}
+ final var httpAddress = ns.getString("http");
+ if (httpAddress != null) {
+ final var address = IOUtils.parseInetSocketAddress(httpAddress);
+ final var handler = new HttpServerHandler(address, m);
+ try {
+ handler.init();
+ } catch (IOException ex) {
+ throw new IOErrorException("Failed to initialize HTTP Server", ex);
+ }
+ }
final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
if (isDbusSystem) {
runDbusSingleAccount(m, true, receiveMode != ReceiveMode.ON_START);
!isDbusSystem
&& socketFile == null
&& tcpAddress == null
+ && httpAddress == null
&& !(inheritedChannel instanceof ServerSocketChannel)
)) {
runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
final var receiveMode = ns.<ReceiveMode>get("receive-mode");
final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+ final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+ final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+ final var receiveConfig = new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
c.getManagers().forEach(m -> {
- m.setIgnoreAttachments(ignoreAttachments);
+ m.setReceiveConfig(receiveConfig);
addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
});
c.addOnManagerAddedHandler(m -> {
- m.setIgnoreAttachments(ignoreAttachments);
+ m.setReceiveConfig(receiveConfig);
addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
});
final var serverChannel = IOUtils.bindSocket(address);
runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
}
+ final var httpAddress = ns.getString("http");
+ if (httpAddress != null) {
+ final var address = IOUtils.parseInetSocketAddress(httpAddress);
+ final var handler = new HttpServerHandler(address, c);
+ try {
+ handler.init();
+ } catch (IOException ex) {
+ throw new IOErrorException("Failed to initialize HTTP Server", ex);
+ }
+ }
final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
if (isDbusSystem) {
runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, true);
!isDbusSystem
&& socketFile == null
&& tcpAddress == null
+ && httpAddress == null
&& !(inheritedChannel instanceof ServerSocketChannel)
)) {
runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, false);
}
private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {
- final var handler = outputWriter instanceof JsonWriter o
- ? new JsonReceiveMessageHandler(m, o)
- : outputWriter instanceof PlainTextWriter o
- ? new ReceiveMessageHandler(m, o)
- : Manager.ReceiveMessageHandler.EMPTY;
+ final var handler = switch (outputWriter) {
+ case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+ case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+ case null -> Manager.ReceiveMessageHandler.EMPTY;
+ };
m.addReceiveHandler(handler, isWeakListener);
}
- private void runSocketSingleAccount(
+ private Thread runSocketSingleAccount(
final Manager m, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
) {
- runSocket(serverChannel, channel -> {
+ return runSocket(serverChannel, channel -> {
final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
handler.handleConnection(m);
});
}
- private void runSocketMultiAccount(
+ private Thread runSocketMultiAccount(
final MultiAccountManager c, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
) {
- runSocket(serverChannel, channel -> {
+ return runSocket(serverChannel, channel -> {
final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
handler.handleConnection(c);
});
private static final AtomicInteger threadNumber = new AtomicInteger(0);
- private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
- final var thread = new Thread(() -> {
- while (true) {
- final var connectionId = threadNumber.getAndIncrement();
- final SocketChannel channel;
- final String clientString;
- try {
- channel = serverChannel.accept();
- clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
- logger.info("Accepted new client connection {}: {}", connectionId, clientString);
- } catch (IOException e) {
- logger.error("Failed to accept new socket connection", e);
- synchronized (this) {
- notifyAll();
- }
- break;
- }
- final var connectionThread = new Thread(() -> {
- try (final var c = channel) {
- socketHandler.accept(c);
+ private Thread runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
+ return Thread.ofPlatform().name("daemon-listener").start(() -> {
+ try (final var executor = Executors.newCachedThreadPool()) {
+ while (true) {
+ final var connectionId = threadNumber.getAndIncrement();
+ final SocketChannel channel;
+ final String clientString;
+ try {
+ channel = serverChannel.accept();
+ clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+ logger.info("Accepted new client connection {}: {}", connectionId, clientString);
} catch (IOException e) {
- logger.warn("Failed to close channel", e);
- } catch (Throwable e) {
- logger.warn("Connection handler failed, closing connection", e);
+ logger.error("Failed to accept new socket connection", e);
+ break;
}
- logger.info("Connection {} closed: {}", connectionId, clientString);
- });
- connectionThread.setName("daemon-connection-" + connectionId);
- connectionThread.start();
+ executor.submit(() -> {
+ try (final var c = channel) {
+ socketHandler.accept(c);
+ } catch (IOException e) {
+ logger.warn("Failed to close channel", e);
+ } catch (Throwable e) {
+ logger.warn("Connection handler failed, closing connection", e);
+ }
+ logger.info("Connection {} closed: {}", connectionId, clientString);
+ });
+ }
+ }
+ synchronized (this) {
+ notifyAll();
}
});
- thread.setName("daemon-listener");
- thread.start();
}
private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
) {
final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
- final var initThread = new Thread(signal::initObjects);
- initThread.setName("dbus-init");
- initThread.start();
- return initThread;
+ return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
}
interface DbusRunner {
git.nmode.ca / signal-cli / blobdiff
