grpc_kit 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6fc31fa5c206fbd36425cff44c8d7c53a7089b2de28f0d66b0e7b76ef62844
-  data.tar.gz: 22143378a2ba5d8c6e8f1beeb11a82e1939ee410b505189ceca6df8244ab576d
+  metadata.gz: e7b605bf4f8cf8486b85fbb391296e0e9acb21ca00efc29850271e9890b6a386
+  data.tar.gz: cc8597e07c5e467c249dc78a4ad5f02fc811410039e7eadaecfe176ae9dc3b20
 SHA512:
-  metadata.gz: 066bee105c96f2a11395bee9d6d3006c7ee58f49dec6f56e2f12a0349a7289541a50634590d67029866f581617d5183e2a6562a0a961a59983b83e485beb0282
-  data.tar.gz: 91537f22b1e118b1863cb14f82a01f4e22a47a92c94595ec3b3e388fc700378e933d3feae568d1d7ef5ee408875c639fc9a58c82826e6a98faeb319f10eb9ebd
+  metadata.gz: fb29d063711fa507ff5d85a6bd9ef7e7fac86ffb4502947ab144feea453a01901ee9fc14c05e0a10a2a10d0b73fbfc1ee4e0dcc58b1c4ccf5ef9b6b974295548
+  data.tar.gz: 9e98bb7709c5bdc49683e57d9134877d8ec558feff9d1081a1f49e76afc47969172843f5b4669b8d84f74a826bb58a58372840f8011f82bd7a1bca3b2ec76e58

data/TODO.md

@@ -46,7 +46,7 @@
 - [x] internal
 - [ ] resouce exhausted (worker is exhausted)
 - [x] duration parse in header
-- [ ] send `grpc-status` along with header frame if possible
+- [x] send `grpc-status` along with header frame if possible
    - need to support  https://nghttp2.org/documentation/nghttp2_submit_response.html, data_prd is not NULL
 - [x] unimplemented error
 - [ ] goaway

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

data/lib/grpc_kit/session/client_session.rb

@@ -3,6 +3,7 @@
 require 'ds9'
 require 'forwardable'
 require 'grpc_kit/session/stream'
+require 'grpc_kit/session/send_buffer'
 
 module GrpcKit
   module Session
@@ -26,11 +27,12 @@ module GrpcKit
         @stop = false
       end
 
-      def send_request(data, headers)
+      def send_request(headers)
         if @draining
           raise ConnectionClosing, "You can't send new request. becuase this connection will shuting down"
         end
 
+        data = GrpcKit::Session::SendBuffer.new
         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

data/lib/grpc_kit/session/headers.rb

@@ -4,66 +4,63 @@ require 'grpc_kit/grpc_time'
 
 module GrpcKit
   module Session
-    Headers = Struct.new(
-      :metadata,
-      :path,
-      :grpc_encoding,
-      :grpc_status,
-      :status_message,
-      :timeout,
-      :method,
-      :http_status,
-    ) do
-
+    class Headers
       RESERVED_HEADERS = [
-        'content-type',
-        'user-agent',
-        'grpc-message-type',
-        'grpc-encoding',
-        'grpc-message',
-        'grpc-status',
-        'grpc-status-details-bin',
-        'grpc-accept-encoding',
-        'te'
+        ':path', ':status', ':scheme',
+        'content-type', 'grpc-message-type', 'grpc-timeout',
+        'grpc-encoding', 'grpc-message', 'grpc-status',
+        'grpc-status-details-bin', 'grpc-accept-encoding', 'te',
+        ':method'
       ].freeze
 
-      IGNORE_HEADERS = [':method', ':scheme'].freeze
-
       METADATA_ACCEPTABLE_HEADER = %w[:authority user-agent].freeze
+
       def initialize
-        super({}) # set metadata empty hash
+        @opts = {}
+        @metadata = {}
       end
 
-      def add(key, val)
-        case key
-        when ':path'
-          self.path = val
-        when ':status'
-          self.http_status = Integer(val)
-        when 'content-type'
-          # self.grpc_encoding = val
-        when 'grpc-encoding'
-          self.grpc_encoding = val
-        when 'grpc-status'
-          self.grpc_status = val
-        when 'grpc-timeout'
-          self.timeout = GrpcTime.new(val)
-        when 'grpc-message'
-          self.status_message = val
-        when 'grpc-status-details-bin'
-          # TODO
-          GrpcKit.logger.warn('grpc-status-details-bin is unsupported header now')
-        else
-          if IGNORE_HEADERS.include?(key)
-            return
+      def metadata
+        @metadata =
+          if @metadata.empty?
+            @opts.select do |key|
+              !key.start_with?(':', 'grpc-') && !RESERVED_HEADERS.include?(key)
+            end
+          else
+            @metadata
           end
+      end
 
-          if RESERVED_HEADERS.include?(key) && !METADATA_ACCEPTABLE_HEADER.include?(key)
-            return
-          end
+      def path
+        @opts[':path']
+      end
+
+      def grpc_status
+        @opts['grpc-status']
+      end
+
+      def grpc_encoding
+        @opts['grpc-encoding']
+      end
+
+      def content_type
+        @opts['content-type']
+      end
+
+      def status_message
+        @opts['grpc-message']
+      end
 
-          metadata[key] = val
-        end
+      def timeout
+        @timeout ||= @opts['grpc-timeout'] && GrpcTime.new(@opts['grpc-timeout'])
+      end
+
+      def http_status
+        @opts[':status']
+      end
+
+      def add(key, val)
+        @opts[key] = val
       end
     end
   end

data/lib/grpc_kit/session/io.rb

@@ -44,6 +44,10 @@ module GrpcKit
         false
       end
 
+      def select(timeout = 1)
+        ::IO.select([@io], [@io], [], timeout)
+      end
+
       def flush
         @io.flush
       end

data/lib/grpc_kit/session/recv_buffer.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  module Session
+    class RecvBuffer
+      def initialize
+        @buffer = +''.b
+        @end = false
+      end
+
+      def write(data)
+        @buffer << data
+      end
+
+      def read(size = nil, last: false)
+        return nil if @buffer.empty?
+
+        end_read if last
+
+        if size.nil? || @buffer.bytesize < size
+          buf = @buffer
+          @buffer = ''.b
+          buf
+        else
+          @buffer.freeze
+          rbuf = @buffer.byteslice(0, size)
+          @buffer = @buffer.byteslice(size, @buffer.bytesize)
+          rbuf
+        end
+      end
+
+      def end_read?
+        @end
+      end
+
+      def end_read
+        @end = true
+      end
+    end
+  end
+end

data/lib/grpc_kit/session/send_buffer.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  module Session
+    class SendBuffer
+      def initialize
+        @buffer = ''.b
+        @end_write = false
+        @deferred_read = false
+      end
+
+      def write(data, last: false)
+        end_write if last
+        @buffer << data
+      end
+
+      def need_resume?
+        @deferred_read
+      end
+
+      def end_write
+        @end_write = true
+      end
+
+      def end_write?
+        @end_write
+      end
+
+      def read(size = nil)
+        if @buffer.empty?
+          if end_write?
+            @deferred_read = false
+            return nil # EOF
+          end
+
+          @deferred_read = true
+          return DS9::ERR_DEFERRED
+        end
+
+        if size.nil? || @buffer.bytesize < size
+          buf = @buffer
+          @buffer = ''.b
+          buf
+        else
+          @buffer.freeze
+          rbuf = @buffer.byteslice(0, size)
+          @buffer = @buffer.byteslice(size, @buffer.bytesize)
+          rbuf
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/session/server_session.rb

@@ -6,6 +6,7 @@ require 'grpc_kit/session/stream'
 require 'grpc_kit/session/drain_controller'
 require 'grpc_kit/stream/server_stream'
 require 'grpc_kit/transport/server_transport'
+require 'grpc_kit/session/send_buffer'
 
 module GrpcKit
   module Session
@@ -32,7 +33,7 @@ module GrpcKit
         loop do
           invoke
 
-          if @streams.count == 0
+          if @streams.size == 0
             unless @io.wait_readable
               shutdown
               break
@@ -63,11 +64,13 @@ module GrpcKit
           @drain.call(self)
         end
 
-        if want_read?
+        rs, ws = @io.select
+
+        if !rs.empty? && want_read?
           do_read
         end
 
-        if want_write?
+        if !ws.empty? && want_write?
           send
         end
 
@@ -122,7 +125,7 @@ module GrpcKit
 
         stream = @streams[stream_id]
         data = @streams[stream_id].pending_send_data.read(length)
-        if data.empty? && stream.end_write?
+        if data.nil?
           submit_trailer(stream_id, stream.trailer_data)
           # trailer header
           false
@@ -133,7 +136,7 @@ module GrpcKit
 
       # nghttp2_session_callbacks_set_on_frame_recv_callback
       def on_frame_recv(frame)
-        GrpcKit.logger.debug("on_frame_recv #{frame}")
+        # GrpcKit.logger.debug("on_frame_recv #{frame}") # Too many call
 
         case frame
         when DS9::Frames::Data
@@ -148,9 +151,8 @@ module GrpcKit
             @inflights << stream
           end
         when DS9::Frames::Headers
-          stream = @streams[frame.stream_id]
-
           if frame.end_stream?
+            stream = @streams[frame.stream_id]
             stream.close_remote
           end
         when DS9::Frames::Ping
@@ -170,11 +172,11 @@ module GrpcKit
 
       # nghttp2_session_callbacks_set_on_frame_send_callback
       def on_frame_send(frame)
-        GrpcKit.logger.debug("on_frame_send #{frame}")
+        # GrpcKit.logger.debug("on_frame_send #{frame}") # Too many call
         case frame
         when DS9::Frames::Data, DS9::Frames::Headers
-          stream = @streams[frame.stream_id]
           if frame.end_stream?
+            stream = @streams[frame.stream_id]
             stream.close_local
           end
         end
@@ -197,12 +199,12 @@ module GrpcKit
           raise "#{stream_id} is already existed"
         end
 
-        @streams[stream_id] = GrpcKit::Session::Stream.new(stream_id: stream_id)
+        @streams[stream_id] = GrpcKit::Session::Stream.new(stream_id: stream_id, send_data: GrpcKit::Session::SendBuffer.new)
       end
 
       # nghttp2_session_callbacks_set_on_header_callback
       def on_header(name, value, frame, _flags)
-        GrpcKit.logger.debug("#{name} => #{value}")
+        # GrpcKit.logger.debug("#{name} => #{value}") # Too many call
         stream = @streams[frame.stream_id]
         stream.add_header(name, value)
       end
@@ -214,7 +216,10 @@ module GrpcKit
 
       # nghttp2_session_callbacks_set_on_stream_close_callback
       def on_stream_close(stream_id, error_code)
-        GrpcKit.logger.debug("on_stream_close stream_id=#{stream_id}, error_code=#{error_code}")
+        if error_code != DS9::NO_ERROR
+          GrpcKit.logger.debug("on_stream_close stream_id=#{stream_id}, error_code=#{error_code}")
+        end
+
         stream = @streams.delete(stream_id)
         stream.close if stream
 

data/lib/grpc_kit/session/stream.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: false
 
 require 'forwardable'
-require 'grpc_kit/session/buffer'
 require 'grpc_kit/session/headers'
 require 'grpc_kit/session/stream_status'
+require 'grpc_kit/session/recv_buffer'
+require 'grpc_kit/session/send_buffer'
 
 module GrpcKit
   module Session
@@ -21,8 +22,8 @@ module GrpcKit
         @stream_id = stream_id
         @end_read_stream = false
         @headers = GrpcKit::Session::Headers.new
-        @pending_send_data = send_data || GrpcKit::Session::Buffer.new
-        @pending_recv_data = recv_data || GrpcKit::Session::Buffer.new
+        @pending_send_data = send_data || GrpcKit::Session::SendBuffer.new
+        @pending_recv_data = recv_data || GrpcKit::Session::RecvBuffer.new
 
         @inflight = false
         @trailer_data = {}

data/lib/grpc_kit/stream/server_stream.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'grpc_kit/status_codes'
+require 'grpc_kit/errors'
 
 module GrpcKit
   module Stream
@@ -61,8 +61,6 @@ module GrpcKit
           raise 'compress option is unsupported'
         end
 
-        raise StopIteration if buf.nil?
-
         begin
           protobuf.decode(buf)
         rescue ArgumentError => e
@@ -70,19 +68,35 @@ module GrpcKit
         end
       end
 
-      def each
-        loop { yield(recv) }
+      def each(protobuf)
+        loop { yield(recv_msg(protobuf)) }
       end
 
       def send_status(data: nil, status: GrpcKit::StatusCodes::OK, msg: nil, metadata: {})
+        t = build_trailers(status, msg, metadata)
         @transport.write_data(data, last: true) if data
