grpc_kit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278f9b00d1dd37370eae8a829ec68742bcfdd9f693e9189d3abfd0404d2cb31a
-  data.tar.gz: 334798bf715bbb1aacab0507457c90a9289c0249c728728e53c7663359318f58
+  metadata.gz: db6a319fa0f74330575752eb203e867d4882d869ec12f73643bf11bc3f147c8d
+  data.tar.gz: 376c711925c3f8534d7e286ed1bc7015ae711f7d4e2998b89fd8a2a2a2a0daac
 SHA512:
-  metadata.gz: 25a7c01b82e0726470147c38be66243226483ddf1dafd6b292201cf4c3da99949dc99a2a298e9166f395b531cf936d279a52789730601e32a416378551f2992a
-  data.tar.gz: 70fa89ff80eebc5d23bcb0e9b1bec9b3190bba7b2fcb00e7d3eb55f0b1c6ac17a3e9beb4738f69558d740995d45eaccfdd557a44fa02d3ebfdbbf4845d8e9f9c
+  metadata.gz: 6fa2789ac0febc6e8dfac1f57d59488d1ab4db39b32c0e529a3fb91240d890abe9021f65db6d539c0d8218dc89204ca284db3b1e302c02d5f2ff785e76d8e9a0
+  data.tar.gz: a8d7f9a5446308d2d31fcde7f4de762a262b58a6068ded6b8a60a0787d68001b7f2cd555a7910977ab9c8cf9e8d811cbbb2da76b55aa1d96b26961af3112be75

data/README.md

@@ -1,6 +1,8 @@
 # GrpcKit
 
-A kit for creating gRPC server/client.
+__UNDER DEVELOPMENT__
+
+A kit for creating [gRPC](https://grpc.io/) server/client.
 
 ## Installation
 
@@ -24,7 +26,32 @@ $ gem install grpc_kit
 
 ## Usage
 
-TODO: Write usage instructions here
+More Details in [examples directory](https://github.com/ganmacs/grpc_kit/tree/master/examples).
+
+##### Server
+
+```ruby
+sock = TCPServer.new(50051)
+server = GrpcKit::Server.new
+server.handle(GreeterServer.new)
+
+loop do
+  conn = sock.accept
+  server.run(conn)
+end
+```
+
+##### Client
+
+```ruby
+stub = Helloworld::Greeter::Stub.new('localhost', 50051)
+message = stub.say_hello(Helloworld::HelloRequest.new(name: 'your name')).message
+puts message
+```
+
+## Requirements
+
+* [nghttp2](https://nghttp2.org/)
 
 ## Development
 

data/examples/helloworld_server.rb

@@ -17,9 +17,8 @@ sock = TCPServer.new(50051)
 
 server = GrpcKit::Server.new
 server.handle(GreeterServer.new)
-server.run
 
 loop do
   conn = sock.accept
-  server.session_start(conn)
+  server.run(conn)
 end

data/examples/routeguide_server.rb

@@ -110,9 +110,8 @@ end
 
 server = GrpcKit::Server.new(**opts)
 server.handle(Server.new)
-server.run
 
 loop do
   conn = sock.accept
-  server.session_start(conn)
+  server.run(conn)
 end

data/lib/grpc_kit/client.rb

@@ -22,27 +22,27 @@ module GrpcKit
     end
 
     def request_response(rpc, request, opts = {})
-      GrpcKit.logger.info('Calling request_respose')
+      GrpcKit.logger.debug('Calling request_respose')
 
       rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, request, opts)
     end
 
     def client_streamer(rpc, opts = {})
-      GrpcKit.logger.info('Calling client_streamer')
+      GrpcKit.logger.debug('Calling client_streamer')
       rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, nil, opts)
     end
 
     def server_streamer(rpc, request, opts = {})
-      GrpcKit.logger.info('Calling server_streamer')
+      GrpcKit.logger.debug('Calling server_streamer')
       rpc.config.interceptor.interceptors = @interceptors
       do_request(rpc, request, opts)
     end
 
     def bidi_streamer(rpc, requests, opts = {})
       rpc.config.interceptor.interceptors = @interceptors
-      GrpcKit.logger.info('Calling bidi_streamer')
+      GrpcKit.logger.debug('Calling bidi_streamer')
     end
 
     private

data/lib/grpc_kit/server.rb

@@ -9,6 +9,7 @@ module GrpcKit
       @sessions = []
       @rpc_descs = {}
       @interceptors = interceptors
+      @mutex = Mutex.new
     end
 
     # @params handler [object]
@@ -22,27 +23,20 @@ module GrpcKit
       end
     end
 
-    def run
-      GrpcKit.logger.info("Start grpc_kit v#{GrpcKit::VERSION}")
-
-      @rpc_descs.freeze
-    end
-
-    def stop
-      GrpcKit.logger.info('Stop grpc_kit')
-      @sessions.each(&:stop)
+    def run(conn)
+      GrpcKit.logger.debug("Run grpc_kit(v#{GrpcKit::VERSION})")
+      establish_session(conn) do |s|
+        s.submit_settings([])
+        s.start
+      end
     end
 
-    def session_start(conn)
-      session = GrpcKit::Session::Server.new(
-        GrpcKit::Session::IO.new(conn),
-        self,
-      )
-      @sessions << session
+    def shutdown
+      GrpcKit.logger.debug('Shutdown grpc_kit')
 
-      session.submit_settings([])
-      session.start # blocking
-      session.finish
+      @mutex.synchronize do
+        @sessions.each(&:finish)
+      end
     end
 
     def dispatch(stream, session)
@@ -53,5 +47,17 @@ module GrpcKit
 
       rpc.invoke(stream, session)
     end
+
+    private
+
+    def establish_session(conn)
+      session = GrpcKit::Session::Server.new(GrpcKit::Session::IO.new(conn), self)
+      begin
+        @mutex.synchronize { @sessions << session }
+        yield(session)
+      ensure
+        @mutex.synchronize { @sessions.delete(session) }
+      end
+    end
   end
 end

data/lib/grpc_kit/session/client.rb

@@ -39,6 +39,8 @@ module GrpcKit
 
           run_once
         end
+      rescue Errno::ECONNRESET, IOError
+        finish
       end
 
       def run_once

data/lib/grpc_kit/session/duration.rb

@@ -17,11 +17,11 @@ module GrpcKit
           raise "Invalid format: too short #{value}"
         end
 
-        unit = value[(size - 1)..size]
+        unit = value.slice!(-1, 1)
         d = Duration.new(0, 0, 0, 0)
-        n = Integer(value[0..size])
+        n = Integer(value)
 
-        case u
+        case unit
         when 'H'
           d.sec = n * HOUR
         when 'M'
@@ -35,7 +35,7 @@ module GrpcKit
         when 'n'
           d.nsec = n
         else
-          raise "Invalid unit `#{u}`: #{unit} "
+          raise "Invalid unit `#{unit}`: #{value + unit} "
         end
         d
       end

data/lib/grpc_kit/session/headers.rb

@@ -45,7 +45,7 @@ module GrpcKit
         when 'grpc-status'
           self.grpc_status = val.to_i
         when 'grpc-timeout'
-          self.timeout = Duration.decod(v)
+          self.timeout = Duration.decode(val)
         when 'grpc-message'
           # TODO
           GrpcKit.logger.warn('grpc-message is unsupported header now')

data/lib/grpc_kit/session/io.rb

@@ -36,6 +36,8 @@ module GrpcKit
             unless IO.select(nil, [io], nil, 1)
               raise 'timeout writing data'
             end
+          rescue IOError => e
+            raise IOError, e # TODO
           end
 
           data = data.byteslice(remain..-1)

data/lib/grpc_kit/session/server.rb

@@ -36,6 +36,8 @@ module GrpcKit
 
           run_once
         end
+      rescue Errno::ECONNRESET, IOError
+        finish
       end
 
       def run_once
@@ -50,10 +52,6 @@ module GrpcKit
         end
       end
 
-      def stop
-        @stop = true
-      end
-
       def finish
         stop
         @io.close
@@ -61,6 +59,10 @@ module GrpcKit
 
       private
 
+      def stop
+        @stop = true
+      end
+
       def invoke_handler
         while (stream = @inflights.pop)
           @handler.dispatch(stream, self)

data/lib/grpc_kit/version.rb

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

data/lib/grpc_kit.rb

@@ -8,7 +8,7 @@ require 'grpc_kit/client'
 
 module GrpcKit
   def self.logger
-    @logger ||= Logger.new(STDOUT, level: :debug) # TODO: use :info level
+    @logger ||= Logger.new(STDOUT, level: :debug)
   end
 
   def self.logger=(logger)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9