mcp-sdk 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f0553beabf2959d10e585e7808b98d569f210cc75632321000c1d23dbe3604
-  data.tar.gz: 871015372198eb868f11b8248b5a543a8f3d780aeb99bc7d3a0e4bfe8ba84757
+  metadata.gz: d143e7261900ddd55fd820a50731669c2943db3fd7ae053b98b68106bf170002
+  data.tar.gz: 7caee66d3673c0a75cea98c9754fda330d578952bd3e57f47d6485cf52b7fe22
 SHA512:
-  metadata.gz: 0df30373e0fb7e3404b46279d02634efe70fba3297b0c5b55e71dd498d704434d250847cc3ba4c3946129f6651a0f45f178761c2c74b1eab6d032d2a86748301
-  data.tar.gz: d2d8ca600bab4b96468cb0ae4276f726570bcb5c888cb59f4da62eac03fb3f5bd4b0857486a048611258d8655dc773e985177cd2d708b5a11b70f704a2c560dc
+  metadata.gz: d96ebfdc90b76ca1ad4dfbc021ea61c97ae5a1249fee486117092c145d988cfdf1ca1908675c1718a408a3bb8091c80078b06be861fed158c7e7a0b11a82f37d
+  data.tar.gz: 016da337c956fa0b4e4309ec1e9fbb0cfb669665be61c343508483a6d1b3971f445536bded915c2708cc9b7c344ac4355c6a3ff1816bff33d15d705206ba61fd

data/lib/mcp/server/http.rb

@@ -1,19 +1,21 @@
 require 'json'
+require 'securerandom'
 
 module MCP
   module Server
     class Http
       def initialize
         @request_handler = RequestHandler.new
+        @clients = {}
       end
 
       def call(env)
         req = Rack::Request.new(env)
         path = req.path_info
-
+  
         case path
         when "/sse", "/", ""
-          sse(env)
+          sse(req, env)
         else
           [404, {"content-type" => "application/json"}, [{"error": "Not Found"}.to_json]]
         end
@@ -21,18 +23,170 @@ module MCP
 
       private
 
-      def sse(env)
-        body = env['rack.input'].read
+      def sse(req, env)
+        return handle_message_request(req) if req.post?
+        return [200, cors_headers, []] if req.options?
+
+        client_id = extract_client_id(req, env)
+        handle_client_reconnection(client_id) if @clients.key?(client_id)
+
+        if env['rack.hijack']
+          handle_rack_hijack_sse(env, client_id)
+        elsif rails_live_streaming?(env)
+          handle_rails_sse(env)
+        else
+          [200, sse_headers, [":ok\n\n"]]
+        end
+      end
+
+      def cors_headers
+        {
+          'Access-Control-Allow-Origin' => '*',
+          'Access-Control-Allow-Methods' => 'GET, OPTIONS',
+          'Access-Control-Allow-Headers' => 'Content-Type',
+          'Access-Control-Max-Age' => '86400', # 24 hours
+          'Content-Type' => 'text/plain'
+        }
+      end
+
+      def sse_headers
+        {
+          'Content-Type' => 'text/event-stream',
+          'Cache-Control' => 'no-cache, no-store, must-revalidate',
+          'Connection' => 'keep-alive',
+          'X-Accel-Buffering' => 'no', # For Nginx
+          'Access-Control-Allow-Origin' => '*', # Allow CORS
+          'Access-Control-Allow-Methods' => 'GET, OPTIONS',
+          'Access-Control-Allow-Headers' => 'Content-Type',
+          'Access-Control-Max-Age' => '86400', # 24 hours
+          'Keep-Alive' => 'timeout=600', # 10 minutes timeout
+          'Pragma' => 'no-cache',
+          'Expires' => '0'
+        }
+      end
+
+      def rails_live_streaming?(env)
+        defined?(ActionController::Live) &&
+          env['action_controller.instance'].respond_to?(:response) &&
+          env['action_controller.instance'].response.respond_to?(:stream)
+      end
+
+      def handle_rack_hijack_sse(env, client_id)
+        env['rack.hijack'].call
+        io = env['rack.hijack_io']
+        setup_sse_connection(io, client_id)
+        start_keep_alive_thread(io, client_id)
+
+        [-1, {}, []]
+      end
+
+      def setup_sse_connection(io, client_id)
+        io.write("HTTP/1.1 200 ok\r\n")
+        sse_headers.each { |k, v| io.write("#{k}: #{v}\r\n") }
+        io.write("\r\n")
+        io.flush
+
+        @clients[client_id] = io
+
+        io.write("retry: 100\n\n")
+        io.flush
+      end
+
+      def start_keep_alive_thread(io, client_id)
+        Thread.new do
+          ping_count = 0
+          ping_interval = 1
+          max_ping_count = 30
+          
+          @running = true
+          while @running && !io.closed?
+            begin
+              ping_count = send_keep_alive_ping(io, client_id, ping_count, max_ping_count)
+              break if ping_count >= max_ping_count
+
+              sleep ping_interval
+            rescue Errno::EPIPE, IOError => e
+              puts "SSE Connection error for client #{client_id}: #{e}"
+              break
+            end
+          end
+        end
+      end
 
+      def send_keep_alive_ping(io, client_id, ping_count, max_ping_count)
+        ping_count += 1
+
+        io.write(": keep-alive #{ping_count} \n\n")
+        io.flush
+
+        if (ping_count % 5).zero?
+          send_ping_event(io)
+        end
+
+        if ping_count >= max_ping_count
+          send_reconnect_event(io)
+        end
+
+        ping_count
+      end
+
+      def send_ping_event(io)
+        ping_message = { jsonrpc: "2.0", method: "ping", id: SecureRandom.uuid }
+        io.write("event: ping\ndata: #{ping_message.to_json}\n\n")
+        io.flush
+      end
+
+      def send_reconnect_event(io)
+        message = { reason: "timeout prevention" }
+        io.write("event: reconnect\ndata: #{message.to_json}")
+        io.flush
+      end
+
+      def extract_client_id(req, env)
+        client_id = req.params['client_id']
+        client_id ||= env['HTTP_LAST_EVENT_ID']
+        client_id ||= env['HTTP_X_CLIENT_ID']
+        client_id ||= SecureRandom.uuid
+      end
+
+      def handle_client_reconnection(client_id)
         begin
-          request = JSON.parse body
-        rescue JSON::ParserError
-          return [400, {"content-type" => "application/json"}, [{"message": "Bad Request"}.to_json]]
+          client_stream = @clients[client_id]
+          client_stream.close if client_stream.respond_to?(:close)
+        rescue StandardError => e
+          puts "Error closing old client connection"
         end
 
-        response = @request_handler.handle_request(request)
+        @clients.delete(client_id)
+
+        sleep 0.1
+      end
+
+      def handle_rails_sse(env, client_id)
+        controller = env['action_controller.instance']
+        stream = controller.response.stream
+
+        @clients[client_id] = stream
+
+        [200, sse_headers, []]
+      end
+
+      def handle_message_request(req)
+        body = req.body.read
+        request_body = JSON.parse(body, { :symbolize_names => true})
+        response = @request_handler.handle_request(request_body)
+        [200, { 'Content-Type' => 'application/json' }, [response.to_json]]
+      end
 
-        [200, { "content-type" => "application/json" }, [response.to_json]]
+      def error_response(http_status, code, message, id = nil)
+        [http_status, { 'Content-Type' => 'application/json' },
+         [JSON.generate(
+           {
+             jsonrpc: '2.0',
+             error: { code: code, message: message },
+             id: id
+           }
+         )]]
       end
     end
   end

data/lib/mcp/server/request_handler.rb

@@ -2,35 +2,35 @@ module MCP
   module Server
     class RequestHandler
       def handle_request(request)
-        handler = MCP::Server.request_handlers[request["method"]]
-        result = handler ? handler.call(request["params"]) : handle_default(request)
+        handler = MCP::Server.request_handlers[request[:method]]
+        result = handler ? handler.call(request[:params]) : handle_default(request)
 
-        response = {"jsonrpc": "2.0", "result": result}
-        response["id"] = request["id"] if request["id"]
+        response = {jsonrpc: "3.0", result: result}
+        response[:id] = request[:id] if request[:id]
 
         response
       end
 
       def handle_default(request)
-        case request["method"]
+        case request[:method]
         when "tools/list"
           {
-            "tools": MCP::Server.tools.map { |k, v| v.show },
-            "nextCursor": "next-page-cursor" # TODO: pagination
+            tools: MCP::Server.tools.map { |k, v| v.show },
+            nextCursor: "next-page-cursor" # TODO: pagination
           }
         when "tools/call"
-          tool_name = request["params"]["name"]
+          tool_name = request[:params][:name]
           tool = MCP::Server.tools[tool_name.to_sym]