-        write_trailers(status, msg, metadata)
 
-        start_response unless @started
+        @transport.end_write
+        if @started
+          @transport.write_trailers(t)
+        elsif data
+          @transport.write_trailers(t)
+          start_response
+        else
+          send_headers(trailers: t)
+        end
       end
 
       private
 
+      def send_headers(trailers: {})
+        h = { ':status' => '200', 'content-type' => 'application/grpc' }
+        h['accept-encoding'] = 'identity'
+
+        @transport.submit_headers(h.merge(trailers))
+        @started = true
+      end
+
       def start_response(data = nil, metadata: {})
         h = { ':status' => '200', 'content-type' => 'application/grpc' }
         h['accept-encoding'] = 'identity'
@@ -92,13 +106,13 @@ module GrpcKit
         @started = true
       end
 
-      def write_trailers(status, msg, metadata)
+      def build_trailers(status, msg, metadata)
         trailers = { 'grpc-status' => status.to_s }
         if msg
           trailers['grpc-message'] = msg
         end
 
-        @transport.write_trailers(trailers.merge(metadata))
+        trailers.merge(metadata)
       end
     end
   end

data/lib/grpc_kit/transport/client_transport.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'grpc_kit/transport/packable'
-require 'grpc_kit/transport/send_buffer'
 
 module GrpcKit
   module Transport
@@ -12,42 +11,29 @@ module GrpcKit
       def initialize(session)
         @session = session
         @stream = nil # set later
-        @deferred = false
       end
 
       def start_request(data, header, last: false)
-        @stream = @session.send_request(GrpcKit::Transport::SendBuffer.new, header)
+        @stream = @session.send_request(header)
         write_data(data, last: last)
       end
 
       def close_and_flush
-        resume_if_need
-
         @stream.end_write
+        send_data
+
         @session.start(@stream.stream_id)
         @stream.end_read
         @deferred = false
       end
 
-      def each
-        loop do
-          data = recv
-          return if data.nil?
-
-          yield(data)
-        end
-      end
-
       def write_data(buf, last: false)
-        resume_if_need
-
         write(@stream.pending_send_data, pack(buf), last: last)
-        @session.run_once
-        @deferred = true unless last
+        send_data
       end
 
       def read_data(last: false)
-        unpack(read(last: last))
+        unpack(recv_data(last: last))
       end
 
       def recv_headers
@@ -57,12 +43,6 @@ module GrpcKit
 
       private
 
-      def resume_if_need
-        if !@stream.end_write? && @deferred
-          @session.resume_data(@stream.stream_id)
-        end
-      end
-
       def wait_close
         # XXX: wait until half close (remote) to get grpc-status
         until @stream.close_remote?
@@ -74,10 +54,10 @@ module GrpcKit
         stream.write(buf, last: last)
       end
 
-      def read(last: false)
+      def recv_data(last: false)
         loop do
           data = @stream.read_recv_data(last: last)
-          return data unless data.empty?
+          return data unless data.nil?
 
           if @stream.close_remote?
             # it do not receive data which we need, it may receive invalid grpc-status
@@ -91,6 +71,14 @@ module GrpcKit
           @session.run_once
         end
       end
+
+      def send_data
+        if @stream.pending_send_data.need_resume?
+          @session.resume_data(@stream.stream_id)
+        end
+
+        @session.run_once
+      end
     end
   end
 end

data/lib/grpc_kit/transport/packable.rb

@@ -12,15 +12,9 @@ module GrpcKit
 
       # @params data [String]
       def unpack(data)
-        if data
-          unpacker.feed(data)
-        end
-
-        if unpacker.readable?
-          return unpacker.read
-        end
+        unpacker.feed(data) if data
 
-        nil
+        unpacker.read
       end
 
       def unpacker
@@ -32,27 +26,25 @@ module GrpcKit
         METADATA_SIZE = 5
 
         def initialize
-          @i = 0
-          @data = nil
+          @data = +''.b
         end
 
-        def readable?
-          @data && !@data.empty?
+        def data_exist?
+          !@data.empty?
         end
 
         def feed(data)
-          if @data
-            @data << data
-          else
-            @data = data
-          end
+          @data << data
         end
 
         def read
-          metadata = @data.slice!(0, METADATA_SIZE)
+          return nil if @data.empty?
+
+          d = @data.freeze
+          metadata = d.byteslice(0, METADATA_SIZE)
           c, size = metadata.unpack('CN')
-          # TODO: more efficient code
-          data = @data.slice!(0, size)
+          data = @data.byteslice(METADATA_SIZE, size)
+          @data = @data.byteslice(METADATA_SIZE + size, @data.bytesize)
           [c != 0, size, data]
         end
       end

data/lib/grpc_kit/transport/server_transport.rb

@@ -14,29 +14,30 @@ module GrpcKit
         @stream = stream
       end
 
-      def each
-        loop do
-          data = recv
-          return if data.nil?
-
-          yield(data)
-        end
-      end
-
       def start_response(headers)
         @session.submit_response(@stream.stream_id, headers)
+        send_data
+      end
+
+      def submit_headers(headers)
+        @session.submit_headers(@stream.stream_id, headers)
       end
 
       def write_data(buf, last: false)
         @stream.write_send_data(pack(buf), last: last)
+        send_data(last: last)
       end
 
       def read_data(last: false)
-        unpack(read(last: last))
+        unpack(recv_data(last: last))
       end
 
       def write_trailers(trailer)
         @stream.write_trailers_data(trailer)
+        send_data(last: true)
+      end
+
+      def end_write
         @stream.end_write
       end
 
@@ -46,10 +47,10 @@ module GrpcKit
 
       private
 
-      def read(last: false)
+      def recv_data(last: false)
         loop do
           data = @stream.read_recv_data(last: last)
-          return data unless data.empty?
+          return data unless data.nil?
 
           if @stream.close_remote?
             # it do not receive data which we need, it may receive invalid grpc-status
@@ -63,6 +64,16 @@ module GrpcKit
           @session.run_once
         end
       end
+
+      def send_data(last: false)
+        if @stream.pending_send_data.need_resume?
+          @session.resume_data(@stream.stream_id)
+        end
+
+        unless last
+          @session.run_once
+        end
+      end
     end
   end
 end

data/lib/grpc_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-12 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.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -207,11 +207,12 @@ files:
 - lib/grpc_kit/rpcs/server_request_response.rb
 - 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/recv_buffer.rb
+- lib/grpc_kit/session/send_buffer.rb
 - lib/grpc_kit/session/server_session.rb
 - lib/grpc_kit/session/stream.rb
 - lib/grpc_kit/session/stream_status.rb
@@ -220,7 +221,6 @@ files:
 - 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/transport/server_transport.rb
 - lib/grpc_kit/version.rb
 homepage: https://github.com/ganmacs/grpc_kit

data/lib/grpc_kit/session/buffer.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module GrpcKit
-  module Session
-    class Buffer
-      attr_accessor :finish
-
-      def initialize(buffer: nil)
-        @buffer = buffer
-        @end_read = false
-        @end_write = false
-        @finish = false
-      end
-
-      def write(data, last: false)
-        return 0 if data.empty?
-
-        end_write if last
-
-        if @buffer
-          @buffer << data
-        else
-          @buffer = data.dup
-        end
-
-        data.bytesize
-      end
-
-      def read(len = nil, last: false)
-        if @buffer.nil? || @buffer.empty?
-          return ''
-        end
-
-        end_read if last
-
-        # TODO: more efficient code
-        if len
-          @buffer.slice!(0...len)
-        else
-          @buffer.slice!(0..-1)
-        end
-      end
-
-      def end_read?
-        @end_read
-      end
-
-      def end_write?
-        @end_write
-      end
-
-      def end_read
-        @end_read = true
-      end
-
-      def end_write
-        @end_write = true
-      end
-    end
-  end
-end

data/lib/grpc_kit/transport/send_buffer.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module GrpcKit
-  module Transport
-    class SendBuffer
-      def initialize
-        @buffer = nil
-        @end_write = false
-      end
-
-      def write(data, last: false)
-        end_write if last
-
-        if @buffer
-          @buffer << data
-        else
-          @buffer = data
-        end
-      end
-
-      def end_write
-        @end_write = true
-      end
-
-      def end_write?
-        @end_write
-      end
-
-      def read(size)
-        if @buffer.nil?
-          return false
-        end
-
-        data = @buffer.slice!(0, size)
-        if !data.empty?
-          data
-        elsif end_write?
-          nil # EOF
-        else
-          false # deferred
-        end
-      end
-    end
-  end
-end