grpc_kit 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb504e4e1ba14e8e0a411336254cd5f7b3b20a39305cc31e506ae4d0d81cd77a
-  data.tar.gz: 2595cda7ac23058f72e76e0e8955b70d305c585fe34d63e1bd183d1fc40c104e
+  metadata.gz: 669ad89bc39849c66aeea640ba77ac6204e7cb1c2034a77b4bd4b698830c071a
+  data.tar.gz: fa4a14c0c2bf93837826b9477c126031849e95310f18f7633237d9a485688e56
 SHA512:
-  metadata.gz: f00be6d6aace37b66fa123f50b89903998b6520446369e067dc56afc4342b1d62153f15f631f170fb0aed6b0dba27f0db270d94edd78ad7ccd5f712eb0163b5b
-  data.tar.gz: 83671c633699f7a0e49adbfffbf9fe383a7eae57216d7876760b9bbd6114018cf606183420135807406ece0ebbbd6fdb6a5fd251956b5e1cd59adef6c68f4369
+  metadata.gz: c20fe45fbc01d727fdde2f70d1ebd53bcd2c89c03e9ef01e676a73344e7618aa7e32eaa07af71b10733cb79986fd1883647ba81a5e71b04779a8ded3c4bd8c4a
+  data.tar.gz: be9fb063cd523f9c6c2a47a58584a930f431378a050af865106126b1784ace126291d226c088884c7bd479423d86076439189856e7831341a1b22d7465443043

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 ganmacs
+Copyright (c) 2019 Yuta Iwama
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -71,6 +71,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/ganmac
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Code of Conduct
-
-TODO

data/examples/interceptors/call_stream.rb

@@ -4,6 +4,7 @@ require 'grpc_kit'
 require 'forwardable'
 
 class CallStream < GrpcKit::Call
+  include Enumerable
   extend Forwardable
   delegate %i[send_msg recv] => :@inner
 
@@ -12,6 +13,10 @@ class CallStream < GrpcKit::Call
     @inner = inner
   end
 
+  def each
+    loop { yield(recv) }
+  end
+
   def method_missing(name, *args, &block)
     @inner.public_send(name, *args, &block)
   end

data/grpc_kit.gemspec

@@ -7,7 +7,7 @@ require 'grpc_kit/version'
 Gem::Specification.new do |spec|
   spec.name          = 'grpc_kit'
   spec.version       = GrpcKit::VERSION
-  spec.authors       = ['ganmacs']
+  spec.authors       = ['Yuta Iwama']
   spec.email         = ['ganmacs@gmail.com']
 
   spec.summary       = 'A kit for creating gRPC server/client'
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ds9', '>= 1.3.1'
+  spec.add_dependency 'ds9', '>= 1.3.3'
   spec.add_dependency 'google-protobuf', '~> 3.6.1'
   spec.add_dependency 'googleapis-common-protos-types', '~> 1.0.2'
 

data/lib/grpc.rb

@@ -3,4 +3,4 @@
 # Compatible file for xx_services_pb.rb and xx_pb.rb which are created by grpc-tools gem
 require 'grpc_kit'
 
-GRPC = GrpcKit::GRPC
+GRPC = GrpcKit::Grpc

data/lib/grpc_kit/call.rb

@@ -26,7 +26,7 @@ module GrpcKit
       @metadata = metadata
       @method_name = @config.method_name
       @service_name = @config.service_name
-      @protobuf = @config.protobuf
+      @codec = @config.codec
       @timeout = timeout
       @stream = stream
 

data/lib/grpc_kit/calls/server_bidi_streamer.rb

