model-context-protocol-rb 0.5.1 → 0.7.0

data/tasks/templates/dev-http.erb

@@ -1,6 +1,7 @@
 #!/usr/bin/env <%= @ruby_path %>
 
 require "bundler/setup"
+require "fileutils"
 require "rack"
 require 'rackup/handler/webrick'
 require "webrick"
@@ -10,31 +11,94 @@ require "securerandom"
 require "redis"
 require "logger"
 require "json"
-require 'stringio'
+require "stringio"
 
 require_relative "../lib/model_context_protocol"
 
-ModelContextProtocol::Server.configure_redis do |config|
-  config.redis_url = "redis://localhost:6379/0"
-  config.pool_size = 10
-  config.enable_reaper = true
-  config.reaper_interval = 10
-  config.idle_timeout = 15
+# Only require test handler files (prompts, resources, tools, etc.), not RSpec helpers
+%w[prompts resources resource_templates tools completions].each do |subdir|
+  Dir[File.join(__dir__, "../spec/support/#{subdir}/**/*.rb")].each { |file| require file }
 end
 
-Dir[File.join(__dir__, "../spec/support/**/*.rb")].each { |file| require file }
+# Flag files for dynamic handler registration (checked at startup)
+FLAGS_DIR = File.join(__dir__, '..', 'tmp', 'flags')
+FileUtils.mkdir_p(FLAGS_DIR) unless Dir.exist?(FLAGS_DIR)
+
+def flag_enabled?(flag_name)
+  File.exist?(File.join(FLAGS_DIR, flag_name))
+end
 
-logger = Logger.new(STDOUT)
-logger.level = Logger::INFO
-logger.formatter = proc do |severity, datetime, progname, msg|
-  request_id = Thread.current[:request_id] || "----"
-  "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}] #{severity} [#{request_id}]: #{msg}\n"
+# Configure server logging
+ModelContextProtocol::Server.configure_server_logging do |config|
+  config.logdev = $stdout
+  config.level = Logger::DEBUG
+  config.progname = "MCP-Dev-Server"
 end
 
+# Configure MCP server
+ModelContextProtocol::Server.with_streamable_http_transport do |config|
+  config.name = "MCP Development Server"
+  config.version = "1.0.0"
+
+  config.redis_url = "redis://localhost:6379/0"
+  config.redis_pool_size = 10
+  config.redis_enable_reaper = true
+  config.redis_reaper_interval = 10
+  config.redis_idle_timeout = 15
+
+  config.pagination = {
+    default_page_size: 2,
+    max_page_size: 3,
+    cursor_ttl: 1800
+  }
+
+  config.require_sessions = true
+  config.session_ttl = 3600
+  config.allowed_origins = ["*"]
+
+  config.registry do
+    prompts do
+      register TestPrompt
+      register TestPromptWithCompletionClass if flag_enabled?('extra_prompts')
+    end
+
+    resources subscribe: true do
+      register TestResource
+      register TestAnnotatedResource
+      register TestProgressiveResource
+      register TestBinaryResource if flag_enabled?('extra_resources')
+    end
+
+    resource_templates do
+      register TestResourceTemplate
+    end
+
+    tools do
+      register TestToolWithStructuredContentResponse
+      register TestToolWithTextResponse
+      register TestToolWithImageResponse
+      register TestToolWithMixedContentResponse
+      register TestToolWithResourceResponse
+      register TestToolWithToolErrorResponse
+      register TestToolWithCancellableSleep
+      register TestToolWithProgressableAndCancellable
+      register TestToolWithAnnotations
+      register TestToolWithSecuritySchemes
+      register TestToolWithResourceLinkResponse
+      register TestToolWithAudioResponse if flag_enabled?('extra_tools')
+    end
+  end
+end
 
+# Rack application
 class MCPHttpApp
-  def initialize(logger)
-    @logger = logger
+  def initialize
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+    @logger.formatter = proc do |severity, datetime, progname, msg|
+      request_id = Thread.current[:request_id] || "----"
+      "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}] #{severity} [#{request_id}]: #{msg}\n"
+    end
   end
 
   def call(env)
@@ -44,6 +108,40 @@ class MCPHttpApp
     request = Rack::Request.new(env)
     body_content = request.body.read
 
+    log_request(env, body_content)
+
+    env['rack.input'] = StringIO.new(body_content)
+
+    unless request.path == "/mcp"
+      return [404, {"Content-Type" => "application/json"}, ['{"error": "Not found"}']]
+    end
+
+    if request.request_method == "OPTIONS"
+      return [200, cors_headers, [""]]
+    end
+
+    begin
+      result = ModelContextProtocol::Server.serve(
+        env: env,
+        session_context: {
+          user_id: "dev-user-123",
+          request_id: request_id
+        }
+      )
+
+      handle_result(result, body_content)
+    rescue => e
+      @logger.error("Error handling request: #{e.message}")
+      @logger.debug("Full backtrace:\n#{e.backtrace.join("\n")}")
+      [500, {"Content-Type" => "application/json"}, [%Q({"error": "Internal server error: #{e.message}"})]]
+    ensure
+      Thread.current[:request_id] = nil
+    end
+  end
+
+  private
+
+  def log_request(env, body_content)
     case env['REQUEST_METHOD']
     when 'POST'
       begin
@@ -51,9 +149,7 @@ class MCPHttpApp
         method = request_json['method']
         id = request_json['id']
 
-        if method&.start_with?('notifications/')
-          @logger.info("→ #{method} [NOTIFICATION]")
-        elsif id.nil?
+        if method&.start_with?('notifications/') || id.nil?
           @logger.info("→ #{method} [NOTIFICATION]")
         else
           @logger.info("→ #{method} (id: #{id}) [REQUEST]")
@@ -61,7 +157,6 @@ class MCPHttpApp
         @logger.info("  Request: #{body_content}")
       rescue JSON::ParserError
         @logger.info("→ POST #{env['PATH_INFO']} [INVALID JSON]")
-        @logger.info("  Request: #{body_content}")
       end
     when 'GET'
       accept_header = env['HTTP_ACCEPT'] || ''
@@ -70,173 +165,45 @@ class MCPHttpApp
       else
         @logger.info("→ GET #{env['PATH_INFO']}")
       end
-      @logger.info("  Headers: Accept=#{accept_header}") unless accept_header.empty?
     when 'DELETE'
       session_id = env['HTTP_MCP_SESSION_ID']
-      if session_id
-        @logger.info("→ DELETE #{env['PATH_INFO']} [SESSION CLEANUP: #{session_id}]")
-      else
-        @logger.info("→ DELETE #{env['PATH_INFO']} [SESSION CLEANUP]")
-      end
+      @logger.info("→ DELETE #{env['PATH_INFO']} [SESSION CLEANUP#{session_id ? ": #{session_id}" : ""}]")
     else
       @logger.info("→ #{env['REQUEST_METHOD']} #{env['PATH_INFO']}")
-      @logger.info("  Request: #{body_content}") unless body_content.empty?
-    end
-
-    if ModelContextProtocol::Server::RedisConfig.configured?
-      pool_stats = ModelContextProtocol::Server::RedisConfig.stats
-      @logger.info("  Redis Pool: #{pool_stats}")
-    end
-
-    env['rack.input'] = StringIO.new(body_content)
-    request = Rack::Request.new(env)
-
-    unless request.path == "/mcp"
-      return [404, {"Content-Type" => "application/json"}, ['{"error": "Not found"}']]
     end
+  end
 
-    if request.request_method == "OPTIONS"
-      return [200, {
-        "Access-Control-Allow-Origin" => "*",
-        "Access-Control-Allow-Methods" => "GET, POST, DELETE, OPTIONS",
-        "Access-Control-Allow-Headers" => "Content-Type, Accept, Mcp-Session-Id, MCP-Protocol-Version, Origin",
-        "Access-Control-Max-Age" => "86400"
-      }, [""]]
-    end
-
-    transport_config = {
-      type: :streamable_http,
-      env:,
-      require_sessions: false,
-      session_ttl: 3600,
-      allowed_origins: ["*"]
-    }
-
-    @logger.debug("Creating MCP server with transport config")
-    server = create_mcp_server(transport_config)
-    transport = nil
-
-    begin
-      @logger.debug("Starting MCP server")
-      result = server.start
-
-      if server.respond_to?(:transport)
-        transport = server.transport
-      end
-
-      case result
-      when Hash
-        if result[:stream]
-          @logger.info("← SSE STREAM OPENED [PERSISTENT CONNECTION]")
-          @logger.info("  Connection will remain open for real-time notifications")
-          headers = result[:headers] || {}
-          headers["Access-Control-Allow-Origin"] = "*"
-          headers["Access-Control-Allow-Methods"] = "GET, POST, DELETE, OPTIONS"
-          headers["Access-Control-Allow-Headers"] = "Content-Type, Accept, Mcp-Session-Id, MCP-Protocol-Version, Origin"
-
-          return [200, headers, result[:stream_proc]]
-        elsif result[:json]
-          response_body = result[:json].to_json
-          status = result[:status] || 200
-
-          begin
-            response_json = result[:json]
-            if response_json[:error]
-              @logger.info("← ERROR RESPONSE (code: #{response_json[:error][:code]})")
-            elsif status == 202
-              @logger.info("← NOTIFICATION ACCEPTED [NO RESPONSE REQUIRED]")
-            elsif response_json[:accepted] == true && status == 200
-              method = request_json['method'] rescue 'unknown'
-              id = request_json['id'] rescue 'unknown'
-              @logger.info("← #{method} RESPONSE (id: #{id}) [DELIVERED VIA SSE STREAM]")
-            elsif response_json[:result]
-              method = request_json['method'] rescue 'unknown'
-              @logger.info("← #{method} RESPONSE (id: #{response_json[:id]})")
-            else
-              @logger.info("← RESPONSE (status: #{status})")
-            end
-            @logger.info("  Response: #{response_body}") unless status == 202 && response_body == '{}'
-          rescue
-            @logger.info("← RESPONSE (status: #{status})")
-            @logger.info("  Response: #{response_body}") unless response_body.empty?
-          end
-
-          headers = result[:headers] || {}
-          headers["Content-Type"] = "application/json"
-          headers["Access-Control-Allow-Origin"] = "*"
-          headers["Access-Control-Allow-Methods"] = "GET, POST, DELETE, OPTIONS" 
-          headers["Access-Control-Allow-Headers"] = "Content-Type, Accept, Mcp-Session-Id, MCP-Protocol-Version, Origin"
-
-          [result[:status] || 200, headers, [response_body]]
-        else
-          # Fallback
-          @logger.error("← Invalid transport response")
-          [500, {"Content-Type" => "application/json"}, ['{"error": "Invalid transport response"}']]
-        end
+  def handle_result(result, body_content)
+    case result
+    when Hash
+      if result[:stream]
+        @logger.info("← SSE STREAM OPENED [PERSISTENT CONNECTION]")
+        headers = (result[:headers] || {}).merge(cors_headers)
+        [200, headers, result[:stream_proc]]
+      elsif result[:json]
+        response_body = result[:json].to_json
+        status = result[:status] || 200
+        @logger.info("← RESPONSE (status: #{status})")
+        @logger.info("  Response: #{response_body}") unless status == 202
+        headers = (result[:headers] || {}).merge(cors_headers).merge("Content-Type" => "application/json")
+        [status, headers, [response_body]]
       else
-        @logger.error("← Unexpected response format")
-        [500, {"Content-Type" => "application/json"}, ['{"error": "Unexpected response format"}']]
+        @logger.error("← Invalid transport response")
+        [500, {"Content-Type" => "application/json"}, ['{"error": "Invalid transport response"}']]
       end
-    rescue => e
-      @logger.error("Error handling request: #{e.message}")
-      @logger.debug("Full backtrace:\n#{e.backtrace.join("\n")}")
-      [500, {"Content-Type" => "application/json"}, [%Q({"error": "Internal server error: #{e.message}"})]]
-    ensure
-      transport&.cleanup if transport&.respond_to?(:cleanup)
-      Thread.current[:request_id] = nil
+    else
+      @logger.error("← Unexpected response format")
+      [500, {"Content-Type" => "application/json"}, ['{"error": "Unexpected response format"}']]
     end
   end
 
-  private
-
-  def create_mcp_server(transport_config)
-    ModelContextProtocol::Server.new do |config|
-      config.name = "MCP Development Server"
-      config.version = "1.0.0"
-      config.logging_enabled = true
-
-      config.pagination = {
-        default_page_size: 2,
-        max_page_size: 3,
-        cursor_ttl: 1800
-      }
-
-      config.set_environment_variable("MCP_ENV", "development")
-
-      config.context = {
-        user_id: "123456",
-        request_id: Thread.current[:request_id]
-      }
-
-      config.transport = transport_config
-
-      config.registry = ModelContextProtocol::Server::Registry.new do
-        prompts list_changed: true do
-          register TestPrompt
-          register TestPromptWithCompletionClass
-        end
-
-        resources list_changed: true, subscribe: true do
-          register TestResource
-          register TestAnnotatedResource
-          register TestBinaryResource
-        end
-
-        resource_templates do
-          register TestResourceTemplate
-        end
-
-        tools list_changed: true do
-          register TestToolWithStructuredContentResponse
-          register TestToolWithTextResponse
-          register TestToolWithImageResponse
-          register TestToolWithMixedContentResponse
-          register TestToolWithResourceResponse
-          register TestToolWithToolErrorResponse
-          register TestToolWithCancellableSleep
-        end
-      end
-    end
+  def cors_headers
+    {
+      "Access-Control-Allow-Origin" => "*",
+      "Access-Control-Allow-Methods" => "GET, POST, DELETE, OPTIONS",
+      "Access-Control-Allow-Headers" => "Content-Type, Accept, Mcp-Session-Id, MCP-Protocol-Version, Origin",
+      "Access-Control-Max-Age" => "86400"
+    }
   end
 end
 
@@ -244,11 +211,23 @@ use_ssl = ENV['SSL'] == 'true'
 port = use_ssl ? 9293 : 9292
 protocol = use_ssl ? 'https' : 'http'
 
-logger.info("Starting MCP #{protocol.upcase} Development Server on #{protocol}://localhost:#{port}/mcp")
+puts "=" * 60
+puts "MCP Development Server (WEBrick)"
+puts "=" * 60
+puts "URL:      #{protocol}://localhost:#{port}/mcp"
+puts "Transport: Streamable HTTP"
+puts "=" * 60
+puts ""
+puts "Flag files (checked at startup only - restart server to apply changes):"
+puts "  touch tmp/flags/extra_tools     # Add TestToolWithAudioResponse"
+puts "  touch tmp/flags/extra_resources # Add TestBinaryResource"
+puts "  touch tmp/flags/extra_prompts   # Add TestPromptWithCompletionClass"
+puts "  rm tmp/flags/<flag>             # Remove the handler"
+puts ""
 
 app = Rack::Builder.new do
   map '/mcp' do
-    run MCPHttpApp.new(logger)
+    run MCPHttpApp.new
   end
 end
 
@@ -262,8 +241,8 @@ if use_ssl
   key_path = File.join(__dir__, '..', 'tmp', 'ssl', 'server.key')
 
   unless File.exist?(cert_path) && File.exist?(key_path)
-    logger.error("SSL certificates not found at tmp/ssl/")
-    logger.error("Generate them with: openssl req -x509 -newkey rsa:4096 -keyout tmp/ssl/server.key -out tmp/ssl/server.crt -days 365 -nodes -subj \"/C=US/ST=Dev/L=Dev/O=Dev/CN=localhost\"")
+    $stderr.puts "SSL certificates not found at tmp/ssl/"
+    $stderr.puts "Generate them with: openssl req -x509 -newkey rsa:4096 -keyout tmp/ssl/server.key -out tmp/ssl/server.crt -days 365 -nodes -subj \"/C=US/ST=Dev/L=Dev/O=Dev/CN=localhost\""
     exit(1)
   end
 
@@ -275,14 +254,17 @@ if use_ssl
   )
 end
 
-server = WEBrick::HTTPServer.new(server_options)
-server.mount '/', Rackup::Handler::WEBrick, app
+# Start the MCP server (lifecycle hook)
+ModelContextProtocol::Server.start
+
+webrick_server = WEBrick::HTTPServer.new(server_options)
+webrick_server.mount '/', Rackup::Handler::WEBrick, app
 
 ['INT', 'TERM'].each do |signal|
   Signal.trap(signal) do
-    server.shutdown
-    exit(0)
+    ModelContextProtocol::Server.shutdown
+    webrick_server.shutdown
   end
 end
 
-server.start
+webrick_server.start

data/tasks/templates/dev.erb

@@ -4,16 +4,30 @@ require "bundler/setup"
 require "securerandom"
 require_relative "../lib/model_context_protocol"
 
-Dir[File.join(__dir__, "../spec/support/**/*.rb")].each { |file| require file }
+# Only require test handler files (prompts, resources, tools, etc.), not RSpec helpers
+%w[prompts resources resource_templates tools completions].each do |subdir|
+  Dir[File.join(__dir__, "../spec/support/#{subdir}/**/*.rb")].each { |file| require file }
+end
+
+# Configure server logging globally (once per application)
+ModelContextProtocol::Server.configure_server_logging do |logger|
+  logger.level = Logger::DEBUG
+  logger.progname = "MCP-Dev-Server"
+  # logger.logdev = $stderr                              # Default for stdio transport
+  # logger.logdev = File.open("/tmp/mcp_server.log", "a") # Alternative: log to file
+  logger.formatter = proc do |severity, datetime, progname, msg|
+    timestamp = datetime.strftime("%Y-%m-%d %H:%M:%S.%3N")
+    "[#{timestamp}] #{severity} [#{progname}] #{msg}\n"
+  end
+end
 
-server = ModelContextProtocol::Server.new do |config|
+server = ModelContextProtocol::Server.with_stdio_transport do |config|
   config.name = "MCP Development Server"
   config.version = "1.0.0"
-  config.logging_enabled = true
 
   config.pagination = {
-    default_page_size: 10,
-    max_page_size: 20,
+    default_page_size: 2,
+    max_page_size: 3,
     cursor_ttl: 1800
   }
 
@@ -24,15 +38,17 @@ server = ModelContextProtocol::Server.new do |config|
     request_id: SecureRandom.uuid
   }
 
-  config.registry = ModelContextProtocol::Server::Registry.new do
+  config.registry do
     prompts list_changed: true do
       register TestPrompt
+      register TestPromptWithCompletionClass
     end
 
     resources list_changed: true, subscribe: true do
       register TestResource
       register TestAnnotatedResource
       register TestBinaryResource
+      register TestProgressiveResource
     end
 
     resource_templates do
@@ -40,11 +56,17 @@ server = ModelContextProtocol::Server.new do |config|
     end
 
     tools list_changed: true do
+      register TestToolWithStructuredContentResponse
       register TestToolWithTextResponse
       register TestToolWithImageResponse
-      register TestToolWithImageResponseDefaultMimeType
+      register TestToolWithMixedContentResponse
       register TestToolWithResourceResponse
       register TestToolWithToolErrorResponse
+      register TestToolWithCancellableSleep
+      register TestToolWithProgressableAndCancellable
+      register TestToolWithAnnotations
+      register TestToolWithSecuritySchemes
+      register TestToolWithResourceLinkResponse
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model-context-protocol-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dick Davis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '1.3'
 description:
 email:
-- dick@hey.com
+- webmaster@dick.codes
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -97,13 +97,34 @@ files:
 - README.md
 - Rakefile
 - lib/model_context_protocol.rb
+- lib/model_context_protocol/rspec.rb
+- lib/model_context_protocol/rspec/helpers.rb
+- lib/model_context_protocol/rspec/matchers.rb
+- lib/model_context_protocol/rspec/matchers/be_mcp_error_response.rb
+- lib/model_context_protocol/rspec/matchers/be_valid_mcp_class.rb
+- lib/model_context_protocol/rspec/matchers/be_valid_mcp_prompt_response.rb
+- lib/model_context_protocol/rspec/matchers/be_valid_mcp_resource_response.rb
+- lib/model_context_protocol/rspec/matchers/be_valid_mcp_tool_response.rb
+- lib/model_context_protocol/rspec/matchers/have_audio_content.rb
+- lib/model_context_protocol/rspec/matchers/have_embedded_resource_content.rb
+- lib/model_context_protocol/rspec/matchers/have_image_content.rb
+- lib/model_context_protocol/rspec/matchers/have_message_count.rb
+- lib/model_context_protocol/rspec/matchers/have_message_with_role.rb
+- lib/model_context_protocol/rspec/matchers/have_resource_annotations.rb
+- lib/model_context_protocol/rspec/matchers/have_resource_blob.rb
+- lib/model_context_protocol/rspec/matchers/have_resource_link_content.rb
+- lib/model_context_protocol/rspec/matchers/have_resource_mime_type.rb
+- lib/model_context_protocol/rspec/matchers/have_resource_text.rb
+- lib/model_context_protocol/rspec/matchers/have_structured_content.rb
+- lib/model_context_protocol/rspec/matchers/have_text_content.rb
 - lib/model_context_protocol/server.rb
 - lib/model_context_protocol/server/cancellable.rb
+- lib/model_context_protocol/server/client_logger.rb
 - lib/model_context_protocol/server/completion.rb
 - lib/model_context_protocol/server/configuration.rb
 - lib/model_context_protocol/server/content.rb
 - lib/model_context_protocol/server/content_helpers.rb
-- lib/model_context_protocol/server/mcp_logger.rb
+- lib/model_context_protocol/server/global_config/server_logging.rb
 - lib/model_context_protocol/server/pagination.rb
 - lib/model_context_protocol/server/progressable.rb
 - lib/model_context_protocol/server/prompt.rb
@@ -114,19 +135,25 @@ files:
 - lib/model_context_protocol/server/resource.rb
 - lib/model_context_protocol/server/resource_template.rb
 - lib/model_context_protocol/server/router.rb
+- lib/model_context_protocol/server/server_logger.rb
+- lib/model_context_protocol/server/stdio_configuration.rb
 - lib/model_context_protocol/server/stdio_transport.rb
 - lib/model_context_protocol/server/stdio_transport/request_store.rb
+- lib/model_context_protocol/server/streamable_http_configuration.rb
 - lib/model_context_protocol/server/streamable_http_transport.rb
 - lib/model_context_protocol/server/streamable_http_transport/event_counter.rb
 - lib/model_context_protocol/server/streamable_http_transport/message_poller.rb
 - lib/model_context_protocol/server/streamable_http_transport/notification_queue.rb
 - lib/model_context_protocol/server/streamable_http_transport/request_store.rb
+- lib/model_context_protocol/server/streamable_http_transport/server_request_store.rb
 - lib/model_context_protocol/server/streamable_http_transport/session_message_queue.rb
 - lib/model_context_protocol/server/streamable_http_transport/session_store.rb
 - lib/model_context_protocol/server/streamable_http_transport/stream_registry.rb
 - lib/model_context_protocol/server/tool.rb
 - lib/model_context_protocol/version.rb
+- lib/puma/plugin/mcp.rb
 - tasks/mcp.rake
+- tasks/templates/dev-http-puma.erb
 - tasks/templates/dev-http.erb
 - tasks/templates/dev.erb
 homepage: https://github.com/dickdavis/model-context-protocol-rb