cleanup

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-11 02:00:29 +03:00
parent e7e1ff15f4
commit 1aa324c17f
63 changed files with 2488 additions and 1165 deletions
--- a/server/combo/combo_test.go
+++ b/server/combo/combo_test.go
@@ -75,7 +75,7 @@ func TestComboServer(t *testing.T) {

 	h := &Handler{t: t}

-	_ = logger.DefaultLogger.Init(logger.WithCallerSkipCount(3))
+	_ = logger.DefaultLogger.Init()

 	// create grpc server
 	gsrv := grpcsrv.NewServer(
--- a/server/combo/mgpb/micro_errors.pb.go
+++ b/server/combo/mgpb/micro_errors.pb.go
@@ -0,0 +1,17 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.10.4
+
+package pb
+
+import (
+	protojson "google.golang.org/protobuf/encoding/protojson"
+)
+
+var (
+	marshaler = protojson.MarshalOptions{}
+)
+
+func (m *Error) Error() string {
+	buf, _ := marshaler.Marshal(m)
+	return string(buf)
+}
--- a/server/combo/mgpb/proto_micro.pb.go
+++ b/server/combo/mgpb/proto_micro.pb.go
@@ -1,14 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.2
-// - protoc              v3.21.12
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.28.3
 // source: proto.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
 	client "go.unistack.org/micro/v3/client"
 )
@@ -16,17 +15,6 @@ import (
 var (
 	TestName = "Test"
 )
-var (
-	TestServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "Test.Call",
-			Path:   "/Call",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-	}
-)

 type TestClient interface {
 	Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error)
--- a/server/combo/mgpb/proto_micro_grpc.pb.go
+++ b/server/combo/mgpb/proto_micro_grpc.pb.go
@@ -1,12 +1,11 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: proto.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
@@ -17,7 +16,7 @@ type testClient struct {
 	name string
 }

-func NewTestClient(name string, c client.Client) TestClient {
+func NewTestClient(name string, c client.Client) proto.TestClient {
 	return &testClient{c: c, name: name}
 }

@@ -31,14 +30,14 @@ func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...clien
 }

 type testServer struct {
-	TestServer
+	proto.TestServer
 }

 func (h *testServer) Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error {
 	return h.TestServer.Call(ctx, req, rsp)
 }

-func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
+func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.HandlerOption) error {
 	type test interface {
 		Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error
 	}
@@ -47,6 +46,5 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }
--- a/server/combo/mhpb/micro_errors.pb.go
+++ b/server/combo/mhpb/micro_errors.pb.go
@@ -0,0 +1,17 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.10.4
+
+package pb
+
+import (
+	protojson "google.golang.org/protobuf/encoding/protojson"
+)
+
+var (
+	marshaler = protojson.MarshalOptions{}
+)
+
+func (m *Error) Error() string {
+	buf, _ := marshaler.Marshal(m)
+	return string(buf)
+}
--- a/server/combo/mhpb/proto_micro.pb.go
+++ b/server/combo/mhpb/proto_micro.pb.go
@@ -1,14 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.2
-// - protoc              v3.21.12
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.28.3
 // source: proto.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
 	client "go.unistack.org/micro/v3/client"
 )
@@ -16,17 +15,6 @@ import (
 var (
 	TestName = "Test"
 )
-var (
-	TestServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "Test.Call",
-			Path:   "/Call",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-	}
-)

 type TestClient interface {
 	Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error)
--- a/server/combo/mhpb/proto_micro_http.pb.go
+++ b/server/combo/mhpb/proto_micro_http.pb.go
@@ -1,25 +1,37 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: proto.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-client-http/v3"
-	v31 "go.unistack.org/micro-server-http/v3"
+	v31 "go.unistack.org/micro-client-http/v3"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
 )

+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "Test.Call",
+			Path:   "/Call",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+	}
+)
+
 type testClient struct {
 	c    client.Client
 	name string
 }

-func NewTestClient(name string, c client.Client) TestClient {
+func NewTestClient(name string, c client.Client) proto.TestClient {
 	return &testClient{c: c, name: name}
 }

@@ -27,12 +39,12 @@ func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...clien
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &proto.Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/Call"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/Call"),
+		v31.Body("*"),
 	)
 	rsp := &proto.CallRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Test.Call", req), rsp, opts...)
