grpc_kit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7415d182781136999b2e1630ef9dff77a61196225b4207e9d9535a2b566fceee
-  data.tar.gz: 9836c54ed198740c4a75e90b957a641528b06333a30314c03441b9dce35f8731
+  metadata.gz: 5cd6355c75605e749f1590fa3f3f3346f5d77288753df21cd104c9af78d22f5f
+  data.tar.gz: 3e6d0c8606b0476edaca281b510b1c8d1f047df7accc479e2b1e569567869497
 SHA512:
-  metadata.gz: '083b685dd4f7966156a1ac41eab594ace1664c813105e1204c521ce85e727945170ef1c701097ee6f93467407b13d08ea649d6da5f86af54ebd60ca1e373336e'
-  data.tar.gz: 505029bdcbfb035cb41b10ed845cec6ce27eae2ff350a27f49cb8a3b2cb4afeca92b8e5b9a7bc70e7dc0e2e8bde9d88591cc8899a871d81d2665c5c8141a1d14
+  metadata.gz: bde53f9753f23d273ed4b211c63f2e4727e88c8d67b9b330add41c9bec5b82ebbe884c551c496c5fcdca57252e36d58660ac5a70f31ecd8cb84f00258a6972f9
+  data.tar.gz: 75d4b9b74c7cc99111c348c754c79cda00295745485ee6d28a4e0aa492bc28bcc6303dd04bbd95320a483a3bc8559840c79be09621eabb04bfb853b7e7be9760

data/README.md

@@ -47,7 +47,8 @@ end
 ##### Client
 
 ```ruby
-stub = Helloworld::Greeter::Stub.new('localhost', 50051)
+sock = TCPSocket.new('localhost', 50051)
+stub = Helloworld::Greeter::Stub.new(sock)
 message = stub.say_hello(Helloworld::HelloRequest.new(name: 'your name')).message
 puts message
 ```

data/TODO.md

@@ -13,8 +13,8 @@
 ### server streamer
 
 - [x] recv/send msg
-- [ ] metadata (client)
-- [ ] metadata (server)
+- [x] metadata (client)
+- [x] metadata (server)
 - [x] interceptor (client)
 - [x] interceptor (server)
 - [ ] deadline (client)
@@ -23,8 +23,8 @@
 ### client streamer
 
 - [x] recv/send msg
-- [ ] metadata (client)
-- [ ] metadata (server)
+- [x] metadata (client)
+- [x] metadata (server)
 - [x] interceptor (client)
 - [x] interceptor (server)
 - [ ] deadline (client)
@@ -62,3 +62,10 @@
 - [ ] add server request spec
 - [ ] add client request spec
 - [ ] handle RST FRAME
