grpc_reflection 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f937bab3c745048c769fb0d42f9904f9aca01117f516558727816543ac1fbe7
-  data.tar.gz: e6891c576a960a263e8866ac0b32e3b3d5d9226d5828bb20647e0a757e43472d
+  metadata.gz: 3b17804fde58e327e1e11735e929252ea6b0d39b27f0c6422ee5641c37f251fb
+  data.tar.gz: 845fc82d9ed3149fb45c31ef8307a5da43240e14b7615e43d00748f5ba1ac008
 SHA512:
-  metadata.gz: 1a4f0d7e0451241e7f9a598ca7f24cf4c48b8cd9059296ec507fbb4d48b3d15428a1855a507b9d64efe186bc7d26d2346e437e45422c76ca0dca9793490d7e86
-  data.tar.gz: 680704101fec7d2db86034a9c275c6ecf5eb9184aeb97a40462e03aaa393d556e3724c4e31a5f983cd9ce4d6baa169c6a15517f1e5810dec4de017dcf0857f81
+  metadata.gz: e91d01d52dad1cfccbcdf331ea1996d90ee546e3f92ad1dd44863c89c4aca742565d6d67b5ff7a71d93d9d48cc5346cdf258c841b49e8f54feb8e13092b262bd
+  data.tar.gz: 96d03f3dec08b28b217111bb6f1017f7423d69eb9fc9785551ee16f953cfa8c589df797b3fbcf7f7aa276b63917c5ea5a537943b4de780d7ce6e8b0bfcd815f2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0
+
+* Support `file_containing_extension` request #14
+* Support message name requests #12
+
 ## 0.3.0
 
 * Support `file_by_filename` #9

data/README.md

@@ -8,7 +8,7 @@ This gem aims to provide GRPC Server Reflection Protocol for Ruby. The main purp
 **Caution**
 
 * This gem only supports files that generated by the latest `protoc`.
-* This gem doesn't support all GRPC Server Reflection Protocol features. Currently, only supports requests by `file_containing_symbol` and `list_services`.
+* This gem doesn't support all GRPC Server Reflection Protocol features.
 
 ## Installation
 

data/Rakefile

@@ -29,4 +29,20 @@ task :update_code_generated_by_protoc do
   File.write(service_file, File.read(service_file).gsub(/require 'reflection_pb'/, "require_relative 'reflection_pb'"))
 end
 
+desc "Compile proto files for test"
+task :compile_test_protos do
+  test_protos_dir = "test/protos"
+  proto_files = Dir.glob("#{test_protos_dir}/*.proto")
+
+  if proto_files.empty?
+    puts "No proto files found in #{test_protos_dir}"
+    exit 1
+  end
+
+  proto_files.each do |proto_file|
+    puts "  - #{proto_file}"
+    system("bundle exec grpc_tools_ruby_protoc --ruby_out=. --grpc_out=. #{proto_file}", exception: true)
+  end
+end
+
 task default: :test

data/lib/grpc_reflection/file_descriptor_decorator.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require "json"
+require "set"
 require "google/protobuf/descriptor_pb"
 
 module GrpcReflection
   class FileDescriptorDecorator
-    attr_reader :service_and_method_names, :serialized_file, :filename, :dependency
+    attr_reader :dataset, :serialized_file, :filename, :dependency
 
     def initialize(file_descriptor_proto)
       @file_descriptor_proto = file_descriptor_proto
@@ -13,19 +14,27 @@ module GrpcReflection
       @filename = @file_descriptor_proto.name
 
       @dependency = @file_descriptor_proto.dependency || []
-      @service_and_method_names = {}
+      @dataset = Set.new
 
-      set_service_and_method_names
+      set_dataset
     end
 
-    def set_service_and_method_names
+    private
+
+    def set_dataset
       @file_descriptor_proto.service.each do |s|
         converted_service = JSON.parse(s.to_json)
