grpc_kit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287f67b56117d3821a209c4be0892d6a9b7327fae3f7db509427afd2b53ef01b
-  data.tar.gz: f2e75960649d6f0c76fa6aae4d6370e0a7d4285d7154ca5bd1a640b5a1d458f0
+  metadata.gz: 7415d182781136999b2e1630ef9dff77a61196225b4207e9d9535a2b566fceee
+  data.tar.gz: 9836c54ed198740c4a75e90b957a641528b06333a30314c03441b9dce35f8731
 SHA512:
-  metadata.gz: ccf9c72baa32cdecfe2d1fe8e7b1126ebb9c7e6604eef084d59ec478b34ad565912f8ebf648dadecf2cd4208441abe9cdfc31781a3f7460d542de395ee98e596
-  data.tar.gz: 5dbd7080945c3d1d47f4b19c488eb36a2cf60e71a28803344fc8f81d4054d42fa0cbe93929260d2e1709dd7f213c015188b8d209e34763de63a36d49b93f3e18
+  metadata.gz: '083b685dd4f7966156a1ac41eab594ace1664c813105e1204c521ce85e727945170ef1c701097ee6f93467407b13d08ea649d6da5f86af54ebd60ca1e373336e'
+  data.tar.gz: 505029bdcbfb035cb41b10ed845cec6ce27eae2ff350a27f49cb8a3b2cb4afeca92b8e5b9a7bc70e7dc0e2e8bde9d88591cc8899a871d81d2665c5c8141a1d14

data/.travis.yml

@@ -32,7 +32,6 @@ rvm:
   - ruby-head
   - 2.5.3
   - 2.4.5
-  - 2.3.8
 before_install:
   - bin/nghttp2
   - export LD_LIBRARY_PATH=$HOME/lib:$LD_LIBRARY_PATH

data/TODO.md

@@ -45,7 +45,7 @@
 - [x] resouce exhausted (body size is to large)
 - [x] internal
 - [ ] resouce exhausted (worker is exhausted)
-- [ ] duration parse in header
+- [x] duration parse in header
 - [ ] 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

data/examples/helloworld_client.rb

@@ -7,6 +7,10 @@ require 'socket'
 require 'pry'
 require 'helloworld_services_pb'
 
-stub = Helloworld::Greeter::Stub.new('localhost', 50051)
+HOST = 'localhost'
+PORT = 50051
+
+sock = TCPSocket.new(HOST, PORT)
+stub = Helloworld::Greeter::Stub.new(sock)
 message = stub.say_hello(Helloworld::HelloRequest.new(name: 'ganmacs')).message
 p message

data/examples/routeguide_client.rb

@@ -11,6 +11,8 @@ require 'logger'
 require 'routeguide_services_pb'
 
 RESOURCE_PATH = './examples/routeguide/routeguide.json'
+HOST = 'localhost'
+PORT = 50051
 
 $logger = Logger.new(STDOUT)
 
@@ -22,7 +24,7 @@ def get_feature(stub)
   ]
 
   points.each do |pt|
-    feature = stub.get_feature(pt, metadata: { 'metadata' => 'data1' })
+    feature = stub.get_feature(pt)
     if feature.name == ''
       $logger.info("Found nothing at #{feature.inspect}")
     else
@@ -74,7 +76,8 @@ elsif ENV['GRPC_TIMEOUT']
   opts[:timeout] = Integer(ENV['GRPC_TIMEOUT'])
 end
 
-stub = Routeguide::RouteGuide::Stub.new('localhost', 50051, **opts)
+sock = TCPSocket.new(HOST, PORT)
+stub = Routeguide::RouteGuide::Stub.new(sock, **opts)
 
 get_feature(stub)
 list_features(stub)

data/lib/grpc_kit/calls/client_client_streamer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Client
+    class ClientStreamer < GrpcKit::Calls::Call
+      attr_reader :deadline, :service_name, :method_name
+      attr_reader :metadata
+      alias outgoing_metadata metadata
+
+      def send_msg(data, timeout: nil, metadata: {}, last: false)
+        raise 'No method error' if @restrict
+
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(last: last)
+      end
+
+      def close_and_recv
+        @stream.close_and_recv
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls/client_request_response.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Client
+    class RequestResponse < GrpcKit::Calls::Call
+      attr_reader :deadline, :service_name, :method_name
+      attr_reader :metadata
+      alias outgoing_metadata metadata
+
+      def send_msg(data, timeout: nil, metadata: {}, last: false)
+        raise 'No method error' if @restrict
+
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(last: last)
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls/client_server_streamer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Client
+    class ServerStreamer < GrpcKit::Calls::Call
+      attr_reader :deadline, :service_name, :method_name
+      attr_reader :metadata
+      alias outgoing_metadata metadata
+
+      def send_msg(data, timeout: nil, metadata: {}, last: false)
+        raise 'No method error' if @restrict
+
+        @stream.send_msg(data, last: last, timeout: timeout, metadata: metadata)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(last: last)
+      end
+
+      def each
+        # TODO
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls/server_client_streamer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Server
+    class ClientStreamer < GrpcKit::Calls::Call
+      attr_reader :deadline, :metadata
+      attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
+      alias incoming_metadata metadata
+
+      def initialize(*)
+        super
+
+        @outgoing_initial_metadata = {}
+        @outgoing_trailing_metadata = {}
+      end
+
+      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)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls/server_request_response.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Server
+    class RequestResponse < GrpcKit::Calls::Call
+      attr_reader :deadline, :metadata
+      attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
+      alias incoming_metadata metadata
+
+      def initialize(*)
+        super
+
+        @outgoing_initial_metadata = {}
+        @outgoing_trailing_metadata = {}
+      end
+
+      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)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls/server_server_streamer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/calls'
+
+module GrpcKit
+  module Calls::Server
+    class ServerStreamer < GrpcKit::Calls::Call
+      attr_reader :deadline, :metadata
+      attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
+      alias incoming_metadata metadata
+
+      def initialize(*)
+        super
+
+        @outgoing_initial_metadata = {}
+        @outgoing_trailing_metadata = {}
+      end
+
+      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)
+      end
+
+      def recv(last: false)
+        raise 'No method error' if @restrict
+
+        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      end
+    end
+  end
+end

data/lib/grpc_kit/calls.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  module Calls
+    class Call
+      Name = Struct.new(:name, :receiver)
+      Reciver = Struct.new(:class)
+      Klass = Struct.new(:service_name)
+      attr_reader :method
+
+      def initialize(stream:, config:, metadata:, timeout: nil)
+        @config = config
+        @metadata = metadata
+        @method_name = @config.method_name
+        @service_name = @config.service_name
+        @protobuf = @config.protobuf
+        @timeout = timeout
+        @stream = stream
+
+        # for compatible
+        klass = Klass.new(@service_name)
+        @method ||= Name.new(@method_name, Reciver.new(klass))
+        @restrict = false
+      end
+
+      def restrict_mode
+        @restrict = true
+      end
+
+      def normal_mode
+        @restrict = false
+      end
+
+      def deadline
+        @deadline ||= @timeout.to_absolute_time
+      end
+    end
+  end
+end

data/lib/grpc_kit/client.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: false
 
-require 'socket'
-require 'grpc_kit/session/client'
-require 'grpc_kit/session/duration'
+require 'grpc_kit/grpc_time'
 require 'grpc_kit/session/io'
-require 'grpc_kit/rpcs'
+require 'grpc_kit/sessions/client_session'
+require 'grpc_kit/streams/client_stream'
+require 'grpc_kit/transports/client_transport'
 
 module GrpcKit
   class Client
