tomasz
/
code-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved scanning logic for newlines.

master
Tomasz Polgrabia 2024-12-27 19:16:26 +01:00
parent 4b34b31928
commit b29a3128bd
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
2024/08/chat_demo1/chat_demo1_web/src/main/java/ch/polgrabia/demos/client/ClientPeriodicStdinScanner.java
View File

@ -1,11 +1,11 @@
package ch.polgrabia.demos.client;
import io.vertx.core.Handler;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.WebSocket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@ -13,17 +13,18 @@ import java.nio.charset.StandardCharsets;
public class ClientPeriodicStdinScanner implements Handler<Long> {
private static final Logger logger = LoggerFactory.getLogger(ClientPeriodicStdinScanner.class);
private final InputStream inputStream;
private ByteArrayOutputStream clientTextInput = new ByteArrayOutputStream();
private Buffer clientPayloadRemainderBuffer = Buffer.buffer();
private final WebSocket webSocket;
ClientPeriodicStdinScanner(WebSocket webSocket, InputStream inputStream) {
this.webSocket = webSocket;
this.webSocket.setWriteQueueMaxSize(0);
this.inputStream = inputStream;
}
private static int newLineIndex(byte[] clientPayload) {
for (int i = 0; i < clientPayload.length; i++) {
if (clientPayload[i] == "\n".getBytes(StandardCharsets.UTF_8)[0]) {
private int newLineIndex(byte[] clientPayload, int prevIdx) {
for (int i = prevIdx; i < clientPayload.length; i++) {
if (clientPayload[i] == '\n' || clientPayload[i] == '\r' ) {
return i;
}
}
@ -36,18 +37,35 @@ public class ClientPeriodicStdinScanner implements Handler<Long> {
try {
int available = inputStream.available();
if (available > 0) {
byte[] clientPayload = inputStream.readNBytes(available);
this.clientTextInput.write(clientPayload);
int idx = newLineIndex(clientPayload);
if (idx > 0) {
String payload = clientTextInput.toString(StandardCharsets.UTF_8);
clientPayloadRemainderBuffer.appendBytes(inputStream.readNBytes(available));
}
byte[] clientPayload = clientPayloadRemainderBuffer.getBytes();
int idx, prevIdx = 0;
do {
idx = newLineIndex(clientPayload, prevIdx);
if (idx >= 0) {
// TODO here don't assume we deal with linux eol
int nidx = payload.indexOf('\n');
String textMsgToBeSent = payload.substring(0, nidx);
webSocket.writeTextMessage(textMsgToBeSent);
clientTextInput = new ByteArrayOutputStream();
clientTextInput.write(payload.substring(idx).getBytes(StandardCharsets.UTF_8));
var eolLength =
idx < clientPayload.length - 1
&& clientPayload[idx] == '\r'
&& clientPayload[idx + 1] == '\n'
? 2 : 1;
int len = idx - prevIdx;
Buffer b = Buffer.buffer(len);
b = b.appendBytes(clientPayload, prevIdx, len);
b = b.appendByte((byte)'\n');
webSocket.writeTextMessage(b.toString(StandardCharsets.UTF_8));
prevIdx = idx + eolLength;
}
} while (idx >= 0 && prevIdx < clientPayload.length);
int remainderLength = clientPayload.length - prevIdx + 1;
if (remainderLength > 0 && prevIdx < clientPayload.length) {
clientPayloadRemainderBuffer = Buffer.buffer(remainderLength)
.appendBytes(clientPayload, prevIdx, remainderLength);
} else {
clientPayloadRemainderBuffer = Buffer.buffer();
}
} catch (IOException e) {
logger.error("Failed to read client input", e);

6
2024/08/chat_demo1/chat_demo1_web/src/main/java/ch/polgrabia/demos/client/WebsocketClientParticle.java
View File

@ -50,7 +50,11 @@ public class WebsocketClientParticle extends AbstractVerticle {
return;
}
WebSocket webSocket = webSocketAsyncResult.result();
vertx.setPeriodic(100, new ClientPeriodicStdinScanner(webSocket, System.in));
vertx.setPeriodic(100, new ClientPeriodicStdinScanner(
webSocket,
System.in
));
webSocket
.textMessageHandler(msg -> logger.info("Got message: {}", msg))
.closeHandler(unused -> {