webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-03 04:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Execute JSON-RPC requests in parallel

Browse source
This commit is contained in:
AsamK 2023-10-05 22:18:13 +02:00
parent a0c345185b
commit 6f4d538832
2 changed files with 75 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
View file

@ -14,7 +14,9 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.Objects;
import java.util.ArrayList;
import java.util.concurrent.Executors;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.StreamSupport;
@ -53,20 +55,25 @@ public class JsonRpcReader {
return;
}
while (!Thread.interrupted()) {
String input = lineSupplier.get();
if (input == null) {
logger.trace("Reached end of JSON-RPC input stream.");
break;
}
final var executor = Executors.newFixedThreadPool(10);
try {
while (!Thread.interrupted()) {
final var input = lineSupplier.get();
if (input == null) {
logger.trace("Reached end of JSON-RPC input stream.");
break;
}
logger.trace("Incoming JSON-RPC message: {}", input);
JsonRpcMessage message = parseJsonRpcMessage(input);
if (message == null) {
continue;
}
logger.trace("Incoming JSON-RPC message: {}", input);
final var message = parseJsonRpcMessage(input);
if (message == null) {
continue;
}
handleMessage(message, requestHandler, responseHandler);
executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
}
} finally {
Util.closeExecutorService(executor);
}
}
@ -84,16 +91,41 @@ public class JsonRpcReader {
} else if (message instanceof JsonRpcResponse jsonRpcResponse) {
responseHandler.accept(jsonRpcResponse);
} else {
final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
final JsonRpcRequest request;
try {
request = parseJsonRpcRequest(jsonNode);
} catch (JsonRpcException e) {
return JsonRpcResponse.forError(e.getError(), getId(jsonNode));
}
final var messages = ((JsonRpcBatchMessage) message).getMessages();
final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
final var executor = Executors.newFixedThreadPool(10);
try {
final var lock = new ReentrantLock();
messages.forEach(jsonNode -> {
final JsonRpcRequest request;
try {
request = parseJsonRpcRequest(jsonNode);
} catch (JsonRpcException e) {
final var response = JsonRpcResponse.forError(e.getError(), getId(jsonNode));
lock.lock();
try {
responseList.add(response);
} finally {
lock.unlock();
}
return;
}
return handleRequest(requestHandler, request);
}).filter(Objects::nonNull).toList();
executor.submit(() -> {
final var response = handleRequest(requestHandler, request);
if (response != null) {
lock.lock();
try {
responseList.add(response);
} finally {
lock.unlock();
}
}
});
});
} finally {
Util.closeExecutorService(executor);
}
if (responseList.size() > 0) {
jsonRpcSender.sendBatchResponses(responseList);