rerost · rerost · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -46,6 +46,11 @@ jobs:
         time echo "{\"message\":\"test\"}" > call_expect.txt
         time go run cmd/giro/main.go call --rpc-server=localhost:5001 example.multiple_package.protos.one.GiroService/GiroTest1 '{"message": "test"}' > call_result.txt
         time diff call_result.txt call_expect.txt
+
+        echo "check empty call"
+        time echo "{}" > empty_call_expect.txt
+        time go run cmd/giro/main.go call --rpc-server=localhost:5001 example.multiple_package.protos.one.GiroService/GiroEmptyTest '{}' > empty_call_result.txt
+        time diff empty_call_result.txt empty_call_expect.txt
 
   check_make_protoc:
     runs-on: ubuntu-latest

diff --git a/domain/grpcreflectiface/client.go b/domain/grpcreflectiface/client.go
@@ -4,6 +4,7 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection/grpc_reflection_v1"
 	"google.golang.org/protobuf/proto"
@@ -51,7 +52,6 @@ func (c *clientImpl) ListServices() ([]string, error) {
 
 	return services, nil
 }
-
 func (c *clientImpl) ResolveService(serviceName string) (protoreflect.ServiceDescriptor, error) {
 	req := grpc_reflection_v1.ServerReflectionRequest{
 		MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_FileContainingSymbol{
@@ -68,25 +68,49 @@ func (c *clientImpl) ResolveService(serviceName string) (protoreflect.ServiceDes
 	if resp.GetFileDescriptorResponse() == nil {
 		return nil, nil
 	}
+
+	// ファイルをレジストリに登録
+	registry := &protoregistry.Files{}
+	checkedFdNames := map[string]bool{}
+	registerFunc := func(fdProto *descriptorpb.FileDescriptorProto) error {
+		// 重複排除
+		if _, ok := checkedFdNames[fdProto.GetName()]; ok {
+			return nil
+		}
+		checkedFdNames[fdProto.GetName()] = true
+
+		file, err := protodesc.NewFile(fdProto, registry)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		return errors.WithStack(registry.RegisterFile(file))
+	}
+
 	for _, fdProtoBytes := range resp.GetFileDescriptorResponse().FileDescriptorProto {
 		var fdProto descriptorpb.FileDescriptorProto
-
 		if err := proto.Unmarshal(fd
8000
ProtoBytes, &fdProto); err != nil {
 			return nil, errors.WithStack(err)
 		}
 
-		file, err := protodesc.NewFile(&fdProto, protoregistry.GlobalFiles)
+		if err := c.resolveFiles(registerFunc, &fdProto); err != nil {
+			return nil, err
+		}
+	}
+	for _, fdProtoBytes := range resp.GetFileDescriptorResponse().FileDescriptorProto {
+		var fdProto descriptorpb.FileDescriptorProto
+		if err := proto.Unmarshal(fdProtoBytes, &fdProto); err != nil {
+			return nil, errors.WithStack(err)
+		}
+		file, err := protodesc.NewFile(&fdProto, registry)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
-
 		svcDescriptor = file.Services().ByName(protoreflect.FullName(serviceName).Name())
 		if svcDescriptor != nil {
-			break
+			return svcDescriptor, nil
 		}
 	}
-
-	return svcDescriptor, nil
+	return nil, errors.New("service not found")
 }
 
 func (c *clientImpl) ResolveMessage(messageName string) (proto.Message, error) {
@@ -101,15 +125,38 @@ func (c *clientImpl) ResolveMessage(messageName string) (proto.Message, error) {
 		return nil, errors.WithStack(err)
 	}
 
+	registry := &protoregistry.Files{}
+	checkedFdNames := map[string]bool{}
+	registerFunc := func(fdProto *descriptorpb.FileDescriptorProto) error {
+		// 重複排除
+		if _, ok := checkedFdNames[fdProto.GetName()]; ok {
+			return nil
+		}
+		checkedFdNames[fdProto.GetName()] = true
+		file, err := protodesc.NewFile(fdProto, registry)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		return registry.RegisterFile(file)
+	}
 	var dynamicMessage proto.Message
+	files := map[string]*descriptorpb.FileDescriptorProto{}
 	for _, fdProtoBytes := range resp.GetFileDescriptorResponse().FileDescriptorProto {
 		var fdProto descriptorpb.FileDescriptorProto
 
 		if err := proto.Unmarshal(fdProtoBytes, &fdProto); err != nil {
 			return nil, errors.WithStack(err)
 		}
+		files[fdProto.GetName()] = &fdProto
+
+		if err := c.resolveFiles(registerFunc, &fdProto); err != nil {
+			return nil, err
+		}
+	}
 
-		file, err := protodesc.NewFile(&fdProto, protoregistry.GlobalFiles)
+	// メッセージディスクリプタを探す
+	for _, fdProto := range files {
+		file, err := protodesc.NewFile(fdProto, registry)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
@@ -141,3 +188,50 @@ func (c *clientImpl) call(request *grpc_reflection_v1.ServerReflectionRequest) (
 
 	return response, nil
 }
+
+// 取得したfdProtoをRegisterFileする
+// 依存関係の末端からRegisterする
+// 依存関係が、FileA -> FileB の時、registerFuncが registerFunc(FileB), registerFunc(FileA) の順で呼ばれる
+// 深さ優先探索でRegister
+func (c *clientImpl) resolveFiles(
+	registerFunc func(fdProto *descriptorpb.FileDescriptorProto) error,
+	fdProto *descriptorpb.FileDescriptorProto,
+) error {
+	return c.resolveFilesInner(registerFunc, fdProto)
+}
+
+func (c *clientImpl) resolveFilesInner(
+	registerFunc func(fdProto *descriptorpb.FileDescriptorProto) error,
+	fdProto *descriptorpb.FileDescriptorProto,
+) error {
+	// 依存関係にあるファイルの、依存関係を解決
+	for _, depFdName := range fdProto.Dependency {
+		depReq := grpc_reflection_v1.ServerReflectionRequest{
+			MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_FileByFilename{
+				FileByFilename: depFdName,
+			},
+		}
+		depResp, err := c.call(&depReq)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+
+		for _, depFdProtoBytes := range depResp.GetFileDescriptorResponse().FileDescriptorProto {
+			zap.L().Debug("Protofile Dependency", zap.String("sourceProto", fdProto.GetName()), zap.String("dependencyProto", depFdName))
+			var depFdProto descriptorpb.FileDescriptorProto
+			if err := proto.Unmarshal(depFdProtoBytes, &depFdProto); err != nil {
+				return errors.WithStack(err)
+			}
+			if err := c.resolveFilesInner(registerFunc, &depFdProto); err != nil {
+				return errors.WithStack(err)
+			}
+		}
+	}
+
+	// 自分自身をRegister
+	if err := registerFunc(fdProto); err != nil {
+		return errors.WithStack(err)
+	}
+
+	return nil
+}
diff --git a/e2etest/dummyserver/echo.pb.go b/e2etest/dummyserver/echo.pb.go
diff --git a/e2etest/dummyserver/echo.proto b/e2etest/dummyserver/echo.proto
@@ -4,6 +4,7 @@ package rerost.giro.v1;
 option go_package = "github.com/rerost/giro/e2etest/dummyserver;dummyserver";
 
 import "rerost/giro/hosts.proto";
+import "google/protobuf/empty.proto";
 
 message MetadataValue {
   repeated string value = 1;
@@ -23,10 +24,16 @@ message EchoResponse {
   Metadata metadata = 2;
 }
 
+message EmptyResponse {
+  string status = 1;
+  Metadata metadata = 2;
+}
+
 service TestService {
   option (rerost.giro.v1.host_option) = {
     host: "localhost:5000"
   };
   rpc Echo(EchoRequest) returns (EchoResponse) {}
+  rpc EmptyCall(google.protobuf.Empty) returns (EmptyResponse) {}
 }