Merge branch 'main' into fix-generate-test-clients

grpc · Jan 22, 2024 · d5cedf7 · d5cedf7
2 parents 0fb60da + 941f500
commit d5cedf7
Show file tree

Hide file tree

Showing 7 changed files with 955 additions and 28 deletions.
diff --git a/Package.swift b/Package.swift
@@ -306,7 +306,10 @@ extension Target {
   static let grpcHTTP2CoreTests: Target = .testTarget(
     name: "GRPCHTTP2CoreTests",
     dependencies: [
-      .grpcHTTP2Core
+      .grpcHTTP2Core,
+      .nioCore,
+      .nioHTTP2,
+      .nioEmbedded,
     ]
   )
 

diff --git a/Sources/GRPCHTTP2Core/Server/Connection/ServerConnectionHandler.swift b/Sources/GRPCHTTP2Core/Server/Connection/ServerConnectionHandler.swift
diff --git a/...erverConnectionHandler+StateMachine.swift → ...ctionManagementHandler+StateMachine.swift b/...erverConnectionHandler+StateMachine.swift → ...ctionManagementHandler+StateMachine.swift
@@ -17,7 +17,7 @@
 import NIOCore
 import NIOHTTP2
 
-extension ServerConnectionHandler {
+extension ServerConnectionManagementHandler {
   /// Tracks the state of TCP connections at the server.
   ///
   /// The state machine manages the state for the graceful shutdown procedure as well as policing
@@ -248,7 +248,7 @@ extension ServerConnectionHandler {
   }
 }
 
-extension ServerConnectionHandler.StateMachine {
+extension ServerConnectionManagementHandler.StateMachine {
   fileprivate struct KeepAlive {
     /// Allow the client to send keep alive pings when there are no active calls.
     private let allowWithoutCalls: Bool
@@ -267,8 +267,7 @@ extension ServerConnectionHandler.StateMachine {
     /// alive (a low number of strikes is therefore expected and okay).
     private var pingStrikes: Int
 
-    /// The last time a valid ping happened. This may be in the distant past if there is no such
-    /// time (for example the connection is new and there are no active calls).
+    /// The last time a valid ping happened.
     ///
     /// Note: `distantPast` isn't used to indicate no previous valid ping as `NIODeadline` uses
     /// the monotonic clock on Linux which uses an undefined starting point and in some cases isn't
@@ -320,7 +319,7 @@ extension ServerConnectionHandler.StateMachine {
   }
 }
 
-extension ServerConnectionHandler.StateMachine {
+extension ServerConnectionManagementHandler.StateMachine {
   fileprivate enum State {
     /// The connection is active.
     struct Active {