grumlin 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6633f34f12f74200b56d3447e7b1cd5c2c4185cd4013a27157d809b2f97f01b2
-  data.tar.gz: a5b0c1b0f4a8ef813a48144b79b17a71c6385802ff77b46ef0fa703643790ac1
+  metadata.gz: 4260297c3d75ec7bc1f987d8c7bad4efd75c81627814fdf984a0aaac0045332b
+  data.tar.gz: 1cb521906a08cf5390f058a28f380492a2999e55ef023c473fc6bae64533b53b
 SHA512:
-  metadata.gz: 6824448759e26af95f8753a1461fac6b0b66677e1cab723b8e79c76333c4e791b5364da81f87844b624796238a3e02b13065a7afb64d7a5ef7ca83a6e9c3e8be
-  data.tar.gz: d7ce1a01b2b50f90a317d270ad005561220fcb0f69da5036b97d20c88b2458e5dd7ea285c384cef5d5e9521ff077f2d43650985c1e928942e463cfc29bbdd247
+  metadata.gz: 992d2192402f3fe282203a3fd0eff1e6c886470899cb37f00ca2abf1392e4d946c7391be0eb7d6560c9941f7a17a3552682a8a47f56273f4299c06551c1e9ffc
+  data.tar.gz: d8695e2485915cb7b4d37a755e42d20b6d7f575d906ae5a0aca5f508c01a104c08f7bb51a2285c9dac48a0091771882afeb405fd26e7802c4d48513274e2895f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.6.2)
+    grumlin (0.7.0)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
 

data/lib/async/channel.rb

@@ -32,7 +32,7 @@ module Async
     end
 
     def close
-      raise(ChannelClosedError, "Cannot close a closed channel") if closed?
+      return if closed?
 
       @queue << [:close]
       @closed = true

data/lib/grumlin/client.rb

@@ -13,6 +13,7 @@ module Grumlin
       def initialize(url, client_factory:, concurrency: 1, parent: Async::Task.current)
         super(concurrency)
         @client = client_factory.call(url, parent).tap(&:connect)
+        @parent = parent
       end
 
       def closed?
@@ -25,6 +26,8 @@ module Grumlin
 
       def write(*args)
         @client.write(*args)
+      ensure
+        @count += 1
       end
 
       def viable?
@@ -36,33 +39,54 @@ module Grumlin
       end
     end
 
+    include Console
+
+    # Client is not reusable. Once closed should be recreated.
     def initialize(url, parent: Async::Task.current, **client_options)
       @url = url
       @client_options = client_options
       @parent = parent
-      reset!
+      @request_dispatcher = nil
+      @transport = nil
     end
 
     def connect
+      raise "ClientClosed" if @closed
+
       @transport = build_transport
       response_channel = @transport.connect
       @request_dispatcher = RequestDispatcher.new
-      @parent.async do
+      @response_task = @parent.async do
         response_channel.each do |response|
           @request_dispatcher.add_response(response)
         end
-      rescue StandardError
-        close
+      rescue Async::Stop, Async::TimeoutError, StandardError
+        close(check_requests: false)
       end
+      logger.debug(self, "Connected")
     end
 
-    def close
+    # Before calling close the user must ensure that:
+    # 1) There are no ongoing requests
+    # 2) There will be no new writes after
+    def close(check_requests: true) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      return if @closed
+
+      @closed = true
+
       @transport&.close
-      if @request_dispatcher&.requests&.any?
-        raise ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}"
-      end
+      @transport&.wait
 
-      reset!
+      @response_task&.stop
+      @response_task&.wait
+
+      return if @request_dispatcher&.requests&.empty?
+
+      @request_dispatcher.clear unless check_requests
+
+      raise ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}" if check_requests
+    ensure
+      logger.debug(self, "Closed")
     end
 
     def connected?
@@ -80,9 +104,9 @@ module Grumlin
 
       begin
         channel.dequeue.flat_map { |item| Typing.cast(item) }
