datagrout-conduit 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd14b15aedac0053578b8851d4f0bb7295be8fde2f8495010eb8f0591193f91a
-  data.tar.gz: 33ba69cb106483c8bdfe1bd28f9e0f08135a6bcdbb1ef385c94d2ea014a2f304
+  metadata.gz: b5f3083e66b890a25b3fe77e4fd86e7e72ba3d86af8a530477ad93334de26f19
+  data.tar.gz: 16bb086f9c923bacad3fe8fc228eb5ea024a475a33bba51f320aad00fa032f56
 SHA512:
-  metadata.gz: f168042023a468b2039c42236e29d0b0671d64c8fa807a4c58fd5eab5a2db1ef9c51049dc5f53fe8555eea86818eb513436b27eeac1d8e366d5823c1076a1b89
-  data.tar.gz: d5ee5d3d4fb4931072596811daabb01d527f08eac8f3a080a83ed700cb8069716c71489cc8cc92f2831ee740b09af5bb1f16f9c98f1a6eaaaa4fd6e63241a889
+  metadata.gz: a38b2be0474f517414da7731565fac6a4327664f84b7b95f9e04d478f29183087ac4da84899fbba952bbba11244386735ecd564c1a422038c8baef3b45141d10
+  data.tar.gz: 82f0c8a811e8165f1a5c91dcc5c3f93121115cc49d9969774e6b0a2c65d63afb2cf34d646c1042039f52182db2bca2084982d75dee76c56c0ad612405132ec66

data/README.md

@@ -310,7 +310,7 @@ Supported topics:
 | `flows.<flow_id>.*` | `flow.into` progress and completion |
 | `governor.<server_uuid>` | Governor percept events (file change, schedule, webhook) |
 
-**Reconnection**: after a disconnect, `send_request` and `subscribe` raise `DatagroutConduit::NotInitializedError`. Call `client.connect` again and re-subscribe — subscriptions do not survive reconnects in v0.4.
+**Reconnection**: after a disconnect, `send_request` and `subscribe` raise `DatagroutConduit::NotInitializedError`. Call `client.connect` again and re-subscribe — subscriptions do not survive reconnects in v0.4. A connection ends when the server closes it, a read fails, or a keepalive ping goes unanswered for a whole interval; in-flight calls then fail and every subscription's `each` ends.
 
 ## Standard MCP Methods
 

data/lib/datagrout_conduit/transport/ws.rb

@@ -442,6 +442,19 @@ module DatagroutConduit
         subs.each_value        { |list| list.each(&:_close) }
       end
 
+      # The peer stopped answering pings: release every waiter as a close
+      # does, then close the socket so the read thread stops too.
+      def peer_gone
+        was_connected = @mutex.synchronize do
+          old = @connected
+          @connected = false
+          old
+        end
+
+        fail_all_pending(:ping_timeout) if was_connected
+        @io&.close rescue nil
+      end
+
       def cleanup_socket
         stop_ping_thread
         @write_mutex.synchronize do
@@ -458,11 +471,17 @@ module DatagroutConduit
       # Start the background ping thread. Sends one WS ping frame every
       # @ping_interval seconds until the connection is torn down. No-op when
       # @ping_interval is non-positive (used by tests to disable pinging).
+      #
+      # A ping still unanswered when the next is due closes the connection: a
+      # peer that vanished without a close frame (a dropped NAT mapping, a
+      # host that went away) is otherwise invisible until the OS gives up on
+      # the TCP connection.
       def start_ping_thread
         return if @ping_thread
         return if @ping_interval <= 0
 
         interval = @ping_interval
+        @awaiting_pong = false
         @ping_thread = Thread.new do
           loop do
             sleep interval
@@ -471,15 +490,26 @@ module DatagroutConduit
             driver = @driver
             break unless driver
 
+            if @awaiting_pong
+              peer_gone
+              break
+            end
+
             begin
               # WebSocket::Driver#ping returns false if the connection is
-              # already closing; treat that as "stop the loop" too.
-              @write_mutex.synchronize { driver.ping } || break
+              # already closing; treat that as "stop the loop" too. Its block
+              # runs when the matching pong arrives.
+              @awaiting_pong = true
+              @write_mutex.synchronize { driver.ping { @awaiting_pong = false } } || break
               @pings_sent += 1
             rescue StandardError
               break
             end
           end
+        ensure
+          # A loop that ended on its own must not stop the next connect from
+          # starting a fresh one.
+          @ping_thread = nil if @ping_thread == Thread.current
         end
         @ping_thread.abort_on_exception = false
         @ping_thread.name = "conduit-ws-ping"

data/lib/datagrout_conduit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatagroutConduit
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrout-conduit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - DataGrout