Skip to content

Own MCP connection request shutdown #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lynnswap merged 1 commit into from
Aug 22, 2026
+1,036 −23
Merged

Own MCP connection request shutdown #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 83 additions & 23 deletions Sources/CodexReviewMCPServer/CodexReviewMCPHTTPServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,17 @@ package actor CodexReviewMCPHTTPServer {

private final class StartingGeneration: @unchecked Sendable {
let id: UInt64
let networkResources: MCPHTTPNetworkResourceOwner
let task: Task<StartingGenerationResult, Never>
var admissionClosed = false

init(id: UInt64, task: Task<StartingGenerationResult, Never>) {
init(
id: UInt64,
networkResources: MCPHTTPNetworkResourceOwner,
task: Task<StartingGenerationResult, Never>
) {
self.id = id
self.networkResources = networkResources
self.task = task
}
}
Expand All @@ -223,6 +229,7 @@ package actor CodexReviewMCPHTTPServer {
let eventLoopGroup: MultiThreadedEventLoopGroup
let cleanupTask: Task<Void, Never>
let boundURL: URL
let networkResources: MCPHTTPNetworkResourceOwner
var admissionClosed = false
var listenerCloseTask: Task<StoppingGenerationResult, Never>?

Expand All @@ -231,13 +238,15 @@ package actor CodexReviewMCPHTTPServer {
listener: any Channel,
eventLoopGroup: MultiThreadedEventLoopGroup,
cleanupTask: Task<Void, Never>,
boundURL: URL
boundURL: URL,
networkResources: MCPHTTPNetworkResourceOwner
) {
self.id = id
self.listener = listener
self.eventLoopGroup = eventLoopGroup
self.cleanupTask = cleanupTask
self.boundURL = boundURL
self.networkResources = networkResources
}
}

Expand Down Expand Up @@ -347,10 +356,18 @@ package actor CodexReviewMCPHTTPServer {
try result.get()
nextGenerationID &+= 1
let id = nextGenerationID
let networkResources = MCPHTTPNetworkResourceOwner(generationID: id)
let task = Task<StartingGenerationResult, Never> { [self] in
await performStartGeneration(id: id)
await performStartGeneration(
id: id,
networkResources: networkResources
)
}
let operation = StartingGeneration(id: id, task: task)
let operation = StartingGeneration(
id: id,
networkResources: networkResources,
task: task
)
lifecycleState = .starting(operation)
let result = await task.value
try publishStartResult(result, operation: operation)
Expand Down Expand Up @@ -378,14 +395,23 @@ package actor CodexReviewMCPHTTPServer {
}
}

private func performStartGeneration(id: UInt64) async -> StartingGenerationResult {
private func performStartGeneration(
id: UInt64,
networkResources: MCPHTTPNetworkResourceOwner
) async -> StartingGenerationResult {
let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
let bootstrap = ServerBootstrap(group: group)
.serverChannelOption(ChannelOptions.backlog, value: 128)
.serverChannelOption(ChannelOptions.socketOption(.so_reuseaddr), value: 1)
.childChannelInitializer { channel in
channel.pipeline.configureHTTPServerPipeline().flatMap {
channel.pipeline.addHandler(CodexReviewMCPHTTPHandler(server: self))
guard let connection = networkResources.admitConnection(channel) else {
return channel.close(mode: .all)
}
return channel.pipeline.configureHTTPServerPipeline().flatMap {
channel.pipeline.addHandler(CodexReviewMCPHTTPHandler(
server: self,
connection: connection
))
}
}
.childChannelOption(ChannelOptions.socketOption(.so_reuseaddr), value: 1)
Expand All @@ -411,10 +437,13 @@ package actor CodexReviewMCPHTTPServer {
listener: channel,
eventLoopGroup: group,
cleanupTask: cleanupTask,
boundURL: configuration.url(boundPort: actualPort)
boundURL: configuration.url(boundPort: actualPort),
networkResources: networkResources
))
} catch {
var failures: [LifecycleError.Failure] = []
networkResources.closeAdmission()
let closingNetworkResources = networkResources.beginClosing(.serverStop)
if let listener {
do {
try await listener.close()
Expand All @@ -428,6 +457,7 @@ package actor CodexReviewMCPHTTPServer {
failures.append(listenerFailure)
}
}
await closingNetworkResources.waitUntilClosed()
do {
try await group.shutdownGracefully()
} catch {
Expand Down Expand Up @@ -496,11 +526,14 @@ package actor CodexReviewMCPHTTPServer {

case .running(let resources):
resources.admissionClosed = true
resources.networkResources.closeAdmission()
let closingNetworkResources = resources.networkResources.beginClosing(.serverStop)
id = resources.id
let groupFailure = consumeEventLoopGroupShutdownFailureForTesting()
let newTask = Task<StoppingGenerationResult, Never> { [self] in
await performStopGeneration(
resources,
closingNetworkResources: closingNetworkResources,
injectedGroupFailure: groupFailure
)
}
Expand All @@ -512,14 +545,15 @@ package actor CodexReviewMCPHTTPServer {
task = newTask

case .starting(let operation):
closeStartingAdmission(operation)
let closingNetworkResources = closeStartingAdmission(operation)
id = operation.id
let newTask = Task<StoppingGenerationResult, Never> { [self] in
switch await operation.task.value {
case .success(let resources):
resources.admissionClosed = true
return await performStopGeneration(
resources,
closingNetworkResources: closingNetworkResources,
injectedGroupFailure: consumeEventLoopGroupShutdownFailureForTesting()
)
case .failure(let failure):
Expand All @@ -540,14 +574,15 @@ package actor CodexReviewMCPHTTPServer {
case .stopped:
return
case .starting(let operation):
closeStartingAdmission(operation)
let closingNetworkResources = closeStartingAdmission(operation)
let id = operation.id
let task = Task<StoppingGenerationResult, Never> { [self] in
switch await operation.task.value {
case .success(let resources):
resources.admissionClosed = true
return await performStopGeneration(
resources,
closingNetworkResources: closingNetworkResources,
injectedGroupFailure: consumeEventLoopGroupShutdownFailureForTesting()
)
case .failure(let failure):
Expand All @@ -559,36 +594,42 @@ package actor CodexReviewMCPHTTPServer {
finishStopIfCurrent(id: id, result: result)
case .running(let resources):
resources.admissionClosed = true
resources.networkResources.closeAdmission()
_ = await listenerCloseTask(for: resources).value
case .stopping(let id, _, let task):
let result = await task.value
finishStopIfCurrent(id: id, result: result)
}
}

private func closeStartingAdmission(_ operation: StartingGeneration) {
guard operation.admissionClosed == false else {
return
}
operation.admissionClosed = true
operation.task.cancel()
lastStartingAdmissionClosedGenerationID = operation.id
let waiters = startingAdmissionCloseWaiters
startingAdmissionCloseWaiters.removeAll(keepingCapacity: false)
for waiter in waiters {
waiter.resume()
private func closeStartingAdmission(
_ operation: StartingGeneration
) -> MCPHTTPNetworkResourceOwner.ClosingGeneration {
if operation.admissionClosed == false {
operation.admissionClosed = true
operation.networkResources.closeAdmission()
operation.task.cancel()
lastStartingAdmissionClosedGenerationID = operation.id
let waiters = startingAdmissionCloseWaiters
startingAdmissionCloseWaiters.removeAll(keepingCapacity: false)
for waiter in waiters {
waiter.resume()
}
}
return operation.networkResources.beginClosing(.serverStop)
}

private func performStopGeneration(
_ resources: RunningGeneration,
closingNetworkResources: MCPHTTPNetworkResourceOwner.ClosingGeneration,
injectedGroupFailure: LifecycleError.Failure?
) async -> StoppingGenerationResult {
let listenerCloseTask = listenerCloseTask(for: resources)
resources.cleanupTask.cancel()
await closeAllSessions()
let listenerResult = await listenerCloseTask.value
await resources.cleanupTask.value
await closingNetworkResources.waitUntilClosed()
await stopCompletionGate.waitIfNeeded()

var failures: [LifecycleError.Failure] = []
Expand Down Expand Up @@ -1171,13 +1212,18 @@ private final class CodexReviewMCPHTTPHandler: ChannelInboundHandler, @unchecked
}

private let server: CodexReviewMCPHTTPServer
private let connection: MCPHTTPNetworkResourceOwner.Connection
private var requestState: RequestState?
private var activeStreamTask: Task<Void, Never>?
private var activeStreamID: UUID?
private var activeStreamCompletion: ActiveRequestCompletion?

init(server: CodexReviewMCPHTTPServer) {
init(
server: CodexReviewMCPHTTPServer,
connection: MCPHTTPNetworkResourceOwner.Connection
) {
self.server = server
self.connection = connection
}

func channelRead(context: ChannelHandlerContext, data: NIOAny) {
Expand All @@ -1195,10 +1241,21 @@ private final class CodexReviewMCPHTTPHandler: ChannelInboundHandler, @unchecked
return
}
requestState = nil
guard let admittedRequest = connection.admitRequest() else {
context.close(promise: nil)
return
}
nonisolated(unsafe) let context = context
Task {
let task = Task { [self] in
defer {
admittedRequest.lease.acknowledgeCompletion()
}
guard await admittedRequest.lease.waitUntilStartIsAllowed() else {
return
}
await handleRequest(state: state, context: context)
}
admittedRequest.lease.install(task)
}
}

Expand All @@ -1208,12 +1265,14 @@ private final class CodexReviewMCPHTTPHandler: ChannelInboundHandler, @unchecked
}

func channelInactive(context: ChannelHandlerContext) {
connection.peerClosed()
finishActiveStream()
context.fireChannelInactive()
}

func userInboundEventTriggered(context: ChannelHandlerContext, event: Any) {
if case ChannelEvent.inputClosed = event {
connection.peerClosed()
finishActiveStream()
context.close(promise: nil)
return
Expand All @@ -1222,6 +1281,7 @@ private final class CodexReviewMCPHTTPHandler: ChannelInboundHandler, @unchecked
}

func errorCaught(context: ChannelHandlerContext, error: any Error) {
connection.transportFailed(error.localizedDescription)
finishActiveStream()
context.close(promise: nil)
}
Expand Down
Loading