-      rescue Async::Stop
-        retry if @request_dispatcher.ongoing_request?(request_id)
-        raise Grumlin::UnknownRequestStoppedError, "#{request_id} is not in the ongoing requests list"
+      rescue Async::Stop, Async::TimeoutError
+        close(check_requests: false)
+        raise
       end
     end
 
@@ -106,11 +130,6 @@ module Grumlin
       }
     end
 
-    def reset!
-      @request_dispatcher = nil
-      @transport = nil
-    end
-
     def build_transport
       Transport.new(@url, parent: @parent, **@client_options)
     end

data/lib/grumlin/request_dispatcher.rb

@@ -22,6 +22,8 @@ module Grumlin
       498 => ClientSideError
     }.freeze
 
+    include Console
+
     def initialize
       @requests = {}
     end
@@ -69,6 +71,10 @@ module Grumlin
       @requests.key?(request_id)
     end
 
+    def clear
+      @requests.clear
+    end
+
     private
 
     def check_errors!(status)

data/lib/grumlin/transport.rb

@@ -5,47 +5,33 @@ module Grumlin
     # A transport based on https://github.com/socketry/async
     # and https://github.com/socketry/async-websocket
 
+    include Console
+
     attr_reader :url
 
+    # Transport is not reusable. Once closed should be recreated.
     def initialize(url, parent: Async::Task.current, **client_options)
       @url = url
       @parent = parent
       @client_options = client_options
       @request_channel = Async::Channel.new
       @response_channel = Async::Channel.new
-      reset!
     end
 
     def connected?
-      @connected
+      !@connection.nil?
     end
 
-    def connect # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def connect
+      raise "ClientClosed" if @closed
       raise AlreadyConnectedError if connected?
 
       @connection = Async::WebSocket::Client.connect(Async::HTTP::Endpoint.parse(@url), **@client_options)
+      logger.debug(self) { "Connected to #{@url}." }
 
-      @response_task = @parent.async do
-        loop do
-          data = @connection.read
-          @response_channel << data
-        end
-      rescue Async::Stop
-        @response_channel.close
-      rescue StandardError => e
-        @response_channel.exception(e)
-      end
+      @response_task = @parent.async { run_response_task }
 
-      @request_task = @parent.async do
-        @request_channel.each do |message|
-          @connection.write(message)
-          @connection.flush
-        end
-      rescue StandardError => e
-        @response_channel.exception(e)
-      end
-
-      @connected = true
+      @request_task = @parent.async { run_request_task }
 
       @response_channel
     end
@@ -57,30 +43,59 @@ module Grumlin
     end
 
     def close
-      return unless connected?
+      return if @closed
 
-      @request_channel.close
-      @request_task.wait
+      @closed = true
 
-      @response_task.stop
-      @response_task.wait
+      @request_channel.close
+      @response_channel.close
 
       begin
         @connection.close
-      rescue Errno::EPIPE
+      rescue StandardError
         nil
       end
+      @connection = nil
+
+      @request_task&.stop(true)
+      @response_task&.stop(true)
+    end
 
-      reset!
+    def wait
+      @request_task.wait
+      @response_task.wait
     end
 
     private
 
-    def reset!
-      @connected = false
-      @connection = nil
-      @response_task = nil
-      @request_task = nil
+    def run_response_task
+      with_guard do
+        loop do
+          data = @connection.read
+          @response_channel << data
+        end
+      end
+    end
+
+    def run_request_task
+      with_guard do
+        @request_channel.each do |message|
+          @connection.write(message)
+          @connection.flush
+        end
+      end
+    end
+
+    def with_guard
+      yield
+    rescue Async::Stop, Async::TimeoutError, StandardError => e
+      logger.debug(self) { "Guard error, closing." }
+      begin
+        @response_channel.exception(e)
+      rescue Async::Channel::ChannelClosedError
+        nil
+      end
+      close
     end
   end
 end

data/lib/grumlin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grumlin
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/grumlin.rb

@@ -45,7 +45,7 @@ module Grumlin
 
     def initialize
       @pool_size = 10
-      @client_concurrency = 2
+      @client_concurrency = 5
       @client_factory = ->(url, parent) { Grumlin::Client.new(url, parent: parent) }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool