Ensure response writer newline delimits on flush

connectrpc · Nov 25, 2024 · 25443cf · 25443cf
1 parent 6686432
commit 25443cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/protocol_grpc.go b/protocol_grpc.go
@@ -740,6 +740,9 @@ func (w *grpcWebTextResponseWriter) Flush() {
 		_ = w.encoder.Close()
 		w.encoder = nil
 	}
+	// Some clients may expect a newline after each message. This does not
+	// affect the base64 encoding.
+	_, _ = w.ResponseWriter.Write([]byte{'\n'})
 	if flusher, ok := w.ResponseWriter.(http.Flusher); ok {
 		flusher.Flush()
 	}

diff --git a/protocol_grpc_test.go b/protocol_grpc_test.go
@@ -183,7 +183,7 @@ func TestGRPCWebTextResponseWriter(t *testing.T) {
 	require.NoError(t, err)
 	writer.Flush()
 
-	assert.Equal(t, "SGVsbG8sIOS4lueVjA==SGVsbG8sIOS4lueVjA==", rec.Body.String())
+	assert.Equal(t, "SGVsbG8sIOS4lueVjA==\nSGVsbG8sIOS4lueVjA==\n", rec.Body.String())
 	assert.Equal(t, "application/grpc-web-text+proto", rec.Header().Get("Content-Type"))
 
 	out, err := io.ReadAll(newGRPCWebTextReader(strings.NewReader(rec.Body.String())))