ruby-mcp-client 0.7.0 → 0.7.1

data/lib/mcp_client/server_http.rb

@@ -37,22 +37,24 @@ module MCPClient
     attr_reader :capabilities
 
     # @param base_url [String] The base URL of the MCP server
-    # @param endpoint [String] The JSON-RPC endpoint path (default: '/rpc')
-    # @param headers [Hash] Additional headers to include in requests
-    # @param read_timeout [Integer] Read timeout in seconds (default: 30)
-    # @param retries [Integer] number of retry attempts on transient errors (default: 3)
-    # @param retry_backoff [Numeric] base delay in seconds for exponential backoff (default: 1)
-    # @param name [String, nil] optional name for this server
-    # @param logger [Logger, nil] optional logger
-    def initialize(base_url:, endpoint: '/rpc', headers: {}, read_timeout: DEFAULT_READ_TIMEOUT,
-                   retries: DEFAULT_MAX_RETRIES, retry_backoff: 1, name: nil, logger: nil)
-      super(name: name)
-      @logger = logger || Logger.new($stdout, level: Logger::WARN)
+    # @param options [Hash] Server configuration options
+    # @option options [String] :endpoint JSON-RPC endpoint path (default: '/rpc')
+    # @option options [Hash] :headers Additional headers to include in requests
+    # @option options [Integer] :read_timeout Read timeout in seconds (default: 30)
+    # @option options [Integer] :retries Retry attempts on transient errors (default: 3)
+    # @option options [Numeric] :retry_backoff Base delay for exponential backoff (default: 1)
+    # @option options [String, nil] :name Optional name for this server
+    # @option options [Logger, nil] :logger Optional logger
+    # @option options [MCPClient::Auth::OAuthProvider, nil] :oauth_provider Optional OAuth provider
+    def initialize(base_url:, **options)
+      opts = default_options.merge(options)
+      super(name: opts[:name])
+      @logger = opts[:logger] || Logger.new($stdout, level: Logger::WARN)
       @logger.progname = self.class.name
       @logger.formatter = proc { |severity, _datetime, progname, msg| "#{severity} [#{progname}] #{msg}\n" }
 
-      @max_retries = retries
-      @retry_backoff = retry_backoff
+      @max_retries = opts[:retries]
+      @retry_backoff = opts[:retry_backoff]
 
       # Validate and normalize base_url
       raise ArgumentError, "Invalid or insecure server URL: #{base_url}" unless valid_server_url?(base_url)
@@ -73,23 +75,23 @@ module MCPClient
       end
 
       @base_url = build_base_url.call(uri)
-      @endpoint = if uri.path && !uri.path.empty? && uri.path != '/' && endpoint == '/rpc'
+      @endpoint = if uri.path && !uri.path.empty? && uri.path != '/' && opts[:endpoint] == '/rpc'
                     # If base_url contains a path and we're using default endpoint,
                     # treat the path as the endpoint and use the base URL without path
                     uri.path
                   else
                     # Standard case: base_url is just scheme://host:port, endpoint is separate
-                    endpoint
+                    opts[:endpoint]
                   end
 
       # Set up headers for HTTP requests
-      @headers = headers.merge({
-                                 'Content-Type' => 'application/json',
-                                 'Accept' => 'application/json',
-                                 'User-Agent' => "ruby-mcp-client/#{MCPClient::VERSION}"
-                               })
+      @headers = opts[:headers].merge({
+                                        'Content-Type' => 'application/json',
+                                        'Accept' => 'application/json',
+                                        'User-Agent' => "ruby-mcp-client/#{MCPClient::VERSION}"
+                                      })
 
-      @read_timeout = read_timeout
+      @read_timeout = opts[:read_timeout]
       @tools = nil
       @tools_data = nil
       @request_id = 0
@@ -98,6 +100,7 @@ module MCPClient
       @initialized = false
       @http_conn = nil
       @session_id = nil
+      @oauth_provider = opts[:oauth_provider]
     end
 
     # Connect to the MCP server over HTTP
@@ -183,50 +186,34 @@ module MCPClient
       raise MCPClient::Errors::ToolCallError, "Error calling tool '#{tool_name}': #{e.message}"
     end
 