-        @service_and_method_names[@file_descriptor_proto.package + "." + converted_service["name"]] = true
+        @dataset.add(@file_descriptor_proto.package + "." + converted_service["name"])
         converted_service["method"].each do |m|
-          @service_and_method_names[@file_descriptor_proto.package + "." + converted_service["name"] + "." + m["name"]] = true
+          @dataset.add(@file_descriptor_proto.package + "." + converted_service["name"] + "." + m["name"])
+          @dataset.add(m["inputType"][1..])
+          @dataset.add(m["outputType"][1..])
         end
       end
+
+      @file_descriptor_proto.extension.each do |s|
+        @dataset.add(@file_descriptor_proto.package + "." + s.name)
+      end
     end
   end
 end

data/lib/grpc_reflection/file_descriptor_manager.rb

@@ -37,21 +37,23 @@ module GrpcReflection
       private
 
       def find_file_descriptor(name)
-        file_descriptor = @@file_descriptor_decorators.detect { |f| f.service_and_method_names[name] }
+        file_descriptor = @@file_descriptor_decorators.detect { |f| f.dataset.include?(name) }
         return file_descriptor if file_descriptor
 
         search_name = name
         file_descriptor_proto = nil
         while pos = search_name.rindex(".")
-          file_descriptor_proto = Google::Protobuf::DescriptorPool.generated_pool.lookup(search_name)&.file_descriptor&.to_proto
-          break unless file_descriptor_proto.nil?
+          descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(search_name)
           search_name = search_name.slice(0..(pos - 1))
+          next if descriptor.nil? || !descriptor.respond_to?(:file_descriptor)
+          file_descriptor_proto = descriptor.file_descriptor&.to_proto
+          break unless file_descriptor_proto.nil?
         end
 
         return nil if file_descriptor_proto.nil?
 
         add(file_descriptor_proto)
-        @@file_descriptor_decorators.detect { |f| f.service_and_method_names[name] }
+        @@file_descriptor_decorators.detect { |f| f.dataset.include?(name) }
       end
     end
   end

data/lib/grpc_reflection/server_shared.rb

@@ -5,7 +5,6 @@ module GrpcReflection
       request = req.first
 
       res = proto_module::ServerReflectionResponse.new
-      # TODO: implement another responses
       if request.list_services.size != 0
         res.list_services_response = proto_module::ListServiceResponse.new(service: list_services_response(proto_module))
       elsif !request.file_containing_symbol.empty?
@@ -14,6 +13,19 @@ module GrpcReflection
       elsif !request.file_by_filename.empty?
         proto = Google::Protobuf::DescriptorPool.generated_pool.lookup(request.file_by_filename)&.to_proto
         res.file_descriptor_response = proto_module::FileDescriptorResponse.new(file_descriptor_proto: [Google::Protobuf::FileDescriptorProto.encode(proto)])
+      elsif !request.file_containing_extension.nil? && !request.file_containing_extension.containing_type.empty?
+        descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(request.file_containing_extension.containing_type)
+        if descriptor.is_a?(Google::Protobuf::FieldDescriptor) && descriptor.number == request.file_containing_extension.extension_number
+          result = GrpcReflection::FileDescriptorManager.find(request.file_containing_extension.containing_type)
+          res.file_descriptor_response = proto_module::FileDescriptorResponse.new(file_descriptor_proto: result)
+        else
+          res.file_descriptor_response = proto_module::FileDescriptorResponse.new(file_descriptor_proto: [])
+        end
+      elsif !request.all_extension_numbers_of_type.empty?
+        res.error_response = proto_module::ErrorResponse.new(
+          error_code: GRPC::Core::StatusCodes::UNIMPLEMENTED,
+          error_message: "all_extension_numbers_of_type is not implemented"
+        )
       end
       [res].enum_for(:each)
     end

data/lib/grpc_reflection/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcReflection
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc_reflection
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yuji Yaginuma