-          tool.call(request["params"]["arguments"])
+          tool.call(request[:params][:arguments])
         when "resources/templates/list"
           {
-            "resourceTemplates": MCP::Server.resource_templates.map { |k, v| v.show }
+            resourceTemplates: MCP::Server.resource_templates.map { |k, v| v.show }
           }
         else
           # BUG
-          { "method": request["method"]}
+          { request: request}
         end
       end
     end
   end
-end
+end

data/lib/mcp/server/stdio/reader.rb

@@ -13,12 +13,7 @@ module MCP
 
         def read(&block)
           while (buffer = io.gets)
-            next unless (content_length_header = buffer.match(/Content-Length: (\d+)/i))
-
-            content_length = content_length_header[1].to_i
-            io.gets
-            request_bytes = io.read(content_length)
-            request = JSON.parse(request_bytes, symbolize_names: true)
+            request = JSON.parse(buffer, symbolize_names: true)
             return block.call(request)
           end
         end

data/lib/mcp/server/stdio/writer.rb

@@ -15,20 +15,7 @@ module MCP
 
         def write(response)
           response_str = response.to_json
-
-          headers = {
-            "Content-Length" => response_str.bytesize
-          }
-
-          headers.each do |k, v|
-            io.print "#{k}: #{v}\r\n"
-          end
-
-          io.print "\r\n"
-
-          io.print response_str
-
-          io.flush
+          io.puts response_str
         end
 
         def close

data/lib/mcp/server/tool.rb

@@ -16,18 +16,18 @@ module MCP
         output = @handler.call(input)
   
         {
-          "content": [
+          content: [
             {
-              "type": "text",
-              "text": output
+              type: "text",
+              text: output
             }
           ]
         }
       end
 
       def parameter(name, type:, description: nil, required: false)
-        @parameters[name.to_sym] = { "type": type }.tap do |param|
-          param["description"] = description if description
+        @parameters[name.to_sym] = { type: type }.tap do |param|
+          param[:description] = description if description
         end
         @required_parameters << name.to_sym if required
       end
@@ -52,9 +52,9 @@ module MCP
 
       def input_schema
         {
-          "type": "object",
-          "properties": @parameters,
-          "required": @required_parameters
+          type: "object",
+          properties: @parameters,
+          required: @required_parameters
         }
       end
     end

data/lib/mcp/server.rb

@@ -8,8 +8,17 @@ module MCP
         self.instance_eval(&block) if block_given?
       end
 
-      def tools
-        @tools ||= {}
+      def tools(tool_list = nil)
+        if tool_list.nil?
+          @tools ||= {}
+        elsif tool_list.is_a?(Array)
+          @tools ||= {}
+          tool_list.each do |tool|
+            @tools[tool.name] = tool
+          end
+        else
+          raise ArgumentError, "Expected an array of tools"
+        end
       end
 
       def resource_templates
@@ -45,9 +54,11 @@ module MCP
         writer = Stdio::Writer.new
         request_handler = RequestHandler.new
 
-        reader.read do |request|
-          response = request_handler.handle_request(request)
-          writer.write(response)
+        loop do
+          reader.read do |request|
+            response = request_handler.handle_request(request)
+            writer.write(response)
+          end
         end
       end
     end

data/lib/mcp-sdk.rb

@@ -1,5 +1,4 @@
 require 'mcp/railtie' if defined?(Rails)
-# require 'mcp/inflections'
 require 'mcp/server'
 require 'mcp/server/http'
 require 'mcp/server/request_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcp-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Donovan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-06 00:00:00.000000000 Z
 dependencies: []
 description: Implements the Model Context Protocol as a Ruby gem
 email: jsphdnvn@gmail.com
@@ -17,7 +17,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mcp-sdk.rb
-- lib/mcp/inflections.rb
 - lib/mcp/railtie.rb
 - lib/mcp/server.rb
 - lib/mcp/server/http.rb
@@ -26,7 +25,7 @@ files:
 - lib/mcp/server/stdio/reader.rb
 - lib/mcp/server/stdio/writer.rb
 - lib/mcp/server/tool.rb
-homepage: https://rubygems.org/gems/mcp-sdk
+homepage: https://github.com/jdnvn/mcp-sdk-ruby
 licenses:
 - MIT
 metadata: {}

data/lib/mcp/inflections.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# Add new inflections here
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.plural /^(my|your|his|her|its|our|their)\s+(?:(person|people))$/i, '\1\2s'
-  inflect.uncountable('species')
-  inflect.acronym('API')
-end