griffin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b530676513eca565d67b7f033c68e7fec613b9232bd3cc1f10654c832bcfe0
-  data.tar.gz: c14bf3300ef1fd84eb5ecafd7b02d6bf51e7e279f624f1e7a1f35d2dd072e416
+  metadata.gz: 7f4d42dab0788aed394458a38fbcf88f9d5ebbe008ae97075c8df717d7022d4e
+  data.tar.gz: 1f5c7a121e48f18e2e3a16a9f2769b4f38ae7f4a4ce7649c3257263b306ba968
 SHA512:
-  metadata.gz: 7b1da06d15ca41a14040742dff811b7b37f570a2d0c2951104676618be4063513bcadc610bae082e8662a487a76d6fa41617eb0cf24d64839a2231837d4e10c2
-  data.tar.gz: '039db6747145dbf7d9a635a0a2b9909c650af9d5fec03ec8aa0802ce7791390fcf26c89332da3cfa87531b22fd3c22b0712a72d25299972335771778fe0e9ac3'
+  metadata.gz: 34ab89ab90c27fb09ea40071c60c1bcd019fee2089034444bacf7531f38ae8ec61277fa9adf8440cd0a53eb11a9685ee026a2a44656c3b70d8602820e876df87
+  data.tar.gz: 19958ae78aa855bd8994636d3e4fdbd478af80868af31d14141dde8b71017095ef49584db8f8259bff2f32452b23355d65bf6e0a1f226e21f6d95ae0e1c3ba73

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/examples/routeguide_client.rb

@@ -4,6 +4,7 @@
 
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
+require 'griffin'
 require 'grpc_kit'
 require 'pry'
 require 'json'
@@ -11,6 +12,8 @@ require 'logger'
 require 'routeguide_services_pb'
 
 RESOURCE_PATH = './examples/routeguide/routeguide.json'
+HOST = 'localhost'
+PORT = 50051
 
 $logger = Logger.new(STDOUT)
 
@@ -22,7 +25,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
@@ -47,6 +50,8 @@ def list_features(stub)
 end
 
 def record_route(stub, size)
+  $logger.info('===== record_route =====')
+
   features = File.open(RESOURCE_PATH) do |f|
     JSON.parse(f.read)
   end
@@ -65,6 +70,36 @@ def record_route(stub, size)
   puts "summary: #{resp[0].inspect}"
 end
 
+ROUTE_CHAT_NOTES = [
+  Routeguide::RouteNote.new(message: 'First message', location: Routeguide::Point.new(latitude: 0, longitude: 1)),
+  Routeguide::RouteNote.new(message: 'Second message', location: Routeguide::Point.new(latitude: 0, longitude: 2)),
+  Routeguide::RouteNote.new(message: 'Third message', location: Routeguide::Point.new(latitude: 0, longitude: 3)),
+  Routeguide::RouteNote.new(message: 'Fourth message', location: Routeguide::Point.new(latitude: 0, longitude: 1)),
+  Routeguide::RouteNote.new(message: 'Fifth message', location: Routeguide::Point.new(latitude: 0, longitude: 2)),
+  Routeguide::RouteNote.new(message: 'Sixth message', location: Routeguide::Point.new(latitude: 0, longitude: 3)),
+].freeze
+
+def route_chat(stub)
+  $logger.info('===== route_chat =====')
+
+  call = stub.route_chat({})
+
+  t = Thread.new do
+    loop do
+      rn = call.recv
+      $logger.info("Got message #{rn.message} at point point(#{rn.location.latitude}, #{rn.location.longitude})")
+    end
+  end
+
+  ROUTE_CHAT_NOTES.each do |rcn|
+    call.send_msg(rcn)
+    sleep 1
+  end
+
+  call.close_and_send
+  t.join
+end
+
 opts = {}
 
 if ENV['GRPC_INTERCEPTOR']
@@ -74,10 +109,12 @@ 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)
 record_route(stub, 10)
+route_chat(stub)
 
 # rubocop:enable Style/GlobalVars

data/examples/routeguide_server.rb

@@ -2,7 +2,7 @@
 
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
-require 'grpc_kit'
+require 'griffin'
 require 'pry'
 require 'json'
 require 'routeguide_services_pb'
@@ -17,6 +17,8 @@ class Server < Routeguide::RouteGuide::Service
       features = JSON.parse(f.read)
       @features = Hash[features.map { |x| [x['location'], x['name']] }]
     end
+
+    @route_notes = Hash.new { |h, k| h[k] = [] }
   end
 
   def get_feature(point, ctx)
@@ -70,6 +72,21 @@ class Server < Routeguide::RouteGuide::Service
     )
   end
 
+  def route_chat(call)
+    loop do
+      rn = call.recv
+      @logger.info("route_note location=#{rn.location.inspect}, message=#{rn.message}")
+      key = "#{rn.location.latitude} #{rn.location.longitude}"
+      saved_msgs = @route_notes[key]
+      @route_notes[key] << rn.message
+
+      saved_msgs.each do |m|
+        n = Routeguide::RouteNote.new(location: rn.location, message: m)
+        call.send_msg(n)
+      end
+    end
+  end
+
   private
 
   COORD_FACTOR = 1e7
@@ -99,20 +116,27 @@ class Server < Routeguide::RouteGuide::Service
   end
 end
 
-sock = TCPServer.new(50051)
+# require 'griffin/interceptors/server/payload_interceptor'
+require 'griffin/interceptors/server/filtered_payload_interceptor'
+require 'griffin/interceptors/server/logging_interceptor'
+require 'griffin/interceptors/server/x_request_id_interceptor'
 
-opts = {}
+interceptors = [
+  Griffin::Interceptors::Server::FilteredPayloadInterceptor.new,
+  Griffin::Interceptors::Server::LoggingInterceptor.new,
+  Griffin::Interceptors::Server::XRequestIdInterceptor.new,
+]
 
-if ENV['GRPC_INTERCEPTOR']
-  require_relative 'interceptors/server_logging_interceptor'
-  opts[:interceptors] = [LoggingInterceptor.new]
-end
+Griffin::Server.configure do |c|
+  c.bind '127.0.0.1'
+
+  c.port 50051
 
-server = GrpcKit::Server.new(**opts)
-server.handle(Server.new)
-server.run
+  c.services Server.new
 
-loop do
-  conn = sock.accept
-  server.session_start(conn)
+  c.interceptors interceptors
+
+  c.workers 2
 end
+
+Griffin::Server.run

data/griffin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ['lib', 'pb']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
 
   spec.add_dependency 'connection_pool', '~> 2.2.2'
-  spec.add_dependency 'grpc_kit', '~> 0.1.5'
+  spec.add_dependency 'grpc_kit', '~> 0.1.10'
   spec.add_dependency 'serverengine', '~> 2.0.7'
 end

data/lib/griffin/engine/server.rb

@@ -8,7 +8,10 @@ module Griffin
       attr_reader :core, :listener
 
       def initialize
-        @core = Griffin::Server.new
+        @core = Griffin::Server.new(
+          pool_size: config[:pool_size],
+          interceptors: config[:interceptors]
+        )
       end
 
       def before_run

data/lib/griffin/engine/single.rb

@@ -7,7 +7,11 @@ module Griffin
   module Engine
     class Single
       def self.create(config)
-        new(Griffin::Server.new, config)
+        serv = Griffin::Server.new(
+          pool_size: config[:pool_size],
+          interceptors: config[:interceptors],
+        )
+        new(serv, config)
       end
 
       def initialize(server, config)

data/lib/griffin/server.rb

@@ -8,7 +8,6 @@ require 'griffin/thread_pool'
 
 module Griffin
   class Server
-    DEFAULT_WORKER_SIZE = 10
     DEFAULT_BACKLOG_SIZE = 1024
 
     GRACEFUL_SHUTDOWN = '0'
@@ -29,18 +28,21 @@ module Griffin
       end
     end
 
-    def initialize(worker_size: DEFAULT_WORKER_SIZE, **opts)
-      @worker_size = worker_size
-      @server = GrpcKit::Server.new
+    # @param pool_size [Integer] Worker thread size
+    # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>] list of interceptors
+    def initialize(pool_size:, interceptors: [], **opts)
+      @worker_size = pool_size
+      @server = GrpcKit::Server.new(interceptors: interceptors)
       @opts = opts
       @status = :run
       @worker_id = 0
     end
 
     def handle(handler)
-      @server.handle(handler)
-      handler.class.rpc_descs.each do |path, _|
-        Griffin.logger.debug("Handle #{path}")
+      klass = handler.is_a?(Class) ? handler : handler.class
+      @server.handle(klass)
+      klass.rpc_descs.each_key do |path|
+        Griffin.logger.info("Handle #{path}")
       end
     end
 

data/lib/griffin/server_config_builder.rb

@@ -6,7 +6,15 @@ module Griffin
     SERVERENGINE_BLOCK_CONFIGS = %i[before_fork after_fork].freeze
     # Users can't change these values
     SERVERENGIEN_FIXED_CONFIGS = %i[daemonize worker_type worker_process_name].freeze
-    GRIFFIN_CONFIGS = %i[thread_pool].freeze
+
+    # The default size of thread pool
+    DEFAULT_POOL_SIZE = 10
+
+    GRIFFIN_CONFIGS = [
+      # The size of thread pool
+      :pool_size
+    ].freeze
+
     GRPC_CONFIGS = %i[services interceptors].freeze
 
     ServerConfig = Struct.new(*(SERVERENGINE_PRIMITIVE_CONFIGS + SERVERENGINE_BLOCK_CONFIGS + SERVERENGIEN_FIXED_CONFIGS + GRIFFIN_CONFIGS + GRPC_CONFIGS)) do
@@ -23,6 +31,8 @@ module Griffin
       workers: 1,
       bind: '0.0.0.0',
       port: 50051,
+      pool_size: DEFAULT_POOL_SIZE,
+      interceptors: [],
     }.freeze
 
     def initialize
@@ -41,8 +51,8 @@ module Griffin
       end
     end
 
-    def services(*serv)
-      @opts[:services] = serv
+    def services(serv, *rest)
+      @opts[:services] = Array(serv) + rest
     end
 
     def build

data/lib/griffin/version.rb

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

data/pb/grpc/health/checker.rb

@@ -0,0 +1,76 @@
+# Copyright 2015 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'grpc'
+require 'grpc/health/v1/health_services_pb'
+require 'thread'
+
+module Grpc
+  # Health contains classes and modules that support providing a health check
+  # service.
+  module Health
+    # Checker is implementation of the schema-specified health checking service.
+    class Checker < V1::Health::Service
+      StatusCodes = GRPC::Core::StatusCodes
+      HealthCheckResponse = V1::HealthCheckResponse
+
+      # Initializes the statuses of participating services
+      def initialize
+        @statuses = {}
+        @status_mutex = Mutex.new  # guards access to @statuses
+      end
+
+      # Implements the rpc IDL API method
+      def check(req, _call)
+        status = nil
+        @status_mutex.synchronize do
+          status = @statuses["#{req.service}"]
+        end
+        if status.nil?
+          fail GRPC::BadStatus.new_status_exception(StatusCodes::NOT_FOUND)
+        end
+        HealthCheckResponse.new(status: status)
+      end
+
+      # Adds the health status for a given service.
+      def add_status(service, status)
+        @status_mutex.synchronize { @statuses["#{service}"] = status }
+      end
+
+      # Adds given health status for all given services
+      def set_status_for_services(status, *services)
+        @status_mutex.synchronize do
+          services.each { |service| @statuses["#{service}"] = status }
+        end
+      end
+
+      # Adds health status for each service given within hash
+      def add_statuses(service_statuses = {})
+        @status_mutex.synchronize do
+          service_statuses.each_pair { |service, status| @statuses["#{service}"] = status }
+        end
+      end
+
+      # Clears the status for the given service.
+      def clear_status(service)
+        @status_mutex.synchronize { @statuses.delete("#{service}") }
+      end
+
+      # Clears alls the statuses.
+      def clear_all
+        @status_mutex.synchronize { @statuses = {} }
+      end
+    end
+  end
+end

data/pb/grpc/health/v1/health_pb.rb

@@ -0,0 +1,28 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: grpc/health/v1/health.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "grpc.health.v1.HealthCheckRequest" do
+    optional :service, :string, 1
+  end
+  add_message "grpc.health.v1.HealthCheckResponse" do
+    optional :status, :enum, 1, "grpc.health.v1.HealthCheckResponse.ServingStatus"
+  end
+  add_enum "grpc.health.v1.HealthCheckResponse.ServingStatus" do
+    value :UNKNOWN, 0
+    value :SERVING, 1
+    value :NOT_SERVING, 2
+  end
+end
+
+module Grpc
+  module Health
+    module V1
+      HealthCheckRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.health.v1.HealthCheckRequest").msgclass
+      HealthCheckResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.health.v1.HealthCheckResponse").msgclass
+      HealthCheckResponse::ServingStatus = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.health.v1.HealthCheckResponse.ServingStatus").enummodule
+    end
+  end
+end

data/pb/grpc/health/v1/health_services_pb.rb

@@ -0,0 +1,44 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: grpc/health/v1/health.proto for package 'grpc.health.v1'
+# Original file comments:
+# Copyright 2015 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# The canonical version of this proto can be found at
+# https://github.com/grpc/grpc-proto/blob/master/grpc/health/v1/health.proto
+#
+
+require 'grpc'
+require 'grpc/health/v1/health_pb'
+
+module Grpc
+  module Health
+    module V1
+      module Health
+        class Service
+
+          include GRPC::GenericService
+
+          self.marshal_class_method = :encode
+          self.unmarshal_class_method = :decode
+          self.service_name = 'grpc.health.v1.Health'
+
+          rpc :Check, HealthCheckRequest, HealthCheckResponse
+        end
+
+        Stub = Service.rpc_stub_class
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,9 @@ files:
 - lib/griffin/server_config_builder.rb
 - lib/griffin/thread_pool.rb
 - lib/griffin/version.rb
+- pb/grpc/health/checker.rb
+- pb/grpc/health/v1/health_pb.rb
+- pb/grpc/health/v1/health_services_pb.rb
 homepage: https://github.com/ganmacs/griffin
 licenses:
 - MIT
@@ -162,6 +165,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- pb
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="