-    # Override send_http_request to handle session headers for MCP protocol
-    def send_http_request(request)
-      conn = http_connection
+    # Override apply_request_headers to add session headers for MCP protocol
+    def apply_request_headers(req, request)
+      super
 
-      begin
-        response = conn.post(@endpoint) do |req|
-          # Apply all headers including custom ones
-          @headers.each { |k, v| req.headers[k] = v }
-
-          # Add session header if we have one (for non-initialize requests)
-          if @session_id && request['method'] != 'initialize'
-            req.headers['Mcp-Session-Id'] = @session_id
-            @logger.debug("Adding session header: Mcp-Session-Id: #{@session_id}")
-          end
+      # Add session header if we have one (for non-initialize requests)
+      return unless @session_id && request['method'] != 'initialize'
 
-          req.body = request.to_json
-        end
+      req.headers['Mcp-Session-Id'] = @session_id
+      @logger.debug("Adding session header: Mcp-Session-Id: #{@session_id}")
+    end
 
-        handle_http_error_response(response) unless response.success?
-
-        # Capture session ID from initialize response with validation
-        if request['method'] == 'initialize' && response.success?
-          session_id = response.headers['mcp-session-id'] || response.headers['Mcp-Session-Id']
-          if session_id
-            if valid_session_id?(session_id)
-              @session_id = session_id
-              @logger.debug("Captured session ID: #{@session_id}")
-            else
-              @logger.warn("Invalid session ID format received: #{session_id.inspect}")
-            end
-          else
-            @logger.warn('No session ID found in initialize response headers')
-          end
-        end
+    # Override handle_successful_response to capture session ID
+    def handle_successful_response(response, request)
+      super
+
+      # Capture session ID from initialize response with validation
+      return unless request['method'] == 'initialize' && response.success?
 
-        log_response(response)
-        response
-      rescue Faraday::UnauthorizedError, Faraday::ForbiddenError => e
-        error_status = e.response ? e.response[:status] : 'unknown'
-        raise MCPClient::Errors::ConnectionError, "Authorization failed: HTTP #{error_status}"
-      rescue Faraday::ConnectionFailed => e
-        raise MCPClient::Errors::ConnectionError, "Server connection lost: #{e.message}"
-      rescue Faraday::Error => e
-        raise MCPClient::Errors::TransportError, "HTTP request failed: #{e.message}"
+      session_id = response.headers['mcp-session-id'] || response.headers['Mcp-Session-Id']
+      if session_id
+        if valid_session_id?(session_id)
+          @session_id = session_id
+          @logger.debug("Captured session ID: #{@session_id}")
+        else
+          @logger.warn("Invalid session ID format received: #{session_id.inspect}")
+        end
+      else
+        @logger.warn('No session ID found in initialize response headers')
       end
     end
 
@@ -273,6 +260,21 @@ module MCPClient
 
     private
 
+    # Default options for server initialization
+    # @return [Hash] Default options
+    def default_options
+      {
+        endpoint: '/rpc',
+        headers: {},
+        read_timeout: DEFAULT_READ_TIMEOUT,
+        retries: DEFAULT_MAX_RETRIES,
+        retry_backoff: 1,
+        name: nil,
+        logger: nil,
+        oauth_provider: nil
+      }
+    end
+
     # Test basic connectivity to the HTTP endpoint
     # @return [void]
     # @raise [MCPClient::Errors::ConnectionError] if connection test fails

data/lib/mcp_client/server_streamable_http.rb

@@ -37,22 +37,16 @@ module MCPClient
     attr_reader :capabilities
 
     # @param base_url [String] The base URL of the MCP server
