Skip to content

fix: replace raw SSE string handling with SSEEvent model and SSEParser #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehsavoie merged 1 commit into from
May 5, 2026
Merged

fix: replace raw SSE string handling with SSEEvent model and SSEParser #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/transport/jsonrpc/src/main/java/io/a2a/client/transport/jsonrpc/JSONRPCTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
try {
A2AHttpClient.PostBuilder builder = createPostBuilder(payloadAndHeaders);
ref.set(builder.postAsyncSSE(
msg -> sseEventListener.onMessage(msg, ref.get()),
event -> sseEventListener.onMessage(event, ref.get()),
throwable -> sseEventListener.onError(throwable, ref.get()),
() -> {
// Signal normal stream completion to error handler (null error means success)
Expand Down Expand Up @@ -315,7 +315,7 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
try {
A2AHttpClient.PostBuilder builder = createPostBuilder(payloadAndHeaders);
ref.set(builder.postAsyncSSE(
msg -> sseEventListener.onMessage(msg, ref.get()),
event -> sseEventListener.onMessage(event, ref.get()),
throwable -> sseEventListener.onError(throwable, ref.get()),
() -> {
// Signal normal stream completion to error handler (null error means success)
Expand Down
9 changes: 5 additions & 4 deletions ...transport/jsonrpc/src/main/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import io.a2a.client.http.ServerSentEvent;
import io.a2a.json.JsonProcessingException;
import io.a2a.json.JsonUtil;
import io.a2a.spec.JSONRPCError;
Expand All @@ -25,13 +26,13 @@ public SSEEventListener(Consumer<StreamingEventKind> eventHandler,
this.errorHandler = errorHandler;
}

public void onMessage(String message, Future<Void> completableFuture) {
public void onMessage(ServerSentEvent event, Future<Void> completableFuture) {
try {
handleMessage(JsonParser.parseString(message).getAsJsonObject(), completableFuture);
handleMessage(JsonParser.parseString(event.data()).getAsJsonObject(), completableFuture);
} catch (JsonSyntaxException e) {
log.warning("Failed to parse JSON message: " + message);
log.warning("Failed to parse JSON message: " + event.data());
} catch (JsonProcessingException e) {
log.warning("Failed to process JSON message: " + message);
log.warning("Failed to process JSON message: " + event.data());
}
}

Expand Down
13 changes: 7 additions & 6 deletions ...sport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import io.a2a.client.http.ServerSentEvent;
import io.a2a.client.transport.jsonrpc.JsonStreamingMessages;
import io.a2a.spec.Artifact;
import io.a2a.spec.JSONRPCError;
Expand Down Expand Up @@ -43,7 +44,7 @@ public void testOnEventWithTaskResult() throws Exception {
JsonStreamingMessages.STREAMING_TASK_EVENT.indexOf("{"));

// Call the onEvent method directly
listener.onMessage(eventData, null);
listener.onMessage(new ServerSentEvent(eventData), null);

// Verify the event was processed correctly
assertNotNull(receivedEvent.get());
Expand All @@ -68,7 +69,7 @@ public void testOnEventWithMessageResult() throws Exception {
JsonStreamingMessages.STREAMING_MESSAGE_EVENT.indexOf("{"));

// Call onEvent method
listener.onMessage(eventData, null);
listener.onMessage(new ServerSentEvent(eventData), null);

// Verify the event was processed correctly
assertNotNull(receivedEvent.get());
Expand Down Expand Up @@ -96,7 +97,7 @@ public void testOnEventWithTaskStatusUpdateEventEvent() throws Exception {
JsonStreamingMessages.STREAMING_STATUS_UPDATE_EVENT.indexOf("{"));

// Call onEvent method
listener.onMessage(eventData, null);
listener.onMessage(new ServerSentEvent(eventData), null);

// Verify the event was processed correctly
assertNotNull(receivedEvent.get());
Expand All @@ -122,7 +123,7 @@ public void testOnEventWithTaskArtifactUpdateEventEvent() throws Exception {
JsonStreamingMessages.STREAMING_ARTIFACT_UPDATE_EVENT.indexOf("{"));

// Call onEvent method
listener.onMessage(eventData, null);
listener.onMessage(new ServerSentEvent(eventData), null);

// Verify the event was processed correctly
assertNotNull(receivedEvent.get());
Expand Down Expand Up @@ -154,7 +155,7 @@ public void testOnEventWithError() throws Exception {
JsonStreamingMessages.STREAMING_ERROR_EVENT.indexOf("{"));

// Call onEvent method
listener.onMessage(eventData, null);
listener.onMessage(new ServerSentEvent(eventData), null);

// Verify the error was processed correctly
assertNotNull(receivedError.get());
Expand Down Expand Up @@ -217,7 +218,7 @@ public void testOnEventWithFinalTaskStatusUpdateEventEventCancels() throws Excep

// Call onEvent method
CancelCapturingFuture future = new CancelCapturingFuture();
listener.onMessage(eventData, future);
listener.onMessage(new ServerSentEvent(eventData), future);

// Verify the event was processed correctly
assertNotNull(receivedEvent.get());
Expand Down
4 changes: 2 additions & 2 deletions client/transport/rest/src/main/java/io/a2a/client/transport/rest/RestTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void sendMessageStreaming(MessageSendParams messageSendParams, Consumer<S
try {
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(agentUrl + "/v1/message:stream", payloadAndHeaders);
ref.set(postBuilder.postAsyncSSE(
msg -> sseEventListener.onMessage(msg, ref.get()),
event -> sseEventListener.onMessage(event, ref.get()),
throwable -> sseEventListener.onError(throwable, ref.get()),
() -> {
// We don't need to do anything special on completion
Expand Down Expand Up @@ -294,7 +294,7 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
String url = agentUrl + String.format("/v1/tasks/%1s:subscribe", request.id());
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(url, payloadAndHeaders);
ref.set(postBuilder.postAsyncSSE(
msg -> sseEventListener.onMessage(msg, ref.get()),
event -> sseEventListener.onMessage(event, ref.get()),
throwable -> sseEventListener.onError(throwable, ref.get()),
() -> {
// We don't need to do anything special on completion
Expand Down
9 changes: 5 additions & 4 deletions ...t/transport/rest/src/main/java/io/a2a/client/transport/rest/sse/RestSSEEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.util.JsonFormat;
import io.a2a.client.http.ServerSentEvent;
import io.a2a.client.transport.rest.RestErrorMapper;
import io.a2a.grpc.StreamResponse;
import io.a2a.grpc.utils.ProtoUtils;
Expand All @@ -29,14 +30,14 @@ public RestSSEEventListener(Consumer<StreamingEventKind> eventHandler,
this.errorHandler = errorHandler;
}

public void onMessage(String message, @Nullable Future<Void> completableFuture) {
public void onMessage(ServerSentEvent event, @Nullable Future<Void> completableFuture) {
try {
log.fine("Streaming message received: " + message);
log.fine("Streaming message received: " + event.data());
io.a2a.grpc.StreamResponse.Builder builder = io.a2a.grpc.StreamResponse.newBuilder();
JsonFormat.parser().merge(message, builder);
JsonFormat.parser().merge(event.data(), builder);
handleMessage(builder.build());
} catch (InvalidProtocolBufferException e) {
errorHandler.accept(RestErrorMapper.mapRestError(message, 500));
errorHandler.accept(RestErrorMapper.mapRestError(event.data(), 500));
}
}

Expand Down
Loading
Loading