acp_sdk_async 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec9246d9b39f427c0ce91bc4d9538808c0721f391dd29cef5f0a5cf2856a7328
-  data.tar.gz: 2666f26808cc8401f430c18a5ff47199343ea712c96915bd9325a289de817e93
+  metadata.gz: 311898f67ba8c2701c3edcebe315120d09f5b445d5bc32b7c31719d4973f9b7c
+  data.tar.gz: d94e9ce7d8da1bb16017c77ee562b87fe8492f5ea60467042a97aa20f4c33493
 SHA512:
-  metadata.gz: 130265b9d6ba0d8bc97441e8412732dd7118bf1727712288837ee176d38fbb56aea27534eb235341034d8083ac13f28b2898e98da82767d80f3fda01fbaecb44
-  data.tar.gz: 77b2eebd91c6a8f0572ecdfc16b6e8bfb902b7d643e4210af9cdd311f074967338e2ddb17eaa520ddeca3d731d72e9799bc856775014f8bb6b039317852d9a31
+  metadata.gz: 0c65a6d278fd08ce6e9fb08cbda659c1eb3fd5805a43f345514ef6cb516534a76c89acb1aa8fc1d99d2fcde0ee92453db1268144884dd87097ba7b1892857f3a
+  data.tar.gz: 014db843ff5839284074e89f56acdb18eacdc8de8387d678892b345b56bd1392fe4232637fb4506623d0c8b2f02e37347114859de8ea44db7381345e3a30ed8a

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.1]
+
+### Fixed
+
+- Support `async` down to 2.32 (the gemspec minimum):
+  `Promise#wait(timeout:)` only exists on newer releases, so timed
+  waits now fall back to `with_timeout` around a blocking wait.
+- Faster connection close: stop the listen task before joining it
+  (it never exits on its own while the peer is alive). Full suite
+  went from ~35s down to ~6s.
+
+### Compatibility
+
+- Verified: full suite (189 tests) green on Ruby 3.2, 3.3, 3.4 and 4.0,
+  with `async` 2.32, 2.36, 2.37, 2.38 and 2.45.
+
 ## [0.3.0]
 
 ### Added

data/lib/acp/connection.rb

@@ -374,7 +374,10 @@ module ACP
       listener = @listen_worker
       return if listener.nil? || Wait.current?(listener)
 
-      Wait.stop(listener) unless Wait.join(listener, @worker_grace)
+      # Stop first, then join: the listener never finishes on its own while
+      # the peer is alive, so joining first would always burn the full grace.
+      Wait.stop(listener)
+      Wait.join(listener, @worker_grace)
     end
   end
 end

data/lib/acp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ACP
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/acp/wait.rb

@@ -3,6 +3,7 @@
 require "async"
 require "async/promise"
 require "logger"
+require "timeout"
 require_relative "exceptions"
 
 module ACP
@@ -102,6 +103,21 @@ module ACP
       worker.finished? || !alive?(worker)
     end
 
+    # Promise#wait(timeout:) only exists on newer async releases.
+    # Older ones get the same semantics via with_timeout around a
+    # blocking wait; outside a reactor fall back to stdlib Timeout.
+    def self.wait_promise(promise, timeout)
+      return promise.wait if timeout.nil?
+
+      if promise.method(:wait).parameters.any? { |type, _| %i[key keyrest].include?(type) }
+        promise.wait(timeout: timeout)
+      elsif async?
+        ::Async::Task.current.with_timeout(timeout) { promise.wait }
+      else
+        ::Timeout.timeout(timeout) { promise.wait }
+      end
+    end
+
     class Latch
       def initialize
         @promise = ::Async::Promise.new
@@ -116,13 +132,9 @@ module ACP
       end
 
       def wait(timeout = nil)
-        if timeout.nil?
-          @promise.wait
-        else
-          @promise.wait(timeout: timeout)
-        end
+        Wait.wait_promise(@promise, timeout)
         true
-      rescue ::Async::TimeoutError
+      rescue ::Async::TimeoutError, ::Timeout::Error
         false
       end
     end
@@ -148,12 +160,8 @@ module ACP
       end
 
       def wait(timeout = nil)
-        if timeout.nil?
-          @promise.wait
-        else
-          @promise.wait(timeout: timeout)
-        end
-      rescue ::Async::TimeoutError
+        Wait.wait_promise(@promise, timeout)
+      rescue ::Async::TimeoutError, ::Timeout::Error
         raise TimeoutError, "Timed out after #{timeout}s"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acp_sdk_async
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - nutsoriginal