-    # @param endpoint [String] The JSON-RPC endpoint path (default: '/rpc')
-    # @param headers [Hash] Additional headers to include in requests
-    # @param read_timeout [Integer] Read timeout in seconds (default: 30)
-    # @param retries [Integer] number of retry attempts on transient errors (default: 3)
-    # @param retry_backoff [Numeric] base delay in seconds for exponential backoff (default: 1)
-    # @param name [String, nil] optional name for this server
-    # @param logger [Logger, nil] optional logger
-    def initialize(base_url:, endpoint: '/rpc', headers: {}, read_timeout: DEFAULT_READ_TIMEOUT,
-                   retries: DEFAULT_MAX_RETRIES, retry_backoff: 1, name: nil, logger: nil)
-      super(name: name)
-      @logger = logger || Logger.new($stdout, level: Logger::WARN)
+    # @param options [Hash] Server configuration options (same as ServerHTTP)
+    def initialize(base_url:, **options)
+      opts = default_options.merge(options)
+      super(name: opts[:name])
+      @logger = opts[:logger] || Logger.new($stdout, level: Logger::WARN)
       @logger.progname = self.class.name
       @logger.formatter = proc { |severity, _datetime, progname, msg| "#{severity} [#{progname}] #{msg}\n" }
 
-      @max_retries = retries
-      @retry_backoff = retry_backoff
+      @max_retries = opts[:retries]
+      @retry_backoff = opts[:retry_backoff]
 
       # Validate and normalize base_url
       raise ArgumentError, "Invalid or insecure server URL: #{base_url}" unless valid_server_url?(base_url)
@@ -73,25 +67,25 @@ module MCPClient
       end
 
       @base_url = build_base_url.call(uri)
-      @endpoint = if uri.path && !uri.path.empty? && uri.path != '/' && endpoint == '/rpc'
+      @endpoint = if uri.path && !uri.path.empty? && uri.path != '/' && opts[:endpoint] == '/rpc'
                     # If base_url contains a path and we're using default endpoint,
                     # treat the path as the endpoint and use the base URL without path
                     uri.path
                   else
                     # Standard case: base_url is just scheme://host:port, endpoint is separate
-                    endpoint
+                    opts[:endpoint]
                   end
 
       # Set up headers for Streamable HTTP requests
-      @headers = headers.merge({
-                                 'Content-Type' => 'application/json',
-                                 'Accept' => 'text/event-stream, application/json',
-                                 'Accept-Encoding' => 'gzip, deflate',
-                                 'User-Agent' => "ruby-mcp-client/#{MCPClient::VERSION}",
-                                 'Cache-Control' => 'no-cache'
-                               })
-
-      @read_timeout = read_timeout
+      @headers = opts[:headers].merge({
+                                        'Content-Type' => 'application/json',
+                                        'Accept' => 'text/event-stream, application/json',
+                                        'Accept-Encoding' => 'gzip, deflate',
+                                        'User-Agent' => "ruby-mcp-client/#{MCPClient::VERSION}",
+                                        'Cache-Control' => 'no-cache'
+                                      })
+
+      @read_timeout = opts[:read_timeout]
       @tools = nil
       @tools_data = nil
       @request_id = 0
@@ -101,6 +95,7 @@ module MCPClient
       @http_conn = nil
       @session_id = nil
       @last_event_id = nil
+      @oauth_provider = opts[:oauth_provider]
     end
 
     # Connect to the MCP server over Streamable HTTP
@@ -196,56 +191,40 @@ module MCPClient
       end
     end
 
-    # Override send_http_request to handle session headers for MCP protocol
-    def send_http_request(request)
-      conn = http_connection
+    # Override apply_request_headers to add session and SSE headers for MCP protocol
+    def apply_request_headers(req, request)
+      super
 
-      begin
-        response = conn.post(@endpoint) do |req|
-          # Apply all headers including custom ones
-          @headers.each { |k, v| req.headers[k] = v }
-
-          # Add session header if we have one (for non-initialize requests)
-          if @session_id && request['method'] != 'initialize'
-            req.headers['Mcp-Session-Id'] = @session_id
-            @logger.debug("Adding session header: Mcp-Session-Id: #{@session_id}")
-          end
+      # Add session header if we have one (for non-initialize requests)
+      if @session_id && request['method'] != 'initialize'
+        req.headers['Mcp-Session-Id'] = @session_id
+        @logger.debug("Adding session header: Mcp-Session-Id: #{@session_id}")
+      end
 
-          # Add Last-Event-ID header for resumability (if available)
-          if @last_event_id
-            req.headers['Last-Event-ID'] = @last_event_id
-            @logger.debug("Adding Last-Event-ID header: #{@last_event_id}")
-          end
+      # Add Last-Event-ID header for resumability (if available)
+      return unless @last_event_id
 
