ruby-mcp-client 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cf7d5701adff89363dd653d263189bded230a32232bbbb496d41b4092afdec
-  data.tar.gz: 9a3561d2f97f0ef518cf75dfce82a8521140c9cdc381aaef3f3b3658265a7298
+  metadata.gz: 16280a305c2b9cd19ecc2a71b8f10d3805644015f34f7eaec28d5846f12fa1db
+  data.tar.gz: 48a791c3a88255c25078234819024dace993f7cfc564485f48680a8768b81238
 SHA512:
-  metadata.gz: 361f1916a531f14ded3292e15ea4947b0e3715d71d2be71dd24ea198616a82c55e516379a59a455b6c14f9fb7b3b9a1d02bdd457fde0b975ece6320bbb6da23b
-  data.tar.gz: b38270ec5a9ddce3a3689e6c8fb6e86efaa35453b6bcc8a590612d02fe1ef86040d62fd30fb95ff02640bb7b822bf8f473ae24fd571ad696069657f98a9d5c20
+  metadata.gz: d4155463bcc691725b3a88e29dbb7df75a5b05a9ca7693d12a4fcc6f43bb57df06966089042dcaebb6f9f0a3b429a1eaa3138bb478ad161aad98163eb6de2763
+  data.tar.gz: 6acb25bd0f1c72d640570823c262f548bda1f09322c137789ad36d5950dc80eda6d66e707b0c69229805ffdb575aea086ae999747d74aef9304ad65c46e67039

data/README.md

@@ -56,10 +56,22 @@ client = MCPClient.create_client(
       retries: 3,       # Optional number of retry attempts (default: 0)
       retry_backoff: 1  # Optional backoff delay in seconds (default: 1)
       # Native support for tool streaming via call_tool_streaming method
-    )
-  ]
+)  ]
 )
 
+# Or load server definitions from a JSON file
+client = MCPClient.create_client(
+  server_definition_file: 'path/to/server_definition.json'
+)
+
+# MCP server configuration JSON format can be:
+# 1. A single server object: 
+#    { "type": "sse", "url": "http://example.com/sse" }
+# 2. An array of server objects: 
+#    [{ "type": "stdio", "command": "npx server" }, { "type": "sse", "url": "http://..." }]
+# 3. An object with "mcpServers" key containing named servers:
+#    { "mcpServers": { "server1": { "type": "sse", "url": "http://..." } } }
+
 # List available tools
 tools = client.list_tools
 
@@ -100,9 +112,8 @@ result = client.send_rpc('another_method', params: { data: 123 }) # Uses first a
 client.send_notification('status_update', params: { status: 'ready' })
 
 # Check server connectivity 
-client.ping # Basic connectivity check
-client.ping({ echo: "hello" }) # With optional parameters 
-client.ping({}, server_index: 1) # Ping a specific server by index
+client.ping # Basic connectivity check (zero-parameter heartbeat call)
+client.ping(server_index: 1) # Ping a specific server by index
 
 # Clear cached tools to force fresh fetch on next list
 client.clear_cache