@@ -43,14 +55,14 @@ func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...clien
 }

 type testServer struct {
-	TestServer
+	proto.TestServer
 }

 func (h *testServer) Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error {
 	return h.TestServer.Call(ctx, req, rsp)
 }

-func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
+func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.HandlerOption) error {
 	type test interface {
 		Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error
 	}
@@ -59,6 +71,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(TestServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }
--- a/server/combo/ngpb/ngpb.pb.go
+++ b/server/combo/ngpb/ngpb.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.21.12
+// 	protoc        v5.28.3
 // source: ngpb.proto

 package pb
--- a/server/combo/ngpb/ngpb_grpc.pb.go
+++ b/server/combo/ngpb/ngpb_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.21.12
+// - protoc-gen-go-grpc v1.5.1
+// - protoc             v5.28.3
 // source: ngpb.proto

 package pb
@@ -15,8 +15,8 @@ import (

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
+// Requires gRPC-Go v1.64.0 or later.
+const _ = grpc.SupportPackageIsVersion9

 const (
 	Test_Call_FullMethodName = "/test.v1.ngpb.Test/Call"
@@ -39,8 +39,9 @@ func NewTestClient(cc grpc.ClientConnInterface) TestClient {
 }

 func (c *testClient) Call(ctx context.Context, in *CallReq, opts ...grpc.CallOption) (*CallRsp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(CallRsp)
-	err := c.cc.Invoke(ctx, Test_Call_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Test_Call_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -49,21 +50,25 @@ func (c *testClient) Call(ctx context.Context, in *CallReq, opts ...grpc.CallOpt

 // TestServer is the server API for Test service.
 // All implementations must embed UnimplementedTestServer
-// for forward compatibility
+// for forward compatibility.
 type TestServer interface {
 	// option (micro.api.micro_service) = { client_wrappers: ["one","two"]; };
 	Call(context.Context, *CallReq) (*CallRsp, error)
 	mustEmbedUnimplementedTestServer()
 }

-// UnimplementedTestServer must be embedded to have forward compatible implementations.
-type UnimplementedTestServer struct {
-}
+// UnimplementedTestServer must be embedded to have
+// forward compatible implementations.
+//
+// NOTE: this should be embedded by value instead of pointer to avoid a nil
+// pointer dereference when methods are called.
+type UnimplementedTestServer struct{}

 func (UnimplementedTestServer) Call(context.Context, *CallReq) (*CallRsp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Call not implemented")
 }
 func (UnimplementedTestServer) mustEmbedUnimplementedTestServer() {}
+func (UnimplementedTestServer) testEmbeddedByValue()              {}

 // UnsafeTestServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to TestServer will
@@ -73,6 +78,13 @@ type UnsafeTestServer interface {
 }

 func RegisterTestServer(s grpc.ServiceRegistrar, srv TestServer) {
+	// If the following call pancis, it indicates UnimplementedTestServer was
+	// embedded by pointer and is nil.  This will cause panics if an
+	// unimplemented method is ever invoked, so we test this at initialization
+	// time to prevent it from happening at runtime later due to I/O.
+	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
+		t.testEmbeddedByValue()
+	}
 	s.RegisterService(&Test_ServiceDesc, srv)
 }

--- a/server/combo/proto/proto.pb.go
+++ b/server/combo/proto/proto.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.21.12
+// 	protoc        v5.28.3
 // source: proto.proto

 package pb
--- a/server/grpc/gproto/test_micro.pb.go
+++ b/server/grpc/gproto/test_micro.pb.go
@@ -1,37 +1,47 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.2
-// - protoc              v3.21.12
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.28.3
 // source: test.proto

 package helloworld

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/grpc/proto"
 	client "go.unistack.org/micro/v3/client"
+	metadata "go.unistack.org/micro/v3/metadata"
 )

 var (
 	TestName = "Test"
 )
-var (
-	TestServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "Test.Call",
-			Path:   "/api/v0/test/call/TEST",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-	}
-)

 type TestClient interface {
 	Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error)
+	StreamCall(ctx context.Context, opts ...client.CallOption) (Test_StreamCallClient, error)
+}
+
+type Test_StreamCallClient interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Header() metadata.Metadata
+	Send(msg *proto.Request) error
+	Recv() (*proto.Response, error)
 }

 type TestServer interface {
 	Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error
+	StreamCall(ctx context.Context, stream Test_StreamCallStream) error
+}
+
+type Test_StreamCallStream interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Recv() (*proto.Request, error)
+	Send(msg *proto.Response) error
 }
