grpc_kit 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f50bc31421b7a051756b64bc75d4622e1a66932e919fa2a10d7bc915716969
-  data.tar.gz: 1e881d306e7c88a6a91da602e2771659fe230c523aedaae96e461621091bec70
+  metadata.gz: 8758d861d7f15069510676fb10809b04e88dcce7ad1fba77bbad60aa1140d508
+  data.tar.gz: 85c19955c66574e418d190915b9426aca629776a7ea7393ebabe44656c101ab4
 SHA512:
-  metadata.gz: 878f6c4a966f9e7af45dc3c57dcb865c93324c21c382439a5b552f67e4dab1ee09f87795af661e39df9cadaf78a20975201fae6af94f2b0b770691369608de55
-  data.tar.gz: 2e7332f3177f51efdc4f625755dbd92a5f5cdea063635eea1d6a1a75bc499ea87af57633903e12e6aebf5da5ddef028ddecc818bb71623a85b1d995c59e065a6
+  metadata.gz: 9642ed431c3fbaa305c9b47f2ddc4ce189c0c2366dbfe80b5b7c913d0da80b5f8ec8240fc981c61646f9b140e72a9e4a7694378809bb2afcb85e69218cd0f612
+  data.tar.gz: 6b231bb959a8b2758a9ff48f06749dd4d6ab37369ce9a82f5a5070ed67ea9eba358d1ed4b9f0e27499eb56059119e87eef03f050adf59d6e042d2cc0c506586b

data/examples/interceptors/client_logging_interceptor.rb

@@ -21,8 +21,9 @@ class LoggingInterceptor < GRPC::ClientInterceptor
     yield(LoggingStream.new(call))
   end
 
-  def bidi_streamer(**)
-    yield
+  def bidi_streamer(call: nil, method: nil, **)
+    GrpcKit.logger.info("Started request method=#{method.name}, service_name=#{method.receiver.class.service_name}")
+    yield(LoggingStream.new(call))
   end
 
   class LoggingStream
@@ -31,18 +32,22 @@ class LoggingInterceptor < GRPC::ClientInterceptor
     end
 
     def send_msg(msg, **opts)
-      GrpcKit.logger.info("logging interceptor send #{msg}")
+      GrpcKit.logger.info("logging interceptor send #{msg.inspect}")
       @stream.send_msg(msg, opts)
     end
 
     def recv(**opt)
       @stream.recv(opt).tap do |v|
-        GrpcKit.logger.info("logging interceptor recv #{v}")
+        GrpcKit.logger.info("logging interceptor recv #{v.inspect}")
       end
     end
 
     def close_and_recv
       @stream.close_and_recv
     end
+
+    def close_and_send
+      @stream.close_and_send
+    end
   end
 end

data/examples/interceptors/server_logging_interceptor.rb

@@ -21,8 +21,9 @@ class LoggingInterceptor < GRPC::ServerInterceptor
     yield(LoggingStream.new(call))
   end
 
-  def bidi_streamer(**)
-    yield
+  def bidi_streamer(call: nil, method: nil, **)
+    GrpcKit.logger.info("Started request method=#{method.name}, service_name=#{method.receiver.class.service_name}")
+    yield(LoggingStream.new(call))
   end
 
   class LoggingStream
@@ -31,13 +32,13 @@ class LoggingInterceptor < GRPC::ServerInterceptor
     end
 
     def send_msg(msg, **opt)
-      GrpcKit.logger.info("logging interceptor send #{msg}")
+      GrpcKit.logger.info("logging interceptor send #{msg.inspect}")
       @stream.send_msg(msg, opt)
     end
 
     def recv(**opt)
       @stream.recv(**opt).tap do |v|
-        GrpcKit.logger.info("logging interceptor recv #{v}")
+        GrpcKit.logger.info("logging interceptor recv #{v.inspect}")
       end
     end
   end

data/lib/grpc.rb

@@ -2,6 +2,8 @@
 
 # Compatible file for xx_services_pb.rb and xx_pb.rb which are created by grpc-tools gem
 require 'grpc_kit'