@@ -110,6 +121,61 @@ client.clear_cache
 client.cleanup
 ```
 
+### Server-Sent Events (SSE) Example
+
+The SSE transport provides robust connection handling for remote MCP servers:
+
+```ruby
+require 'mcp_client'
+require 'logger'
+
+# Optional logger for debugging
+logger = Logger.new($stdout)
+logger.level = Logger::INFO
+
+# Create an MCP client that connects to a Playwright MCP server via SSE
+# First run: npx @playwright/mcp@latest --port 8931
+sse_client = MCPClient.create_client(
+  mcp_server_configs: [
+    MCPClient.sse_config(
+      base_url: 'http://localhost:8931/sse',
+      read_timeout: 30,  # Timeout in seconds
+    )
+  ]
+)
+
+# List available tools
+tools = sse_client.list_tools
+
+# Launch a browser
+result = sse_client.call_tool('browser_install', {})
+result = sse_client.call_tool('browser_navigate', { url: 'about:blank' })
+# No browser ID needed with these tool names
+
+# Create a new page
+page_result = sse_client.call_tool('browser_tab_new', {})
+# No page ID needed with these tool names
+
+# Navigate to a website
+sse_client.call_tool('browser_navigate', { url: 'https://example.com' })
+
+# Get page title
+title_result = sse_client.call_tool('browser_snapshot', {})
+puts "Page snapshot: #{title_result}"
+
+# Take a screenshot
+screenshot_result = sse_client.call_tool('browser_take_screenshot', {})
+
+# Ping the server to verify connectivity
+ping_result = sse_client.ping
+puts "Ping successful: #{ping_result.inspect}"
+
+# Clean up
+sse_client.cleanup
+```
+
+See `examples/mcp_sse_server_example.rb` for the full Playwright SSE example.
+
 ### Integration Examples
 
 The repository includes examples for integrating with popular AI APIs:
@@ -196,6 +262,7 @@ Complete examples can be found in the `examples/` directory:
 - `ruby_openai_mcp.rb` - Integration with alexrudall/ruby-openai gem
 - `openai_ruby_mcp.rb` - Integration with official openai/openai-ruby gem
 - `ruby_anthropic_mcp.rb` - Integration with alexrudall/ruby-anthropic gem
+- `mcp_sse_server_example.rb` - SSE transport with Playwright MCP
 
 ## MCP Server Compatibility
 
@@ -205,7 +272,77 @@ This client works with any MCP-compatible server, including:
 - [@playwright/mcp](https://www.npmjs.com/package/@playwright/mcp) - Browser automation
 - Custom servers implementing the MCP protocol
 
-### Server Implementation Features
+### Server Definition Files
+
+You can define MCP server configurations in JSON files for easier management:
+
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "type": "sse",
+      "url": "http://localhost:8931/sse",
+      "headers": {
+        "Authorization": "Bearer TOKEN"
+      }
+    },
+    "filesystem": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/dir"],
+      "env": {
+        "DEBUG": "true"
+      }
+    }
+  }
+}
+```
+
+A simpler example used in the Playwright demo (found in `examples/playwright_server_definition.json`):
+
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "url": "http://localhost:8931/sse",
+      "headers": {},
+      "comment": "Local Playwright MCP Server running on port 8931"
+    }
+  }
+}
+```
+
+Load this configuration with:
+
+```ruby
+client = MCPClient.create_client(server_definition_file: 'path/to/definition.json')
+```
+
+The JSON format supports:
+1. A single server object: `{ "type": "sse", "url": "..." }`
+2. An array of server objects: `[{ "type": "stdio", ... }, { "type": "sse", ... }]`
+3. An object with named servers under `mcpServers` key (as shown above)
+
+Special configuration options:
+- `comment` and `description` are reserved keys that are ignored during parsing and can be used for documentation
+- Server type can be inferred from the presence of either `command` (for stdio) or `url` (for SSE)
+- All string values in arrays (like `args`) are automatically converted to strings
+
+## Key Features
+
+### Client Features
+
+- **Multiple transports** - Support for both stdio and SSE transports
+- **Multiple servers** - Connect to multiple MCP servers simultaneously
+- **Tool discovery** - Find tools by name or pattern
+- **Atomic tool calls** - Simple API for invoking tools with parameters
+- **Batch support** - Call multiple tools in a single operation
+- **API conversions** - Built-in format conversion for OpenAI and Anthropic APIs
+- **Thread safety** - Synchronized access for thread-safe operation
+- **Server notifications** - Support for JSON-RPC notifications
+- **Custom RPC methods** - Send any custom JSON-RPC method
+- **Consistent error handling** - Rich error types for better exception handling
+- **JSON configuration** - Support for server definition files in JSON format
 
 ### Server-Sent Events (SSE) Implementation
 
@@ -226,7 +363,7 @@ The SSE client implementation provides these key features:
 
 ## Requirements
 
-- Ruby >= 2.7.0
+- Ruby >= 3.2.0
 - No runtime dependencies
 
 ## Implementing an MCP Server
@@ -274,4 +411,4 @@ This gem is available as open source under the [MIT License](LICENSE).
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/simonx1/ruby-mcp-client.
+https://github.com/simonx1/ruby-mcp-client.

data/lib/mcp_client/client.rb

@@ -31,9 +31,9 @@ module MCPClient
       # Register default and user-defined notification handlers on each server
       @servers.each do |server|
         server.on_notification do |method, params|
-          # Default handling: clear tool cache on tools list change
-          clear_cache if method == 'notifications/tools/list_changed'
-          # Invoke user listeners
+          # Default notification processing (e.g., cache invalidation, logging)
+          process_notification(server, method, params)
+          # Invoke user-defined listeners
           @notification_listeners.each { |cb| cb.call(server, method, params) }
         end
       end
@@ -163,17 +163,16 @@ module MCPClient
       end
     end
 
-    # Ping the MCP server to check connectivity
-    # @param params [Hash] optional parameters for the ping request
+    # Ping the MCP server to check connectivity (zero-parameter heartbeat call)
     # @param server_index [Integer, nil] optional index of a specific server to ping, nil for first available
     # @return [Object] result from the ping request
     # @raise [MCPClient::Errors::ServerNotFound] if no server is available
-    def ping(params = {}, server_index: nil)
+    def ping(server_index: nil)
       if server_index.nil?
         # Ping first available server
         raise MCPClient::Errors::ServerNotFound, 'No server available for ping' if @servers.empty?
 
-        @servers.first.ping(params)
+        @servers.first.ping
       else
         # Ping specified server
         if server_index >= @servers.length
@@ -181,12 +180,78 @@ module MCPClient
                 "Server at index #{server_index} not found"
         end
 
-        @servers[server_index].ping(params)
+        @servers[server_index].ping
       end
     end
 
+    # Send a raw JSON-RPC request to a server
+    # @param method [String] JSON-RPC method name
+    # @param params [Hash] parameters for the request
+    # @param server [Integer, String, Symbol, MCPClient::ServerBase, nil] server selector
+    # @return [Object] result from the JSON-RPC response
+    def send_rpc(method, params: {}, server: nil)
+      srv = select_server(server)
+      srv.rpc_request(method, params)
+    end
+
+    # Send a raw JSON-RPC notification to a server (no response expected)
+    # @param method [String] JSON-RPC method name
+    # @param params [Hash] parameters for the notification
+    # @param server [Integer, String, Symbol, MCPClient::ServerBase, nil] server selector
+    # @return [void]
+    def send_notification(method, params: {}, server: nil)
+      srv = select_server(server)
+      srv.rpc_notify(method, params)
+    end
+
     private
 
+    # Process incoming JSON-RPC notifications with default handlers
+    # @param server [MCPClient::ServerBase] the server that emitted the notification
+    # @param method [String] JSON-RPC notification method
+    # @param params [Hash] parameters for the notification
+    # @return [void]
+    def process_notification(server, method, params)
+      case method
+      when 'notifications/tools/list_changed'
+        logger.warn("[#{server.class}] Tool list has changed, clearing tool cache")
+        clear_cache
+      when 'notifications/resources/updated'
+        logger.warn("[#{server.class}] Resource #{params['uri']} updated")
+      when 'notifications/prompts/list_changed'
+        logger.warn("[#{server.class}] Prompt list has changed")
+      when 'notifications/resources/list_changed'
+        logger.warn("[#{server.class}] Resource list has changed")
+      end
+    end
+
+    # Select a server based on index, type, or instance
+    # @param server_arg [Integer, String, Symbol, MCPClient::ServerBase, nil] server selector
+    # @return [MCPClient::ServerBase]
+    def select_server(server_arg)
+      case server_arg
+      when nil
+        raise MCPClient::Errors::ServerNotFound, 'No server available' if @servers.empty?
+
+        @servers.first
+      when Integer
+        @servers.fetch(server_arg) do
+          raise MCPClient::Errors::ServerNotFound, "Server at index #{server_arg} not found"
+        end
+      when String, Symbol
+        key = server_arg.to_s.downcase
+        srv = @servers.find { |s| s.class.name.split('::').last.downcase.end_with?(key) }
+        raise MCPClient::Errors::ServerNotFound, "Server of type #{server_arg} not found" unless srv
+
+        srv
+      else
+        raise ArgumentError, "Invalid server argument: #{server_arg.inspect}" unless @servers.include?(server_arg)
+
+        server_arg
+
+      end
+    end
+
     # Validate parameters against tool JSON schema (checks required properties)
     # @param tool [MCPClient::Tool] tool definition with schema
     # @param parameters [Hash] parameters to validate

data/lib/mcp_client/config_parser.rb

@@ -0,0 +1,203 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'logger'
+
+module MCPClient
+  # Parses MCP server definition JSON files into configuration hashes
+  class ConfigParser
+    # Reserved JSON keys that shouldn't be included in final config
+    RESERVED_KEYS = %w[comment description].freeze
+
+    # @param file_path [String] path to JSON file containing 'mcpServers' definitions
+    # @param logger [Logger, nil] optional logger for warnings
+    def initialize(file_path, logger: nil)
+      @file_path = file_path
+      @logger = logger || Logger.new($stdout, level: Logger::WARN)
+    end
+
+    # Parse the JSON config and return a mapping of server names to clean config hashes
+    # @return [Hash<String, Hash>] server name => config hash with symbol keys
+    def parse
+      content = File.read(@file_path)
+      data = JSON.parse(content)
+
+      servers_data = extract_servers_data(data)
+      servers_data = filter_reserved_keys(servers_data)
+
+      result = {}
+      servers_data.each do |server_name, config|
+        next unless validate_server_config(config, server_name)
+
+        server_config = process_server_config(config, server_name)
+        result[server_name] = server_config if server_config
+      end
+
+      result
+    rescue Errno::ENOENT
+      raise Errno::ENOENT, "Server definition file not found: #{@file_path}"
+    rescue JSON::ParserError => e
+      raise JSON::ParserError, "Invalid JSON in #{@file_path}: #{e.message}"
+    end
+
+    # Extract server data from parsed JSON
+    # @param data [Object] parsed JSON data
+    # @return [Hash] normalized server data
+    def extract_servers_data(data)
+      if data.is_a?(Hash) && data.key?('mcpServers') && data['mcpServers'].is_a?(Hash)
+        data['mcpServers']
+      elsif data.is_a?(Array)
+        h = {}
+        data.each_with_index { |cfg, idx| h[idx.to_s] = cfg }
+        h
+      elsif data.is_a?(Hash)
+        { '0' => data }
+      else
+        @logger.warn("Invalid root JSON structure in #{@file_path}: #{data.class}")
+        {}
+      end
+    end
+
+    # Validate server configuration is a hash
+    # @param config [Object] server configuration to validate
+    # @param server_name [String] name of the server
+    # @return [Boolean] true if valid, false otherwise
+    def validate_server_config(config, server_name)
+      return true if config.is_a?(Hash)
+
+      @logger.warn("Configuration for server '#{server_name}' is not an object; skipping.")
+      false
+    end
+
+    # Process a single server configuration
+    # @param config [Hash] server configuration to process
+    # @param server_name [String] name of the server
+    # @return [Hash, nil] processed configuration or nil if invalid
+    def process_server_config(config, server_name)
+      type = determine_server_type(config, server_name)
+      return nil unless type
+
+      clean = { type: type.to_s }
+      case type.to_s
+      when 'stdio'
+        parse_stdio_config(clean, config, server_name)
+      when 'sse'
+        return nil unless parse_sse_config(clean, config, server_name)
+      else
+        @logger.warn("Unrecognized type '#{type}' for server '#{server_name}'; skipping.")
+        return nil
+      end
+
+      clean
+    end
+
+    # Determine the type of server from its configuration
+    # @param config [Hash] server configuration
+    # @param server_name [String] name of the server for logging
+    # @return [String, nil] determined server type or nil if cannot be determined
+    def determine_server_type(config, server_name)
+      type = config['type']
+      return type if type
+
+      inferred_type = if config.key?('command') || config.key?('args') || config.key?('env')
+                        'stdio'
+                      elsif config.key?('url')
+                        'sse'
+                      end
+
+      if inferred_type
+        @logger.warn("'type' not specified for server '#{server_name}', inferring as '#{inferred_type}'.")
+        return inferred_type
+      end
+
+      @logger.warn("Could not determine type for server '#{server_name}' (missing 'command' or 'url'); skipping.")
+      nil
+    end
+
+    private
+
+    # Parse stdio-specific configuration
+    # @param clean [Hash] clean configuration hash to update
+    # @param config [Hash] raw configuration from JSON
+    # @param server_name [String] name of the server for error reporting
+    def parse_stdio_config(clean, config, server_name)
+      # Command is required
+      cmd = config['command']
+      unless cmd.is_a?(String)
+        @logger.warn("'command' for server '#{server_name}' is not a string; converting to string.")
+        cmd = cmd.to_s
+      end
+
+      # Args are optional
+      args = config['args']
+      if args.is_a?(Array)
+        args = args.map(&:to_s)
+      elsif args
+        @logger.warn("'args' for server '#{server_name}' is not an array; treating as single argument.")
+        args = [args.to_s]
+      else
+        args = []
+      end
+
+      # Environment variables are optional
+      env = config['env']
+      env = env.is_a?(Hash) ? env.transform_keys(&:to_s) : {}
+
+      # Update clean config
+      clean[:command] = cmd
+      clean[:args] = args
+      clean[:env] = env
+    end
+
+    # Parse SSE-specific configuration
+    # @param clean [Hash] clean configuration hash to update
+    # @param config [Hash] raw configuration from JSON
+    # @param server_name [String] name of the server for error reporting
+    # @return [Boolean] true if parsing succeeded, false if required elements are missing
+    def parse_sse_config(clean, config, server_name)
+      # URL is required
+      source = config['url']
+      unless source
+        @logger.warn("SSE server '#{server_name}' is missing required 'url' property; skipping.")
+        return false
+      end
+
+      unless source.is_a?(String)
+        @logger.warn("'url' for server '#{server_name}' is not a string; converting to string.")
+        source = source.to_s
+      end
+
+      # Headers are optional
+      headers = config['headers']
+      headers = headers.is_a?(Hash) ? headers.transform_keys(&:to_s) : {}
+
+      # Update clean config
+      clean[:url] = source
+      clean[:headers] = headers
+      true
+    end
+
+    # Filter out reserved keys from configuration objects
+    # @param data [Hash] configuration data
+    # @return [Hash] filtered configuration data
+    def filter_reserved_keys(data)
+      return data unless data.is_a?(Hash)
+
+      result = {}
+      data.each do |key, value|
+        # Skip reserved keys at server level
+        next if RESERVED_KEYS.include?(key)
+
+        # If value is a hash, recursively filter its keys too
+        if value.is_a?(Hash)
+          filtered_value = value.dup
+          RESERVED_KEYS.each { |reserved| filtered_value.delete(reserved) }
+          result[key] = filtered_value
+        else
+          result[key] = value
+        end
+      end
+      result
+    end
+  end
+end

data/lib/mcp_client/server_base.rb

@@ -45,11 +45,10 @@ module MCPClient
       raise NotImplementedError, 'Subclasses must implement rpc_notify'
     end
 
-    # Ping the MCP server to check connectivity
-    # @param params [Hash] optional parameters for the ping request
+    # Ping the MCP server to check connectivity (zero-parameter heartbeat call)
     # @return [Object] result from the ping request
-    def ping(params = {})
-      rpc_request('ping', params)
+    def ping
+      rpc_request('ping')
     end
 
     # Register a callback to receive JSON-RPC notifications

data/lib/mcp_client/server_sse.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'net/http'
 require 'json'
-require 'openssl'
 require 'monitor'
 require 'logger'
+require 'faraday'
+require 'faraday/retry'
 
 module MCPClient
   # Implementation of MCP server that communicates via Server-Sent Events (SSE)
   # Useful for communicating with remote MCP servers over HTTP
   class ServerSSE < ServerBase
-    attr_reader :base_url, :tools, :session_id, :http_client, :server_info, :capabilities
+    attr_reader :base_url, :tools, :server_info, :capabilities
 
     # @param base_url [String] The base URL of the MCP server
     # @param headers [Hash] Additional headers to include in requests
@@ -33,10 +33,12 @@ module MCPClient
                                  'Cache-Control' => 'no-cache',
                                  'Connection' => 'keep-alive'
                                })
-      @http_client = nil
+      # HTTP client is managed via Faraday
       @tools = nil
       @read_timeout = read_timeout
-      @session_id = nil
+
+      # SSE-provided JSON-RPC endpoint path for POST requests
+      @rpc_endpoint = nil
       @tools_data = nil
       @request_id = 0
       @sse_results = {}
@@ -132,19 +134,7 @@ module MCPClient
       @mutex.synchronize do
         return true if @connection_established
 
-        uri = URI.parse(@base_url)
-        @http_client = Net::HTTP.new(uri.host, uri.port)
-
-        if uri.scheme == 'https'
-          @http_client.use_ssl = true
-          @http_client.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-
-        @http_client.open_timeout = 10
-        @http_client.read_timeout = @read_timeout
-        @http_client.keep_alive_timeout = 60
-
-        @http_client.start
+        # Start SSE listener using Faraday HTTP client
         start_sse_thread
 
         timeout = 10
@@ -179,7 +169,6 @@ module MCPClient
         end
 
         @tools = nil
-        @session_id = nil
         @connection_established = false
         @sse_connected = false
       end
@@ -204,31 +193,31 @@ module MCPClient
     # @return [void]
     def rpc_notify(method, params = {})
       ensure_initialized
-      url_base = @base_url.sub(%r{/sse/?$}, '')
-      uri = URI.parse("#{url_base}/messages?sessionId=#{@session_id}")
-      rpc_http = Net::HTTP.new(uri.host, uri.port)
-      if uri.scheme == 'https'
-        rpc_http.use_ssl = true
-        rpc_http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      uri = URI.parse(@base_url)
+      base = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      rpc_ep = @mutex.synchronize { @rpc_endpoint }
+      @rpc_conn ||= Faraday.new(url: base) do |f|
+        f.request :retry, max: @max_retries, interval: @retry_backoff, backoff_factor: 2
+        f.options.open_timeout = @read_timeout
+        f.options.timeout = @read_timeout
+        f.adapter Faraday.default_adapter
       end
-      rpc_http.open_timeout = 10
-      rpc_http.read_timeout = @read_timeout
-      rpc_http.keep_alive_timeout = 60
-      rpc_http.start do |http|
-        http_req = Net::HTTP::Post.new(uri)
-        http_req.content_type = 'application/json'
-        http_req.body = { jsonrpc: '2.0', method: method, params: params }.to_json
-        headers = @headers.dup
-        headers.except('Accept', 'Cache-Control').each { |k, v| http_req[k] = v }
-        response = http.request(http_req)
-        unless response.is_a?(Net::HTTPSuccess)
-          raise MCPClient::Errors::ServerError, "Notification failed: #{response.code} #{response.message}"
+      response = @rpc_conn.post(rpc_ep) do |req|
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accept'] = 'application/json'
+        (@headers.dup.tap do |h|
+          h.delete('Accept')
+          h.delete('Cache-Control')
+        end).each do |k, v|
+          req.headers[k] = v
         end
+        req.body = { jsonrpc: '2.0', method: method, params: params }.to_json
+      end
+      unless response.success?
+        raise MCPClient::Errors::ServerError, "Notification failed: #{response.status} #{response.reason_phrase}"
       end
     rescue StandardError => e
       raise MCPClient::Errors::TransportError, "Failed to send notification: #{e.message}"
-    ensure
-      rpc_http.finish if rpc_http&.started?
     end
 
     private
@@ -269,60 +258,31 @@ module MCPClient
       return if @sse_thread&.alive?
 
       @sse_thread = Thread.new do
-        sse_http = nil
-        begin
-          uri = URI.parse(@base_url)
-          sse_http = Net::HTTP.new(uri.host, uri.port)
-
-          if uri.scheme == 'https'
-            sse_http.use_ssl = true
-            sse_http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          end
-
-          sse_http.open_timeout = 10
-          sse_http.read_timeout = @read_timeout
-          sse_http.keep_alive_timeout = 60
-
-          sse_http.start do |http|
-            request = Net::HTTP::Get.new(uri)
-            @headers.each { |k, v| request[k] = v }
-
-            http.request(request) do |response|
-              unless response.is_a?(Net::HTTPSuccess) && response['content-type']&.start_with?('text/event-stream')
-                @mutex.synchronize do
-                  # Signal connection attempt completed (failed)
-                  @connection_established = false
-                  @connection_cv.broadcast
-                end
-                raise MCPClient::Errors::ServerError, 'Server response not OK or not text/event-stream'
-              end
+        uri = URI.parse(@base_url)
+        sse_base = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+        sse_path = uri.request_uri
 
-              @mutex.synchronize do
-                # Signal connection established and SSE ready
-                @sse_connected = true
-                @connection_established = true
-                @connection_cv.broadcast
-              end
+        @sse_conn ||= Faraday.new(url: sse_base) do |f|
+          f.options.open_timeout = 10
+          f.options.timeout = nil
+          f.adapter Faraday.default_adapter
+        end
 
-              response.read_body do |chunk|
-                @logger.debug("SSE chunk received: #{chunk.inspect}")
-                process_sse_chunk(chunk.dup)
-              end
-            end
-          end
-        rescue StandardError
-          # On any SSE thread error, signal connection as established to unblock connect
-          @mutex.synchronize do
-            @connection_established = true
-            @connection_cv.broadcast
-          end
-          nil
-        ensure
-          sse_http&.finish if sse_http&.started?
-          @mutex.synchronize do
-            @sse_connected = false
+        @sse_conn.get(sse_path) do |req|
+          @headers.each { |k, v| req.headers[k] = v }
+          req.options.on_data = proc do |chunk, _bytes|
+            @logger.debug("SSE chunk received: #{chunk.inspect}")
+            process_sse_chunk(chunk.dup)
           end
         end
+      rescue StandardError
+        # On any SSE thread error, signal connection established to unblock connect
+        @mutex.synchronize do
+          @connection_established = true
+          @connection_cv.broadcast
+        end
+      ensure
+        @mutex.synchronize { @sse_connected = false }
       end
     end
 
@@ -352,14 +312,11 @@ module MCPClient
 
       case event[:event]
       when 'endpoint'
-        if event[:data].include?('sessionId=')
-          session_id = event[:data].split('sessionId=').last
-
-          @mutex.synchronize do
-            @session_id = session_id
-            @connection_established = true
-            @connection_cv.broadcast
-          end
+        ep = event[:data]
+        @mutex.synchronize do
+          @rpc_endpoint = ep
+          @connection_established = true
+          @connection_cv.broadcast
         end
       when 'message'
         begin
@@ -475,72 +432,56 @@ module MCPClient
     def send_jsonrpc_request(request)
       @logger.debug("Sending JSON-RPC request: #{request.to_json}")
       uri = URI.parse(@base_url)
-      rpc_http = Net::HTTP.new(uri.host, uri.port)
-
-      if uri.scheme == 'https'
-        rpc_http.use_ssl = true
-        rpc_http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      base = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      rpc_ep = @mutex.synchronize { @rpc_endpoint }
+
+      @rpc_conn ||= Faraday.new(url: base) do |f|
+        f.request :retry, max: @max_retries, interval: @retry_backoff, backoff_factor: 2
+        f.options.open_timeout = @read_timeout
+        f.options.timeout = @read_timeout
+        f.adapter Faraday.default_adapter
       end
 
-      rpc_http.open_timeout = 10
-      rpc_http.read_timeout = @read_timeout
-      rpc_http.keep_alive_timeout = 60
-
-      begin
-        rpc_http.start do |http|
-          session_id = @mutex.synchronize { @session_id }
-
-          url = if session_id
-                  "#{@base_url.sub(%r{/sse/?$}, '')}/messages?sessionId=#{session_id}"
-                else
-                  "#{@base_url.sub(%r{/sse/?$}, '')}/messages"
-                end
-
-          uri = URI.parse(url)
-          http_request = Net::HTTP::Post.new(uri)
-          http_request.content_type = 'application/json'
-          http_request.body = request.to_json
-
-          headers = @mutex.synchronize { @headers.dup }
-          headers.except('Accept', 'Cache-Control')
-                 .each { |k, v| http_request[k] = v }
+      response = @rpc_conn.post(rpc_ep) do |req|
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accept'] = 'application/json'
+        (@headers.dup.tap do |h|
+          h.delete('Accept')
+          h.delete('Cache-Control')
+        end).each do |k, v|
+          req.headers[k] = v
+        end
+        req.body = request.to_json
+      end
+      @logger.debug("Received JSON-RPC response: #{response.status} #{response.body}")
 
-          response = http.request(http_request)
-          @logger.debug("Received JSON-RPC response: #{response.code} #{response.body}")
+      unless response.success?
+        raise MCPClient::Errors::ServerError, "Server returned error: #{response.status} #{response.reason_phrase}"
+      end
 
-          unless response.is_a?(Net::HTTPSuccess)
-            raise MCPClient::Errors::ServerError, "Server returned error: #{response.code} #{response.message}"
+      if @use_sse
+        # Wait for result via SSE channel
+        request_id = request[:id]
+        start_time = Time.now
+        timeout = @read_timeout || 10
+        loop do
+          result = nil
+          @mutex.synchronize do
+            result = @sse_results.delete(request_id) if @sse_results.key?(request_id)
           end
+          return result if result
+          break if Time.now - start_time > timeout
 
-          # If SSE transport is enabled, retrieve the result via the SSE channel
-          if @use_sse
-            request_id = request[:id]
-            start_time = Time.now
-            timeout = @read_timeout || 10
-            result = nil
-
-            loop do
-              @mutex.synchronize do
-                result = @sse_results.delete(request_id) if @sse_results.key?(request_id)
-              end
-              break if result || (Time.now - start_time > timeout)
-
-              sleep 0.1
-            end
-            return result if result
-
-            raise MCPClient::Errors::ToolCallError, "Timeout waiting for SSE result for request #{request_id}"
-          end
-          # Fallback: parse synchronous HTTP JSON response
-          begin
-            data = JSON.parse(response.body)
-            return data['result']
-          rescue JSON::ParserError => e
-            raise MCPClient::Errors::TransportError, "Invalid JSON response from server: #{e.message}"
-          end
+          sleep 0.1
+        end
+        raise MCPClient::Errors::ToolCallError, "Timeout waiting for SSE result for request #{request_id}"
+      else
+        begin
+          data = JSON.parse(response.body)
+          data['result']
+        rescue JSON::ParserError => e
+          raise MCPClient::Errors::TransportError, "Invalid JSON response from server: #{e.message}"
         end
-      ensure
-        rpc_http.finish if rpc_http.started?
       end
     end
   end

data/lib/mcp_client/version.rb

@@ -2,5 +2,5 @@
 
 module MCPClient
   # Current version of the MCP client gem
-  VERSION = '0.4.1'
+  VERSION = '0.5.1'
 end

data/lib/mcp_client.rb

@@ -9,6 +9,7 @@ require_relative 'mcp_client/server_sse'
 require_relative 'mcp_client/server_factory'
 require_relative 'mcp_client/client'
 require_relative 'mcp_client/version'
+require_relative 'mcp_client/config_parser'
 
 # Model Context Protocol (MCP) Client module
 # Provides a standardized way for agents to communicate with external tools and services
@@ -16,9 +17,31 @@ require_relative 'mcp_client/version'
 module MCPClient
   # Create a new MCPClient client
   # @param mcp_server_configs [Array<Hash>] configurations for MCP servers
+  # @param server_definition_file [String, nil] optional path to a JSON file defining server configurations
+  #   The JSON may be a single server object or an array of server objects.
   # @return [MCPClient::Client] new client instance
-  def self.create_client(mcp_server_configs: [])
-    MCPClient::Client.new(mcp_server_configs: mcp_server_configs)
+  def self.create_client(mcp_server_configs: [], server_definition_file: nil)
+    require 'json'
+    # Start with any explicit configs provided
+    configs = Array(mcp_server_configs)
+    # Load additional configs from a JSON file if specified
+    if server_definition_file
+      # Parse JSON definitions into clean config hashes
+      parser = MCPClient::ConfigParser.new(server_definition_file)
+      parsed = parser.parse
+      parsed.each_value do |cfg|
+        case cfg[:type].to_s
+        when 'stdio'
+          # Build command list with args
+          cmd_list = [cfg[:command]] + Array(cfg[:args])
+          configs << MCPClient.stdio_config(command: cmd_list)
+        when 'sse'
+          # Use 'url' from parsed config as 'base_url' for SSE config
+          configs << MCPClient.sse_config(base_url: cfg[:url], headers: cfg[:headers] || {})
+        end
+      end
+    end
+    MCPClient::Client.new(mcp_server_configs: configs)
   end
 
   # Create a standard server configuration for stdio
@@ -35,13 +58,17 @@ module MCPClient
   # @param base_url [String] base URL for the server
   # @param headers [Hash] HTTP headers to include in requests
   # @param read_timeout [Integer] read timeout in seconds (default: 30)
+  # @param retries [Integer] number of retry attempts (default: 0)
+  # @param retry_backoff [Integer] backoff delay in seconds (default: 1)
   # @return [Hash] server configuration
-  def self.sse_config(base_url:, headers: {}, read_timeout: 30)
+  def self.sse_config(base_url:, headers: {}, read_timeout: 30, retries: 0, retry_backoff: 1)
     {
       type: 'sse',
       base_url: base_url,
       headers: headers,
-      read_timeout: read_timeout
+      read_timeout: read_timeout,
+      retries: retries,
+      retry_backoff: retry_backoff
     }
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mcp-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Szymon Kurcab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-04-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +106,7 @@ files:
 - README.md
 - lib/mcp_client.rb
 - lib/mcp_client/client.rb
+- lib/mcp_client/config_parser.rb
 - lib/mcp_client/errors.rb
 - lib/mcp_client/server_base.rb
 - lib/mcp_client/server_factory.rb
@@ -98,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="