Merge branch 'main' into gb-uuid-extraction

Author: glbrntt

Sources/Examples/HelloWorld/Client/main.swift renamed to Sources/Examples/HelloWorld/Client/HelloWorldClient.swift

@@ -21,6 +21,7 @@ import NIOCore
 import NIOPosix
 
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@main
 struct HelloWorld: AsyncParsableCommand {
   @Option(help: "The port to connect to")
   var port: Int = 1234
@@ -67,4 +68,11 @@ struct HelloWorld: AsyncParsableCommand {
     }
   }
 }
+#else
+@main
+enum HelloWorld {
+  static func main() {
+    fatalError("This example requires swift >= 5.6")
+  }
+}
 #endif // compiler(>=5.6)

Sources/Examples/HelloWorld/Server/main.swift renamed to Sources/Examples/HelloWorld/Server/HelloWorldServer.swift

@@ -21,6 +21,7 @@ import NIOCore
 import NIOPosix
 
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@main
 struct HelloWorld: AsyncParsableCommand {
   @Option(help: "The port to listen on for new connections")
   var port = 1234
@@ -43,4 +44,11 @@ struct HelloWorld: AsyncParsableCommand {
     try await server.onClose.get()
   }
 }
+#else
+@main
+enum HelloWorld {
+  static func main() {
+    fatalError("This example requires swift >= 5.6")
+  }
+}
 #endif // compiler(>=5.6)

Sources/GRPC/ClientConnection.swift

@@ -454,9 +454,15 @@ extension ClientConnection {
     /// used to add additional handlers to the pipeline and is intended for debugging.
     ///
     /// - Warning: The initializer closure may be invoked *multiple times*.
-    public var debugChannelInitializer: GRPCChannelInitializer?
+    #if compiler(>=5.6)
+    @preconcurrency
+    public var debugChannelInitializer: (@Sendable (Channel) -> EventLoopFuture<Void>)?
+    #else
+    public var debugChannelInitializer: ((Channel) -> EventLoopFuture<Void>)?
+    #endif
 
     #if canImport(NIOSSL)
+    #if compiler(>=5.6)
     /// Create a `Configuration` with some pre-defined defaults. Prefer using
     /// `ClientConnection.secure(group:)` to build a connection secured with TLS or
     /// `ClientConnection.insecure(group:)` to build a plaintext connection.
@@ -480,6 +486,7 @@ extension ClientConnection {
     /// - Parameter debugChannelInitializer: A channel initializer will be called after gRPC has
     ///     initialized the channel. Defaults to `nil`.
     @available(*, deprecated, renamed: "default(target:eventLoopGroup:)")
+    @preconcurrency
     public init(
       target: ConnectionTarget,
       eventLoopGroup: EventLoopGroup,
@@ -496,7 +503,7 @@ extension ClientConnection {
         label: "io.grpc",
         factory: { _ in SwiftLogNoOpLogHandler() }
       ),
-      debugChannelInitializer: GRPCChannelInitializer? = nil
+      debugChannelInitializer: (@Sendable (Channel) -> EventLoopFuture<Void>)? = nil
     ) {
       self.target = target
       self.eventLoopGroup = eventLoopGroup
@@ -512,6 +519,41 @@ extension ClientConnection {
       self.backgroundActivityLogger = backgroundActivityLogger
       self.debugChannelInitializer = debugChannelInitializer
     }
+    #else
+    @available(*, deprecated, renamed: "default(target:eventLoopGroup:)")
+    public init(
+      target: ConnectionTarget,
+      eventLoopGroup: EventLoopGroup,
+      errorDelegate: ClientErrorDelegate? = LoggingClientErrorDelegate(),
+      connectivityStateDelegate: ConnectivityStateDelegate? = nil,
+      connectivityStateDelegateQueue: DispatchQueue? = nil,
+      tls: Configuration.TLS? = nil,
+      connectionBackoff: ConnectionBackoff? = ConnectionBackoff(),
+      connectionKeepalive: ClientConnectionKeepalive = ClientConnectionKeepalive(),
+      connectionIdleTimeout: TimeAmount = .minutes(30),
+      callStartBehavior: CallStartBehavior = .waitsForConnectivity,
+      httpTargetWindowSize: Int = 8 * 1024 * 1024,
+      backgroundActivityLogger: Logger = Logger(
+        label: "io.grpc",
+        factory: { _ in SwiftLogNoOpLogHandler() }
+      ),
+      debugChannelInitializer: ((Channel) -> EventLoopFuture<Void>)? = nil
+    ) {
+      self.target = target
+      self.eventLoopGroup = eventLoopGroup
+      self.errorDelegate = errorDelegate
+      self.connectivityStateDelegate = connectivityStateDelegate
+      self.connectivityStateDelegateQueue = connectivityStateDelegateQueue
+      self.tlsConfiguration = tls.map { GRPCTLSConfiguration(transforming: $0) }
+      self.connectionBackoff = connectionBackoff
+      self.connectionKeepalive = connectionKeepalive
+      self.connectionIdleTimeout = connectionIdleTimeout
+      self.callStartBehavior = callStartBehavior
+      self.httpTargetWindowSize = httpTargetWindowSize
+      self.backgroundActivityLogger = backgroundActivityLogger
+      self.debugChannelInitializer = debugChannelInitializer
+    }
+    #endif // compiler(>=5.6)
     #endif // canImport(NIOSSL)
 
     private init(eventLoopGroup: EventLoopGroup, target: ConnectionTarget) {

Sources/GRPC/ConnectionPool/GRPCChannelPool.swift

@@ -167,7 +167,12 @@ extension GRPCChannelPool {
     /// This may be used to add additional handlers to the pipeline and is intended for debugging.
     ///
     /// - Warning: The initializer closure may be invoked *multiple times*.
-    public var debugChannelInitializer: GRPCChannelInitializer?
+    #if compiler(>=5.6)
+    @preconcurrency
+    public var debugChannelInitializer: (@Sendable (Channel) -> EventLoopFuture<Void>)?
+    #else
+    public var debugChannelInitializer: ((Channel) -> EventLoopFuture<Void>)?
+    #endif
 
     /// An error delegate which is called when errors are caught.
     public var errorDelegate: ClientErrorDelegate?

Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift

@@ -315,13 +315,24 @@ extension ClientConnection.Builder {
   /// used to add additional handlers to the pipeline and is intended for debugging.
   ///
   /// - Warning: The initializer closure may be invoked *multiple times*.
+  #if compiler(>=5.6)
   @discardableResult
+  @preconcurrency
   public func withDebugChannelInitializer(
-    _ debugChannelInitializer: @escaping GRPCChannelInitializer
+    _ debugChannelInitializer: @Sendable @escaping (Channel) -> EventLoopFuture<Void>
   ) -> Self {
     self.configuration.debugChannelInitializer = debugChannelInitializer
     return self
   }
+  #else
+  @discardableResult
+  public func withDebugChannelInitializer(
+    _ debugChannelInitializer: @escaping (Channel) -> EventLoopFuture<Void>
+  ) -> Self {
+    self.configuration.debugChannelInitializer = debugChannelInitializer
+    return self
+  }
+  #endif
 }
 
 extension Double {