various fixes

Author: johnnzhou

Sources/LCLWebSocket/Client/WebSocketClient.swift

@@ -341,36 +341,40 @@ extension WebSocketClient {
     ) -> ChannelInitializer {
         @Sendable
         func makeChannelInitializer(_ channel: Channel) -> EventLoopFuture<Void> {
+            let promise = channel.eventLoop.makePromise(of: Void.self)
             if let deviceName = configuration.deviceName,
                 let device = findDevice(with: deviceName, protocol: resolvedAddress.protocol)
             {
                 // bind to selected device, if any
-                return bindTo(device: device, on: channel).flatMap { () -> EventLoopFuture<Void> in
-                    if scheme.enableTLS {
-                        // enale TLS
-                        let tlsConfig = configuration.tlsConfiguration ?? scheme.defaultTLSConfig!
-                        guard let sslContext = try? NIOSSLContext(configuration: tlsConfig) else {
-                            return channel.eventLoop.makeFailedFuture(LCLWebSocketError.tlsInitializationFailed)
-                        }
-
-                        do {
-                            let sslClientHandler = try NIOSSLClientHandler(context: sslContext, serverHostname: host)
-                            try channel.pipeline.syncOperations.addHandlers(sslClientHandler)
-                        } catch let error as NIOSSLExtraError where error == .invalidSNIHostname {
-                            do {
-                                let sslClientHandler = try NIOSSLClientHandler(context: sslContext, serverHostname: nil)
-                                try channel.pipeline.syncOperations.addHandlers(sslClientHandler)
-                            } catch {
-                                return channel.eventLoop.makeFailedFuture(error)
-                            }
-                        } catch {
-                            return channel.eventLoop.makeFailedFuture(error)
-                        }
+                bindTo(device: device, on: channel).cascadeFailure(to: promise)
+            }
+            
+            if scheme.enableTLS {
+                // enale TLS
+                let tlsConfig = configuration.tlsConfiguration ?? scheme.defaultTLSConfig!
+                guard let sslContext = try? NIOSSLContext(configuration: tlsConfig) else {
+                    promise.fail(LCLWebSocketError.tlsInitializationFailed)
+                    return promise.futureResult
+                }
+
+                do {
+                    let sslClientHandler = try NIOSSLClientHandler(context: sslContext, serverHostname: host)
+                    try channel.pipeline.syncOperations.addHandlers(sslClientHandler)
+                } catch let error as NIOSSLExtraError where error == .invalidSNIHostname {
+                    do {
+                        let sslClientHandler = try NIOSSLClientHandler(context: sslContext, serverHostname: nil)
+                        try channel.pipeline.syncOperations.addHandlers(sslClientHandler)
+                    } catch {
+                        promise.fail(error)
+                        return promise.futureResult
                     }
-                    return channel.eventLoop.makeSucceededVoidFuture()
+                } catch {
+                    promise.fail(error)
+                    return promise.futureResult
                 }
             }
-            return channel.eventLoop.makeSucceededVoidFuture()
+            promise.succeed()
+            return promise.futureResult
         }
 
         return makeChannelInitializer

Sources/LCLWebSocket/Server/WebSocketServer.swift

@@ -276,6 +276,7 @@ extension WebSocketServer {
                     if let deviceName = configuration.deviceName,
                         let device = findDevice(with: deviceName, protocol: resolvedAddress.protocol)
                     {
+                        logger.debug("deviceName \(deviceName), device \(device)")
                         return bindTo(device: device, on: channel)
                     }
 

Sources/LCLWebSocket/WebSocketConfiguration.swift

@@ -81,6 +81,9 @@ extension LCLWebSocket {
 
         /// The network device name on the system to route the traffic to.
         ///
+        /// If the device associated with the given `deviceName` is not found, then the WebSocket will
+        /// be bound to the default interface according to the operating system's choice.
+        ///
         /// - Note: You might need root privileges to use this feature.
         var deviceName: String?
 

Sources/LCLWebSocket/WebSocketHandler.swift

@@ -21,13 +21,15 @@ final class WebSocketHandler: ChannelInboundHandler {
         self.websocket = websocket
     }
 
+    #if DEBUG
     func channelInactive(context: ChannelHandlerContext) {
         logger.debug("WebSocketHandler channelInactive")
     }
 
     func channelUnregistered(context: ChannelHandlerContext) {
         logger.debug("WebSocketHandler channelUnregistered")
     }
+    #endif // DEBUG
 
     func channelRead(context: ChannelHandlerContext, data: NIOAny) {
         let frame = self.unwrapInboundIn(data)