Change API to allow only customisation of NWParameters, not bootstraps

Author: gjcairo

Package.swift

@@ -40,7 +40,7 @@ let packageDependencies: [Package.Dependency] = [
   ),
   .package(
     url: "https://github.com/apple/swift-nio-transport-services.git",
-    from: "1.15.0"
+    from: "1.24.0"
   ),
   .package(
     url: "https://github.com/apple/swift-nio-extras.git",

Sources/GRPC/ClientConnection.swift

@@ -33,6 +33,10 @@ import Foundation
 import NIOSSL
 #endif
 
+#if canImport(Network)
+import Network
+#endif
+
 /// Provides a single, managed connection to a server which is guaranteed to always use the same
 /// `EventLoop`.
 ///
@@ -472,13 +476,9 @@ extension ClientConnection {
     #if canImport(Network)
     /// A closure allowing to customise the `NWParameters` used when establising a connection using NIOTransportServices.
     @available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *)
-    public var nwParametersConfigurator: (
-      @Sendable (NIOTSConnectionBootstrap) -> Void
-    )? {
+    public var nwParametersConfigurator: (@Sendable (NWParameters) -> Void)? {
       get {
-        return self._nwParametersConfigurator as! (
-          @Sendable (NIOTSConnectionBootstrap) -> Void
-        )?
+        self._nwParametersConfigurator as! (@Sendable (NWParameters) -> Void)?
       }
       set {
         self._nwParametersConfigurator = newValue

Sources/GRPC/ConnectionManagerChannelProvider.swift

@@ -22,6 +22,10 @@ import NIOTransportServices
 import NIOSSL
 #endif
 
+#if canImport(Network)
+import Network
+#endif
+
 @usableFromInline
 internal protocol ConnectionManagerChannelProvider {
   /// Make an `EventLoopFuture<Channel>`.
@@ -75,13 +79,9 @@ internal struct DefaultChannelProvider: ConnectionManagerChannelProvider {
   #if canImport(Network)
   @available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *)
   @usableFromInline
-  internal var nwParametersConfigurator: (
-    @Sendable (NIOTSConnectionBootstrap) -> Void
-  )? {
+  internal var nwParametersConfigurator: (@Sendable (NWParameters) -> Void)? {
     get {
-      return self._nwParametersConfigurator as! (
-        @Sendable (NIOTSConnectionBootstrap) -> Void
-      )?
+      self._nwParametersConfigurator as! (@Sendable (NWParameters) -> Void)?
     }
     set {
       self._nwParametersConfigurator = newValue
@@ -104,7 +104,7 @@ internal struct DefaultChannelProvider: ConnectionManagerChannelProvider {
     httpMaxFrameSize: Int,
     errorDelegate: ClientErrorDelegate?,
     debugChannelInitializer: ((Channel) -> EventLoopFuture<Void>)?,
-    nwParametersConfigurator: (@Sendable (NIOTSConnectionBootstrap) -> Void)?
+    nwParametersConfigurator: (@Sendable (NWParameters) -> Void)?
   ) {
     self.init(
       connectionTarget: connectionTarget,
@@ -269,8 +269,8 @@ internal struct DefaultChannelProvider: ConnectionManagerChannelProvider {
         #if canImport(Network)
         if #available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *),
            let configurator = self.nwParametersConfigurator,
-           let niotsBootstrap = bootstrap as? NIOTSConnectionBootstrap {
-          configurator(niotsBootstrap)
+           let transportServicesBootstrap = bootstrap as? NIOTSConnectionBootstrap {
+          _ = transportServicesBootstrap.configureNWParameters(configurator)
         }
         #endif
 

Sources/GRPC/ConnectionPool/GRPCChannelPool.swift

@@ -18,7 +18,7 @@ import NIOCore
 import NIOPosix
 
 #if canImport(Network)
-import NIOTransportServices
+import Network
 #endif
 
 import struct Foundation.UUID
@@ -322,13 +322,9 @@ extension GRPCChannelPool.Configuration {
 
     /// A closure allowing to customise the `NWParameters` used when establising a connection using NIOTransportServices.
     @available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *)
-    public var nwParametersConfigurator: (
-      @Sendable (NIOTSConnectionBootstrap) -> Void
-    )? {
+    public var nwParametersConfigurator: (@Sendable (NWParameters) -> Void)? {
       get {
-        return self._nwParametersConfigurator as! (
-          @Sendable (NIOTSConnectionBootstrap) -> Void
-        )?
+        self._nwParametersConfigurator as! (@Sendable (NWParameters) -> Void)?
       }
       set {
         self._nwParametersConfigurator = newValue

Sources/GRPC/Server.swift

@@ -129,9 +129,9 @@ public final class Server: @unchecked Sendable {
     }
 
     if #available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *),
-       let nwParametersConfigurator = configuration.nwParametersConfigurator,
+       let configurator = configuration.nwParametersConfigurator,
        let transportServicesBootstrap = bootstrap as? NIOTSListenerBootstrap {
-        nwParametersConfigurator(transportServicesBootstrap)
+      _ = transportServicesBootstrap.configureNWParameters(configurator)
     }
     #endif  // canImport(Network)
 
@@ -393,13 +393,9 @@ extension Server {
     #if canImport(Network)
     /// A closure allowing to customise the `NWParameters` used when establising a connection using NIOTransportServices.
     @available(macOS 10.14, iOS 12.0, watchOS 6.0, tvOS 12.0, *)
-    public var nwParametersConfigurator: (
-      @Sendable (NIOTSListenerBootstrap) -> Void
-    )? {
+    public var nwParametersConfigurator: (@Sendable (NWParameters) -> Void)? {
       get {
-        return self._nwParametersConfigurator as! (
-          @Sendable (NIOTSListenerBootstrap) -> Void
-        )?
+        self._nwParametersConfigurator as! (@Sendable (NWParameters) -> Void)?
       }
       set {
         self._nwParametersConfigurator = newValue