grpcClient.finishSend() is essential for websocket transport (improba…

…ble-eng#211) * grpcClient.finishSend() is essential for websocket transport * call hackIntoNormalGrpcRequest() in handleWebSocket()
thalesfsp · Aug 15, 2018 · e3d8d34 · e3d8d34
1 parent 2cf3019
commit e3d8d34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/go/grpcweb/wrapper.go b/go/grpcweb/wrapper.go
@@ -154,12 +154,8 @@ func (w *WrappedGrpcServer) handleWebSocket(wsConn *websocket.Conn, req *http.Re
 	req.Body = wrappedReader
 	req.Method = http.MethodPost
 	req.Header = headers
-	req.ProtoMajor = 2
-	req.ProtoMinor = 0
-	contentType := req.Header.Get("content-type")
-	req.Header.Set("content-type", strings.Replace(contentType, "application/grpc-web", "application/grpc", 1))
 
-	w.server.ServeHTTP(respWriter, req)
+	w.server.ServeHTTP(respWriter, hackIntoNormalGrpcRequest(req))
 }
 
 // IsGrpcWebRequest determines if a request is a gRPC-Web request by checking that the "content-type" is

diff --git a/ts/src/invoke.ts b/ts/src/invoke.ts
@@ -45,6 +45,7 @@ export function invoke<TRequest extends ProtobufMessage, TResponse extends Proto
 
   grpcClient.start(props.metadata);
   grpcClient.send(props.request);
+  grpcClient.finishSend();
 
   return {
     close: () => {

diff --git a/ts/src/unary.ts b/ts/src/unary.ts
@@ -57,6 +57,7 @@ export function unary<TRequest extends ProtobufMessage, TResponse extends Protob
 
   grpcClient.start(props.metadata);
   grpcClient.send(props.request);
+  grpcClient.finishSend();
 
   return {
     close: () => {