grpc_kit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24da7e7fc87c510f28152d959814121928623f6217da6d46148fa8a83f39446f
-  data.tar.gz: 792c2414ddffaf2e96abf6e8de8239cbf4a9cd1963675e9af9cf3af2434c7bf5
+  metadata.gz: 9c229b35fd09c414d3fc19aeaa1c46dd1e4c99b5046dbbaf33fbe8e418c5a34b
+  data.tar.gz: 613b394508932720c519ebc41abaab965e7b8cfb4ba6fcf864729bb027f8ebd8
 SHA512:
-  metadata.gz: 8c7194e0e9043f0f984b226b13dee18ee3ff84168061f2c788a8deeeb8e8096c748c83a26635ef4241deaeb283e315e9ffb39d40a54065922daad0bb59152055
-  data.tar.gz: 0b502f3c1d0606c4bfe514eea8a0d250fbf7a34718d6f5926a9cbc7b0eaae296ba4f1a2f5a33eeebd50e665481927d6711377978d762184e29ec50a666b18b7e
+  metadata.gz: 49874a742c974ba015526b8649bb1667b65478e2b533a7cde9020e906e425f47d523d4868ad0c64d944e4f249c9c08ef88c6e592fb3dab774a987f07b54e5a2e
+  data.tar.gz: b147ff2d8aa48c6b1cf537b9809939a4344432a265d96543537dd9bd8aa8731681e31ea9989e7f6844a5d60adef173058942dd33120b75bf77088bf22604c28a

data/lib/grpc_kit/session/send_buffer.rb

@@ -23,6 +23,10 @@ module GrpcKit
         @deferred_read
       end
 
+      def no_resume
+        @deferred_read = false
+      end
+
       # @return [void]
       def end_write
         @end_write = true
@@ -41,22 +45,24 @@ module GrpcKit
       # @return [nil,DS9::ERR_DEFERRED,String]
       def read(size = nil)
         buf = do_read(size)
-        if buf.nil?
-          if end_write?
-            # Call again because #write invokes `@buffer << data` before calling #end_write
-            if (buf = do_read(size))
-              return buf
-            end
+        if buf
+          @deferred_read = false
+          return buf
+        end
 
+        if end_write?
+          # Call again because #write invokes `@buffer << data` before calling #end_write
+          if (buf = do_read(size))
             @deferred_read = false
-            return nil # EOF
+            return buf
           end
 
-          @deferred_read = true
-          return DS9::ERR_DEFERRED
+          @deferred_read = false
+          return nil # EOF
         end
 
-        buf
+        @deferred_read = true
+        DS9::ERR_DEFERRED
       end
 
       private

data/lib/grpc_kit/session/server_session.rb

@@ -107,8 +107,9 @@ module GrpcKit
         while (event = @control_queue.pop)
           case event[0]
           when :submit_response
+            stream = @streams[event[1]]
             # piggybacked previous invokeing #submit_response?
-            if @streams[event[1]].pending_send_data.empty?
+            unless stream && !stream.pending_send_data.empty?
               next
             end
 
@@ -116,7 +117,13 @@ module GrpcKit
           when :submit_headers
             submit_headers(event[1], event[2])
           when :resume_data
+            stream = @streams[event[1]]
+            unless stream && stream.pending_send_data.need_resume?
+              next
+            end
+
             resume_data(event[1])
+            stream.pending_send_data.no_resume
           end
         end
       end

data/lib/grpc_kit/transport/server_transport.rb

@@ -18,6 +18,7 @@ module GrpcKit
       # @return [void]
       def start_response(headers)
         @control_queue.submit_response(@stream.stream_id, headers)
+        send_data
       end
 
       # @param headers [Hash<String, String>]
@@ -31,6 +32,7 @@ module GrpcKit
       # @return [void]
       def write_data(buf, last: false)
         @stream.write_send_data(pack(buf), last: last)
+        send_data
       end
 
       # @param last [Boolean]
@@ -43,6 +45,7 @@ module GrpcKit
       # @return [void]
       def write_trailers(trailer)
         @stream.write_trailers_data(trailer)
+        send_data
       end
 
       # @return [void]
@@ -72,11 +75,7 @@ module GrpcKit
       end
 
       def send_data
-        unless @stream.pending_send_data.need_resume?
-          return
-        end
-
-        @session.resume_data(@stream.stream_id)
+        @control_queue.resume_data(@stream.stream_id)
       end
     end
   end

data/lib/grpc_kit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuta Iwama