--- a/server/grpc/gproto/test_micro_grpc.pb.go
+++ b/server/grpc/gproto/test_micro_grpc.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: test.proto

 package helloworld

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/grpc/proto"
 	client "go.unistack.org/micro/v3/client"
+	metadata "go.unistack.org/micro/v3/metadata"
 	server "go.unistack.org/micro/v3/server"
 )

@@ -17,7 +17,7 @@ type testClient struct {
 	name string
 }

-func NewTestClient(name string, c client.Client) TestClient {
+func NewTestClient(name string, c client.Client) proto.TestClient {
 	return &testClient{c: c, name: name}
 }

@@ -30,23 +30,107 @@ func (c *testClient) Call(ctx context.Context, req *proto.Request, opts ...clien
 	return rsp, nil
 }

+func (c *testClient) StreamCall(ctx context.Context, opts ...client.CallOption) (Test_StreamCallClient, error) {
+	stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Test.StreamCall", &proto.Request{}), opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &testClientStreamCall{stream}, nil
+}
+
+type testClientStreamCall struct {
+	stream client.Stream
+}
+
+func (s *testClientStreamCall) Close() error {
+	return s.stream.Close()
+}
+
+func (s *testClientStreamCall) CloseSend() error {
+	return s.stream.CloseSend()
+}
+
+func (s *testClientStreamCall) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *testClientStreamCall) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testClientStreamCall) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *testClientStreamCall) Header() metadata.Metadata {
+	return s.stream.Response().Header()
+}
+
+func (s *testClientStreamCall) Send(msg *proto.Request) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testClientStreamCall) Recv() (*proto.Response, error) {
+	msg := &proto.Response{}
+	if err := s.stream.Recv(msg); err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
 type testServer struct {
-	TestServer
+	proto.TestServer
 }

 func (h *testServer) Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error {
 	return h.TestServer.Call(ctx, req, rsp)
 }

-func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
+func (h *testServer) StreamCall(ctx context.Context, stream server.Stream) error {
+	return h.TestServer.StreamCall(ctx, &testStreamCallStream{stream})
+}
+
+type testStreamCallStream struct {
+	stream server.Stream
+}
+
+func (s *testStreamCallStream) Close() error {
+	return s.stream.Close()
+}
+
+func (s *testStreamCallStream) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *testStreamCallStream) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testStreamCallStream) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *testStreamCallStream) Send(msg *proto.Response) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testStreamCallStream) Recv() (*proto.Request, error) {
+	msg := &proto.Request{}
+	if err := s.stream.Recv(msg); err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
+func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.HandlerOption) error {
 	type test interface {
 		Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error
+		StreamCall(ctx context.Context, stream server.Stream) error
 	}
 	type Test struct {
 		test
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }
--- a/server/grpc/proto/test.pb.go
+++ b/server/grpc/proto/test.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.21.12
+// 	protoc        v5.28.3
 // source: test.proto

 package helloworld
@@ -204,13 +204,17 @@ var file_test_proto_rawDesc = []byte{
 	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x2a, 0x0a, 0x06,
 	0x62, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x68,
 	0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x42, 0x72, 0x6f, 0x6b, 0x65, 0x6e,
-	0x52, 0x06, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x32, 0x5c, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74,
-	0x12, 0x54, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x13, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f,
-	0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e,
-	0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x21, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x1b, 0x22, 0x16, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x76, 0x30, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x63, 0x61, 0x6c, 0x6c, 0x2f, 0x54,
-	0x45, 0x53, 0x54, 0x3a, 0x01, 0x2a, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69,
+	0x52, 0x06, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x32, 0x9b, 0x01, 0x0a, 0x04, 0x54, 0x65, 0x73,
+	0x74, 0x12, 0x54, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x13, 0x2e, 0x68, 0x65, 0x6c, 0x6c,
+	0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14,
+	0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x1b, 0x22, 0x16, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x76, 0x30, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x63, 0x61, 0x6c, 0x6c, 0x2f,
+	0x54, 0x45, 0x53, 0x54, 0x3a, 0x01, 0x2a, 0x12, 0x3d, 0x0a, 0x0a, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x13, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72,
+	0x6c, 0x64, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x68, 0x65, 0x6c,
+	0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69,
 	0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d,
 	0x74, 0x65, 0x73, 0x74, 0x73, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x67, 0x72, 0x70,
 	0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72,
@@ -239,9 +243,11 @@ var file_test_proto_depIdxs = []int32{
 	1, // 0: helloworld.Request.broken:type_name -> helloworld.Broken
 	1, // 1: helloworld.Response.broken:type_name -> helloworld.Broken
 	0, // 2: helloworld.Test.Call:input_type -> helloworld.Request
-	2, // 3: helloworld.Test.Call:output_type -> helloworld.Response
-	3, // [3:4] is the sub-list for method output_type
-	2, // [2:3] is the sub-list for method input_type
+	0, // 3: helloworld.Test.StreamCall:input_type -> helloworld.Request
+	2, // 4: helloworld.Test.Call:output_type -> helloworld.Response
+	2, // 5: helloworld.Test.StreamCall:output_type -> helloworld.Response
+	4, // [4:6] is the sub-list for method output_type
+	2, // [2:4] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
 	2, // [2:2] is the sub-list for extension extendee
 	0, // [0:2] is the sub-list for field type_name
--- a/server/grpc/proto/test.proto
+++ b/server/grpc/proto/test.proto
@@ -13,6 +13,7 @@ service Test {
      body: "*";
    };
  }
+  rpc StreamCall(stream Request) returns (stream Response) {};
 }

 message Request {
--- a/server/grpc/proto/test_grpc.pb.go
+++ b/server/grpc/proto/test_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.21.12
+// - protoc-gen-go-grpc v1.5.1
+// - protoc             v5.28.3
 // source: test.proto

 package helloworld
@@ -15,11 +15,12 @@ import (

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
+// Requires gRPC-Go v1.64.0 or later.
+const _ = grpc.SupportPackageIsVersion9

 const (
-	Test_Call_FullMethodName = "/helloworld.Test/Call"
+	Test_Call_FullMethodName       = "/helloworld.Test/Call"
+	Test_StreamCall_FullMethodName = "/helloworld.Test/StreamCall"
 )

 // TestClient is the client API for Test service.
@@ -27,6 +28,7 @@ const (
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type TestClient interface {
 	Call(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error)
+	StreamCall(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[Request, Response], error)
 }

 type testClient struct {
@@ -38,30 +40,52 @@ func NewTestClient(cc grpc.ClientConnInterface) TestClient {
 }

 func (c *testClient) Call(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, Test_Call_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, Test_Call_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

+func (c *testClient) StreamCall(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[Request, Response], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Test_ServiceDesc.Streams[0], Test_StreamCall_FullMethodName, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &grpc.GenericClientStream[Request, Response]{ClientStream: stream}
+	return x, nil
+}
+
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Test_StreamCallClient = grpc.BidiStreamingClient[Request, Response]
+
 // TestServer is the server API for Test service.
 // All implementations must embed UnimplementedTestServer
-// for forward compatibility
+// for forward compatibility.
 type TestServer interface {
 	Call(context.Context, *Request) (*Response, error)
+	StreamCall(grpc.BidiStreamingServer[Request, Response]) error
 	mustEmbedUnimplementedTestServer()
 }

-// UnimplementedTestServer must be embedded to have forward compatible implementations.
-type UnimplementedTestServer struct {
-}
+// UnimplementedTestServer must be embedded to have
+// forward compatible implementations.
+//
+// NOTE: this should be embedded by value instead of pointer to avoid a nil
+// pointer dereference when methods are called.
+type UnimplementedTestServer struct{}

 func (UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Call not implemented")
 }
+func (UnimplementedTestServer) StreamCall(grpc.BidiStreamingServer[Request, Response]) error {
+	return status.Errorf(codes.Unimplemented, "method StreamCall not implemented")
+}
 func (UnimplementedTestServer) mustEmbedUnimplementedTestServer() {}
+func (UnimplementedTestServer) testEmbeddedByValue()              {}

 // UnsafeTestServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to TestServer will
@@ -71,6 +95,13 @@ type UnsafeTestServer interface {
 }

 func RegisterTestServer(s grpc.ServiceRegistrar, srv TestServer) {
+	// If the following call pancis, it indicates UnimplementedTestServer was
+	// embedded by pointer and is nil.  This will cause panics if an
+	// unimplemented method is ever invoked, so we test this at initialization
+	// time to prevent it from happening at runtime later due to I/O.
+	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
+		t.testEmbeddedByValue()
+	}
 	s.RegisterService(&Test_ServiceDesc, srv)
 }

@@ -92,6 +123,13 @@ func _Test_Call_Handler(srv interface{}, ctx context.Context, dec func(interface
 	return interceptor(ctx, in, info, handler)
 }

+func _Test_StreamCall_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(TestServer).StreamCall(&grpc.GenericServerStream[Request, Response]{ServerStream: stream})
+}
+
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Test_StreamCallServer = grpc.BidiStreamingServer[Request, Response]
+
 // Test_ServiceDesc is the grpc.ServiceDesc for Test service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -104,6 +142,13 @@ var Test_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _Test_Call_Handler,
 		},
 	},
-	Streams:  []grpc.StreamDesc{},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "StreamCall",
+			Handler:       _Test_StreamCall_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
+	},
 	Metadata: "test.proto",
 }
--- a/server/http-handler/swaggerui_test.go
+++ b/server/http-handler/swaggerui_test.go
@@ -0,0 +1,17 @@
+package http_handler
+
+import (
+	"net/http"
+	"testing"
+
+	swaggerui "go.unistack.org/micro-server-http/v3/handler/swagger-ui"
+)
+
+func TestTemplate(t *testing.T) {
+	// t.Skip()
+	h := http.NewServeMux()
+	h.HandleFunc("/", swaggerui.Handler(""))
+	if err := http.ListenAndServe(":8080", h); err != nil {
+		t.Fatal(err)
+	}
+}
--- a/server/http/http_test.go
+++ b/server/http/http_test.go
@@ -24,10 +24,7 @@ import (
 	meterhandler "go.unistack.org/micro-server-http/v3/handler/meter"
 	pb "go.unistack.org/micro-tests/server/http/proto"
 	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/logger"
-	lwrapper "go.unistack.org/micro/v3/logger/wrapper"
 	"go.unistack.org/micro/v3/metadata"
-	mwrapper "go.unistack.org/micro/v3/meter/wrapper"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
 	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
@@ -363,8 +360,6 @@ func TestNativeClientServer(t *testing.T) {
 		server.Register(reg),
 		server.Codec("application/json", jsonpbcodec.NewCodec()),
 		server.Codec("application/x-www-form-urlencoded", urlencodecodec.NewCodec()),
-		server.WrapHandler(mwrapper.NewHandlerWrapper(mwrapper.Meter(m))),
-		server.WrapHandler(lwrapper.NewServerHandlerWrapper(lwrapper.WithEnabled(false), lwrapper.WithLevel(logger.ErrorLevel))),
 		httpsrv.Middleware(mwf),
 		server.WrapHandler(NewServerHandlerWrapper(t)),
 	)
--- a/server/http/proto/micro_errors.pb.go
+++ b/server/http/proto/micro_errors.pb.go
@@ -0,0 +1,17 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.10.4
+
+package pb
+
+import (
+	protojson "google.golang.org/protobuf/encoding/protojson"
+)
+
+var (
+	marshaler = protojson.MarshalOptions{}
+)
+
+func (m *Error) Error() string {
+	buf, _ := marshaler.Marshal(m)
+	return string(buf)
+}
--- a/server/http/proto/test.pb.go
+++ b/server/http/proto/test.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.21.12
+// 	protoc        v5.28.3
 // source: test.proto

 package pb
--- a/server/http/proto/test_micro.pb.go
+++ b/server/http/proto/test_micro.pb.go
@@ -1,31 +1,19 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.2
-// - protoc              v3.21.12
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.28.3
 // source: test.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )

 var (
 	TestDoubleName = "TestDouble"
 )
-var (
-	TestDoubleServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "TestDouble.CallDouble",
-			Path:   "/v1/testdouble/call/name/{name}",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-	}
-)

 type TestDoubleClient interface {
 	CallDouble(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)
@@ -38,38 +26,6 @@ type TestDoubleServer interface {
 var (
 	TestName = "Test"
 )
-var (
-	TestServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "Test.CallRepeatedString",
-			Path:   "/v1/test/call_repeated_string",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "Test.CallRepeatedInt64",
-			Path:   "/v1/test/call_repeated_int64",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "Test.Call",
-			Path:   "/v1/test/call/{name}",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "Test.CallError",
-			Path:   "/v1/test/callerror/{name}",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-	}
-)

 type TestClient interface {
 	CallRepeatedString(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)
--- a/server/http/proto/test_micro_http.pb.go
+++ b/server/http/proto/test_micro_http.pb.go
@@ -1,19 +1,31 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: test.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-client-http/v3"
-	v31 "go.unistack.org/micro-server-http/v3"
+	v31 "go.unistack.org/micro-client-http/v3"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
 	time "time"
 )

+var (
+	TestDoubleServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "TestDouble.CallDouble",
+			Path:   "/v1/testdouble/call/name/{name}",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+	}
+)
+
 type testDoubleClient struct {
 	c    client.Client
 	name string
@@ -27,12 +39,12 @@ func (c *testDoubleClient) CallDouble(ctx context.Context, req *CallReq, opts ..
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/v1/testdouble/call/name/{name}"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/v1/testdouble/call/name/{name}"),
+		v31.Body("*"),
 	)
 	td := time.Duration(5000000000)
 	opts = append(opts, client.WithRequestTimeout(td))
@@ -65,10 +77,43 @@ func RegisterTestDoubleServer(s server.Server, sh TestDoubleServer, opts ...serv
 	}
 	h := &testDoubleServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(TestDoubleServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(TestDoubleServerEndpoints))
 	return s.Handle(s.NewHandler(&TestDouble{h}, append(nopts, opts...)...))
 }

+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "Test.CallRepeatedString",
+			Path:   "/v1/test/call_repeated_string",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "Test.CallRepeatedInt64",
+			Path:   "/v1/test/call_repeated_int64",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "Test.Call",
+			Path:   "/v1/test/call/{name}",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "Test.CallError",
+			Path:   "/v1/test/callerror/{name}",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+	}
+)
+
 type testClient struct {
 	c    client.Client
 	name string
@@ -82,12 +127,12 @@ func (c *testClient) CallRepeatedString(ctx context.Context, req *CallReq, opts
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/v1/test/call_repeated_string"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/v1/test/call_repeated_string"),
+		v31.Body("*"),
 	)
 	td := time.Duration(5000000000)
 	opts = append(opts, client.WithRequestTimeout(td))
@@ -103,12 +148,12 @@ func (c *testClient) CallRepeatedInt64(ctx context.Context, req *CallReq, opts .
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/v1/test/call_repeated_int64"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/v1/test/call_repeated_int64"),
+		v31.Body("*"),
 	)
 	td := time.Duration(5000000000)
 	opts = append(opts, client.WithRequestTimeout(td))
@@ -124,16 +169,16 @@ func (c *testClient) Call(ctx context.Context, req *CallReq, opts ...client.Call
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/v1/test/call/{name}"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/v1/test/call/{name}"),
+		v31.Body("*"),
 	)
 	opts = append(opts,
-		v3.Header("Clientid", "true"),
-		v3.Cookie("Csrftoken", "true"),
+		v31.Header("Clientid", "true"),
+		v31.Cookie("Csrftoken", "true"),
 	)
 	td := time.Duration(5000000000)
 	opts = append(opts, client.WithRequestTimeout(td))
@@ -149,12 +194,12 @@ func (c *testClient) CallError(ctx context.Context, req *CallReq1, opts ...clien
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/v1/test/callerror/{name}"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/v1/test/callerror/{name}"),
+		v31.Body("*"),
 	)
 	rsp := &CallRsp1{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Test.CallError", req), rsp, opts...)
@@ -189,9 +234,9 @@ func (h *testServer) Call(ctx context.Context, req *CallReq, rsp *CallRsp) error
 	td := time.Duration(5000000000)
 	ctx, cancel = context.WithTimeout(ctx, td)
 	defer cancel()
-	v31.FillRequest(ctx, req,
-		v31.Header("Clientid", "true"),
-		v31.Cookie("Csrftoken", "true"),
+	v3.FillRequest(ctx, req,
+		v3.Header("Clientid", "true"),
+		v3.Cookie("Csrftoken", "true"),
 	)
 	return h.TestServer.Call(ctx, req, rsp)
 }
@@ -212,6 +257,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(TestServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }