diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d9301b..f6e732a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,30 +11,57 @@ permissions: pull-requests: write jobs: - test: + setup: + name: Setup + runs-on: ubuntu-latest + outputs: + swift-versions: ${{ steps.set-matrix.outputs.swift-versions }} + env: + SWIFT_VERSIONS: | + 6.0.3 + 6.1.0 + steps: + - id: set-matrix + run: | + # Convert multi-line string to JSON array (jq is pre-installed on GitHub runners) + VERSIONS=$(echo "$SWIFT_VERSIONS" | jq -R -s -c 'split("\n") | map(select(length > 0))') + echo "swift-versions=$VERSIONS" >> $GITHUB_OUTPUT + + test-macos: + name: Test (macOS, Swift ${{ matrix.swift-version }}) + needs: setup strategy: matrix: - os: [macos-latest, ubuntu-latest] - swift-version: - - 6.0.3 - - 6.1.0 + swift-version: ${{ fromJson(needs.setup.outputs.swift-versions) }} + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Swift + uses: swift-actions/setup-swift@v2 + with: + swift-version: ${{ matrix.swift-version }} + + - name: Build + run: swift build -v - runs-on: ${{ matrix.os }} - name: Test (${{ matrix.os }}, Swift ${{ matrix.swift-version }}) + - name: Run tests + run: swift test -v + test-ubuntu: + name: Test (Ubuntu, Swift ${{ matrix.swift-version }}) + needs: setup + strategy: + matrix: + swift-version: ${{ fromJson(needs.setup.outputs.swift-versions) }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Setup Swift on Linux - if: matrix.os == 'ubuntu-latest' + - name: Setup Swift uses: vapor/swiftly-action@v0.2 with: toolchain: ${{ matrix.swift-version }} - - name: Setup Swift on macOS - if: matrix.os == 'macos-latest' - uses: swift-actions/setup-swift@v2 - with: - swift-version: ${{ matrix.swift-version }} - name: Build run: swift build -v diff --git a/README.md b/README.md index 2c05a96..01adf58 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Swift implementation of the [Model Context Protocol][mcp] (MCP). | visionOS | 1.0+ | | Linux | ✓ [^1] | -[^1]: Linux support requires glibc-based distributions such as Ubuntu, Debian, Fedora, CentOS, or RHEL. Alpine Linux and other musl-based distributions are not supported. +[^1]: Linux support includes glibc-based distributions (Ubuntu, Debian, Fedora, CentOS, RHEL) and musl-based distributions (Alpine Linux). ## Installation diff --git a/Sources/MCP/Base/Transports/StdioTransport.swift b/Sources/MCP/Base/Transports/StdioTransport.swift index 99e7b0a..973db54 100644 --- a/Sources/MCP/Base/Transports/StdioTransport.swift +++ b/Sources/MCP/Base/Transports/StdioTransport.swift @@ -9,59 +9,61 @@ import struct Foundation.Data #endif // Import for specific low-level operations not yet in Swift System -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) import Darwin.POSIX -#elseif os(Linux) +#elseif canImport(Glibc) import Glibc +#elseif canImport(Musl) + import Musl #endif -/// Standard input/output transport implementation -public actor StdioTransport: Transport { - private let input: FileDescriptor - private let output: FileDescriptor - public nonisolated let logger: Logger - - private var isConnected = false - private let messageStream: AsyncStream - private let messageContinuation: AsyncStream.Continuation - - public init( - input: FileDescriptor = FileDescriptor.standardInput, - output: FileDescriptor = FileDescriptor.standardOutput, - logger: Logger? = nil - ) { - self.input = input - self.output = output - self.logger = - logger - ?? Logger( - label: "mcp.transport.stdio", - factory: { _ in SwiftLogNoOpLogHandler() }) - - // Create message stream - var continuation: AsyncStream.Continuation! - self.messageStream = AsyncStream { continuation = $0 } - self.messageContinuation = continuation - } +#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) + /// Standard input/output transport implementation + public actor StdioTransport: Transport { + private let input: FileDescriptor + private let output: FileDescriptor + public nonisolated let logger: Logger + + private var isConnected = false + private let messageStream: AsyncStream + private let messageContinuation: AsyncStream.Continuation + + public init( + input: FileDescriptor = FileDescriptor.standardInput, + output: FileDescriptor = FileDescriptor.standardOutput, + logger: Logger? = nil + ) { + self.input = input + self.output = output + self.logger = + logger + ?? Logger( + label: "mcp.transport.stdio", + factory: { _ in SwiftLogNoOpLogHandler() }) + + // Create message stream + var continuation: AsyncStream.Continuation! + self.messageStream = AsyncStream { continuation = $0 } + self.messageContinuation = continuation + } - public func connect() async throws { - guard !isConnected else { return } + public func connect() async throws { + guard !isConnected else { return } - // Set non-blocking mode - try setNonBlocking(fileDescriptor: input) - try setNonBlocking(fileDescriptor: output) + // Set non-blocking mode + try setNonBlocking(fileDescriptor: input) + try setNonBlocking(fileDescriptor: output) - isConnected = true - logger.info("Transport connected successfully") + isConnected = true + logger.info("Transport connected successfully") - // Start reading loop in background - Task { - await readLoop() + // Start reading loop in background + Task { + await readLoop() + } } - } - private func setNonBlocking(fileDescriptor: FileDescriptor) throws { - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux) + private func setNonBlocking(fileDescriptor: FileDescriptor) throws { // Get current flags let flags = fcntl(fileDescriptor.rawValue, F_GETFL) guard flags >= 0 else { @@ -73,100 +75,94 @@ public actor StdioTransport: Transport { guard result >= 0 else { throw MCPError.transportError(Errno(rawValue: CInt(errno))) } - #else - // For platforms where non-blocking operations aren't supported - throw MCPError.internalError("Setting non-blocking mode not supported on this platform") - #endif - } + } - private func readLoop() async { - let bufferSize = 4096 - var buffer = [UInt8](repeating: 0, count: bufferSize) - var pendingData = Data() + private func readLoop() async { + let bufferSize = 4096 + var buffer = [UInt8](repeating: 0, count: bufferSize) + var pendingData = Data() - while isConnected && !Task.isCancelled { - do { - let bytesRead = try buffer.withUnsafeMutableBufferPointer { pointer in - try input.read(into: UnsafeMutableRawBufferPointer(pointer)) - } + while isConnected && !Task.isCancelled { + do { + let bytesRead = try buffer.withUnsafeMutableBufferPointer { pointer in + try input.read(into: UnsafeMutableRawBufferPointer(pointer)) + } - if bytesRead == 0 { - logger.notice("EOF received") - break - } + if bytesRead == 0 { + logger.notice("EOF received") + break + } - pendingData.append(Data(buffer[.. 0 { - remaining = remaining.dropFirst(written) + var remaining = messageWithNewline + while !remaining.isEmpty { + do { + let written = try remaining.withUnsafeBytes { buffer in + try output.write(UnsafeRawBufferPointer(buffer)) + } + if written > 0 { + remaining = remaining.dropFirst(written) + } + } catch let error where MCPError.isResourceTemporarilyUnavailable(error) { + try await Task.sleep(for: .milliseconds(10)) + continue + } catch { + throw MCPError.transportError(error) } - } catch let error where MCPError.isResourceTemporarilyUnavailable(error) { - try await Task.sleep(for: .milliseconds(10)) - continue - } catch { - throw MCPError.transportError(error) } } - } - public func receive() -> AsyncThrowingStream { - return AsyncThrowingStream { continuation in - Task { - for await message in messageStream { - continuation.yield(message) + public func receive() -> AsyncThrowingStream { + return AsyncThrowingStream { continuation in + Task { + for await message in messageStream { + continuation.yield(message) + } + continuation.finish() } - continuation.finish() } } } -} +#endif