chore: upload patch from internal repo

bridge.go

@@ -3,6 +3,8 @@ package grpcbridge
 import (
 	"log/slog"
 	"net/http"
+	"slices"
+	"strings"
 
 	"github.com/renbou/grpcbridge/bridgelog"
 	"github.com/renbou/grpcbridge/grpcadapter"
@@ -44,6 +46,8 @@ type BridgeOption interface {
 type WebBridge struct {
 	transcodedHTTPBridge      *webbridge.TranscodedHTTPBridge
 	transcodedWebSocketBridge *webbridge.TranscodedWebSocketBridge
+	gRPCWebHTTPBridge         *webbridge.GRPCWebBridge
+	gRPCWebSocketBridge       *webbridge.GRPCWebSocketBridge
 }
 
 // NewWebBridge constructs a new [*WebBridge] with the given router and options.
@@ -74,16 +78,37 @@ func NewWebBridge(router Router, opts ...BridgeOption) *WebBridge {
 		Forwarder:  options.common.forwarder,
 	})
 
-	return &WebBridge{transcodedHTTPBridge: transcodedHTTPBridge, transcodedWebSocketBridge: transcodedWebSocketBridge}
+	gRPCWebHTTPBridge := webbridge.NewGRPCWebBridge(router, webbridge.GRPCWebBridgeOpts{
+		Logger:    options.common.logger,
+		Forwarder: options.common.forwarder,
+	})
+
+	gRPCWebSocketBridge := webbridge.NewGRPCWebSocketBridge(router, webbridge.GRPCWebBridgeOpts{
+		Logger:    options.common.logger,
+		Forwarder: options.common.forwarder,
+	})
+
+	return &WebBridge{transcodedHTTPBridge: transcodedHTTPBridge, transcodedWebSocketBridge: transcodedWebSocketBridge, gRPCWebHTTPBridge: gRPCWebHTTPBridge, gRPCWebSocketBridge: gRPCWebSocketBridge}
 }
 
 // ServeHTTP implements [net/http.Handler] and routes the request to the appropriate bridging handler according to these rules:
 //  1. WebSocket upgrades (Connection: Upgrade and Upgrade: WebSocket) are handled by [webbridge.TranscodedWebSocketBridge].
-//  2. All other requests are handled by [webbridge.TranscodedHTTPBridge].
+//  2. WebSocket upgrades with the Sec-WebSocket-Protocol header containing grpc-websockets are handled by [webbridge.GRPCWebSocketBridge].
+//  3. HTTP gRPC-Web (Content-Type: application/grpc-web) requests are handled by [webbridge.GRPCWebBridge].
+//  4. All other requests are handled by [webbridge.TranscodedHTTPBridge].
 func (b *WebBridge) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Case-insensitive comparison as specified in the RFC https://datatracker.ietf.org/doc/html/rfc6455#section-4.2.1.
 	if ascii.EqualFold(r.Header.Get("Connection"), "upgrade") && ascii.EqualFold(r.Header.Get("Upgrade"), "websocket") {
-		b.transcodedWebSocketBridge.ServeHTTP(w, r)
+		if slices.Contains(r.Header.Values("Sec-WebSocket-Protocol"), "grpc-websockets") {
+			b.gRPCWebSocketBridge.ServeHTTP(w, r)
+		} else {
+			b.transcodedWebSocketBridge.ServeHTTP(w, r)
+		}
+		return
+	}
+
+	if strings.HasPrefix(r.Header.Get("Content-Type"), "application/grpc-web") {
+		b.gRPCWebHTTPBridge.ServeHTTP(w, r)
 		return
 	}
 

codecov.yml

@@ -9,6 +9,6 @@ coverage:
 
 ignore:
   - "internal/bridgetest"
-  - "internal/httprule"
+  - "webbridge/grpcweb.go"
   - "internal/gwquery"
   - "test"

e2e/.gitignore

@@ -0,0 +1 @@
+**/node_modules/

e2e/empty.cjs

@@ -0,0 +1 @@
+module.exports = require("google-protobuf/google/protobuf/empty_pb.js");

e2e/google/api/annotations_pb.cjs

@@ -0,0 +1,54 @@
+// source: google/api/annotations.proto
+/**
+ * @fileoverview
+ * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
+ * @suppress {messageConventions} JS Compiler reports an error if a variable or
+ *     field starts with 'MSG_' and isn't a translatable message.
+ * @public
+ */
+// GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
+
+var jspb = require('google-protobuf');
+var goog = jspb;
+var global = (function() {
+  if (this) { return this; }
+  if (typeof window !== 'undefined') { return window; }
+  if (typeof global !== 'undefined') { return global; }
+  if (typeof self !== 'undefined') { return self; }
+  return Function('return this')();
+}.call(null));
+
+var google_api_http_pb = require('../../google/api/http_pb.cjs');
+goog.object.extend(proto, google_api_http_pb);
+var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js');
+goog.object.extend(proto, google_protobuf_descriptor_pb);
+goog.exportSymbol('proto.google.api.http', null, global);
+
+/**
+ * A tuple of {field number, class constructor} for the extension
+ * field named `http`.
+ * @type {!jspb.ExtensionFieldInfo<!proto.google.api.HttpRule>}
+ */
+proto.google.api.http = new jspb.ExtensionFieldInfo(
+    72295728,
+    {http: 0},
+    google_api_http_pb.HttpRule,
+     /** @type {?function((boolean|undefined),!jspb.Message=): !Object} */ (
+         google_api_http_pb.HttpRule.toObject),
+    0);
+
+google_protobuf_descriptor_pb.MethodOptions.extensionsBinary[72295728] = new jspb.ExtensionFieldBinaryInfo(
+    proto.google.api.http,
+    jspb.BinaryReader.prototype.readMessage,
+    jspb.BinaryWriter.prototype.writeMessage,
+    google_api_http_pb.HttpRule.serializeBinaryToWriter,
+    google_api_http_pb.HttpRule.deserializeBinaryFromReader,
+    false);
+// This registers the extension field with the extended class, so that
+// toObject() will function correctly.
+google_protobuf_descriptor_pb.MethodOptions.extensions[72295728] = proto.google.api.http;
+
+goog.object.extend(exports, proto.google.api);