@@ -23,7 +23,7 @@ module GrpcKit
       def send_msg(data)
         @stream.send_msg(
           data,
-          @protobuf,
+          @codec,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
@@ -32,7 +32,7 @@ module GrpcKit
 
       # @return [Object] response object
       def recv
-        @stream.recv_msg(@protobuf, limit_size: @config.max_receive_message_size)
+        @stream.recv_msg(@codec, limit_size: @config.max_receive_message_size)
       end
 
       # @yieldparam response [Object] each response object of bidi streaming RPC

data/lib/grpc_kit/calls/server_client_streamer.rb

@@ -23,7 +23,7 @@ module GrpcKit
       def send_msg(data)
         @stream.send_msg(
           data,
-          @protobuf,
+          @codec,
           last: true,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
@@ -33,7 +33,7 @@ module GrpcKit
 
       # @return [Object] response object
       def recv
-        @stream.recv_msg(@protobuf, limit_size: @config.max_receive_message_size)
+        @stream.recv_msg(@codec, limit_size: @config.max_receive_message_size)
       end
 
       # @yieldparam response [Object] each response object of client streaming RPC

data/lib/grpc_kit/calls/server_request_response.rb

@@ -22,7 +22,7 @@ module GrpcKit
       def send_msg(data)
         @stream.send_msg(
           data,
-          @protobuf,
+          @codec,
           last: true,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
@@ -32,7 +32,7 @@ module GrpcKit
 
       # @return [Object] response object
       def recv
-        @stream.recv_msg(@protobuf, last: true, limit_size: @config.max_receive_message_size)
+        @stream.recv_msg(@codec, last: true, limit_size: @config.max_receive_message_size)
       end
     end
   end

data/lib/grpc_kit/calls/server_server_streamer.rb

@@ -21,7 +21,7 @@ module GrpcKit
       def send_msg(data)
         @stream.send_msg(
           data,
-          @protobuf,
+          @codec,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
@@ -30,7 +30,7 @@ module GrpcKit
 
       # @return [Object] response object
       def recv
-        @stream.recv_msg(@protobuf, last: true, limit_size: @config.max_receive_message_size)
+        @stream.recv_msg(@codec, last: true, limit_size: @config.max_receive_message_size)
       end
     end
   end

data/lib/grpc_kit/client.rb

@@ -10,7 +10,7 @@ module GrpcKit
   class Client
     # @param sock [TCPSocket]
     # @param authority [nil, String]
-    # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>] list of interceptors
+    # @param interceptors [Array<GrpcKit::Grpc::ClientInterceptor>] list of interceptors
     # @param timeout [nil, Integer, String]
     def initialize(sock, authority: nil, interceptors: [], timeout: nil)
       @sock = sock

data/lib/grpc_kit/codec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  class Codec
+    # @param marshal [Class, GrpcKit::Grpc::Stream]
+    # @param unmarshal [Class, GrpcKit::Grpc::Stream]
+    # @param marshal_method [Symbol]
+    # @param unmarshal_method [Symbol]
+    def initialize(marshal:, unmarshal:, marshal_method:, unmarshal_method:)
+      @marshal = marshal
+      @unmarshal = unmarshal
+      @marshal_method = marshal_method
+      @unmarshal_method = unmarshal_method
+    end
+
+    # @param data [String]
+    # @return [String]
+    def encode(data)
+      @marshal.send(@marshal_method, data)
+    end
+
+    # @param data [String]
+    # @return [String]
+    def decode(data)
+      @unmarshal.send(@unmarshal_method, data)
+    end
+  end
+end

data/lib/grpc_kit/errors.rb

@@ -10,7 +10,16 @@ module GrpcKit
     # @param message [String]
     # @return [GrpcKit::Errors::BadStatus]
     def self.from_status_code(code, message)
-      CODES.fetch(code).new(message)
+      if code == GrpcKit::StatusCodes::OK
+        raise ArgumentError, 'Status OK is not an error'
+      end
+
+      error_class = CODES[code]
+      if error_class
+        error_class.new(message)
+      else
+        GrpcKit::Errors::Unknown.new("Received unknown code: code=#{code}\n #{message}")
+      end
     end
 
     class BadStatus < StandardError
@@ -29,13 +38,6 @@ module GrpcKit
       end
     end
 
-    class Ok < BadStatus
-      # @param message [String]
-      def initialize(message)
-        super(GrpcKit::StatusCodes::OK, message)
-      end
-    end
-
     class Cancelled < BadStatus
       # @param message [String]
       def initialize(message)
@@ -156,7 +158,6 @@ module GrpcKit
     end
 
     CODES = {
-      GrpcKit::StatusCodes::OK => Ok,
       GrpcKit::StatusCodes::CANCELLED => Cancelled,
       GrpcKit::StatusCodes::UNKNOWN => Unknown,
       GrpcKit::StatusCodes::INVALID_ARGUMENT => InvalidArgument,

data/lib/grpc_kit/grpc/core.rb

@@ -3,7 +3,7 @@
 require 'grpc_kit/status_codes'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     module Core
       StatusCodes = GrpcKit::StatusCodes
     end

data/lib/grpc_kit/grpc/dsl.rb

@@ -6,7 +6,7 @@ require 'grpc_kit/client'
 require 'grpc_kit/grpc/stream'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     module Dsl
       # @param value [String]
       attr_accessor :service_name
@@ -23,8 +23,8 @@ module GrpcKit
       end
 
       # @param name [Symbol] gRPC method name
-      # @param marshal [Class, GrpcKit::GRPC::Stream] marshaling object
-      # @param unmarshal [Class, GrpcKit::GRPC::Stream] unmarshaling object
+      # @param marshal [Class, GrpcKit::Grpc::Stream] marshaling object
+      # @param unmarshal [Class, GrpcKit::Grpc::Stream] unmarshaling object
       # @return [void]
       def rpc(name, marshal, unmarshal)
         if rpc_descs.key?(name)
@@ -55,9 +55,9 @@ module GrpcKit
         end
       end
 
-      # @return [GrpcKit::GRPC::Stream]
+      # @return [GrpcKit::Grpc::Stream]
       def stream(cls)
-        GrpcKit::GRPC::Stream.new(cls)
+        GrpcKit::Grpc::Stream.new(cls)
       end
 
       # @return [GrpcKit::Client]

data/lib/grpc_kit/grpc/errors.rb

@@ -4,7 +4,7 @@ require 'grpc_kit'
 require 'grpc_kit/errors'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     include GrpcKit::Errors
   end
 end

data/lib/grpc_kit/grpc/generic_service.rb

@@ -3,10 +3,10 @@
 require 'grpc_kit/grpc/dsl'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     module GenericService
       def self.included(obj)
-        obj.extend(GrpcKit::GRPC::Dsl)
+        obj.extend(GrpcKit::Grpc::Dsl)
       end
     end
   end

data/lib/grpc_kit/grpc/interceptor.rb

@@ -3,7 +3,7 @@
 require 'grpc_kit/grpc/dsl'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     class Interceptor
       def initialize(options = {})
         @options = options

data/lib/grpc_kit/grpc/logger.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  module GRPC
+  module Grpc
     module DefaultLogger
       def logger
         GrpcKit.logger

data/lib/grpc_kit/grpc/stream.rb

@@ -4,7 +4,7 @@ require 'grpc_kit/grpc/dsl'
 require 'forwardable'
 
 module GrpcKit
-  module GRPC
+  module Grpc
     class Stream
       extend Forwardable
       delegate %i[encode decode] => :@klass

data/lib/grpc_kit/interceptor_registory.rb

@@ -24,11 +24,11 @@ module GrpcKit
       end
 
       invalid_interceptors = @interceptors.reject do |interceptor|
-        interceptor.class.ancestors.include?(GrpcKit::GRPC::Interceptor)
+        interceptor.class.ancestors.include?(GrpcKit::Grpc::Interceptor)
       end
 
       unless invalid_interceptors.empty?
-        raise ArgumentError, "interceptor #{invalid_interceptors} must descend from #{GrpcKit::GRPC::Interceptor}"
+        raise ArgumentError, "interceptor #{invalid_interceptors.join(', ')} must descend from #{GrpcKit::Grpc::Interceptor}"
       end
     end
   end

data/lib/grpc_kit/interceptors/client_bidi_streamer.rb

@@ -7,7 +7,7 @@ module GrpcKit
     class BidiStreamer < Streaming
       private
 
-      # @param interceptor [GrpcKit::GRPC::ClientInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ClientInterceptor]
       # @param call [GrpcKit::Calls::Client::BidiStreamer]
       # @param metadata [Hash<String,String>]
       def invoke(interceptor, call, metadata)

data/lib/grpc_kit/interceptors/client_client_streamer.rb

@@ -7,7 +7,7 @@ module GrpcKit
     class ClientStreamer < Streaming
       private
 
-      # @param interceptor [GrpcKit::GRPC::ClientInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ClientInterceptor]
       # @param call [GrpcKit::Calls::Client::ClientStreamer]
       # @param metadata [Hash<String,String>]
       def invoke(interceptor, call, metadata)

data/lib/grpc_kit/interceptors/client_request_response.rb

@@ -5,7 +5,7 @@ require 'grpc_kit/interceptors'
 module GrpcKit
   module Interceptors::Client
     class RequestResponse
-      # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>]
+      # @param interceptors [Array<GrpcKit::Grpc::ClientInterceptor>]
       def initialize(interceptors)
         @registry = GrpcKit::InterceptorRegistry.new(interceptors)
       end

data/lib/grpc_kit/interceptors/client_server_streamer.rb

@@ -7,7 +7,7 @@ module GrpcKit
     class ServerStreamer < Streaming
       private
 
-      # @param interceptor [GrpcKit::GRPC::ClientInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ClientInterceptor]
       # @param call [GrpcKit::Calls::Client::ServerStreamer]
       # @param metadata [Hash<String,String>]
       def invoke(interceptor, call, metadata)

data/lib/grpc_kit/interceptors/server_bidi_streamer.rb

@@ -5,7 +5,7 @@ require 'grpc_kit/interceptors'
 module GrpcKit
   module Interceptors::Server
     class BidiStreamer < Streaming
-      # @param interceptor [GrpcKit::GRPC::ServerInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ServerInterceptor]
       # @param call [GrpcKit::Calls::Client::BidiStreamer]
       def invoke(interceptor, call)
         interceptor.bidi_streamer(call: call, method: call.method) do |new_call = nil|

data/lib/grpc_kit/interceptors/server_client_streamer.rb

@@ -5,7 +5,7 @@ require 'grpc_kit/interceptors'
 module GrpcKit
   module Interceptors::Server
     class ClientStreamer < Streaming
-      # @param interceptor [GrpcKit::GRPC::ServerInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ServerInterceptor]
       # @param call [GrpcKit::Calls::Client::ClientStreamer]
       def invoke(interceptor, call)
         interceptor.client_streamer(call: call, method: call.method) do |new_call = nil|

data/lib/grpc_kit/interceptors/server_request_response.rb

@@ -6,7 +6,7 @@ require 'grpc_kit/interceptor_registory'
 module GrpcKit
   module Interceptors::Server
     class RequestResponse
-      # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>]
+      # @param interceptors [Array<GrpcKit::Grpc::ServerInterceptor>]
       def initialize(interceptors)
         @registry = GrpcKit::InterceptorRegistry.new(interceptors)
       end

data/lib/grpc_kit/interceptors/server_server_streamer.rb

@@ -5,7 +5,7 @@ require 'grpc_kit/interceptors'
 module GrpcKit
   module Interceptors::Server
     class ServerStreamer < Streaming
-      # @param interceptor [GrpcKit::GRPC::ServerInterceptor]
+      # @param interceptor [GrpcKit::Grpc::ServerInterceptor]
       # @param call [GrpcKit::Calls::Client::ServerStreamer]
       def invoke(interceptor, call)
         # We don't need a `:request` parameter but,

data/lib/grpc_kit/interceptors.rb

@@ -6,7 +6,7 @@ module GrpcKit
   module Interceptors
     module Client
       class Streaming
-        # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>]
+        # @param interceptors [Array<GrpcKit::Grpc::ClientInterceptor>]
         def initialize(interceptors)
           @registry = GrpcKit::InterceptorRegistry.new(interceptors)
         end
@@ -35,7 +35,7 @@ module GrpcKit
 
     module Server
       class Streaming
-        # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>]
+        # @param interceptors [Array<GrpcKit::Grpc::ServerInterceptor>]
         def initialize(interceptors)
           @registry = GrpcKit::InterceptorRegistry.new(interceptors)
         end

data/lib/grpc_kit/method_config.rb

@@ -4,7 +4,7 @@ module GrpcKit
   MethodConfig = Struct.new(
     :path,
     :ruby_style_method_name,
-    :protobuf,
+    :codec,
     :interceptor,
     :service_name,
     :method_name,
@@ -18,17 +18,17 @@ module GrpcKit
     MAX_CLIENT_SEND_MESSAGE_SIZE = 1024 * 1024 * 4
 
     def self.build_for_server(
-          path:, ruby_style_method_name:, protobuf:, service_name:, method_name:, interceptor:,
+          path:, ruby_style_method_name:, codec:, service_name:, method_name:, interceptor:,
           max_receive_message_size: MAX_SERVER_RECEIVE_MESSAGE_SIZE, max_send_message_size: MAX_SERVER_SEND_MESSAGE_SIZE, compressor_type: ''
         )
-      new(path, ruby_style_method_name, protobuf, interceptor, service_name, method_name, max_receive_message_size, max_send_message_size, compressor_type)
+      new(path, ruby_style_method_name, codec, interceptor, service_name, method_name, max_receive_message_size, max_send_message_size, compressor_type)
     end
 
     def self.build_for_client(
-          path:, ruby_style_method_name:, protobuf:, service_name:, method_name:, interceptor:,
+          path:, ruby_style_method_name:, codec:, service_name:, method_name:, interceptor:,
           max_receive_message_size: MAX_CLIENT_RECEIVE_MESSAGE_SIZE, max_send_message_size: MAX_CLIENT_SEND_MESSAGE_SIZE, compressor_type: ''
         )
-      new(path, ruby_style_method_name, protobuf, interceptor, service_name, method_name, max_receive_message_size, max_send_message_size, compressor_type)
+      new(path, ruby_style_method_name, codec, interceptor, service_name, method_name, max_receive_message_size, max_send_message_size, compressor_type)
     end
   end
 end

data/lib/grpc_kit/rpc_desc.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'grpc_kit/method_config'
-require 'grpc_kit/protobuffer'
+require 'grpc_kit/codec'
 
 require 'grpc_kit/interceptors/client_request_response'
 require 'grpc_kit/interceptors/client_client_streamer'
@@ -24,8 +24,8 @@ require 'grpc_kit/rpcs/server_bidi_streamer'
 module GrpcKit
   class RpcDesc
     # @param name [Symbol] path name
-    # @param marshal [Class, GrpcKit::GRPC::Stream] marshaling object
-    # @param unmarshal [Class, GrpcKit::GRPC::Stream] unmarshaling object
+    # @param marshal [Class, GrpcKit::Grpc::Stream] marshaling object
+    # @param unmarshal [Class, GrpcKit::Grpc::Stream] unmarshaling object
     # @param marshal_method [Symbol] method name of marshaling which marshal is called this method
     # @param unmarshal_method [Symbol] method name of unmarshaling which unmarshal is called this method
     # @param service_name [String]
@@ -38,8 +38,8 @@ module GrpcKit
       @service_name = service_name
     end
 
-    # @param handler [GrpcKit::GRPC::GenericService]
-    # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>]
+    # @param handler [GrpcKit::Grpc::GenericService]
+    # @param interceptors [Array<GrpcKit::Grpc::ServerInterceptor>]
     # @return [#invoke] Server version of rpc class
     def build_server(handler, interceptors: [])
       inter = interceptors.empty? ? nil : server_interceptor.new(interceptors)
@@ -47,7 +47,7 @@ module GrpcKit
       config = GrpcKit::MethodConfig.build_for_server(
         path: path,
         ruby_style_method_name: ruby_style_name,
-        protobuf: server_protobuf,
+        codec: server_codec,
         service_name: @service_name,
         method_name: @name,
         interceptor: inter,
@@ -55,7 +55,7 @@ module GrpcKit
       server.new(handler, config)
     end
 
-    # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>]
+    # @param interceptors [Array<GrpcKit::Grpc::ClientInterceptor>]
     # @return [#invoke] Client version of rpc class
     def build_client(interceptors: [])
       inter = interceptors.empty? ? nil : client_interceptor.new(interceptors)
@@ -63,7 +63,7 @@ module GrpcKit
       config = GrpcKit::MethodConfig.build_for_client(
         path: path,
         ruby_style_method_name: ruby_style_name,
-        protobuf: client_protobuf,
+        codec: client_codec,
         service_name: @service_name,
         method_name: @name,
         interceptor: inter,
@@ -83,22 +83,22 @@ module GrpcKit
 
     # @return [Boolean]
     def request_response?
-      !@marshal.is_a?(GrpcKit::GRPC::Stream) && !@unmarshal.is_a?(GrpcKit::GRPC::Stream)
+      !@marshal.is_a?(GrpcKit::Grpc::Stream) && !@unmarshal.is_a?(GrpcKit::Grpc::Stream)
     end
 
     # @return [Boolean]
     def client_streamer?
-      @marshal.is_a?(GrpcKit::GRPC::Stream) && !@unmarshal.is_a?(GrpcKit::GRPC::Stream)
+      @marshal.is_a?(GrpcKit::Grpc::Stream) && !@unmarshal.is_a?(GrpcKit::Grpc::Stream)
     end
 
     # @return [Boolean]
     def server_streamer?
-      !@marshal.is_a?(GrpcKit::GRPC::Stream) && @unmarshal.is_a?(GrpcKit::GRPC::Stream)
+      !@marshal.is_a?(GrpcKit::Grpc::Stream) && @unmarshal.is_a?(GrpcKit::Grpc::Stream)
     end
 
     # @return [Boolean]
     def bidi_streamer?
-      @marshal.is_a?(GrpcKit::GRPC::Stream) && @unmarshal.is_a?(GrpcKit::GRPC::Stream)
+      @marshal.is_a?(GrpcKit::Grpc::Stream) && @unmarshal.is_a?(GrpcKit::Grpc::Stream)
     end
 
     private
@@ -129,21 +129,21 @@ module GrpcKit
         end
     end
 
-    def server_protobuf
-      @server_protobuf ||= ProtoBuffer.new(
-        encoder: @unmarshal,
-        decoder: @marshal,
-        encode_method: @marshal_method,
-        decode_method: @unmarshal_method,
+    def server_codec
+      @server_codec ||= Codec.new(
+        marshal: @unmarshal,
+        unmarshal: @marshal,
+        marshal_method: @marshal_method,
+        unmarshal_method: @unmarshal_method,
       )
     end
 
-    def client_protobuf
-      @client_protobuf ||= ProtoBuffer.new(
-        encoder: @marshal,
-        decoder: @unmarshal,
-        encode_method: @marshal_method,
-        decode_method: @unmarshal_method,
+    def client_codec
+      @client_codec ||= Codec.new(
+        marshal: @marshal,
+        unmarshal: @unmarshal,
+        marshal_method: @marshal_method,
+        unmarshal_method: @unmarshal_method,
       )
     end
 

data/lib/grpc_kit/rpcs.rb

@@ -19,7 +19,7 @@ module GrpcKit
     end
 
     class ServerRpc
-      # @param handler [GrpcKit::GRPC::GenericService]
+      # @param handler [GrpcKit::Grpc::GenericService]
       # @param config [GrpcKit::MethodConfig]
       def initialize(handler, config)
         @handler = handler

data/lib/grpc_kit/server.rb

@@ -5,24 +5,25 @@ require 'grpc_kit/session/server_session'
 
 module GrpcKit
   class Server
-    # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>] list of interceptors
-    def initialize(interceptors: [])
+    # @param interceptors [Array<GrpcKit::Grpc::ServerInterceptor>] list of interceptors
+    # @param shutdown_timeout [Integer] Number of seconds to wait for the server shutdown
+    def initialize(interceptors: [], shutdown_timeout: 30)
+      @interceptors = interceptors
+      @shutdown_timeout = shutdown_timeout
       @sessions = []
       @rpc_descs = {}
-      @interceptors = interceptors
       @mutex = Mutex.new
       @stopping = false
-      @max_graceful_wait = 60
 
       GrpcKit.logger.debug("Launched grpc_kit(v#{GrpcKit::VERSION})")
     end
 
-    # @param handler [GrpcKit::GRPC::GenericService] gRPC handler object or class
+    # @param handler [GrpcKit::Grpc::GenericService] gRPC handler object or class
     # @return [void]
     def handle(handler)
       klass = handler.is_a?(Class) ? handler : handler.class
-      unless klass.include?(GrpcKit::GRPC::GenericService)
-        raise "#{klass} must include GRPC::GenericService"
+      unless klass.include?(GrpcKit::Grpc::GenericService)
+        raise "#{klass} must include Grpc::GenericService"
       end
 
       klass.rpc_descs.each do |path, rpc_desc|
@@ -49,34 +50,34 @@ module GrpcKit
     # This method is expected to be called in trap context
     # @return [void]
     def force_shutdown
-      Thread.new do
-        @mutex.synchronize do
-          GrpcKit.logger.debug('force shutdown')
-          @stopping = true
-          @sessions.each(&:shutdown)
-        end
-      end
+      @stopping = true
+
+      Thread.new {
+        GrpcKit.logger.debug('force shutdown')
+        shutdown_sessions
+      }
     end
 
     # This method is expected to be called in trap context
     # @return [void]
     def graceful_shutdown
+      @stopping = true
+
       Thread.new do
         GrpcKit.logger.debug('graceful shutdown')
         @mutex.synchronize { @sessions.each(&:drain) }
-        @stopping = true
-
-        begin
-          Timeout.timeout(@max_graceful_wait) do
-            loop do
-              break if @sessions.empty?
 
-              sleep 1
-            end
+        end_time = Time.now + @shutdown_timeout
+        until end_time < Time.now
+          if @sessions.empty?
+            return
           end
-        rescue Timeout::Error => _
-          GrpcKit.logger.debug('Max wait time expired')
+
+          sleep 1
         end
+
+        GrpcKit.logger.error('Timeout graceful shutdown. perform force shutdown')
+        shutdown_sessions
       end
     end
 
@@ -100,6 +101,10 @@ module GrpcKit
 
     private
 
+    def shutdown_sessions
+      @mutex.synchronize { @sessions.each(&:shutdown) }
+    end
+
     def establish_session(conn)
       session = GrpcKit::Session::ServerSession.new(GrpcKit::Session::IO.new(conn), self)
       begin

data/lib/grpc_kit/session/client_session.rb

@@ -26,6 +26,7 @@ module GrpcKit
         @opts = opts
         @draining = false
         @stop = false
+        @no_write_data = false
       end
 
       # @param headers [Hash<String,String>]
@@ -39,6 +40,7 @@ module GrpcKit
         stream_id = submit_request(headers, stream.pending_send_data).to_i
         stream.stream_id = stream_id
         @streams[stream_id] = stream
+        @no_write_data = false
         stream
       end
 
@@ -67,12 +69,21 @@ module GrpcKit
           raise 'trasport is closing'
         end
 
-        if want_read?
-          do_read
-        end
+        if @no_write_data
+          @io.wait_readable
 
-        if want_write?
-          send
+          if want_read?
+            do_read
+          end
+        else
+          rs, ws = @io.select
+          if !rs.empty? && want_read?
+            do_read
+          end
+
+          if !ws.empty? && want_write?
+            send
+          end
         end
       end
 
@@ -133,6 +144,7 @@ module GrpcKit
           stream = @streams[frame.stream_id]
           if frame.end_stream?
             stream.close_local
+            @no_write_data = @streams.all? { |_, v| v.close_local? }
           end
         end
 

data/lib/grpc_kit/session/drain_controller.rb

@@ -5,33 +5,57 @@ require 'ds9'
 module GrpcKit
   module Session
     class DrainController
+      module Status
+        NOT_START = 0
+        STARTED = 1
+        SENT_PING = 2
+        RECV_PING_ACK = 3
+        SENT_GOAWAY = 4
+      end
+
       def initialize
-        @sent_shutdown_notice = false
-        @goaway_sent = false
-        @after_one_rtt = false
-        # @sent_ping = false
+        @status = Status::NOT_START
+      end
+
+      def start_draining?
+        @status > Status::NOT_START
+      end
+
+      def start_draining
+        @status = Status::STARTED
       end
 
       # @return [void]
       def recv_ping_ack
-        @after_one_rtt = true
+        if @status == Status::SENT_PING
+          next_step
+        end
       end
 
       # @return [void]
-      def call(session)
-        if @goaway_sent
-        # session.shutdown
-        elsif @sent_shutdown_notice && @after_one_rtt
-          session.submit_goaway(DS9::NO_ERROR, session.last_proc_stream_id)
-          @goaway_sent = true
-        # elsif @sent_shutdown_notice && !@after_one_rtt && !@sent_ping
-        # @sent_ping = true
-        elsif !@sent_shutdown_notice
+      def next(session)
+        case @status
+        when Status::NOT_START
+          # next_step
+        when Status::STARTED
           session.submit_shutdown
-          @sent_shutdown_notice = true
-          session.submit_ping # wait for 1 RTT
+          session.submit_ping
+          next_step
+        when Status::SENT_PING
+          # skip until #recv_ping_ack is called (1RTT)
+        when Status::RECV_PING_ACK
+          session.submit_goaway(DS9::NO_ERROR, session.last_proc_stream_id)
+          next_step
+        when Status::SENT_GOAWAY
+          session.shutdown
         end
       end
+
+      private
+
+      def next_step
+        @status += 1
+      end
     end
   end
 end

data/lib/grpc_kit/session/server_session.rb

@@ -24,9 +24,8 @@ module GrpcKit
         @streams = {}
         @stop = false
         @dispatcher = dispatcher
-        @peer_shutdowned = false
         @inflights = []
-        @drain = nil
+        @drain_controller = GrpcKit::Session::DrainController.new
       end
 
       # @return [void]
@@ -50,19 +49,19 @@ module GrpcKit
 
       # @return [bool] return session can continue
       def run_once
-        if @peer_shutdowned || @stop || !(want_read? || want_write?)
+        if @stop || !(want_read? || want_write?)
           # it could be called twice
           @streams.each_value(&:close)
           return false
         end
 
-        if @drain
+        if @drain_controller.start_draining?
           if @streams.empty?
             shutdown
-            return
+            return false
           end
 
-          @drain.call(self)
+          @drain_controller.next(self)
         end
 
         rs, ws = @io.select
@@ -84,7 +83,7 @@ module GrpcKit
 
       # @return [void]
       def drain
-        @drain ||= GrpcKit::Session::DrainController.new
+        @drain_controller.start_draining
       end
 
       # @return [void]
@@ -113,13 +112,15 @@ module GrpcKit
         receive
       rescue DS9::Exception => e
         shutdown
-        if DS9::ERR_EOF == e.code
-          @peer_shutdowned = true
-          return
-          # raise EOFError
-        end
 
-        raise e
+        case e.code
+        when DS9::ERR_EOF
+          GrpcKit.logger.debug('The peer performed a shutdown on the connection')
+        when DS9::ERR_BAD_CLIENT_MAGIC
+          GrpcKit.logger.error('Invalid client magic was received')
+        else
+          raise "#{e.message}. code=#{e.code}"
+        end
       end
 
       # `provider` for nghttp2_submit_response
@@ -164,7 +165,7 @@ module GrpcKit
             # nghttp2 can't send any data once server sent actaul GoAway(not shutdown notice) frame.
             # We want to send data in case of ClientStreamer or BidiBstreamer which they are sending data in same stream
             # So we have to wait to send actual GoAway frame untill timeout or something
-            # @drain.recv_ping_ack if @drain
+            # @drain_controller.recv_ping_ack
           end
           # when DS9::Frames::Goaway
           # when DS9::Frames::RstStream

data/lib/grpc_kit/stream/client_stream.rb

@@ -26,7 +26,7 @@ module GrpcKit
       def send_msg(data, metadata: {}, last: false)
         buf =
           begin
-            @config.protobuf.encode(data)
+            @config.codec.encode(data)
           rescue ArgumentError => e
             raise GrpcKit::Errors::Internal, "Error while encoding in client: #{e}"
           end
@@ -135,7 +135,7 @@ module GrpcKit
         raise StopIteration if buf.nil?
 
         begin
-          @config.protobuf.decode(buf)
+          @config.codec.decode(buf)
         rescue ArgumentError, TypeError => e
           raise GrpcKit::Errors::Internal, "Error while decoding in Client: #{e}"
         end

data/lib/grpc_kit/stream/server_stream.rb

@@ -23,16 +23,16 @@ module GrpcKit
       end
 
       # @param data [Object]
-      # @param protobuf [GrpcKit::ProtoBuffer]
+      # @param codec [GrpcKit::Codec]
       # @param last [Boolean]
       # @param limit_size [Integer]
       # @param initial_metadata [Hash<String,String>]
       # @param trailing_metadata [Hash<String,String>]
       # @return [void]
-      def send_msg(data, protobuf, last: false, limit_size: nil, initial_metadata: {}, trailing_metadata: {})
+      def send_msg(data, codec, last: false, limit_size: nil, initial_metadata: {}, trailing_metadata: {})
         buf =
           begin
-            protobuf.encode(data)
+            codec.encode(data)
           rescue ArgumentError, TypeError => e
             raise GrpcKit::Errors::Internal, "Error while encoding in server: #{e}"
           end
@@ -51,11 +51,11 @@ module GrpcKit
       end
 
       # @raise [StopIteration] when recving message finished
-      # @param protobuf [GrpcKit::ProtoBuffer]
+      # @param codec [GrpcKit::Codec]
       # @param last [Boolean]
       # @param limit_size [Integer]
       # @return [Object]
-      def recv_msg(protobuf, last: false, limit_size: nil)
+      def recv_msg(codec, last: false, limit_size: nil)
         data = @transport.read_data(last: last)
 
         raise StopIteration if data.nil?
@@ -75,7 +75,7 @@ module GrpcKit
         end
 
         begin
-          protobuf.decode(buf)
+          codec.decode(buf)
         rescue ArgumentError => e
           raise GrpcKit::Errors::Internal, "Error while decoding in server: #{e}"
         end

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
-- ganmacs
+- Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - lib/grpc_kit/calls/server_request_response.rb
 - lib/grpc_kit/calls/server_server_streamer.rb
 - lib/grpc_kit/client.rb
+- lib/grpc_kit/codec.rb
 - lib/grpc_kit/errors.rb
 - lib/grpc_kit/grpc/core.rb
 - lib/grpc_kit/grpc/dsl.rb
@@ -202,7 +203,6 @@ files:
 - lib/grpc_kit/interceptors/server_request_response.rb
 - lib/grpc_kit/interceptors/server_server_streamer.rb
 - lib/grpc_kit/method_config.rb
-- lib/grpc_kit/protobuffer.rb
 - lib/grpc_kit/rpc_desc.rb
 - lib/grpc_kit/rpcs.rb
 - lib/grpc_kit/rpcs/client_bidi_streamer.rb

data/lib/grpc_kit/protobuffer.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module GrpcKit
-  class ProtoBuffer
-    # @param encoder [Class, GrpcKit::GRPC::Stream]
-    # @param decoder [Class, GrpcKit::GRPC::Stream]
-    # @param encode_method [Symbol]
-    # @param decode_method [Symbol]
-    def initialize(encoder:, decoder:, encode_method:, decode_method:)
-      @encoder = encoder
-      @decoder = decoder
-      @encode_method = encode_method
-      @decode_method = decode_method
-    end
-
-    # @param data [String]
-    # @return [void]
-    def encode(data)
-      @encoder.send(@encode_method, data)
-    end
-
-    # @param data [String]
-    # @return [void]
-    def decode(data)
-      @decoder.send(@decode_method, data)
-    end
-  end
-end