datagrout-conduit 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a08c2cb30deefe712f0083b473838a1ec6b578c1b7decbcc53ac14aca4cffb
-  data.tar.gz: ea88b13e4a5998164c4dfaa1b71d448e5d498b694b8de312449a8c82d4daf555
+  metadata.gz: 177af76b0cdd7d7e82fd1384db89da6a5dd4b3152ff5f07e255075dec041a91c
+  data.tar.gz: 34b1c4d17471013349db85beb09f167719e4fc0189204b117042c1394fc175f8
 SHA512:
-  metadata.gz: 70c40acb181dcc382395c454e769e26fede6798a32dc2dab7797ffaf66b1936dd0e89cf767f2f9f16a5e668ad1ceff9dfd3d2a22d03db34bcb146ab1eef78ba6
-  data.tar.gz: 3c2cf29896ae08b63876e60e8807ccb7ea85118fdb5d422aaf9b94e4ef3aa76345786b42bb0406f1c8df1b938d3755cf78a84fd3bf9728f5ecc4fd54a6c7b737
+  metadata.gz: 6812db873347c88a86bfd0ecce380e6d264b4f66854d3eeb01e3ee4a28b89cf2b6e8f93423442ea9b0c14fcb40c68cd6bcc2d6210a5f343200115dd92343ff35
+  data.tar.gz: 23deaeee4cfe9be72cc546b919e5a87cb5ea5fa108831c346a4e02b0faa501578b582632f538a42dd0456095a9b8589511e349318c95f414b086bed7a0d90980

data/lib/datagrout_conduit/client.rb

@@ -388,16 +388,24 @@ module DatagroutConduit
       unwrap_content(raw)
     end
 
-    # Unwrap the MCP content envelope that wraps tool results from both MCP and
-    # JSONRPC transports: {"content" => [{"type" => "text", "text" => "<json>"}]}
+    # Unwrap the MCP content envelope from tool call results.
+    #
+    # Priority order (MCP 2025):
+    # 1. +structuredContent+ — pure JSON Hash, no decoding needed.
+    # 2. +content[0]["text"]+ parsed as JSON — legacy text-encoded path.
+    # 3. +content[0]+ as-is — plain-text or non-JSON content item.
+    # 4. +raw+ unchanged — no content envelope present.
     def unwrap_content(raw)
       return raw unless raw.is_a?(Hash)
 
+      # 1. Prefer structuredContent (MCP 2025).
+      return raw["structuredContent"] if raw.key?("structuredContent")
+
       content = raw["content"]
       return raw unless content.is_a?(Array) && !content.empty?
 
       first = content.first
-      return raw unless first.is_a?(Hash) && first["text"].is_a?(String)
+      return first unless first.is_a?(Hash) && first["text"].is_a?(String)
 
       begin
         JSON.parse(first["text"])

data/lib/datagrout_conduit/transport/ws.rb

@@ -32,6 +32,14 @@ module DatagroutConduit
     class Ws
       SUBPROTOCOL = "datagrout-jsonrpc.v1"
 
+      # Seconds between client-initiated WS ping frames.
+      #
+      # Many load balancers and reverse proxies (nginx, AWS ALB) close idle
+      # WS connections after 60-120 seconds; pinging every 25 seconds keeps
+      # the connection alive well within the tightest common timeout window.
+      # Mirrors PING_INTERVAL in the Rust reference implementation.
+      PING_INTERVAL_SECONDS = 25
+
       # ── Subscription ─────────────────────────────────────────────────────────
 
       # Per-subscription event stream delivered via a thread-safe Queue.
@@ -98,7 +106,7 @@ module DatagroutConduit
 
       # ── Construction ─────────────────────────────────────────────────────────
 
-      def initialize(url:, auth: {}, identity: nil)
+      def initialize(url:, auth: {}, identity: nil, ping_interval: PING_INTERVAL_SECONDS)
         @url      = url
         @auth     = normalize_auth(auth)
         @identity = identity
@@ -113,9 +121,16 @@ module DatagroutConduit
         @io          = nil
         @driver      = nil
         @read_thread = nil
+        @ping_thread = nil
+        @ping_interval = ping_interval.to_f
+        @pings_sent   = 0
         @connected   = false
       end
 
+      # Number of ping frames this transport has sent over its lifetime.
+      # Exposed for tests; production code can ignore it.
+      attr_reader :pings_sent, :ping_interval
+
       # ── Public API ────────────────────────────────────────────────────────────
 
       # Establish the WebSocket connection.
@@ -145,6 +160,7 @@ module DatagroutConduit
         raise ConnectionError, "WebSocket handshake failed: #{err}" if err
 
         @connected = true
+        start_ping_thread
         self
       rescue Timeout::Error
         cleanup_socket
@@ -423,6 +439,7 @@ module DatagroutConduit
       end
 
       def cleanup_socket
+        stop_ping_thread
         @write_mutex.synchronize do
           @driver = nil
         end
@@ -432,6 +449,44 @@ module DatagroutConduit
         @io = nil
       end
 
+      # ── Ping keepalive ───────────────────────────────────────────────────────
+
+      # 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).
+      def start_ping_thread
+        return if @ping_thread
+        return if @ping_interval <= 0
+
+        interval = @ping_interval
+        @ping_thread = Thread.new do
+          loop do
+            sleep interval
+            break unless @connected
+
+            driver = @driver
+            break unless driver
+
+            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
+              @pings_sent += 1
+            rescue StandardError
+              break
+            end
+          end
+        end
+        @ping_thread.abort_on_exception = false
+        @ping_thread.name = "conduit-ws-ping"
+      end
+
+      def stop_ping_thread
+        thread = @ping_thread
+        @ping_thread = nil
+        thread&.kill
+      end
+
       # ── Helpers ───────────────────────────────────────────────────────────────
 
       def ensure_connected!

data/lib/datagrout_conduit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrout-conduit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - DataGrout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-10 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday