Merge branch 'async'

Author: odrobnik

.swiftpm/xcode/xcshareddata/xcschemes/SwiftMCPDemo.xcscheme

@@ -69,7 +69,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--token secret"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
       <EnvironmentVariables>

Demos/SwiftMCPDemo/Calculator.swift

@@ -57,16 +57,33 @@ class Calculator {
     /// Returns a greeting message with the provided name
     /// - Parameter name: Name of the person to greet
     /// - Returns: The greeting message
-    @MCPTool(description: "Shows a greeting message")
-    func greet(name: String) -> String {
-        return "Hello, \(name)!"
-    }
+	@MCPTool(description: "Shows a greeting message")
+	func greet(name: String) async throws -> String {
+		// Validate name length
+		if name.count < 2 {
+			throw DemoError.nameTooShort(name: name)
+		}
+		
+		// Validate name contains only letters and spaces
+		if !name.allSatisfy({ $0.isLetter || $0.isWhitespace }) {
+			throw DemoError.invalidName(name: name)
+		}
+		
+		return "Hello, \(name)!"
+	}
+
 
     /** A simple ping function that returns 'pong' */
 	@MCPTool
 	func ping() -> String {
 		return "pong"
 	}
+	
+	/** A function to test doing nothing, not returning anything*/
+	@MCPTool
+	func noop() {
+		
+	}
 
     /// Returns an array of all MCP resources defined in this type
     var mcpResources: [MCPResource] {

Demos/SwiftMCPDemo/Commands/HTTPSSECommand.swift

@@ -76,6 +76,21 @@ struct HTTPSSECommand: ParsableCommand {
 #endif
 
         let calculator = Calculator()
+		
+		
+		let mirror = Mirror(reflecting: calculator)
+		var metadataArray: [MCPToolMetadata] = []
+		
+		for child in mirror.children {
+		   if let metadata = child.value as? MCPToolMetadata,
+		   child.label?.hasPrefix("__mcpMetadata_") == true {
+		   metadataArray.append(metadata)
+		   }
+		}
+		
+		print(metadataArray.description)
+
+		
         let host = String.localHostname
         print("MCP Server \(calculator.serverName) (\(calculator.serverVersion)) started with HTTP+SSE transport on http://\(host):\(port)/sse")
 

Demos/SwiftMCPDemo/Commands/StdioCommand.swift

@@ -39,7 +39,7 @@ struct StdioCommand: ParsableCommand {
 """
     )
 
-    func run() throws {
+	func run() async throws {
 #if canImport(OSLog)
         LoggingSystem.bootstrapWithOSLog()
 #endif
@@ -51,7 +51,7 @@ struct StdioCommand: ParsableCommand {
             fputs("MCP Server \(calculator.serverName) (\(calculator.serverVersion)) started with Stdio transport\n", stderr)
 
             let transport = StdioTransport(server: calculator)
-            try transport.run()
+			try await transport.run()
         }
         catch let error as IOError {
             // Handle specific IO errors with more detail

Demos/SwiftMCPDemo/DemoError.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+/// Custom errors for the demo app
+public enum DemoError: LocalizedError {
+    /// When a greeting name is too short
+    case nameTooShort(name: String)
+    
+    /// When a greeting name contains invalid characters
+    case invalidName(name: String)
+    
+    /// When the greeting service is temporarily unavailable
+    case serviceUnavailable
+    
+    public var errorDescription: String? {
+        switch self {
+        case .nameTooShort(let name):
+            return "Name '\(name)' is too short. Names must be at least 2 characters long."
+        case .invalidName(let name):
+            return "Name '\(name)' contains invalid characters. Only letters and spaces are allowed."
+        case .serviceUnavailable:
+            return "The greeting service is temporarily unavailable. Please try again later."
+        }
+    }
+} 

Sources/SwiftMCP/Extensions/Array+MCPTool.swift

@@ -12,34 +12,8 @@ extension Array where Element == MCPToolMetadata {
         return self.map { meta in
             // Create properties for the JSON schema
             let properties = Dictionary(uniqueKeysWithValues: meta.parameters.map { param in
-                // Create the appropriate schema based on the parameter type
-                let schema: JSONSchema
-                let jsonSchemaType = param.type.JSONSchemaType
-                
-                if jsonSchemaType == "array" {
-                    // This is an array type
-                    let elementType: JSONSchema
-                    if let arrayElementType = param.type.arrayElementType {
-                        if arrayElementType.JSONSchemaType == "number" {
-                            elementType = JSONSchema.number()
-                        } else if arrayElementType.JSONSchemaType == "boolean" {
-                            elementType = JSONSchema.boolean()
-                        } else {
-                            elementType = JSONSchema.string()
-                        }
-                    } else {
-                        elementType = JSONSchema.string()
-                    }
-                    schema = JSONSchema.array(items: elementType, description: param.description)
-                } else if jsonSchemaType == "number" {
-                    schema = JSONSchema.number(description: param.description)
-                } else if jsonSchemaType == "boolean" {
-                    schema = JSONSchema.boolean(description: param.description)
-                } else {
-                    schema = JSONSchema.string(description: param.description)
-                }
-                
-                return (param.name, schema)
+
+				return (param.name, param.jsonSchema)
             })
 
             // Determine which parameters are required (those without default values)

Sources/SwiftMCP/Extensions/MCPToolParameterInfo+JSONSchema.swift

@@ -0,0 +1,47 @@
+//
+//  MCPToolParameterInfo+JSONSchema.swift
+//  SwiftMCP
+//
+//  Created by Oliver Drobnik on 18.03.25.
+//
+
+import Foundation
+
+extension MCPToolParameterInfo {
+	
+	var jsonSchema: JSONSchema {
+		
+		switch type.JSONSchemaType {
+				
+			case "array":
+				
+				// This is an array type
+				let elementType: JSONSchema
+				if let arrayElementType = type.arrayElementType {
+					if arrayElementType.JSONSchemaType == "number" {
+						elementType = JSONSchema.number()
+					} else if arrayElementType.JSONSchemaType == "boolean" {
+						elementType = JSONSchema.boolean()
+					} else {
+						elementType = JSONSchema.string()
+					}
+				} else {
+					elementType = JSONSchema.string()
+				}
+				
+				return JSONSchema.array(items: elementType, description: description)
+				
+			case "number":
+				
+				return JSONSchema.number(description: description)
+				
+			case "boolean":
+				
+				return JSONSchema.boolean(description: description)
+				
+			default:
+				
+				return JSONSchema.string(description: description)
+		}
+	}
+}

Sources/SwiftMCP/MCPMacros.swift

@@ -46,6 +46,6 @@ public macro MCPTool(description: String? = nil) = #externalMacro(module: "Swift
 ///     }
 /// }
 /// ```
-@attached(member, names: named(mcpTools), named(callTool), named(__mcpServerName), named(__mcpServerVersion), named(__mcpServerDescription))
+@attached(member, names: named(callTool), named(__mcpServerName), named(__mcpServerVersion), named(__mcpServerDescription))
 @attached(extension, conformances: MCPServer)
 public macro MCPServer(name: String? = nil, version: String? = nil) = #externalMacro(module: "SwiftMCPMacros", type: "MCPServerMacro")

Sources/SwiftMCP/Models/JSONRPC/JSONRPCRequest.swift

@@ -8,7 +8,7 @@ public struct JSONRPCRequest: Codable {
     public let method: String?
     public let params: [String: AnyCodable]?
 
-    public init(jsonrpc: String, id: Int?, method: String, params: [String: AnyCodable]? = nil) {
+    public init(jsonrpc: String, id: Int?, method: String?, params: [String: AnyCodable]? = nil) {
         self.jsonrpc = jsonrpc
         self.id = id
         self.method = method

Sources/SwiftMCP/Models/MCPRequestResponse.swift

@@ -117,14 +117,3 @@ public struct MCPErrorResponse: Codable {
         self.error = error
     }
 }
-
-/// Process MCP requests and generate appropriate responses
-/// - Parameter request: The MCPRequest to handle
-/// - Returns: An optional MCPResponse if the request can be handled
-public func handleRequest(_ request: MCPRequest) -> MCPResponse? {
-    if request.method == "hello" {
-        let name = request.params?["name"] ?? "World"
-        return MCPResponse(id: request.id, result: ["message": "Hello, \(name)!"])
-    }
-    return nil
-}