-
Notifications
You must be signed in to change notification settings - Fork 93
Add a server connection manager #532
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.
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
Merged
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
0e06179
Bring ServerConnectionManagementHandler and associated files from gRP…
aryan-25 be27e7b
Add a server connection manager
aryan-25 a4f06b6
Update documentation
aryan-25 ce91534
Add documentation for `configureAsyncHTTP2Pipeline`
aryan-25 0b845ab
Add `NIOHTTP2` prefix to file names
aryan-25 be04127
Merge branch 'main' into server-connection-manager
aryan-25 ecb5630
Address feedback from review
aryan-25 f9377f4
Remove redundant `public` modifiers
aryan-25 c60a29a
Remove `repeating` property from `Timer`; make `Timer` conform to `Se…
aryan-25 7dcde4c
Make handler views `Sendable`
aryan-25 3b22bd2
Make stream delegate `Sendable`
aryan-25 3123363
Replace `assert` check with `preconditionInEventLoop()`
aryan-25 112133c
Remove redundant func
aryan-25 825f70b
Merge branch 'main' into server-connection-manager
aryan-25 8286cd7
Suppress `NoBlockComments` formatting errors
aryan-25 03f8720
Update documentation for `Configuration`
aryan-25 9a9ebec
Remove default argument for `ackTimeout`
aryan-25 c50b7a4
Propagate error forward in `errorCaught`
aryan-25 1b0a455
Remove `errorCaught()` function; let default implementation propagate…
aryan-25 b564fc0
Remove in-event-loop assertions from `Timer`
aryan-25 92aa96e
Add a default configuration property
aryan-25 fe56484
Merge branch 'main' into server-connection-manager
aryan-25 945121b
Run formatter
aryan-25 d681526
Remove handling of ping where ack flag not set
aryan-25 23700d4
Remove `Clock`; not used anywhere
aryan-25 99787fb
Remove dead code
aryan-25 3d6e195
Add comment about NIOHTTP2Handler handling PING frames where ACK flag…
aryan-25 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
292 changes: 292 additions & 0 deletions
292
Sources/NIOHTTP2/ServerConnectionManagementHandler+StateMachine.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,292 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the SwiftNIO open source project | ||
| // | ||
| // Copyright (c) 2026 Apple Inc. and the SwiftNIO project authors | ||
| // Licensed under Apache License v2.0 | ||
| // | ||
| // See LICENSE.txt for license information | ||
| // See CONTRIBUTORS.txt for the list of SwiftNIO project authors | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| /* | ||
| * Copyright 2024, gRPC Authors All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import NIOCore | ||
|
|
||
| extension NIOHTTP2ServerConnectionManagementHandler { | ||
| /// Tracks the state of TCP connections at the server. | ||
| /// | ||
| /// The state machine manages the state for the graceful shutdown procedure. | ||
| struct StateMachine { | ||
| /// Current state. | ||
| private var state: State | ||
|
|
||
| /// Opaque data sent to the client in a PING frame after emitting the first GOAWAY frame | ||
| /// as part of graceful shutdown. | ||
| private let goAwayPingData: HTTP2PingData | ||
|
|
||
| /// Whether the connection is currently closing. | ||
| var isClosing: Bool { | ||
| self.state.isClosing | ||
| } | ||
|
|
||
| /// Create a new state machine. | ||
| /// | ||
| /// - Parameters: | ||
| /// - goAwayPingData: Opaque data sent to the client in a PING frame when the server | ||
| /// initiates graceful shutdown. | ||
| init(goAwayPingData: HTTP2PingData = HTTP2PingData(withInteger: .random(in: .min ... .max))) { | ||
| self.state = .active(State.Active()) | ||
| self.goAwayPingData = goAwayPingData | ||
| } | ||
|
|
||
| /// Record that the stream with the given ID has been opened. | ||
| mutating func streamOpened(_ id: HTTP2StreamID) { | ||
| switch self.state { | ||
| case .active(var state): | ||
| self.state = ._modifying | ||
| state.lastStreamID = id | ||
| let (inserted, _) = state.openStreams.insert(id) | ||
| assert(inserted, "Can't open stream \(Int(id)), it's already open") | ||
| self.state = .active(state) | ||
|
|
||
| case .closing(var state): | ||
| self.state = ._modifying | ||
| state.lastStreamID = id | ||
| let (inserted, _) = state.openStreams.insert(id) | ||
| assert(inserted, "Can't open stream \(Int(id)), it's already open") | ||
| self.state = .closing(state) | ||
|
|
||
| case .closed: | ||
| () | ||
|
|
||
| case ._modifying: | ||
| preconditionFailure() | ||
| } | ||
| } | ||
|
|
||
| enum OnStreamClosed: Equatable { | ||
| /// Start the idle timer, after which the connection should be closed gracefully. | ||
| case startIdleTimer | ||
| /// Close the connection. | ||
| case close | ||
| /// Do nothing. | ||
| case none | ||
| } | ||
|
|
||
| /// Record that the stream with the given ID has been closed. | ||
| mutating func streamClosed(_ id: HTTP2StreamID) -> OnStreamClosed { | ||
| let onStreamClosed: OnStreamClosed | ||
|
|
||
| switch self.state { | ||
| case .active(var state): | ||
| self.state = ._modifying | ||
| let removedID = state.openStreams.remove(id) | ||
| assert(removedID != nil, "Can't close stream \(Int(id)), it wasn't open") | ||
| onStreamClosed = state.openStreams.isEmpty ? .startIdleTimer : .none | ||
| self.state = .active(state) | ||
|
|
||
| case .closing(var state): | ||
| self.state = ._modifying | ||
| let removedID = state.openStreams.remove(id) | ||
| assert(removedID != nil, "Can't close stream \(Int(id)), it wasn't open") | ||
| // If the second GOAWAY hasn't been sent it isn't safe to close if there are no open | ||
| // streams: the client may have opened a stream which the server doesn't know about yet. | ||
| let canClose = state.sentSecondGoAway && state.openStreams.isEmpty | ||
| onStreamClosed = canClose ? .close : .none | ||
| self.state = .closing(state) | ||
|
|
||
| case .closed: | ||
| onStreamClosed = .none | ||
|
|
||
| case ._modifying: | ||
| preconditionFailure() | ||
| } | ||
|
|
||
| return onStreamClosed | ||
| } | ||
|
|
||
| enum OnPing: Equatable { | ||
| /// Send a GOAWAY frame with the code "enhance your calm" and immediately close the connection. | ||
| case enhanceYourCalmThenClose(HTTP2StreamID) | ||
| /// Acknowledge the ping. | ||
| case sendAck | ||
| /// Ignore the ping. | ||
| case none | ||
| } | ||
|
|
||
| /// Received a ping with the given data. | ||
| /// | ||
| /// - Parameters: | ||
| /// - time: The time at which the ping was received. | ||
| /// - data: The data sent with the ping. | ||
| mutating func receivedPing(atTime time: NIODeadline, data: HTTP2PingData) -> OnPing { | ||
| let onPing: OnPing | ||
|
|
||
| switch self.state { | ||
| case .active(let state): | ||
| self.state = ._modifying | ||
|
|
||
| onPing = .sendAck | ||
| self.state = .active(state) | ||
|
|
||
| case .closing(let state): | ||
| self.state = ._modifying | ||
|
|
||
| onPing = .sendAck | ||
| self.state = .closing(state) | ||
|
|
||
| case .closed: | ||
| onPing = .none | ||
|
|
||
| case ._modifying: | ||
| preconditionFailure() | ||
| } | ||
|
|
||
| return onPing | ||
| } | ||
|
|
||
| enum OnPingAck: Equatable { | ||
| /// Send a GOAWAY frame with no error and the given last stream ID, optionally closing the | ||
| /// connection immediately afterwards. | ||
| case sendGoAway(lastStreamID: HTTP2StreamID, close: Bool) | ||
| /// Ignore the ack. | ||
| case none | ||
| } | ||
|
|
||
| /// Received a PING frame with the 'ack' flag set. | ||
| mutating func receivedPingAck(data: HTTP2PingData) -> OnPingAck { | ||
| let onPingAck: OnPingAck | ||
|
|
||
| switch self.state { | ||
| case .closing(var state): | ||
| self.state = ._modifying | ||
|
|
||
| // If only one GOAWAY has been sent and the data matches the data from the GOAWAY ping then | ||
| // the server should send another GOAWAY ratcheting down the last stream ID. If no streams | ||
| // are open then the server can close the connection immediately after, otherwise it must | ||
| // wait until all streams are closed. | ||
| if !state.sentSecondGoAway, data == self.goAwayPingData { | ||
| state.sentSecondGoAway = true | ||
|
|
||
| if state.openStreams.isEmpty { | ||
| self.state = .closed | ||
| onPingAck = .sendGoAway(lastStreamID: state.lastStreamID, close: true) | ||
| } else { | ||
| self.state = .closing(state) | ||
| onPingAck = .sendGoAway(lastStreamID: state.lastStreamID, close: false) | ||
| } | ||
| } else { | ||
| onPingAck = .none | ||
| } | ||
|
|
||
| self.state = .closing(state) | ||
|
|
||
| case .active, .closed: | ||
| onPingAck = .none | ||
|
|
||
| case ._modifying: | ||
| preconditionFailure() | ||
| } | ||
|
|
||
| return onPingAck | ||
| } | ||
|
|
||
| enum OnStartGracefulShutdown: Equatable { | ||
| /// Initiate graceful shutdown by sending a GOAWAY frame with the last stream ID set as the max | ||
| /// stream ID and no error. Follow it immediately with a PING frame with the given data. | ||
| case sendGoAwayAndPing(HTTP2PingData) | ||
| /// Ignore the request to start graceful shutdown. | ||
| case none | ||
| } | ||
|
|
||
| /// Request that the connection begins graceful shutdown. | ||
| mutating func startGracefulShutdown() -> OnStartGracefulShutdown { | ||
| let onStartGracefulShutdown: OnStartGracefulShutdown | ||
|
|
||
| switch self.state { | ||
| case .active(let state): | ||
| self.state = .closing(State.Closing(from: state)) | ||
| onStartGracefulShutdown = .sendGoAwayAndPing(self.goAwayPingData) | ||
|
|
||
| case .closing, .closed: | ||
| onStartGracefulShutdown = .none | ||
|
|
||
| case ._modifying: | ||
| preconditionFailure() | ||
| } | ||
|
|
||
| return onStartGracefulShutdown | ||
| } | ||
|
|
||
| /// Marks the state as closed. | ||
| mutating func markClosed() { | ||
| self.state = .closed | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension NIOHTTP2ServerConnectionManagementHandler.StateMachine { | ||
| fileprivate enum State { | ||
| /// The connection is active. | ||
| struct Active { | ||
| /// The number of open streams. | ||
| var openStreams: Set<HTTP2StreamID> | ||
| /// The ID of the most recently opened stream (zero indicates no streams have been opened yet). | ||
| var lastStreamID: HTTP2StreamID | ||
|
|
||
| init() { | ||
| self.openStreams = [] | ||
| self.lastStreamID = .rootStream | ||
| } | ||
| } | ||
|
|
||
| /// The connection is closing gracefully, an initial GOAWAY frame has been sent (with the | ||
| /// last stream ID set to max). | ||
| struct Closing { | ||
| /// The number of open streams. | ||
| var openStreams: Set<HTTP2StreamID> | ||
| /// The ID of the most recently opened stream (zero indicates no streams have been opened yet). | ||
| var lastStreamID: HTTP2StreamID | ||
| /// Whether the second GOAWAY frame has been sent with a lower stream ID. | ||
| var sentSecondGoAway: Bool | ||
|
|
||
| init(from state: Active) { | ||
| self.openStreams = state.openStreams | ||
| self.lastStreamID = state.lastStreamID | ||
| self.sentSecondGoAway = false | ||
| } | ||
| } | ||
|
|
||
| case active(Active) | ||
| case closing(Closing) | ||
| case closed | ||
| case _modifying | ||
|
|
||
| var isClosing: Bool { | ||
| switch self { | ||
| case .closing: | ||
| return true | ||
| case .active, .closed, ._modifying: | ||
| return false | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Passing in the handler is a bit odd. It'd be more idiomatic to pass in the config for the handler and have this func create the handler for the caller.