go-kratos · NathanBaulch · Apr 15, 2024 · Sep 19, 2024
diff --git a/api/metadata/metadata_http.pb.go b/api/metadata/metadata_http.pb.go
diff --git a/cmd/protoc-gen-go-http/httpTemplate.tpl b/cmd/protoc-gen-go-http/httpTemplate.tpl
@@ -38,6 +38,7 @@ func _{{$svrType}}_{{.Name}}{{.Num}}_HTTP_Handler(srv {{$svrType}}HTTPServer) fu
 			return err
 		}
 		{{- end}}
+		http.SetServer(ctx, srv)
 		http.SetOperation(ctx,Operation{{$svrType}}{{.OriginalName}})
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
 			return srv.{{.Name}}(ctx, req.(*{{.Request}}))

diff --git a/encoding/form/proto_encode.go b/encoding/form/proto_encode.go
@@ -21,10 +21,7 @@ func EncodeValues(msg interface{}) (url.Values, error) {
 	if v, ok := msg.(proto.Message); ok {
 		u := make(url.Values)
 		err := encodeByField(u, "", v.ProtoReflect())
-		if err != nil {
-			return nil, err
-		}
-		return u, nil
+		return u, err
 	}
 	return encoder.Encode(msg)
 }
@@ -56,7 +53,6 @@ func encodeByField(u url.Values, path string, m protoreflect.Message) (finalErr
 				list, err := encodeRepeatedField(fd, v.List())
 				if err != nil {
 					finalErr = err
-					return false
 				}
 				for _, item := range list {
 					u.Add(newPath, item)
@@ -67,7 +63,6 @@ func encodeByField(u url.Values, path string, m protoreflect.Message) (finalErr
 				m, err := encodeMapField(fd, v.Map())
 				if err != nil {
 					finalErr = err
-					return false
 				}
 				for k, value := range m {
 					u.Set(fmt.Sprintf("%s[%s]", newPath, k), value)
@@ -81,13 +76,11 @@ func encodeByField(u url.Values, path string, m protoreflect.Message) (finalErr
 			}
 			if err = encodeByField(u, newPath, v.Message()); err != nil {
 				finalErr = err
-				return false
 			}
 		default:
 			value, err := EncodeField(fd, v)
 			if err != nil {
 				finalErr = err
-				return false
 			}
 			u.Set(newPath, value)
 		}

diff --git a/internal/testdata/helloworld/helloworld_http.pb.go b/internal/testdata/helloworld/helloworld_http.pb.go
diff --git a/middleware/auth/jwt/jwt_test.go b/middleware/auth/jwt/jwt_test.go
@@ -61,6 +61,10 @@ func (tr *Transport) Endpoint() string {
 	return tr.endpoint
 }
 
+func (tr *Transport) Server() interface{} {
+	return nil
+}
+
 func (tr *Transport) Operation() string {
 	return tr.operation
 }

diff --git a/middleware/circuitbreaker/circuitbreaker_test.go b/middleware/circuitbreaker/circuitbreaker_test.go
@@ -28,6 +28,10 @@ func (tr *transportMock) Endpoint() string {
 	return tr.endpoint
 }
 
+func (tr *transportMock) Server() interface{} {
+	return nil
+}
+
 func (tr *transportMock) Operation() string {
 	return tr.operation
 }

diff --git a/middleware/logging/logging_test.go b/middleware/logging/logging_test.go
@@ -27,6 +27,10 @@ func (tr *Transport) Endpoint() string {
 	return tr.endpoint
 }
 
+func (tr *Transport) Server() interface{} {
+	return nil
+}
+
 func (tr *Transport) Operation() string {
 	return tr.operation
 }

diff --git a/middleware/metadata/metadata_test.go b/middleware/metadata/metadata_test.go
@@ -37,6 +37,7 @@ type testTransport struct{ header headerCarrier }
 
 func (tr *testTransport) Kind() transport.Kind            { return transport.KindHTTP }
 func (tr *testTransport) Endpoint() string                { return "" }
+func (tr *testTransport) Server() interface{}             { return nil }
 func (tr *testTransport) Operation() string               { return "" }
 func (tr *testTransport) RequestHeader() transport.Header { return tr.header }
 func (tr *testTransport) ReplyHeader() transport.Header   { return tr.header }

diff --git a/middleware/selector/selector_test.go b/middleware/selector/selector_test.go
@@ -27,6 +27,10 @@ func (tr *Transport) Endpoint() string {
 	return tr.endpoint
 }
 
+func (tr *Transport) Server() interface{} {
+	return nil
+}
+
 func (tr *Transport) Operation() string {
 	return tr.operation
 }

diff --git a/middleware/tracing/tracing_test.go b/middleware/tracing/tracing_test.go
@@ -58,6 +58,7 @@ type mockTransport struct {
 
 func (tr *mockTransport) Kind() transport.Kind            { return tr.kind }
 func (tr *mockTransport) Endpoint() string                { return tr.endpoint }
+func (tr *mockTransport) Server() interface{}             { return nil }
 func (tr *mockTransport) Operation() string               { return tr.operation }
 func (tr *mockTransport) RequestHeader() transport.Header { return tr.header }
 func (tr *mockTransport) ReplyHeader() transport.Header   { return tr.header }

diff --git a/transport/grpc/interceptor.go b/transport/grpc/interceptor.go
@@ -22,6 +22,7 @@ func (s *Server) unaryServerInterceptor() grpc.UnaryServerInterceptor {
 		replyHeader := grpcmd.MD{}
 		tr := &Transport{
 			operation:   info.FullMethod,
+			server:      info.Server,
 			reqHeader:   headerCarrier(md),
 			replyHeader: headerCarrier(replyHeader),
 		}
@@ -75,6 +76,7 @@ func (s *Server) streamServerInterceptor() grpc.StreamServerInterceptor {
 		replyHeader := grpcmd.MD{}
 		ctx = transport.NewServerContext(ctx, &Transport{
 			endpoint:    s.endpoint.String(),
+			server:      srv,
 			operation:   info.FullMethod,
 			reqHeader:   headerCarrier(md),
 			replyHeader: headerCarrier(replyHeader),

diff --git a/transport/grpc/transport.go b/transport/grpc/transport.go
@@ -12,6 +12,7 @@ var _ transport.Transporter = (*Transport)(nil)
 // Transport is a gRPC transport.
 type Transport struct {
 	endpoint    string
+	server      interface{}
 	operation   string
 	reqHeader   headerCarrier
 	replyHeader headerCarrier
@@ -28,6 +29,11 @@ func (tr *Transport) Endpoint() string {
 	return tr.endpoint
 }
 
+// Server returns the transport server.
+func (tr *Transport) Server() interface{} {
+	return tr.server
+}
+
 // Operation returns the transport operation.
 func (tr *Transport) Operation() string {
 	return tr.operation

diff --git a/transport/grpc/transport_test.go b/transport/grpc/transport_test.go
@@ -23,6 +23,14 @@ func TestTransport_Endpoint(t *testing.T) {
 	}
 }
 
+func TestTransport_Server(t *testing.T) {
+	v := struct{}{}
+	o := &Transport{server: v}
+	if !reflect.DeepEqual(v, o.Server()) {
+		t.Errorf("expect %v, got %v", v, o.Server())
+	}
+}
+
 func TestTransport_Operation(t *testing.T) {
 	v := "hello"
 	o := &Transport{operation: v}

diff --git a/transport/http/transport.go b/transport/http/transport.go
@@ -18,6 +18,7 @@
 
 // Transport is an HTTP transport.
 type Transport struct {
+	server       interface{}
 	endpoint     string
 	operation    string
 	reqHeader    headerCarrier
@@ -37,6 +38,11 @@
 	return tr.endpoint
 }
 
+// Server returns the transport server.
+func (tr *Transport) Server() interface{} {
+	return tr.server
+}
+
 // Operation returns the transport operation.
 func (tr *Transport) Operation() string {
 	return tr.operation
@@ -71,6 +77,15 @@
 	}
 }
 
+// SetServer sets the transport server.
+func SetServer(ctx context.Context, srv interface{}) {
+	if tr, ok := transport.FromServerContext(ctx); ok {
+		if tr, ok := tr.(*Transport); ok {
+			tr.server = srv
+		}
+	}
+}
+
 // SetCookie adds a Set-Cookie header to the provided [ResponseWriter]'s headers.
 // The provided cookie must have a valid Name. Invalid cookies may be
 // silently dropped.

diff --git a/transport/http/transport_test.go b/transport/http/transport_test.go
@@ -84,6 +84,16 @@ func TestHeaderCarrier_Keys(t *testing.T) {
 	}
 }
 
+func TestSetServer(t *testing.T) {
+	tr := &Transport{}
+	ctx := transport.NewServerContext(context.Background(), tr)
+	srv := struct{}{}
+	SetServer(ctx, srv)
+	if !reflect.DeepEqual(tr.server, srv) {
+		t.Errorf("expect %v, got %v", srv, tr.server)
+	}
+}
+
 func TestSetOperation(t *testing.T) {
 	tr := &Transport{}
 	ctx := transport.NewServerContext(context.Background(), tr)

diff --git a/transport/transport.go b/transport/transport.go
@@ -42,6 +42,8 @@ type Transporter interface {
 	// Server Transport: grpc://127.0.0.1:9000
 	// Client Transport: discovery:///provider-demo
 	Endpoint() string
+	// Server return server implementation
+	Server() interface{}
 	// Operation Service full method selector generated by protobuf
 	// example: /helloworld.Greeter/SayHello
 	Operation() string

diff --git a/transport/transport_test.go b/transport/transport_test.go
@@ -22,6 +22,11 @@ func (tr *mockTransport) Endpoint() string {
 	return tr.endpoint
 }
 
+// Server returns the transport server.
+func (tr *mockTransport) Server() interface{} {
+	return nil
+}
+
 // Operation returns the transport operation.
 func (tr *mockTransport) Operation() string {
 	return tr.operation