smplkit 3.0.135 → 3.0.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1cba1222e1ec1109993202959fa417b65752d969da90230f6f4ed913de9753
-  data.tar.gz: d1656093905daa0e565c6fb20c482b922251d2a4eb0dfbc7ca8684bc323abac5
+  metadata.gz: 82238262a8b9ee5b4d6a01d678238c0b47f5b16b029d2af72f7452d39b522040
+  data.tar.gz: e7fa9dc7b95404fd98661942c5cce79d538d2b6812cd0245cd3bf8617316a821
 SHA512:
-  metadata.gz: 4c18d2ec862ee1ad4b58539f326aaa55e6868de62205fe037998a00f90cb6d3c60676d80ab3f94771d8923d9c08543133d861358dc9c18dd1ff35a57ae15e783
-  data.tar.gz: d9225dd299dbbeac794f58a7fbd48713e10166e4f7e266a4eedd4ead1649c7315542de018a5d1bfe1aa1796cb7f82d4c04bfac4fdab30ab1ecd21ac4ba48ad2c
+  metadata.gz: 38eb4b4763f7a80130e7160d4736176782f55161624e4b2fddfc514bd8155df49820ba83710e2a3cf2eb02ab2856d7f453e05c5c96302657d3393700eb9aa650
+  data.tar.gz: 149450fce5a3dc5da39c26a3bed0c191bae710a6541acf5ce967062008d72c627c066354019eece249d8da34da730cef9c258d14bafb528f0a5e29393356d453

data/lib/smplkit/event_stream.rb

@@ -35,14 +35,23 @@ module Smplkit
   #
   # On disconnect the reactor reconnects with exponential backoff (base
   # delay doubling up to +MAX_BACKOFF+ seconds), resetting to the base on
-  # every successful connect. +stop+ closes the stream from the outer
-  # thread; the reader exits and the daemon thread terminates.
+  # every successful connect. +stop+ flips +@closed+ and waits; the reader
+  # re-checks the flag at least every +POLL_INTERVAL+, tears its own
+  # connection down in-reactor, and the daemon thread terminates.
   class EventStream
     # Seconds without any bytes from the server (events or keepalive
     # comments) before the connection is considered dead — two missed
     # 30-second server keepalives.
     READ_TIMEOUT = 45
 
+    # How long a single blocking read may park the reactor before it wakes
+    # to re-check +@closed+. Liveness is tracked as a deadline across
+    # polls (see +read_loop+), so this changes nothing on the wire — it
+    # exists so +stop+ never has to interrupt the reactor from a foreign
+    # thread: a cross-thread close cannot wake a fiber blocked in
+    # +body.read+, which left teardown hanging until the next keepalive.
+    POLL_INTERVAL = 1.0
+
     # Ceiling for the exponential reconnect backoff, in seconds.
     MAX_BACKOFF = 60
 
@@ -254,12 +263,19 @@ module Smplkit
     def stop
       Smplkit.debug("events", "stopping shared event stream")
       @closed = true
-      close_active_connection
       thread = @stream_thread
       @stream_thread = nil
       if thread
-        thread.join(2.0)
-        thread.kill if thread.alive?
+        # The reactor re-checks +@closed+ at least every POLL_INTERVAL and
+        # closes its own connection in-reactor on the way out — closing it
+        # from this thread instead would race the reactor and cannot wake
+        # a blocked read.
+        thread.join(POLL_INTERVAL + 1.0)
+        if thread.alive?
+          # Last resort: a connect attempt wedged before the read loop.
+          thread.kill
+          close_active_connection
+        end
       end
       # Set authoritatively after the thread is dead so a racing connect
       # call (which also sets "connecting") cannot clobber this value.
@@ -405,19 +421,33 @@ module Smplkit
     end
 
     # Read chunks until EOF, feeding the SSE parser and dispatching the
-    # events it completes. Each read is individually wrapped in the liveness
-    # timeout, so any received bytes — including keepalive comment frames —
-    # reset the clock.
+    # events it completes. Reads park for at most POLL_INTERVAL at a time
+    # so +stop+ is honored promptly; liveness is a rolling deadline — any
+    # received bytes, including keepalive comment frames, push it out by
+    # READ_TIMEOUT. A deadline breach raises into the reconnect path.
     def read_loop(task, body)
       parser = Parser.new
+      deadline = monotonic_now + READ_TIMEOUT
       until @closed
-        chunk = task.with_timeout(READ_TIMEOUT) { body.read }
+        begin
+          chunk = task.with_timeout(POLL_INTERVAL) { body.read }
+        rescue Async::TimeoutError
+          raise Async::TimeoutError, "no data for #{READ_TIMEOUT}s" if monotonic_now >= deadline
+
+          next
+        end
         break if chunk.nil?
 
+        deadline = monotonic_now + READ_TIMEOUT
         process_chunk(parser, chunk)
       end
     end
 
+    # Seam for specs; the liveness deadline math needs a controllable clock.
+    def monotonic_now
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
     def process_chunk(parser, chunk)
       parser.feed(chunk).each { |event| handle_event(event.name, event.data) }
       @retry_base = parser.retry_ms / 1000.0 unless parser.retry_ms.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smplkit
 version: !ruby/object:Gem::Version
-  version: 3.0.135
+  version: 3.0.136
 platform: ruby
 authors:
 - Smpl Solutions LLC