-    def initialize(host, port, interceptors: [], timeout: nil)
-      @host = host
-      @port = port
-      @authority = "#{host}:#{port}"
-      @interceptors = interceptors
-      @timeout =
-        if timeout
-          GrpcKit::Session::Duration.from_numeric(timeout)
+    def initialize(sock, authority: nil, interceptors: [], timeout: nil)
+      @sock = sock
+      @authority =
+        if authority
+          authority
         else
-          nil
+          addr = sock.addr
+          "#{addr[3]}:#{addr[1]}"
         end
+      @interceptors = interceptors
+      @timeout = timeout && GrpcKit::GrpcTime.new(timeout)
     end
 
     def request_response(rpc, request, opts = {})
@@ -48,12 +48,12 @@ module GrpcKit
     private
 
     def do_request(rpc, request, **opts)
-      sock = TCPSocket.new(@host, @port) # XXX
-      session = GrpcKit::Session::Client.new(GrpcKit::Session::IO.new(sock), rpc)
+      session = GrpcKit::Sessions::ClientSession.new(GrpcKit::Session::IO.new(@sock))
       session.submit_settings([])
 
-      default = { timeout: @timeout, authority: @authority }.compact
-      rpc.invoke(session, request, opts.merge(default))
+      t = GrpcKit::Transports::ClientTransport.new(session)
+      cs = GrpcKit::Streams::ClientStream.new(t, rpc.config, authority: @authority, timeout: @timeout)
+      rpc.invoke(cs, request, opts.merge(timeout: @timeout))
     end
   end
 end

data/lib/grpc_kit/grpc_time.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  class GrpcTime
+    MAX = 10**9-1
+
+    # @params value [String|Integer]
+    def initialize(value)
+      @unit = nil
+      @value = nil
+
+      if value.is_a?(String)
+        from_string(value)
+      elsif value.is_a?(Integer)
+        from_integer(value)
+      else
+        raise ArgumentError, "unsupported value: #{value}, class=#{value.class}"
+      end
+    end
+
+    # @return [Float]
+    def to_f
+      case @unit
+      when 'S'
+        @value * 1.0
+      when 'H'
+        @value * 60 * 60.0
+      when 'M'
+        @value * 60.0
+      when 'm'
+        @value * 10**-3
+      when 'u'
+        @value * 10**-6
+      when 'n'
+        @value * 10**-9
+      else
+        raise 'This case would never happen'
+      end
+    end
+
+    def to_s
+      "#{@value}#{@unit}"
+    end
+
+    def to_absolute_time
+      case @unit
+      when 'S'
+        Time.now + @value
+      when 'H'
+        Time.now + @value * 60 * 60
+      when 'M'
+        Time.now + @value * 60
+      when 'm'
+        t = Time.now
+        Time.at(t.to_i, (t.nsec * (10**-3)) + (@value * 10**3))
+      when 'u'
+        t = Time.now
+        Time.at(t.to_i, (t.nsec * (10**-3)) + @value)
+      when 'n'
+        t = Time.now
+        Time.at(t.to_i, (t.nsec * (10**-3)) + (@value * 10**-3))
+      else
+        raise 'This case would never happen'
+      end
+    end
+
+    private
+
+    def from_integer(value)
+      if value < 0
+        @value = MAX
+      else
+        @value = value
+      end
+
+      @unit = 'S'
+    end
+
+    def from_string(value)
+      size = value.size
+      if size < 2
+        raise ArgumentError, "Invalid format: too short #{value}"
+      end
+
+      if size > 9
+        raise ArgumentError, "Invalid format: too long #{value}"
+      end
+
+      unit = value.byteslice(-1, 1)
+      value = Integer(value.byteslice(0, size - 1))
+      case unit
+      when 'H', 'M', 'S', 'm', 'u', 'n'
+        @value = value
+        @unit = unit
+      else
+        raise ArgumentError, "Invalid unit `#{unit}`: #{value}"
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/client_client_streamer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Client
+    class ClientStreamer < Streaming
+      private
+
+      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)
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/client_request_response.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Client
+    class RequestResponse
+      attr_writer :interceptors
+
+      def initialize
+        # Cant' get interceptor at definition time...
+        @interceptors = nil
+      end
+
+      def intercept(request, call, metadata, &block)
+        if @interceptors && !@interceptors.empty?
+          do_intercept(@interceptors.dup, request, call, metadata, &block)
+        else
+          yield(request, call, metadata)
+        end
+      end
+
+      private
+
+      def do_intercept(interceptors, request, call, metadata)
+        if interceptors.empty?
+          return yield(request, call, metadata)
+        end
+
+        interceptor = interceptors.pop
+        interceptor.request_response(request: request, call: call, method: call.method, metadata: metadata) do
+          do_intercept(interceptors, request, call, metadata) do |r, c, m|
+            yield(r, c, m)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/client_server_streamer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Client
+    class ServerStreamer < Streaming
+      private
+
+      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)
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/server_client_streamer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Server
+    class ClientStreamer < Streaming
+      def invoke(interceptor, call)
+        interceptor.client_streamer(call: call, method: call.method) do
+          yield(call)
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/server_request_response.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Server
+    class RequestResponse
+      def initialize(interceptors)
+        @interceptors = interceptors
+      end
+
+      def intercept(request, call, &block)
+        if @interceptors && !@interceptors.empty?
+          do_intercept(@interceptors.dup, request, call, &block)
+        else
+          yield(request, call)
+        end
+      end
+
+      private
+
+      def do_intercept(interceptors, request, call)
+        if interceptors.empty?
+          return yield(request, call)
+        end
+
+        interceptor = interceptors.pop
+        interceptor.request_response(request: request, call: call, method: call.method) do
+          do_intercept(interceptors, request, call) do |req, c|
+            yield(req, c)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors/server_server_streamer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/interceptors'
+
+module GrpcKit
+  module Interceptors::Server
+    class ServerStreamer < Streaming
+      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)
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors.rb

@@ -1,11 +1,70 @@
 # frozen_string_literal: true
 
-require 'grpc_kit/interceptors/request_response'
-require 'grpc_kit/interceptors/server_streamer'
-require 'grpc_kit/interceptors/client_streamer'
-# TODO: bidi
-
 module GrpcKit
   module Interceptors
+    module Client
+      class Streaming
+        attr_writer :interceptors
+
+        def initialize
+          # Cant' get interceptor at definition time...
+          @interceptors = nil
+        end
+
+        def intercept(call, metadata, &block)
+          if @interceptors && !@interceptors.empty?
+            do_intercept(@interceptors.dup, call, metadata, &block)
+          else
+            yield(call, metadata)
+          end
+        end
+
+        private
+
+        def do_intercept(interceptors, call, metadata)
+          if interceptors.empty?
+            return yield(call, metadata)
+          end
+
+          interceptor = interceptors.pop
+          invoke(interceptor, call, metadata) do |inter_call, meta|
+            do_intercept(interceptors, inter_call, meta) do |c, m|
+              yield(c, m)
+            end
+          end
+        end
+      end
+    end
+
+    module Server
+      class Streaming
+        def initialize(interceptors)
+          @interceptors = interceptors
+        end
+
+        def intercept(call, &block)
+          if @interceptors && !@interceptors.empty?
+            do_intercept(@interceptors.dup, call, &block)
+          else
+            yield(call)
+          end
+        end
+
+        private
+
+        def do_intercept(interceptors, call)
+          if interceptors.empty?
+            return yield(call)
+          end
+
+          interceptor = interceptors.pop
+          invoke(interceptor, call) do |inter_call|
+            do_intercept(interceptors, inter_call) do |c|
+              yield(c)
+            end
+          end
+        end
+      end
+    end
   end
 end