cleanup

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

client/drpc/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

client/drpc/proto/test_drpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-drpc. DO NOT EDIT.
-// protoc-gen-go-drpc version: v0.0.32
+// protoc-gen-go-drpc version: v0.0.34
 // source: test.proto
 
 package pb

client/drpc/proto/test_micro.pb.go

@@ -1,23 +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 (
 	TestServiceName = "TestService"
 )
-var (
-	TestServiceServerEndpoints = []v3.EndpointMetadata{}
-)
 
 type TestServiceClient interface {
 	Call(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)

client/drpc/proto/test_micro_rpc.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: test.proto
 
 package pb
 
 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 )
@@ -60,6 +59,5 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se
 	}
 	h := &testServiceServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(TestServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...))
 }

client/grpc/gproto/test_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: test.proto
 
 package helloworld
 
 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/client/grpc/proto"
 	client "go.unistack.org/micro/v3/client"
 	metadata "go.unistack.org/micro/v3/metadata"
@@ -17,9 +16,6 @@ import (
 var (
 	TestName = "Test"
 )
-var (
-	TestServerEndpoints = []v3.EndpointMetadata{}
-)
 
 type TestClient interface {
 	Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error)

client/grpc/gproto/test_micro_rpc.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: test.proto
 
 package helloworld
 
 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/client/grpc/proto"
 	client "go.unistack.org/micro/v3/client"
 	metadata "go.unistack.org/micro/v3/metadata"
@@ -18,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}
 }
 
@@ -80,7 +79,7 @@ func (s *testClientStream) Recv() (*proto.Response, error) {
 }
 
 type testServer struct {
-	TestServer
+	proto.TestServer
 }
 
 func (h *testServer) Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error {
@@ -123,7 +122,7 @@ func (s *testStreamStream) Recv() (*proto.Request, error) {
 	return msg, nil
 }
 
-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.Request, rsp *proto.Response) error
 		Stream(ctx context.Context, stream server.Stream) error
@@ -133,6 +132,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...)...))
 }

client/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

client/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,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   = "/helloworld.Test/Call"
@@ -28,7 +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)
-	Stream(ctx context.Context, opts ...grpc.CallOption) (Test_StreamClient, error)
+	Stream(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[Request, Response], error)
 }
 
 type testClient struct {
@@ -40,65 +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) Stream(ctx context.Context, opts ...grpc.CallOption) (Test_StreamClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Test_ServiceDesc.Streams[0], Test_Stream_FullMethodName, opts...)
+func (c *testClient) Stream(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_Stream_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &testStreamClient{stream}
+	x := &grpc.GenericClientStream[Request, Response]{ClientStream: stream}
 	return x, nil
 }
 
-type Test_StreamClient interface {
-	Send(*Request) error
-	Recv() (*Response, error)
-	grpc.ClientStream
-}
-
-type testStreamClient struct {
-	grpc.ClientStream
-}
-
-func (x *testStreamClient) Send(m *Request) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testStreamClient) Recv() (*Response, error) {
-	m := new(Response)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Test_StreamClient = 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)
-	Stream(Test_StreamServer) error
+	Stream(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) Stream(Test_StreamServer) error {
+func (UnimplementedTestServer) Stream(grpc.BidiStreamingServer[Request, Response]) error {
 	return status.Errorf(codes.Unimplemented, "method Stream 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
@@ -108,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)
 }
 
@@ -130,30 +124,11 @@ func _Test_Call_Handler(srv interface{}, ctx context.Context, dec func(interface
 }
 
 func _Test_Stream_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServer).Stream(&testStreamServer{stream})
+	return srv.(TestServer).Stream(&grpc.GenericServerStream[Request, Response]{ServerStream: stream})
 }
 
-type Test_StreamServer interface {
-	Send(*Response) error
-	Recv() (*Request, error)
-	grpc.ServerStream
-}
-
-type testStreamServer struct {
-	grpc.ServerStream
-}
-
-func (x *testStreamServer) Send(m *Response) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testStreamServer) Recv() (*Request, error) {
-	m := new(Request)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type Test_StreamServer = grpc.BidiStreamingServer[Request, Response]
 
 // Test_ServiceDesc is the grpc.ServiceDesc for Test service.
 // It's only intended for direct use with grpc.RegisterService,

client/http/proto/github.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: github.proto
 
 package pb

client/http/proto/github_micro.pb.go

@@ -1,38 +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: github.proto
 
 package pb
 
 import (
 	context "context"
-	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	GithubName = "Github"
 )
-var (
-	GithubServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "Github.LookupUser",
-			Path:   "/users/{username}",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "Github.LookupUserWithoutPath",
-			Path:   "/{username}",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-	}
-)
 
 type GithubClient interface {
 	LookupUser(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error)

client/http/proto/github_micro_http.pb.go

@@ -1,18 +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: github.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"
 )
 
+var (
+	GithubServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "Github.LookupUser",
+			Path:   "/users/{username}",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "Github.LookupUserWithoutPath",
+			Path:   "/{username}",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+	}
+)
+
 type githubClient struct {
 	c    client.Client
 	name string
@@ -26,11 +45,11 @@ func (c *githubClient) LookupUser(ctx context.Context, req *LookupUserReq, 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.MethodGet),
-		v3.Path("/users/{username}"),
+		v31.Method(http.MethodGet),
+		v31.Path("/users/{username}"),
 	)
 	rsp := &LookupUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Github.LookupUser", req), rsp, opts...)
@@ -44,11 +63,11 @@ func (c *githubClient) LookupUserWithoutPath(ctx context.Context, req *LookupUse
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodGet),
-		v3.Path("/{username}"),
+		v31.Method(http.MethodGet),
+		v31.Path("/{username}"),
 	)
 	rsp := &LookupUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Github.LookupUserWithoutPath", req), rsp, opts...)
@@ -80,6 +99,6 @@ func RegisterGithubServer(s server.Server, sh GithubServer, opts ...server.Handl
 	}
 	h := &githubServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(GithubServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(GithubServerEndpoints))
 	return s.Handle(s.NewHandler(&Github{h}, append(nopts, opts...)...))
 }

client/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)
+}