mcp 0.11.0 → 0.12.0

data/lib/mcp/client/http.rb

@@ -7,9 +7,10 @@ module MCP
 
       attr_reader :url
 
-      def initialize(url:, headers: {})
+      def initialize(url:, headers: {}, &block)
         @url = url
         @headers = headers
+        @faraday_customizer = block
       end
 
       def send_request(request:)
@@ -78,6 +79,8 @@ module MCP
           headers.each do |key, value|
             faraday.headers[key] = value
           end
+
+          @faraday_customizer&.call(faraday)
         end
       end
 

data/lib/mcp/server/transports/streamable_http_transport.rb

@@ -15,7 +15,7 @@ module MCP
 
         def initialize(server, stateless: false, session_idle_timeout: nil)
           super(server)
-          # Maps `session_id` to `{ stream: stream_object, server_session: ServerSession, last_active_at: float_from_monotonic_clock }`.
+          # Maps `session_id` to `{ get_sse_stream: stream_object, server_session: ServerSession, last_active_at: float_from_monotonic_clock }`.
           @sessions = {}
           @mutex = Mutex.new
 
@@ -61,7 +61,7 @@ module MCP
           end
 
           removed_sessions.each do |session|
-            close_stream_safely(session[:stream])
+            close_stream_safely(session[:get_sse_stream])
             close_post_request_streams(session)
           end
         end
@@ -113,7 +113,7 @@ module MCP
               failed_sessions = []
 
               @sessions.each do |sid, session|
-                next unless (stream = session[:stream])
+                next unless (stream = session[:get_sse_stream])
 
                 if session_expired?(session)
                   failed_sessions << sid
@@ -247,7 +247,7 @@ module MCP
           end
 
           removed_sessions.each do |session|
-            close_stream_safely(session[:stream])
+            close_stream_safely(session[:get_sse_stream])
             close_post_request_streams(session)
           end
         end
@@ -267,6 +267,9 @@ module MCP
           accept_error = validate_accept_header(request, REQUIRED_POST_ACCEPT_TYPES)
           return accept_error if accept_error
 
+          content_type_error = validate_content_type(request)
+          return content_type_error if content_type_error
+
           body_string = request.body.read
           session_id = extract_session_id(request)
 
@@ -334,7 +337,7 @@ module MCP
           end
 
           if session
-            close_stream_safely(session[:stream])
+            close_stream_safely(session[:get_sse_stream])
             close_post_request_streams(session)
           end
         end
@@ -358,7 +361,7 @@ module MCP
         def cleanup_and_collect_stream(session_id, streams_to_close)
           return unless (removed = cleanup_session_unsafe(session_id))
 
-          streams_to_close << removed[:stream]
+          streams_to_close << removed[:get_sse_stream]
           removed[:post_request_streams]&.each_value { |stream| streams_to_close << stream }
         end
 
@@ -399,6 +402,18 @@ module MCP
           end
         end
 
+        def validate_content_type(request)
+          content_type = request.env["CONTENT_TYPE"]
+          media_type = content_type&.split(";")&.first&.strip&.downcase
+          return if media_type == "application/json"
+
+          [
+            415,
+            { "Content-Type" => "application/json" },
+            [{ error: "Unsupported Media Type: Content-Type must be application/json" }.to_json],
+          ]
+        end
+
         def not_acceptable_response(required_types)
           [
             406,
@@ -449,7 +464,7 @@ module MCP
 
             @mutex.synchronize do
               @sessions[session_id] = {
-                stream: nil,
+                get_sse_stream: nil,
                 server_session: server_session,
                 last_active_at: Process.clock_gettime(Process::CLOCK_MONOTONIC),
               }
@@ -543,7 +558,7 @@ module MCP
           if related_request_id
             session.dig(:post_request_streams, related_request_id)
           else
-            session[:stream]
+            session[:get_sse_stream]
           end
         end
 
@@ -572,7 +587,7 @@ module MCP
           end
 
           if removed
-            close_stream_safely(removed[:stream])
+            close_stream_safely(removed[:get_sse_stream])
 
             removed[:post_request_streams]&.each_value do |stream|
               close_stream_safely(stream)
@@ -583,7 +598,7 @@ module MCP
         end
 
         def get_session_stream(session_id)
-          @mutex.synchronize { @sessions[session_id]&.fetch(:stream, nil) }
+          @mutex.synchronize { @sessions[session_id]&.fetch(:get_sse_stream, nil) }
         end
 
         def session_exists?(session_id)
@@ -626,8 +641,8 @@ module MCP
         def store_stream_for_session(session_id, stream)
           @mutex.synchronize do
             session = @sessions[session_id]
-            if session && !session[:stream]
-              session[:stream] = stream
+            if session && !session[:get_sse_stream]
+              session[:get_sse_stream] = stream
             else
               # Either session was removed, or another request already established a stream.
               stream.close
@@ -652,13 +667,13 @@ module MCP
         end
 
         def session_active_with_stream?(session_id)
-          @mutex.synchronize { @sessions.key?(session_id) && @sessions[session_id][:stream] }
+          @mutex.synchronize { @sessions.key?(session_id) && @sessions[session_id][:get_sse_stream] }
         end
 
         def send_keepalive_ping(session_id)
           @mutex.synchronize do
-            if @sessions[session_id] && @sessions[session_id][:stream]
-              send_ping_to_stream(@sessions[session_id][:stream])
+            if @sessions[session_id] && @sessions[session_id][:get_sse_stream]
+              send_ping_to_stream(@sessions[session_id][:get_sse_stream])
             end
           end
         rescue *STREAM_WRITE_ERRORS => e

data/lib/mcp/transport.rb

@@ -7,6 +7,7 @@ module MCP
     # Initialize the transport with the server instance
     def initialize(server)
       @server = server
+      server.transport = self
     end
 
     # Send a response to the client

data/lib/mcp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MCP
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcp
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Model Context Protocol
@@ -78,7 +78,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/modelcontextprotocol/ruby-sdk/releases/tag/v0.11.0
+  changelog_uri: https://github.com/modelcontextprotocol/ruby-sdk/releases/tag/v0.12.0
   homepage_uri: https://github.com/modelcontextprotocol/ruby-sdk
   source_code_uri: https://github.com/modelcontextprotocol/ruby-sdk
   bug_tracker_uri: https://github.com/modelcontextprotocol/ruby-sdk/issues