fix response not sent for methods not returning values

yarolegovich · yarolegovich · commit 76240700a143 · 2026-03-13T13:56:27.000Z
diff --git a/a2asrv/jsonrpc.go b/a2asrv/jsonrpc.go
@@ -133,12 +133,10 @@ func (h *jsonrpcHandler) handleRequest(ctx context.Context, rw http.ResponseWrit
 		return
 	}
 
-	if result != nil {
-		rw.Header().Set("Content-Type", "application/json")
-		resp := jsonrpc.ServerResponse{JSONRPC: jsonrpc.Version, ID: req.ID, Result: result}
-		if err := json.NewEncoder(rw).Encode(resp); err != nil {
-			log.Error(ctx, "failed to encode response", err)
-		}
+	rw.Header().Set("Content-Type", "application/json")
+	resp := jsonrpc.ServerResponse{JSONRPC: jsonrpc.Version, ID: req.ID, Result: result}
+	if err := json.NewEncoder(rw).Encode(resp); err != nil {
+		log.Error(ctx, "failed to encode response", err)
 	}
 }
 
diff --git a/a2asrv/jsonrpc_test.go b/a2asrv/jsonrpc_test.go
@@ -382,6 +382,56 @@ func TestJSONRPC_StreamingKeepAlive(t *testing.T) {
 	}
 }
 
+func TestJSONRPC_DeletePushConfigResponse(t *testing.T) {
+	t.Parallel()
+	ctx := t.Context()
+
+	taskID := a2a.NewTaskID()
+	config := &a2a.PushConfig{ID: "config-1", URL: "https://example.com/push"}
+	store := testutil.NewTestTaskStore().WithTasks(t, &a2a.Task{ID: taskID})
+	pushStore := testutil.NewTestPushConfigStore().WithConfigs(t, taskID, config)
+	pushSender := testutil.NewTestPushSender(t).SetSendPushError(nil)
+	reqHandler := NewHandler(
+		&mockAgentExecutor{},
+		WithTaskStore(store),
+		WithPushNotifications(pushStore, pushSender),
+	)
+	server := httptest.NewServer(NewJSONRPCHandler(reqHandler))
+	defer server.Close()
+
+	params := mustMarshal(t, &a2a.DeleteTaskPushConfigRequest{TaskID: taskID, ID: config.ID})
+	request := jsonrpc.ServerRequest{
+		JSONRPC: "2.0",
+		Method:  jsonrpc.MethodPushConfigDelete,
+		Params:  params,
+		ID:      "delete-1",
+	}
+	req, err := http.NewRequestWithContext(ctx, "POST", server.URL, bytes.NewBuffer(mustMarshal(t, request)))
+	if err != nil {
+		t.Fatalf("http.NewRequestWithContext() error = %v", err)
+	}
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatalf("http.DefaultClient.Do() error = %v", err)
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	var payload jsonrpc.ServerResponse
+	if err := json.NewDecoder(resp.Body).Decode(&payload); err != nil {
+		t.Fatalf("json.Decode() error = %v, want valid JSON-RPC response", err)
+	}
+	if payload.JSONRPC != "2.0" {
+		t.Fatalf("payload.JSONRPC = %q, want %q", payload.JSONRPC, "2.0")
+	}
+	if payload.Error != nil {
+		t.Fatalf("payload.Error = %v, want nil", payload.Error)
+	}
+	if payload.ID != "delete-1" {
+		t.Fatalf("payload.ID = %v, want %q", payload.ID, "delete-1")
+	}
+}
+
 func mustMarshal(t *testing.T, data any) []byte {
 	t.Helper()
 	body, err := json.Marshal(data)

Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,10 @@ func (h *jsonrpcHandler) handleRequest(ctx context.Context, rw http.ResponseWrit`
`133`	`133`	`return`
`134`	`134`	`}`
`135`	`135`
`136`		`- if result != nil {`
`137`		`- rw.Header().Set("Content-Type", "application/json")`
`138`		`- resp := jsonrpc.ServerResponse{JSONRPC: jsonrpc.Version, ID: req.ID, Result: result}`
`139`		`- if err := json.NewEncoder(rw).Encode(resp); err != nil {`
`140`		`- log.Error(ctx, "failed to encode response", err)`
`141`		`- }`
	`136`	`+ rw.Header().Set("Content-Type", "application/json")`
	`137`	`+ resp := jsonrpc.ServerResponse{JSONRPC: jsonrpc.Version, ID: req.ID, Result: result}`
	`138`	`+ if err := json.NewEncoder(rw).Encode(resp); err != nil {`
	`139`	`+ log.Error(ctx, "failed to encode response", err)`
`142`	`140`	`}`
`143`	`141`	`}`
`144`	`142`