+
+## bugs
+
+- [x] status_check is invoked twice
+- [x] undefined local variable or method `finish' for #<GrpcKit::Sessions::ClientSession:0x00007f9ae3abf970> (NameError)
+- [x] clients don't use same object even if thier connections alive
+

data/grpc_kit.gemspec

@@ -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.2.0'
+  spec.add_dependency 'ds9', '~> 1.2.1'
   spec.add_dependency 'google-protobuf', '~> 3.6.1'
   spec.add_dependency 'googleapis-common-protos-types', '~> 1.0.2'
 

data/lib/grpc_kit/calls/client_client_streamer.rb

@@ -9,10 +9,10 @@ module GrpcKit
       attr_reader :metadata
       alias outgoing_metadata metadata
 
-      def send_msg(data, timeout: nil, metadata: {}, last: false)
+      def send_msg(data, timeout: nil, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: outgoing_metadata)
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls/client_request_response.rb

@@ -9,10 +9,10 @@ module GrpcKit
       attr_reader :metadata
       alias outgoing_metadata metadata
 
-      def send_msg(data, timeout: nil, metadata: {}, last: false)
+      def send_msg(data, timeout: nil, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: outgoing_metadata)
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls/client_server_streamer.rb

@@ -9,10 +9,10 @@ module GrpcKit
       attr_reader :metadata
       alias outgoing_metadata metadata
 
-      def send_msg(data, timeout: nil, metadata: {}, last: false)
+      def send_msg(data, timeout: nil, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: outgoing_metadata)
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls/server_client_streamer.rb

@@ -19,7 +19,14 @@ module GrpcKit
       def send_msg(data, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, @protobuf, last: last, limit_size: @config.max_send_message_size)
+        @stream.send_msg(
+          data,
+          @protobuf,
+          last: last,
+          initial_metadata: @outgoing_initial_metadata,
+          trailing_metadata: @outgoing_trailing_metadata,
+          limit_size: @config.max_send_message_size,
+        )
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls/server_request_response.rb

@@ -19,7 +19,14 @@ module GrpcKit
       def send_msg(data, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, @protobuf, last: last, limit_size: @config.max_send_message_size)
+        @stream.send_msg(
+          data,
+          @protobuf,
+          last: last,
+          initial_metadata: @outgoing_initial_metadata,
+          trailing_metadata: @outgoing_trailing_metadata,
+          limit_size: @config.max_send_message_size,
+        )
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls/server_server_streamer.rb

@@ -19,7 +19,14 @@ module GrpcKit
       def send_msg(data, last: false)
         raise 'No method error' if @restrict
 
-        @stream.send_msg(data, @protobuf, last: last, limit_size: @config.max_send_message_size)
+        @stream.send_msg(
+          data,
+          @protobuf,
+          last: last,
+          initial_metadata: @outgoing_initial_metadata,
+          trailing_metadata: @outgoing_trailing_metadata,
+          limit_size: @config.max_send_message_size,
+        )
       end
 
       def recv(last: false)

data/lib/grpc_kit/calls.rb

@@ -8,6 +8,9 @@ module GrpcKit
       Klass = Struct.new(:service_name)
       attr_reader :method
 
+      # @params stream [GrpcKit::Stream::ServerStream|GrpcKit::Stream::ClientStream]
+      # @params config [GrpcKit::MethodConfig]
+      # @params metadata [Hash]
       def initialize(stream:, config:, metadata:, timeout: nil)
         @config = config
         @metadata = metadata

data/lib/grpc_kit/client.rb

@@ -2,9 +2,9 @@
 
 require 'grpc_kit/grpc_time'
 require 'grpc_kit/session/io'
-require 'grpc_kit/sessions/client_session'
-require 'grpc_kit/streams/client_stream'
-require 'grpc_kit/transports/client_transport'
+require 'grpc_kit/session/client_session'
+require 'grpc_kit/stream/client_stream'
+require 'grpc_kit/transport/client_transport'
 
 module GrpcKit
   class Client
@@ -17,43 +17,46 @@ module GrpcKit
           addr = sock.addr
           "#{addr[3]}:#{addr[1]}"
         end
-      @interceptors = interceptors
+
       @timeout = timeout && GrpcKit::GrpcTime.new(timeout)
+
+      build_rpcs(interceptors)
     end
 
     def request_response(rpc, request, opts = {})
       GrpcKit.logger.debug('Calling request_respose')
-
-      rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, request, opts)
     end
 
     def client_streamer(rpc, opts = {})
       GrpcKit.logger.debug('Calling client_streamer')
-      rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, nil, opts)
     end
 
     def server_streamer(rpc, request, opts = {})
       GrpcKit.logger.debug('Calling server_streamer')
-      rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, request, opts)
     end
 
     def bidi_streamer(rpc, requests, opts = {})
-      rpc.config.interceptor.interceptors = @interceptors
       GrpcKit.logger.debug('Calling bidi_streamer')
     end
 
     private
 
     def do_request(rpc, request, **opts)
-      session = GrpcKit::Sessions::ClientSession.new(GrpcKit::Session::IO.new(@sock))
-      session.submit_settings([])
-
-      t = GrpcKit::Transports::ClientTransport.new(session)
-      cs = GrpcKit::Streams::ClientStream.new(t, rpc.config, authority: @authority, timeout: @timeout)
+      t = GrpcKit::Transport::ClientTransport.new(session)
+      cs = GrpcKit::Stream::ClientStream.new(t, rpc.config, authority: @authority, timeout: @timeout)
       rpc.invoke(cs, request, opts.merge(timeout: @timeout))
     end
+
+    def session
+      @session ||=
+        begin
+          s = GrpcKit::Session::ClientSession.new(GrpcKit::Session::IO.new(@sock))
+          s.submit_settings([])
+          s
+        end
+    end
   end
 end

data/lib/grpc_kit/grpc/dsl.rb

@@ -48,27 +48,40 @@ module GrpcKit
       end
 
       def rpc_stub_class
-        rpc_descs_ = rpc_descs
+        rpc_descs_ = {}
+        rpc_descs.each_value do |rpc_desc|
+          rpc_descs_[rpc_desc.ruby_style_name] = rpc_desc
+        end
+
         Class.new(GrpcKit::Client) do
-          rpc_descs_.each do |_, rpc_desc|
-            method_name = rpc_desc.ruby_style_name
-            rpc = rpc_desc.build_client
+          def initialize(*)
+            @rpcs = {}
+            super
+          end
+
+          define_method(:build_rpcs) do |interceptors|
+            rpc_descs_.each do |method_name, rpc_desc|
+              @rpcs[method_name] = rpc_desc.build_client(interceptors: interceptors)
+            end
+          end
+          private :build_rpcs
 
+          rpc_descs_.each do |method_name, rpc_desc|
             if rpc_desc.request_response?
               define_method(method_name) do |request, opts = {}|
-                request_response(rpc, request, opts)
+                request_response(@rpcs.fetch(method_name), request, opts)
               end
             elsif rpc_desc.client_streamer?
               define_method(method_name) do |opts = {}|
-                client_streamer(rpc, opts)
+                client_streamer(@rpcs.fetch(method_name), opts)
               end
             elsif rpc_desc.server_streamer?
               define_method(method_name) do |request, opts = {}|
-                server_streamer(rpc, request, opts)
+                server_streamer(@rpcs.fetch(method_name), request, opts)
               end
             elsif rpc_desc.bidi_streamer?
               define_method(method_name) do |requests, opts = {}, &blk|
-                bidi_streamer(rpc, requests, opts, &blk)
+                bidi_streamer(@rpcs.fetch(method_name), requests, opts, &blk)
               end
             else
               raise "unknown #{rpc_desc}"

data/lib/grpc_kit/grpc_time.rb

@@ -2,7 +2,7 @@
 
 module GrpcKit
   class GrpcTime
-    MAX = 10**9-1
+    MAX = 10**9 - 1
 
     # @params value [String|Integer]
     def initialize(value)
@@ -67,12 +67,7 @@ module GrpcKit
     private
 
     def from_integer(value)
-      if value < 0
-        @value = MAX
-      else
-        @value = value
-      end
-
+      @value = value < 0 ? MAX : value
       @unit = 'S'
     end
 

data/lib/grpc_kit/interceptors/client_request_response.rb

@@ -5,11 +5,8 @@ require 'grpc_kit/interceptors'
 module GrpcKit
   module Interceptors::Client
     class RequestResponse
-      attr_writer :interceptors
-
-      def initialize
-        # Cant' get interceptor at definition time...
-        @interceptors = nil
+      def initialize(interceptors)
+        @interceptors = interceptors
       end
 
       def intercept(request, call, metadata, &block)

data/lib/grpc_kit/interceptors.rb

@@ -4,11 +4,8 @@ module GrpcKit
   module Interceptors
     module Client
       class Streaming
-        attr_writer :interceptors
-
-        def initialize
-          # Cant' get interceptor at definition time...
-          @interceptors = nil
+        def initialize(interceptors)
+          @interceptors = interceptors
         end
 
         def intercept(call, metadata, &block)

data/lib/grpc_kit/rpc_desc.rb

@@ -46,14 +46,16 @@ module GrpcKit
       server.new(handler, config)
     end
 
-    def build_client
+    def build_client(interceptors: [])
+      inter = interceptors.empty? ? nil : client_interceptor.new(interceptors)
+
       config = GrpcKit::MethodConfig.build_for_client(
         path: path,
         ruby_style_method_name: ruby_style_name,
         protobuf: client_protobuf,
         service_name: @server_name,
         method_name: @name,
-        interceptor: client_interceptor.new,
+        interceptor: inter,
       )
       client.new(config)
     end

data/lib/grpc_kit/rpcs/client_client_streamer.rb

@@ -14,8 +14,10 @@ module GrpcKit
           stream: stream,
         )
 
-        @config.interceptor.intercept(call, metadata) do |s|
-          s
+        if @config.interceptor
+          @config.interceptor.intercept(call, metadata) { |s| s }
+        else
+          call
         end
       end
     end

data/lib/grpc_kit/rpcs/client_request_response.rb

@@ -14,16 +14,27 @@ module GrpcKit
           stream: stream,
         )
 
-        @config.interceptor.intercept(request, call, call.metadata) do |r, c, _|
-          if timeout
+        # TODO: DRY
+        if @config.interceptor && timeout
+          @config.interceptor.intercept(request, call, call.metadata) do |r, c, _|
             Timeout.timeout(timeout.to_f, GrpcKit::Errors::DeadlineExceeded) do
-              call.send_msg(r, timeout: timeout.to_s, metadata: c.metadata, last: true)
+              call.send_msg(request, timeout: timeout.to_s, last: true)
               call.recv(last: true)
             end
-          else
-            call.send_msg(r, metadata: c.metadata, last: true)
+          end
+        elsif @config.interceptor && !timeout
+          @config.interceptor.intercept(request, call, call.metadata) do |r, c, _|
+            call.send_msg(request, last: true)
+            call.recv(last: true)
+          end
+        elsif !@config.interceptor && timeout
+          Timeout.timeout(timeout.to_f, GrpcKit::Errors::DeadlineExceeded) do
+            call.send_msg(request, timeout: timeout.to_s, last: true)
             call.recv(last: true)
           end
+        else
+          call.send_msg(request, last: true)
+          call.recv(last: true)
         end
       end
     end

data/lib/grpc_kit/rpcs/client_server_streamer.rb

@@ -9,9 +9,14 @@ module GrpcKit
       def invoke(stream, request, metadata: {}, timeout: nil)
         call = GrpcKit::Calls::Client::ServerStreamer.new(metadata: metadata, config: @config, timeout: timeout, stream: stream)
 
-        @config.interceptor.intercept(call, metadata) do |c, m|
-          c.send_msg(request, metadata: m, last: true)
-          c
+        if @config.interceptor
+          @config.interceptor.intercept(call, metadata) do |c, m|
+            c.send_msg(request, last: true)
+            c
+          end
+        else
+          call.send_msg(request, last: true)
+          call
         end
       end
     end

data/lib/grpc_kit/server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'grpc_kit/session/io'
-require 'grpc_kit/sessions/server_session'
+require 'grpc_kit/session/server_session'
 
 module GrpcKit
   class Server
@@ -10,6 +10,8 @@ module GrpcKit
       @rpc_descs = {}
       @interceptors = interceptors
       @mutex = Mutex.new
+      @stopping = false
+      @max_graceful_wait = 60
 
       GrpcKit.logger.debug("Launched grpc_kit(v#{GrpcKit::VERSION})")
     end
@@ -26,23 +28,51 @@ module GrpcKit
     end
 
     def run(conn)
+      raise 'Stopping server' if @stopping
+
       establish_session(conn) do |s|
         s.submit_settings([])
         s.start
       end
     end
 
-    def shutdown
-      GrpcKit.logger.debug('Shutdown grpc_kit')
+    def wait_shutdown
+      loop do
+        return if @stopping
+
+        sleep 1
+      end
+    end
 
-      @mutex.synchronize do
-        @sessions.each(&:finish)
+    def force_shutdown
+      # expected to be called in trap context
+      Thread.new do
+        @mutex.synchronize do
+          GrpcKit.logger.debug('force shutdown')
+          @stopping = true
+          @sessions.each(&:shutdown)
+        end
       end
     end
 
     def graceful_shutdown
-      @mutex.synchronize do
-        @sessions.each(&:drain)
+      # expected to be called in trap context
+      Thread.new do
+        GrpcKit.logger.debug('graceful shutdown')
+        @mutex.synchronize { @sessions.each(&:drain) }
+        begin
+          Timeout.timeout(@max_graceful_wait) do
+            loop do
+              break if @mutex.synchronize { @sessions.empty? }
+
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => _
+          GrpcKit.logger.debug('Max wait time expired')
+        end
+
+        @stopping = true
       end
     end
 
@@ -62,7 +92,7 @@ module GrpcKit
     private
 
     def establish_session(conn)
-      session = GrpcKit::Sessions::ServerSession.new(GrpcKit::Session::IO.new(conn), self)
+      session = GrpcKit::Session::ServerSession.new(GrpcKit::Session::IO.new(conn), self)
       begin
         @mutex.synchronize { @sessions << session }
         yield(session)

data/lib/grpc_kit/{sessions → session}/client_session.rb

@@ -5,10 +5,14 @@ require 'forwardable'
 require 'grpc_kit/session/stream'
 
 module GrpcKit
-  module Sessions
+  module Session
     class ClientSession < DS9::Client
+      class ConnectionClosing < StandardError; end
+
       extend Forwardable
 
+      MAX_STREAM_ID = 2**31 - 1
+
       delegate %i[send_event recv_event] => :@io
 
       # @params io [GrpcKit::Session::IO]
@@ -18,16 +22,24 @@ module GrpcKit
         @io = io
         @streams = {}
         @opts = opts
+        @draining = false
+        @stop = false
+        @last_stream_id = 0
       end
 
       def send_request(data, headers)
-        stream_id = submit_request(headers, data)
+        if @draining
+          raise ConnectionClosing, "You can't send new request. becuase this connection will shuting down"
+        end
+
+        stream_id = submit_request(headers, data).to_i
         stream = GrpcKit::Session::Stream.new(stream_id: stream_id, send_data: data)
         stream.stream_id = stream_id
         @streams[stream_id] = stream
         stream
       end
 
+      # @params stream_id [Integer]
       def start(stream_id)
         stream = @streams.fetch(stream_id)
 
@@ -38,13 +50,18 @@ module GrpcKit
 
           run_once
         end
-      rescue Errno::ECONNRESET, IOError
-        finish
+      rescue Errno::ECONNRESET, IOError => e
+        GrpcKit.logger.debug(e.message)
+        shutdown
       end
 
       def run_once
         return if @stop
 
+        if @draining && @drain_time < Time.now
+          raise 'trasport is closing'
+        end
+
         if want_read?
           do_read
         end
@@ -56,13 +73,18 @@ module GrpcKit
 
       private
 
+      def shutdown
+        @stop = true
+        @io.close
+      end
+
       def do_read
         receive
       rescue IOError => e
-        finish
+        shutdown
         raise e
       rescue DS9::Exception => e
-        finish
+        shutdown
         if DS9::ERR_EOF == e.code
           @peer_shutdowned = true
           return
@@ -93,9 +115,8 @@ module GrpcKit
           if frame.end_stream?
             stream.close_remote
           end
-
-          # when DS9::Frames::Goaway
-          # when DS9::Frames::RstStream
+        when DS9::Frames::Goaway
+          handle_goaway(frame)
         end
 
         true
@@ -154,6 +175,25 @@ module GrpcKit
       # # for nghttp2_session_callbacks_set_on_invalid_frame_recv_callback
       # def on_invalid_frame_recv(frame, error_code)
       # end
+
+      def handle_goaway(frame)
+        # shutdown notice
+        last_stream_id = frame.last_stream_id
+        if last_stream_id == MAX_STREAM_ID && frame.error_code == DS9::NO_ERROR
+          @draining = true
+          @drain_time = Time.now + 10 # XXX
+          @streams.each_value(&:drain)
+        end
+
+        @last_stream_id = last_stream_id
+        @streams.each do |id, stream|
+          if id > last_stream_id
+            stream.close
+          end
+        end
+
+        shutdown if @streams.empty?
+      end
     end
   end
 end

data/lib/grpc_kit/session/drain_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'ds9'
+
+module GrpcKit
+  module Session
+    class DrainController
+      def initialize
+        @sent_shutdown_notice = false
+        @goaway_sent = false
+        @after_one_rtt = false
+        # @sent_ping = false
+      end
+
+      def recv_ping_ack
+        @after_one_rtt = true
+      end
+
+      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
+          session.submit_shutdown
+          @sent_shutdown_notice = true
+          session.submit_ping # wait for 1 RTT
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/session/headers.rb

@@ -23,10 +23,13 @@ module GrpcKit
         'grpc-message',
         'grpc-status',
         'grpc-status-details-bin',
+        'grpc-accept-encoding',
         'te'
       ].freeze
 
-      METADATA_ACCEPTABLE_HEADER = %w[authority user-agent].freeze
+      IGNORE_HEADERS = [':method', ':scheme'].freeze
+
+      METADATA_ACCEPTABLE_HEADER = %w[:authority user-agent].freeze
       def initialize
         super({}) # set metadata empty hash
       end
@@ -38,8 +41,7 @@ module GrpcKit
         when ':status'
           self.http_status = Integer(val)
         when 'content-type'
-          # TODO
-          metadata[key] = val
+          # self.grpc_encoding = val
         when 'grpc-encoding'
           self.grpc_encoding = val
         when 'grpc-status'
@@ -52,6 +54,10 @@ module GrpcKit
           # TODO
           GrpcKit.logger.warn('grpc-status-details-bin is unsupported header now')
         else
+          if IGNORE_HEADERS.include?(key)
+            return
+          end
+
           if RESERVED_HEADERS.include?(key) && !METADATA_ACCEPTABLE_HEADER.include?(key)
             return
           end

data/lib/grpc_kit/{sessions → session}/server_session.rb

@@ -3,11 +3,12 @@
 require 'ds9'
 require 'forwardable'
 require 'grpc_kit/session/stream'
-require 'grpc_kit/streams/server_stream'
-require 'grpc_kit/transports/server_transport'
+require 'grpc_kit/session/drain_controller'
+require 'grpc_kit/stream/server_stream'
+require 'grpc_kit/transport/server_transport'
 
 module GrpcKit
-  module Sessions
+  module Session
     class ServerSession < DS9::Server
       extend Forwardable
 
@@ -24,11 +25,14 @@ module GrpcKit
         @dispatcher = dispatcher
         @peer_shutdowned = false
         @inflights = []
+        @drain = nil
       end
 
       def start
         @io.wait_readable
         loop do
+          break if @stop
+
           invoke
 
           if !want_read? && !want_write?
@@ -41,12 +45,23 @@ module GrpcKit
         end
       rescue Errno::ECONNRESET, IOError => e
         GrpcKit.logger.debug(e.message)
-        finish
+        shutdown
+      ensure
+        GrpcKit.logger.debug('Finish server session')
       end
 
       def run_once
         return if @stop
 
+        if @drain
+          if @streams.empty?
+            shutdown
+            return
+          end
+
+          @drain.call(self)
+        end
+
         if want_read?
           do_read
         end
@@ -57,16 +72,14 @@ module GrpcKit
       end
 
       def drain
-        # could be race condition
-        @streams.each do |s|
-          GrpcKit.logger.debug("#{s.stream_id} is draining")
-          s.drain
-        end
+        @drain ||= GrpcKit::Session::DrainController.new
       end
 
-      def finish
+      def shutdown
         stop
         @io.close
+      rescue StandardError => e
+        GrpcKit.logger.debug(e)
       end
 
       private
@@ -77,8 +90,8 @@ module GrpcKit
 
       def invoke
         while (stream = @inflights.pop)
-          t = GrpcKit::Transports::ServerTransport.new(self, stream)
-          th = GrpcKit::Streams::ServerStream.new(t)
+          t = GrpcKit::Transport::ServerTransport.new(self, stream)
+          th = GrpcKit::Stream::ServerStream.new(t)
           @dispatcher.dispatch(stream.headers.path, th)
         end
       end
@@ -86,10 +99,10 @@ module GrpcKit
       def do_read
         receive
       rescue IOError => e
-        finish
+        shutdown
         raise e
       rescue DS9::Exception => e
-        finish
+        shutdown
         if DS9::ERR_EOF == e.code
           @peer_shutdowned = true
           return
@@ -136,7 +149,15 @@ module GrpcKit
           if frame.end_stream?
             stream.close_remote
           end
-
+        when DS9::Frames::Ping
+          if frame.ping_ack?
+            GrpcKit.logger.debug('ping ack is received')
+            # nghttp2 can't send any data once server sent actaul GoAway(not shutdown notice) frame.
+            # We want to send data in this case when 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
+          end
           # when DS9::Frames::Goaway
           # when DS9::Frames::RstStream
         end
@@ -192,9 +213,13 @@ module GrpcKit
       def on_stream_close(stream_id, error_code)
         GrpcKit.logger.debug("on_stream_close stream_id=#{stream_id}, error_code=#{error_code}")
         stream = @streams.delete(stream_id)
-        return unless stream
+        stream.close if stream
 
-        stream.close
+        if @drain
+          if @streams.empty?
+            shutdown
+          end
+        end
       end
 
       # nghttp2_session_callbacks_set_on_data_chunk_recv_callback

data/lib/grpc_kit/{streams → stream}/client_stream.rb

@@ -3,9 +3,9 @@
 require 'grpc_kit/status_codes'
 
 module GrpcKit
-  module Streams
+  module Stream
     class ClientStream
-      # @params transport [GrpcKit::Transports::ClientTransport]
+      # @params transport [GrpcKit::Transport::ClientTransport]
       # @params config [GrpcKit::MethodConfig]
       # @params authority [String]
       def initialize(transport, config, authority:, timeout: nil)
@@ -15,7 +15,7 @@ module GrpcKit
         @authority = authority
         @timeout = timeout
 
-        @sent_first_msg = false
+        @started = false
       end
 
       def send_msg(data, metadata: {}, timeout: nil, last: false)
@@ -31,15 +31,10 @@ module GrpcKit
           raise GrpcKit::Errors::ResourceExhausted, "Sending message is too large: send=#{req.bytesize}, max=#{limit_size}"
         end
 
-        if @sent_first_msg
-          # unless metadata.empty?
-          #   raise 'You can attach metadata at first send_msg' # XXX
-          # end
+        if @started
           @transport.write_data(buf, last: last)
         else
-          headers = build_headers(metadata: metadata)
-          @transport.send_request(buf, headers, last: last)
-          @sent_first_msg = true
+          start_request(buf, metadata: metadata, last: last)
         end
       end
 
@@ -59,7 +54,6 @@ module GrpcKit
         validate_if_request_start!
 
         @transport.close_and_flush
-        check_status!
 
         data = []
         loop { data.push(do_recv) }
@@ -69,7 +63,7 @@ module GrpcKit
       private
 
       def validate_if_request_start!
-        unless @sent_first_msg
+        unless @started
           raise 'You should call `send_msg` method to send data'
         end
       end
@@ -80,6 +74,8 @@ module GrpcKit
         if data.nil?
           check_status!
           raise StopIteration
+        elsif last
+          check_status!
         end
 
         compressed, size, buf = *data
@@ -107,39 +103,47 @@ module GrpcKit
       end
 
       def check_status!
-        headers = @transport.recv_headers
-
-        if headers.grpc_status != GrpcKit::StatusCodes::OK
-          raise GrpcKit::Errors.from_status_code(headers.grpc_status, headers.status_message)
+        if status.code != GrpcKit::StatusCodes::OK
+          raise GrpcKit::Errors.from_status_code(status.code, status.msg)
         else
           GrpcKit.logger.debug('request is success')
         end
       end
 
-      def build_headers(metadata: {}, **headers)
-        # TODO: an order of Headers is important?
+      Status = Struct.new(:code, :msg, :metadata)
+
+      def status
+        @status ||=
+          begin
+            headers = @transport.recv_headers
+            Status.new(headers.grpc_status, headers.status_message, headers.metadata)
+          end
+      end
+
+      def start_request(buf = nil, last: nil, metadata: {}, timeout: @timeout, authority: @authority)
         hdrs = {
           ':method' => 'POST',
           ':scheme' => 'http',
           ':path' => @config.path,
-          ':authority' => @authority,
-          'grpc-timeout' => @timeout,
+          ':authority' => authority,
+          'grpc-timeout' => timeout,
           'te' => 'trailers',
           'content-type' => 'application/grpc',
           'user-agent' => "grpc-ruby/#{GrpcKit::VERSION} (grpc_kit)",
           'grpc-accept-encoding' => 'identity,deflate,gzip',
-        }.merge(headers)
+        }
 
         metadata.each do |k, v|
           if k.start_with?('grpc-')
             # https://github.com/grpc/grpc/blob/ffac9d90b18cb076b1c952faa55ce4e049cbc9a6/doc/PROTOCOL-HTTP2.md
-            GrpcKit.logger.info("metadata name wich starts with 'grpc-' is reserved for future GRPC")
+            GrpcKit.logger.info("metadata name wich starts with 'grpc-' is reserved for future GRPC metadata")
           else
             hdrs[k] = v
           end
         end
 
-        hdrs.compact
+        @transport.start_request(buf, hdrs.compact, last: last)
+        @started = true
       end
     end
   end

data/lib/grpc_kit/{streams → stream}/server_stream.rb

@@ -3,12 +3,12 @@
 require 'grpc_kit/status_codes'
 
 module GrpcKit
-  module Streams
+  module Stream
     class ServerStream
       # @params transport [GrpcKit::transports::ServerTransport]
       def initialize(transport)
         @transport = transport
-        @sent_first_msg = false
+        @started = false
       end
 
       def invoke(rpc)
@@ -21,11 +21,7 @@ module GrpcKit
         send_status(status: GrpcKit::StatusCodes::UNKNOWN, msg: e.message, metadata: {})
       end
 
-      def send_msg(data, protobuf, last: false, limit_size: nil)
-        if last
-          send_trailer # TODO: pass trailer metadata
-        end
-
+      def send_msg(data, protobuf, last: false, limit_size: nil, initial_metadata: {}, trailing_metadata: {})
         buf =
           begin
             protobuf.encode(data)
@@ -37,11 +33,13 @@ module GrpcKit
           raise GrpcKit::Errors::ResourceExhausted, "Sending message is too large: send=#{req.bytesize}, max=#{limit_size}"
         end
 
-        @transport.write_data(buf, last: last)
-        return if @sent_first_msg
-
-        send_response({})
-        @sent_first_msg = true
+        if last
+          send_status(data: buf, metadata: trailing_metadata)
+        elsif @started
+          @transport.write_data(buf)
+        else
+          start_response(buf, metadata: initial_metadata)
+        end
       end
 
       def recv_msg(protobuf, last: false, limit_size: nil)
@@ -68,7 +66,7 @@ module GrpcKit
         begin
           protobuf.decode(buf)
         rescue ArgumentError => e
-          raise GrpcKit::Errors::Internal, "Error while decoding in Server: #{e}"
+          raise GrpcKit::Errors::Internal, "Error while decoding in server: #{e}"
         end
       end
 
@@ -76,29 +74,31 @@ module GrpcKit
         loop { yield(recv) }
       end
 
-      def send_status(status: GrpcKit::StatusCodes::INTERNAL, msg: nil, metadata: {})
-        send_trailer(status: status, msg: msg, metadata: metadata)
-        return if @sent_first_msg
+      def send_status(data: nil, status: GrpcKit::StatusCodes::OK, msg: nil, metadata: {})
+        @transport.write_data(data, last: true) if data
+        write_trailers(status, msg, metadata)
 
-        send_response({})
-        @sent_first_msg = true
+        start_response unless @started
       end
 
-      def send_trailer(status: GrpcKit::StatusCodes::OK, msg: nil, metadata: {})
-        trailer = metadata.dup
-        trailer['grpc-status'] = status.to_s
-        if msg
-          trailer['grpc-message'] = msg
-        end
+      private
+
+      def start_response(data = nil, metadata: {})
+        h = { ':status' => '200', 'content-type' => 'application/grpc' }
+        h['accept-encoding'] = 'identity'
 
-        @transport.write_trailers_data(trailer)
+        @transport.write_data(data) if data
+        @transport.start_response(h.merge(metadata))
+        @started = true
       end
 
-      def send_response(headers)
-        h = { ':status' => '200', 'content-type' => 'application/grpc' }.merge(headers)
-        h['accept-encoding'] = 'identity'
+      def write_trailers(status, msg, metadata)
+        trailers = { 'grpc-status' => status.to_s }
+        if msg
+          trailers['grpc-message'] = msg
+        end
 
-        @transport.send_response(h)
+        @transport.write_trailers(trailers.merge(metadata))
       end
     end
   end

data/lib/grpc_kit/{transports → transport}/client_transport.rb

@@ -4,18 +4,18 @@ require 'grpc_kit/transport/packable'
 require 'grpc_kit/transport/send_buffer'
 
 module GrpcKit
-  module Transports
+  module Transport
     class ClientTransport
       include GrpcKit::Transport::Packable
 
-      # @params session [GrpcKit::Session::Server|GrpcKit::Session::Client]
+      # @params session [GrpcKit::Session::ClientSession]
       def initialize(session)
         @session = session
         @stream = nil # set later
         @deferred = false
       end
 
-      def send_request(data, header, last: false)
+      def start_request(data, header, last: false)
         @stream = @session.send_request(GrpcKit::Transport::SendBuffer.new, header)
         write_data(data, last: last)
       end

data/lib/grpc_kit/{transports → transport}/server_transport.rb

@@ -3,11 +3,11 @@
 require 'grpc_kit/transport/packable'
 
 module GrpcKit
-  module Transports
+  module Transport
     class ServerTransport
       include GrpcKit::Transport::Packable
 
-      # @params session [GrpcKit::Sessions::ServerSession]
+      # @params session [GrpcKit::Session::ServerSession]
       # @params stream [GrpcKit::Session::Stream]
       def initialize(session, stream)
         @session = session
@@ -23,7 +23,7 @@ module GrpcKit
         end
       end
 
-      def send_response(headers)
+      def start_response(headers)
         @session.submit_response(@stream.stream_id, headers)
       end
 
@@ -35,7 +35,7 @@ module GrpcKit
         unpack(read(last: last))
       end
 
-      def write_trailers_data(trailer)
+      def write_trailers(trailer)
         @stream.write_trailers_data(trailer)
         @stream.end_write
       end

data/lib/grpc_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -208,19 +208,20 @@ files:
 - lib/grpc_kit/rpcs/server_server_streamer.rb
 - lib/grpc_kit/server.rb
 - lib/grpc_kit/session/buffer.rb
+- lib/grpc_kit/session/client_session.rb
+- lib/grpc_kit/session/drain_controller.rb
 - lib/grpc_kit/session/headers.rb
 - lib/grpc_kit/session/io.rb
+- lib/grpc_kit/session/server_session.rb
 - lib/grpc_kit/session/stream.rb
 - lib/grpc_kit/session/stream_status.rb
-- lib/grpc_kit/sessions/client_session.rb
-- lib/grpc_kit/sessions/server_session.rb
 - lib/grpc_kit/status_codes.rb
-- lib/grpc_kit/streams/client_stream.rb
-- lib/grpc_kit/streams/server_stream.rb
+- lib/grpc_kit/stream/client_stream.rb
+- lib/grpc_kit/stream/server_stream.rb
+- lib/grpc_kit/transport/client_transport.rb
 - lib/grpc_kit/transport/packable.rb
 - lib/grpc_kit/transport/send_buffer.rb
-- lib/grpc_kit/transports/client_transport.rb
-- lib/grpc_kit/transports/server_transport.rb
+- lib/grpc_kit/transport/server_transport.rb
 - lib/grpc_kit/version.rb
 homepage: https://github.com/ganmacs/grpc_kit
 licenses: