jrpc 1.1.8 → 2.1.0

metadata

@@ -1,85 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Denis Talakevich
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: netstring
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: JSON RPC client over TCP
 email:
 - senid231@gmail.com
@@ -89,9 +46,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -103,28 +61,25 @@ files:
 - bin/setup
 - jrpc.gemspec
 - lib/jrpc.rb
-- lib/jrpc/base_client.rb
-- lib/jrpc/error/client_error.rb
-- lib/jrpc/error/connection_error.rb
-- lib/jrpc/error/error.rb
-- lib/jrpc/error/internal_error.rb
-- lib/jrpc/error/internal_server_error.rb
-- lib/jrpc/error/invalid_params.rb
-- lib/jrpc/error/invalid_request.rb
-- lib/jrpc/error/method_not_found.rb
-- lib/jrpc/error/parse_error.rb
-- lib/jrpc/error/server_error.rb
-- lib/jrpc/error/unknown_error.rb
-- lib/jrpc/tcp_client.rb
-- lib/jrpc/transport/socket_base.rb
-- lib/jrpc/transport/socket_tcp.rb
-- lib/jrpc/utils.rb
+- lib/jrpc/errors.rb
+- lib/jrpc/id_generator.rb
+- lib/jrpc/message.rb
+- lib/jrpc/payload_logging.rb
+- lib/jrpc/shared_client.rb
+- lib/jrpc/shared_client/outbound_queue.rb
+- lib/jrpc/shared_client/registry.rb
+- lib/jrpc/shared_client/ticket.rb
+- lib/jrpc/shared_client/transport_loop.rb
+- lib/jrpc/simple_client.rb
+- lib/jrpc/transport.rb
+- lib/jrpc/transport/base.rb
+- lib/jrpc/transport/tcp.rb
+- lib/jrpc/transport/test.rb
 - lib/jrpc/version.rb
 homepage: https://github.com/didww/jrpc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -132,15 +87,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: JSON RPC client
 test_files: []

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.10.6

data/lib/jrpc/base_client.rb

@@ -1,123 +0,0 @@
-require 'oj'
-require 'forwardable'
-module JRPC
-  class BaseClient
-    extend Forwardable
-
-    attr_reader :uri, :options
-
-    ID_CHARACTERS = (('a'..'z').to_a + ('0'..'9').to_a + ('A'..'Z').to_a).freeze
-    REQUEST_TYPES = [:request, :notification].freeze
-
-    def self.connect(uri, options)
-      client = new(uri, options)
-      yield(client)
-    ensure
-      client.close if client
-    end
-
-    def initialize(uri, options)
-      @uri = uri
-      @options = options
-    end
-
-    def method_missing(method, *params)
-      invoke_request(method, *params)
-    end
-
-    def perform_request(method, params: nil, type: :request, read_timeout: nil, write_timeout: nil)
-      validate_request(params, type)
-      request = create_message(method.to_s, params)
-      if type == :request
-        id = generate_id
-        request['id'] = id
-        response = send_command serialize_request(request), read_timeout: read_timeout, write_timeout: write_timeout
-        response = deserialize_response(response)
-
-        validate_response(response, id)
-        parse_error(response['error']) if response.has_key?('error')
-
-        response['result']
-      else
-        send_notification serialize_request(request), write_timeout: write_timeout
-        nil
-      end
-    end
-
-    def invoke_request(method, *params)
-      warn '[DEPRECATION] `invoke_request` is deprecated. Please use `perform_request` instead.'
-      params = nil if params.empty?
-      perform_request(method, params: params)
-    end
-
-    def invoke_notification(method, *params)
-      warn '[DEPRECATION] `invoke_request` is deprecated. Please use `perform_request` instead.'
-      params = nil if params.empty?
-      perform_request(method, params: params, type: :notification)
-    end
-
-    private
-
-    def serialize_request(request)
-      Oj.dump(request, mode: :compat)
-    end
-
-    def deserialize_response(response)
-      Oj.load(response)
-    end
-
-    def validate_response(response, id)
-      raise ClientError, 'Wrong response structure' unless response.is_a?(Hash)
-      raise ClientError, 'Wrong version' if response['jsonrpc'] != JRPC::JSON_RPC_VERSION
-      if id != response['id']
-        raise ClientError, "ID response mismatch. expected #{id.inspect} got #{response['id'].inspect}"
-      end
-    end
-
-    def validate_request(params, type)
-      raise ClientError, 'invalid type' unless REQUEST_TYPES.include?(type)
-      raise ClientError, 'invalid params' if !params.nil? && !params.is_a?(Array) && !params.is_a?(Hash)
-    end
-
-    def parse_error(error)
-      case error['code']
-        when -32700
-          raise ParseError.new(error['message'])
-        when -32600
-          raise InvalidRequest.new(error['message'])
-        when -32601
-          raise MethodNotFound.new(error['message'])
-        when -32602
-          raise InvalidParams.new(error['message'])
-        when -32603
-          raise InternalError.new(error['message'])
-        when -32099..-32000
-          raise InternalServerError.new(error['message'], error['code'])
-        else
-          raise UnknownError.new(error['message'], error['code'])
-      end
-    end
-
-    def send_command(json, options={})
-      raise NotImplementedError
-    end
-
-    def send_notification(json, options={})
-      raise NotImplementedError
-    end
-
-    def generate_id
-      size = ID_CHARACTERS.size
-      (0...32).map { ID_CHARACTERS.to_a[rand(size)] }.join
-    end
-
-    def create_message(method, params)
-      message = {
-          'jsonrpc' => JSON_RPC_VERSION,
-          'method' => method
-      }
-      message['params'] = params unless params.nil?
-      message
-    end
-  end
-end

data/lib/jrpc/error/client_error.rb

@@ -1,5 +0,0 @@
-module JRPC
-  class ClientError < Error
-
-  end
-end

data/lib/jrpc/error/connection_error.rb

@@ -1,11 +0,0 @@
-module JRPC
-  class ConnectionError < Error
-    attr_reader :original
-
-    def initialize(msg, original=$!)
-      super(msg)
-      @original = original
-    end
-
-  end
-end

data/lib/jrpc/error/error.rb

@@ -1,5 +0,0 @@
-module JRPC
-  class Error < RuntimeError
-
-  end
-end

data/lib/jrpc/error/internal_error.rb

@@ -1,9 +0,0 @@
-module JRPC
-  class InternalError < ServerError
-
-    def initialize(message)
-      super(message, -32603)
-    end
-
-  end
-end

data/lib/jrpc/error/internal_server_error.rb

@@ -1,5 +0,0 @@
-module JRPC
-  class InternalServerError < ServerError
-
-  end
-end

data/lib/jrpc/error/invalid_params.rb

@@ -1,9 +0,0 @@
-module JRPC
-  class InvalidParams < ServerError
-
-    def initialize(message)
-      super(message, -32602)
-    end
-
-  end
-end

data/lib/jrpc/error/invalid_request.rb

@@ -1,9 +0,0 @@
-module JRPC
-  class InvalidRequest < ServerError
-
-    def initialize(message)
-      super(message, -32600)
-    end
-
-  end
-end

data/lib/jrpc/error/method_not_found.rb

@@ -1,9 +0,0 @@
-module JRPC
-  class MethodNotFound < ServerError
-
-    def initialize(message)
-      super(message, -32601)
-    end
-
-  end
-end

data/lib/jrpc/error/parse_error.rb

@@ -1,9 +0,0 @@
-module JRPC
-  class ParseError < ServerError
-
-    def initialize(message)
-      super(message, -32700)
-    end
-
-  end
-end

data/lib/jrpc/error/server_error.rb

@@ -1,11 +0,0 @@
-module JRPC
-  class ServerError < Error
-    attr_reader :code
-
-    def initialize(message, code)
-      @code = code
-      super(message)
-    end
-
-  end
-end

data/lib/jrpc/error/unknown_error.rb

@@ -1,5 +0,0 @@
-module JRPC
-  class UnknownError < ServerError
-
-  end
-end

data/lib/jrpc/tcp_client.rb

@@ -1,112 +0,0 @@
-require 'netstring'
-require 'logger'
-require 'benchmark'
-module JRPC
-  class TcpClient < BaseClient
-    attr_reader :namespace, :transport
-    attr_accessor :logger
-    def_delegators :@transport, :close, :closed?, :connect
-
-    MAX_LOGGED_MESSAGE_LENGTH = 255
-
-    def initialize(uri, options = {})
-      super
-      @logger = @options.delete(:logger) || Logger.new($null)
-      @namespace = @options.delete(:namespace).to_s
-
-      timeout = @options.fetch(:timeout, 5)
-      connect_timeout = @options.fetch(:connect_timeout, timeout)
-      read_timeout = @options.fetch(:read_timeout, timeout)
-      write_timeout = @options.fetch(:write_timeout, 60) # default 60
-      connect_retry_count = @options.fetch(:connect_retry_count, 10) # default 10
-      @close_after_sent = @options.fetch(:close_after_sent, false)
-
-      @transport = JRPC::Transport::SocketTcp.new server: @uri,
-                                                  connect_retry_count: connect_retry_count,
-                                                  connect_timeout: connect_timeout,
-                                                  read_timeout: read_timeout,
-                                                  write_timeout: write_timeout
-      begin
-        @transport.connect
-      rescue JRPC::Transport::SocketTcp::Error
-        raise ConnectionError, "Can't connect to #{@uri}"
-      end
-    end
-
-    private
-
-    def ensure_connected
-      if @transport.closed?
-        logger.debug { 'Connecting transport...' }
-        @transport.connect
-        logger.debug { 'Connected.' }
-      end
-    end
-
-    def send_command(request, options = {})
-      ensure_connected
-      read_timeout = options.fetch(:read_timeout)
-      write_timeout = options.fetch(:write_timeout)
-      response = nil
-      t = Benchmark.realtime do
-        logger.debug { "Request address: #{uri}" }
-        logger.debug { "Request message: #{Utils.truncate(request, MAX_LOGGED_MESSAGE_LENGTH)}" }
-        logger.debug { "Request read_timeout: #{read_timeout}" }
-        logger.debug { "Request write_timeout: #{write_timeout}" }
-        send_request(request, write_timeout)
-        response = receive_response(read_timeout)
-      end
-      logger.debug do
-        "(#{'%.2f' % (t * 1000)}ms) Response message: #{Utils.truncate(response, MAX_LOGGED_MESSAGE_LENGTH)}"
-      end
-      response
-    ensure
-      @transport.close if @close_after_sent
-    end
-
-    def send_notification(request, options = {})
-      ensure_connected
-      write_timeout = options.fetch(:write_timeout)
-      logger.debug { "Request address: #{uri}" }
-      logger.debug { "Request message: #{Utils.truncate(request, MAX_LOGGED_MESSAGE_LENGTH)}" }
-      logger.debug { "Request write_timeout: #{write_timeout}" }
-      send_request(request, write_timeout)
-      logger.debug { 'No response required' }
-    ensure
-      @transport.close if @close_after_sent
-    end
-
-    def create_message(method, params)
-      super("#{namespace}#{method}", params)
-    end
-
-    def send_request(request, timeout)
-      timeout ||= @transport.write_timeout
-      @transport.write Netstring.dump(request.to_s), timeout
-    rescue ::SocketError
-      raise ConnectionError, "Can't send request to #{uri}"
-    end
-
-    def receive_response(timeout)
-      timeout ||= @transport.read_timeout
-      length = get_msg_length(timeout)
-      response = @transport.read(length + 1, timeout)
-      raise ClientError.new('invalid response. missed comma as terminator') if response[-1] != ','
-      response.chomp(',')
-    rescue ::SocketError
-      raise ConnectionError, "Can't receive response from #{uri}"
-    end
-
-    def get_msg_length(timeout)
-      length = ''
-      while true do
-        character = @transport.read(1, timeout)
-        break if character == ':'
-        length += character
-      end
-
-      Integer(length)
-    end
-
-  end
-end

data/lib/jrpc/transport/socket_base.rb

@@ -1,88 +0,0 @@
-module JRPC
-  module Transport
-    class SocketBase
-
-      class Error < ::JRPC::Error
-      end
-
-      class TimeoutError < Error
-        def initialize
-          super(self.class.to_s.split('::').last)
-        end
-      end
-
-      class ReadTimeoutError < TimeoutError
-      end
-
-      class WriteTimeoutError < TimeoutError
-      end
-
-      class ConnectionTimeoutError < TimeoutError
-      end
-
-      class ConnectionFailedError < Error
-      end
-
-      class WriteFailedError < Error
-      end
-
-      class ReadFailedError < Error
-      end
-
-      attr_reader :options, :read_timeout, :write_timeout
-
-      def self.connect(options)
-        connection = new(options)
-        yield(connection)
-      ensure
-        connection.close if connection
-      end
-
-      def initialize(options)
-        @server = options.fetch(:server)
-        @read_timeout = options.fetch(:read_timeout, nil)
-        @write_timeout = options.fetch(:write_timeout, nil)
-        @connect_timeout = options.fetch(:connect_timeout, nil)
-        @connect_retry_count = options.fetch(:connect_retry_count, 0)
-        @options = options
-      end
-
-      def connect
-        retries = @connect_retry_count
-
-        while retries >= 0
-          begin
-            connect_socket
-            break
-          rescue Error => e
-            retries -= 1
-            raise e if retries < 0
-          end
-        end
-      end
-
-      def read(_length, _timeout = @read_timeout)
-        raise NotImplementedError
-      end
-
-      def write(_data, _timeout = @write_timeout)
-        raise NotImplementedError
-      end
-
-      def close
-        raise NotImplementedError
-      end
-
-      def closed?
-        raise NotImplementedError
-      end
-
-      private
-
-      def connect_socket
-        raise NotImplementedError
-      end
-
-    end
-  end
-end