grpc_kit 0.1.3 → 0.1.4

data/lib/grpc_kit/{streams → transport}/packable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  module Streams
+  module Transport
     module Packable
       # @params data [String]
       # @params compress [Boolean]
@@ -24,7 +24,7 @@ module GrpcKit
       end
 
       def unpacker
-        @unpacker ||= GrpcKit::Streams::Packable::Unpacker.new
+        @unpacker ||= Unpacker.new
       end
 
       class Unpacker

data/lib/grpc_kit/{streams → transport}/send_buffer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  module Streams
+  module Transport
     class SendBuffer
       def initialize
         @buffer = nil

data/lib/grpc_kit/transports/client_transport.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/transport/packable'
+require 'grpc_kit/transport/send_buffer'
+
+module GrpcKit
+  module Transports
+    class ClientTransport
+      include GrpcKit::Transport::Packable
+
+      # @params session [GrpcKit::Session::Server|GrpcKit::Session::Client]
+      def initialize(session)
+        @session = session
+        @stream = nil # set later
+        @deferred = false
+      end
+
+      def send_request(data, header, last: false)
+        @stream = @session.send_request(GrpcKit::Transport::SendBuffer.new, header)
+        write_data(data, last: last)
+      end
+
+      def close_and_flush
+        resume_if_need
+
+        @stream.end_write
+        @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
+      end
+
+      def read_data(last: false)
+        unpack(read(last: last))
+      end
+
+      def recv_headers
+        wait_close
+        @stream.headers
+      end
+
+      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?
+          @session.run_once
+        end
+      end
+
+      def write(stream, buf, last: false)
+        stream.write(buf, last: last)
+      end
+
+      def read(last: false)
+        loop do
+          data = @stream.read_recv_data(last: last)
+          return data unless data.empty?
+
+          if @stream.close_remote?
+            # it do not receive data which we need, it may receive invalid grpc-status
+            unless @stream.end_read?
+              return nil
+            end
+
+            return nil
+          end
+
+          @session.run_once
+        end
+      end
+    end
+  end
+end

data/lib/grpc_kit/transports/server_transport.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'grpc_kit/transport/packable'
+
+module GrpcKit
+  module Transports
+    class ServerTransport
+      include GrpcKit::Transport::Packable
+
+      # @params session [GrpcKit::Sessions::ServerSession]
+      # @params stream [GrpcKit::Session::Stream]
+      def initialize(session, stream)
+        @session = session
+        @stream = stream
+      end
+
+      def each
+        loop do
+          data = recv
+          return if data.nil?
+
+          yield(data)
+        end
+      end
+
+      def send_response(headers)
+        @session.submit_response(@stream.stream_id, headers)
+      end
+
+      def write_data(buf, last: false)
+        @stream.write_send_data(pack(buf), last: last)
+      end
+
+      def read_data(last: false)
+        unpack(read(last: last))
+      end
+
+      def write_trailers_data(trailer)
+        @stream.write_trailers_data(trailer)
+        @stream.end_write
+      end
+
+      def recv_headers
+        @stream.headers
+      end
+
+      private
+
+      def read(last: false)
+        loop do
+          data = @stream.read_recv_data(last: last)
+          return data unless data.empty?
+
+          if @stream.close_remote?
+            # it do not receive data which we need, it may receive invalid grpc-status
+            unless @stream.end_read?
+              return nil
+            end
+
+            return nil
+          end
+
+          @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.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -172,6 +172,13 @@ files:
 - grpc_kit.gemspec
 - lib/grpc.rb
 - lib/grpc_kit.rb
+- lib/grpc_kit/calls.rb
+- lib/grpc_kit/calls/client_client_streamer.rb
+- lib/grpc_kit/calls/client_request_response.rb
+- lib/grpc_kit/calls/client_server_streamer.rb
+- lib/grpc_kit/calls/server_client_streamer.rb
+- lib/grpc_kit/calls/server_request_response.rb
+- lib/grpc_kit/calls/server_server_streamer.rb
 - lib/grpc_kit/client.rb
 - lib/grpc_kit/errors.rb
 - lib/grpc_kit/grpc/dsl.rb
@@ -179,37 +186,41 @@ files:
 - lib/grpc_kit/grpc/interceptor.rb
 - lib/grpc_kit/grpc/logger.rb
 - lib/grpc_kit/grpc/stream.rb
+- lib/grpc_kit/grpc_time.rb
 - lib/grpc_kit/interceptors.rb
-- lib/grpc_kit/interceptors/client_streamer.rb
-- lib/grpc_kit/interceptors/request_response.rb
-- lib/grpc_kit/interceptors/server_streamer.rb
-- lib/grpc_kit/interceptors/streaming.rb
+- lib/grpc_kit/interceptors/client_client_streamer.rb
+- lib/grpc_kit/interceptors/client_request_response.rb
+- lib/grpc_kit/interceptors/client_server_streamer.rb
+- lib/grpc_kit/interceptors/server_client_streamer.rb
+- lib/grpc_kit/interceptors/server_request_response.rb
+- lib/grpc_kit/interceptors/server_server_streamer.rb
 - lib/grpc_kit/method_config.rb
 - lib/grpc_kit/protobuffer.rb
 - lib/grpc_kit/rpc_desc.rb
 - lib/grpc_kit/rpcs.rb
-- lib/grpc_kit/rpcs/base.rb
-- lib/grpc_kit/rpcs/bidi_streamer.rb
-- lib/grpc_kit/rpcs/call.rb
-- lib/grpc_kit/rpcs/client_streamer.rb
-- lib/grpc_kit/rpcs/error.rb
-- lib/grpc_kit/rpcs/request_response.rb
-- lib/grpc_kit/rpcs/server_streamer.rb
+- lib/grpc_kit/rpcs/client_bidi_streamer.rb
+- lib/grpc_kit/rpcs/client_client_streamer.rb
+- lib/grpc_kit/rpcs/client_request_response.rb
+- lib/grpc_kit/rpcs/client_server_streamer.rb
+- lib/grpc_kit/rpcs/server_bidi_streamer.rb
+- lib/grpc_kit/rpcs/server_client_streamer.rb
+- 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.rb
-- lib/grpc_kit/session/duration.rb
 - lib/grpc_kit/session/headers.rb
 - lib/grpc_kit/session/io.rb
-- lib/grpc_kit/session/server.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/stream.rb
-- lib/grpc_kit/streams/client.rb
-- lib/grpc_kit/streams/packable.rb
-- lib/grpc_kit/streams/send_buffer.rb
-- lib/grpc_kit/streams/server.rb
+- lib/grpc_kit/streams/client_stream.rb
+- lib/grpc_kit/streams/server_stream.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/version.rb
 homepage: https://github.com/ganmacs/grpc_kit
 licenses:

data/lib/grpc_kit/interceptors/client_streamer.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'grpc_kit/interceptors/streaming'
-
-module GrpcKit
-  module Interceptors
-    module 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
-
-    module Server
-      class ClientStreamer < Streaming
-        def invoke(interceptor, call)
-          interceptor.client_streamer(call: call, method: call.method) do
-            yield(call)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/grpc_kit/interceptors/request_response.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module GrpcKit
-  module Interceptors
-    module 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
-
-    module 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
-end

data/lib/grpc_kit/interceptors/server_streamer.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'grpc_kit/interceptors/streaming'
-
-module GrpcKit
-  module Interceptors
-    module 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
-
-    module 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
-end

data/lib/grpc_kit/interceptors/streaming.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-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

data/lib/grpc_kit/rpcs/base.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'timeout'
-
-require 'grpc_kit/errors'
-require 'grpc_kit/rpcs/call'
-require 'grpc_kit/streams/server'
-require 'grpc_kit/streams/client'
-
-module GrpcKit
-  module Rpcs
-    module Client
-      class Base
-        attr_reader :config
-        def initialize(config)
-          @config = config
-        end
-      end
-    end
-
-    module Server
-      class Base
-        def initialize(handler, config)
-          @handler = handler
-          @config = config
-        end
-      end
-    end
-  end
-end

data/lib/grpc_kit/rpcs/bidi_streamer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'grpc_kit/rpcs/base'
-
-module GrpcKit
-  module Rpcs
-    module Client
-      class BidiStreamer < Base
-        def invoke(session, data, opts = {}); end
-      end
-    end
-
-    module Server
-      class BidiStreamer < Base
-      end
-    end
-  end
-end

data/lib/grpc_kit/rpcs/call.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-
-module GrpcKit
-  module Rpcs
-    # compatible for grpc gem
-    class Call
-      extend Forwardable
-
-      delegate %i[recv send_msg close_and_recv each].freeze => :@stream
-
-      Name = Struct.new(:name, :receiver)
-      Reciver = Struct.new(:class)
-      Klass = Struct.new(:service_name)
-
-      attr_reader :metadata, :method
-
-      def initialize(metadata, method_name, service_name, stream)
-        @metadata = metadata
-        klass = Klass.new(service_name)
-        @method = Name.new(method_name, Reciver.new(klass))
-        @stream = stream
-      end
-    end
-  end
-end

data/lib/grpc_kit/rpcs/client_streamer.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'grpc_kit/rpcs/base'
-
-module GrpcKit
-  module Rpcs
-    module Client
-      class ClientStreamer < Base
-        def invoke(session, _request, authority:, metadata: {}, timeout: nil, **opts)
-          cs = GrpcKit::Streams::Client.new(config: @config, session: session, authority: authority)
-          call = GrpcKit::Rpcs::Call.new(metadata, @config.method_name, @config.service_name, cs)
-          @config.interceptor.intercept(call, metadata) do |s|
-            s
-          end
-        end
-      end
-    end
-
-    module Server
-      class ClientStreamer < Base
-        def invoke(stream, session)
-          ss = GrpcKit::Streams::Server.new(stream: stream, session: session, config: @config)
-          call = GrpcKit::Rpcs::Call.new(stream.headers.metadata, @config.method_name, @config.service_name, ss)
-
-          if @config.interceptor
-            @config.interceptor.intercept(call) do |c|
-              resp = @handler.send(@config.ruby_style_method_name, c)
-              c.send_msg(resp, last: true)
-            end
-          else
-            resp = @handler.send(@config.ruby_style_method_name, call)
-            call.send_msg(resp, last: true)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/grpc_kit/rpcs/error.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'grpc_kit/status_codes'
-
-module GrpcKit
-  module Rpcs
-    module Client
-      class Error
-        # def invoke(session, request, authority:, error)
-        # end
-      end
-    end
-
-    module Server
-      class Error
-        def send_bad_status(stream, session, bad_status)
-          ss = GrpcKit::Streams::Server.new(stream: stream, protobuf: nil, session: session)
-          ss.send_status(status: bad_status.code, msg: bad_status.grpc_message)
-        end
-      end
-    end
-  end
-end