-          req.body = request.to_json
-        end
+      req.headers['Last-Event-ID'] = @last_event_id
+      @logger.debug("Adding Last-Event-ID header: #{@last_event_id}")
+    end
 
-        handle_http_error_response(response) unless response.success?
-
-        # Capture session ID from initialize response with validation
-        if request['method'] == 'initialize' && response.success?
-          session_id = response.headers['mcp-session-id'] || response.headers['Mcp-Session-Id']
-          if session_id
-            if valid_session_id?(session_id)
-              @session_id = session_id
-              @logger.debug("Captured session ID: #{@session_id}")
-            else
-              @logger.warn("Invalid session ID format received: #{session_id.inspect}")
-            end
-          else
-            @logger.warn('No session ID found in initialize response headers')
-          end
-        end
+    # Override handle_successful_response to capture session ID
+    def handle_successful_response(response, request)
+      super
+
+      # Capture session ID from initialize response with validation
+      return unless request['method'] == 'initialize' && response.success?
 
-        log_response(response)
-        response
-      rescue Faraday::UnauthorizedError, Faraday::ForbiddenError => e
-        error_status = e.response ? e.response[:status] : 'unknown'
-        raise MCPClient::Errors::ConnectionError, "Authorization failed: HTTP #{error_status}"
-      rescue Faraday::ConnectionFailed => e
-        raise MCPClient::Errors::ConnectionError, "Server connection lost: #{e.message}"
-      rescue Faraday::Error => e
-        raise MCPClient::Errors::TransportError, "HTTP request failed: #{e.message}"
+      session_id = response.headers['mcp-session-id'] || response.headers['Mcp-Session-Id']
+      if session_id
+        if valid_session_id?(session_id)
+          @session_id = session_id
+          @logger.debug("Captured session ID: #{@session_id}")
+        else
+          @logger.warn("Invalid session ID format received: #{session_id.inspect}")
+        end
+      else
+        @logger.warn('No session ID found in initialize response headers')
       end
     end
 
@@ -282,6 +261,21 @@ module MCPClient
 
     private
 
+    # Default options for server initialization
+    # @return [Hash] Default options
+    def default_options
+      {
+        endpoint: '/rpc',
+        headers: {},
+        read_timeout: DEFAULT_READ_TIMEOUT,
+        retries: DEFAULT_MAX_RETRIES,
+        retry_backoff: 1,
+        name: nil,
+        logger: nil,
+        oauth_provider: nil
+      }
+    end
+
     # Test basic connectivity to the HTTP endpoint
     # @return [void]
     # @raise [MCPClient::Errors::ConnectionError] if connection test fails

data/lib/mcp_client/version.rb

@@ -2,7 +2,7 @@
 
 module MCPClient
   # Current version of the MCP client gem
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 
   # JSON-RPC handshake protocol version (date-based)
   PROTOCOL_VERSION = '2024-11-05'

data/lib/mcp_client.rb

@@ -12,6 +12,8 @@ require_relative 'mcp_client/server_factory'
 require_relative 'mcp_client/client'
 require_relative 'mcp_client/version'
 require_relative 'mcp_client/config_parser'
+require_relative 'mcp_client/auth'
+require_relative 'mcp_client/oauth_client'
 
 # Model Context Protocol (MCP) Client module
 # Provides a standardized way for agents to communicate with external tools and services

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mcp-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Szymon Kurcab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -105,11 +105,14 @@ files:
 - LICENSE
 - README.md
 - lib/mcp_client.rb
+- lib/mcp_client/auth.rb
+- lib/mcp_client/auth/oauth_provider.rb
 - lib/mcp_client/client.rb
 - lib/mcp_client/config_parser.rb
 - lib/mcp_client/errors.rb
 - lib/mcp_client/http_transport_base.rb
 - lib/mcp_client/json_rpc_common.rb
+- lib/mcp_client/oauth_client.rb
 - lib/mcp_client/server_base.rb
 - lib/mcp_client/server_factory.rb
 - lib/mcp_client/server_http.rb