Rename to fastad (lowercase), fix multiproto wrapper

Author: pomo-mondreganto

cmd/receiver/main.go

@@ -9,11 +9,11 @@ import (
 	"syscall"
 	"time"
 
-	"FastAD/internal/pinger"
-	"FastAD/internal/receiver"
-	"FastAD/internal/wrapper"
-	pingerpb "FastAD/pkg/proto/pinger"
-	receiverpb "FastAD/pkg/proto/receiver"
+	"fastad/internal/multiproto"
+	"fastad/internal/pinger"
+	"fastad/internal/receiver"
+	pingerpb "fastad/pkg/proto/pinger"
+	receiverpb "fastad/pkg/proto/receiver"
 
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
@@ -30,8 +30,10 @@ func main() {
 	pingerpb.RegisterPingerServiceServer(grpcServer, pinger.New())
 	reflection.Register(grpcServer)
 
-	httpServer := wrapper.NewServer(grpcServer)
-	httpServer.Addr = "0.0.0.0:8002"
+	httpServer := &http.Server{
+		Addr:    "0.0.0.0:8002",
+		Handler: multiproto.NewHandler(grpcServer),
+	}
 
 	go func() {
 		logrus.Infof("Running http server on %s", httpServer.Addr)

go.mod

@@ -1,4 +1,4 @@
-module FastAD
+module fastad
 
 go 1.18
 

internal/multiproto/wrapper.go

@@ -0,0 +1,52 @@
+package multiproto
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/improbable-eng/grpc-web/go/grpcweb"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/h2c"
+	"google.golang.org/grpc"
+)
+
+func OriginAllowed(_ string) bool {
+	return true
+}
+
+func WebSocketOriginAllowed(_ *http.Request) bool {
+	return true
+}
+
+func NewHandler(grpcServer *grpc.Server) http.Handler {
+	return h2c.NewHandler(
+		&Handler{
+			grpcServer: grpcServer,
+			webServer: grpcweb.WrapServer(
+				grpcServer,
+				grpcweb.WithWebsockets(true),
+				grpcweb.WithOriginFunc(OriginAllowed),
+				grpcweb.WithWebsocketOriginFunc(WebSocketOriginAllowed),
+			),
+			httpHandler: http.DefaultServeMux,
+		},
+		&http2.Server{},
+	)
+}
+
+type Handler struct {
+	grpcServer  *grpc.Server
+	webServer   *grpcweb.WrappedGrpcServer
+	httpHandler http.Handler
+}
+
+func (s *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch {
+	case r.ProtoMajor == 2 && strings.Contains(r.Header.Get("Content-Type"), "application/grpc"):
+		s.grpcServer.ServeHTTP(w, r)
+	case s.webServer.IsGrpcWebRequest(r) || s.webServer.IsGrpcWebSocketRequest(r):
+		s.webServer.ServeHTTP(w, r)
+	default:
+		s.httpHandler.ServeHTTP(w, r)
+	}
+}

internal/pinger/pinger.go

@@ -3,7 +3,7 @@ package pinger
 import (
 	"context"
 
-	pingerpb "FastAD/pkg/proto/pinger"
+	pingerpb "fastad/pkg/proto/pinger"
 )
 
 func New() *Service {

internal/receiver/receiver.go

@@ -3,7 +3,7 @@ package receiver
 import (
 	"context"
 
-	receiverpb "FastAD/pkg/proto/receiver"
+	receiverpb "fastad/pkg/proto/receiver"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

internal/wrapper/wrapper.go

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package pinger;
-option go_package = "FastAD/pkg/proto/pinger";
+option go_package = "fastad/pkg/proto/pinger";
 
 message PingRequest {}
 

proto/pinger/pinger.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package pinger;
-option go_package = "FastAD/pkg/proto/pinger";
+option go_package = "fastad/pkg/proto/pinger";
 
 import "pinger/pinger.proto";
 

proto/pinger/pinger_service.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package receiver;
-option go_package = "FastAD/pkg/proto/receiver";
+option go_package = "fastad/pkg/proto/receiver";
 
 message SubmitFlagsRequest {
     repeated string flags = 1;

proto/receiver/receiver.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package receiver;
-option go_package = "FastAD/pkg/proto/receiver";
+option go_package = "fastad/pkg/proto/receiver";
 
 import "receiver/receiver.proto";