+require 'grpc_kit/grpc/core'
+require 'grpc_kit/grpc/errors'
 require 'grpc_kit/grpc/generic_service'
 require 'grpc_kit/grpc/interceptor'
 require 'grpc_kit/grpc/logger'

data/lib/grpc_kit/calls/client_bidi_streamer.rb

@@ -48,6 +48,8 @@ module GrpcKit
             return msg
           end
         end
+
+        raise StopIteration
       rescue GrpcKit::Errors::BadStatus => e
         @reason = e
         raise e

data/lib/grpc_kit/calls.rb

@@ -49,7 +49,9 @@ module GrpcKit
 
       # @return [Time] deadline of this rpc call
       def deadline
-        @deadline ||= @timeout.to_absolute_time
+        return @deadline if instance_variable_defined?(:@deadline)
+
+        @deadline = @timeout && @timeout.to_absolute_time
       end
     end
   end

data/lib/grpc_kit/grpc/core.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'grpc_kit'
+
+module GrpcKit
+  module GRPC
+    module Core
+      StatusCodes = GrpcKit::StatusCodes
+    end
+  end
+end

data/lib/grpc_kit/grpc/errors.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'grpc_kit'
+require 'grpc_kit/errors'
+
+module GrpcKit
+  module GRPC
+    include GrpcKit::Errors
+  end
+end

data/lib/grpc_kit/interceptors/client_bidi_streamer.rb

@@ -11,8 +11,8 @@ module GrpcKit
       # @param call [GrpcKit::Calls::Client::BidiStreamer]
       # @param metadata [Hash<String,String>]
       def invoke(interceptor, call, metadata)
-        interceptor.bidi_streamer(requests: nil, call: call, method: call.method, metadata: metadata) do
-          yield(call, metadata)
+        interceptor.bidi_streamer(requests: nil, call: call, method: call.method, metadata: metadata) do |new_call = nil|
+          yield(new_call || call, metadata)
         end
       end
     end

data/lib/grpc_kit/interceptors/client_client_streamer.rb

@@ -13,8 +13,8 @@ module GrpcKit
       def invoke(interceptor, call, metadata)
         # We don't need a `:requests` parameter but,
         # it shuoldn't remove from paramters due to having a compatibility of grpc gem.
-        interceptor.client_streamer(requests: nil, call: call, method: call.method, metadata: metadata) do
-          yield(call, metadata)
+        interceptor.client_streamer(requests: nil, call: call, method: call.method, metadata: metadata) do |new_call = nil|
+          yield(new_call || call, metadata)
         end
       end
     end

data/lib/grpc_kit/interceptors/client_server_streamer.rb

@@ -13,8 +13,8 @@ module GrpcKit
       def invoke(interceptor, call, metadata)
         # We don't need a `:request` parameter but,
         # it shuoldn't remove from paramters due to having a compatibility of grpc gem.
-        interceptor.server_streamer(request: nil, call: call, method: call.method, metadata: metadata) do
-          yield(call, metadata)
+        interceptor.server_streamer(request: nil, call: call, method: call.method, metadata: metadata) do |new_call = nil|
+          yield(new_call || call, metadata)
         end
       end
     end

data/lib/grpc_kit/interceptors/server_bidi_streamer.rb

@@ -8,8 +8,8 @@ module GrpcKit
       # @param interceptor [GrpcKit::GRPC::ServerInterceptor]
       # @param call [GrpcKit::Calls::Client::BidiStreamer]
       def invoke(interceptor, call)
-        interceptor.bidi_streamer(call: call, method: call.method) do
-          yield(call)
+        interceptor.bidi_streamer(call: call, method: call.method) do |new_call = nil|
+          yield(new_call || call)
         end
       end
     end

data/lib/grpc_kit/interceptors/server_client_streamer.rb

@@ -8,8 +8,8 @@ module GrpcKit
       # @param interceptor [GrpcKit::GRPC::ServerInterceptor]
       # @param call [GrpcKit::Calls::Client::ClientStreamer]
       def invoke(interceptor, call)
-        interceptor.client_streamer(call: call, method: call.method) do
-          yield(call)
+        interceptor.client_streamer(call: call, method: call.method) do |new_call = nil|
+          yield(new_call || call)
         end
       end
     end

data/lib/grpc_kit/interceptors/server_server_streamer.rb

@@ -10,8 +10,8 @@ module GrpcKit
       def invoke(interceptor, call)
         # We don't need a `:request` parameter but,
         # it shuoldn't remove from paramters due to having a compatibility of grpc gem.
-        interceptor.server_streamer(request: nil, call: call, method: call.method) do
-          yield(call)
+        interceptor.server_streamer(request: nil, call: call, method: call.method) do |new_call = nil|
+          yield(new_call || call)
         end
       end
     end

data/lib/grpc_kit/rpc_desc.rb

@@ -48,7 +48,7 @@ module GrpcKit
         path: path,
         ruby_style_method_name: ruby_style_name,
         protobuf: server_protobuf,
-        service_name: @server_name,
+        service_name: @service_name,
         method_name: @name,
         interceptor: inter,
       )
@@ -64,7 +64,7 @@ module GrpcKit
         path: path,
         ruby_style_method_name: ruby_style_name,
         protobuf: client_protobuf,
-        service_name: @server_name,
+        service_name: @service_name,
         method_name: @name,
         interceptor: inter,
       )

data/lib/grpc_kit/session/client_session.rb

@@ -35,9 +35,8 @@ module GrpcKit
           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 = GrpcKit::Session::Stream.new(stream_id: 0) # set later
+        stream_id = submit_request(headers, stream.pending_send_data).to_i
         stream.stream_id = stream_id
         @streams[stream_id] = stream
         stream

data/lib/grpc_kit/session/server_session.rb

@@ -202,7 +202,7 @@ module GrpcKit
           raise "#{stream_id} is already existed"
         end
 
-        @streams[stream_id] = GrpcKit::Session::Stream.new(stream_id: stream_id, send_data: GrpcKit::Session::SendBuffer.new)
+        @streams[stream_id] = GrpcKit::Session::Stream.new(stream_id: stream_id)
       end
 
       # nghttp2_session_callbacks_set_on_header_callback

data/lib/grpc_kit/session/stream.rb

@@ -19,14 +19,12 @@ module GrpcKit
       attr_accessor :inflight, :stream_id
 
       # @param stream_id [Integer]
-      # @param send_data [GrpcKit::Session::SendBuffer]
-      # @param recv_data [GrpcKit::Session::RecvBuffer]
-      def initialize(stream_id:, send_data: nil, recv_data: nil)
+      def initialize(stream_id:)
         @stream_id = stream_id
         @end_read_stream = false
         @headers = GrpcKit::Session::Headers.new
-        @pending_send_data = send_data || GrpcKit::Session::SendBuffer.new
-        @pending_recv_data = recv_data || GrpcKit::Session::RecvBuffer.new
+        @pending_send_data = GrpcKit::Session::SendBuffer.new
+        @pending_recv_data = GrpcKit::Session::RecvBuffer.new
 
         @inflight = false
         @trailer_data = {}

data/lib/grpc_kit/stream/client_stream.rb

@@ -143,7 +143,7 @@ module GrpcKit
 
         begin
           @config.protobuf.decode(buf)
-        rescue ArgumentError => e
+        rescue ArgumentError, TypeError => e
           raise GrpcKit::Errors::Internal, "Error while decoding in Client: #{e}"
         end
       end

data/lib/grpc_kit/stream/server_stream.rb

@@ -33,7 +33,7 @@ module GrpcKit
         buf =
           begin
             protobuf.encode(data)
-          rescue ArgumentError => e
+          rescue ArgumentError, TypeError => e
             raise GrpcKit::Errors::Internal, "Error while encoding in server: #{e}"
           end
 

data/lib/grpc_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -182,7 +182,9 @@ files:
 - lib/grpc_kit/calls/server_server_streamer.rb
 - lib/grpc_kit/client.rb
 - lib/grpc_kit/errors.rb
+- lib/grpc_kit/grpc/core.rb
 - lib/grpc_kit/grpc/dsl.rb
+- lib/grpc_kit/grpc/errors.rb
 - lib/grpc_kit/grpc/generic_service.rb
 - lib/grpc_kit/grpc/interceptor.rb
 - lib/grpc_kit/grpc/logger.rb