Add Sec-WebSocket-Protocol header

Tests all use test.mosquitto.org server now

Author: adam-fowler

Sources/MQTTNIO/MQTTChannelHandlers.swift

@@ -30,7 +30,6 @@ struct ByteToMQTTMessageDecoder: ByteToMessageDecoder {
 
     mutating func decode(context: ChannelHandlerContext, buffer: inout ByteBuffer) throws -> DecodingState {
         do {
-            //print(buffer.readableBytesView.map {String(format: "0x%02x", $0)})
             let packet = try MQTTSerializer.readIncomingPacket(from: &buffer)
             let message: MQTTInboundMessage
             switch packet.type {

Sources/MQTTNIO/WebSocketInitialRequest.swift

@@ -24,6 +24,7 @@ final class WebSocketInitialRequestHandler: ChannelInboundHandler, RemovableChan
         headers.add(name: "Content-Type", value: "text/plain; charset=utf-8")
         headers.add(name: "Content-Length", value: "\(0)")
         headers.add(name: "host", value: host)
+        headers.add(name: "Sec-WebSocket-Protocol", value: "mqttv3.1")
 
         let requestHead = HTTPRequestHead(version: HTTPVersion(major: 1, minor: 1),
                                           method: .GET,

Tests/MQTTNIOTests/MQTTNIOTests.swift

@@ -1,5 +1,6 @@
 import XCTest
 import NIO
+import NIOHTTP1
 import NIOSSL
 @testable import MQTTNIO
 
@@ -32,27 +33,27 @@ final class MQTTNIOTests: XCTestCase {
     m/XriWr/Cq4h/JfB7NTsezVslgkBaoU=
     -----END CERTIFICATE-----
     """
-    
+
     func createClient(cb: @escaping (Result<MQTTPublishInfo, Swift.Error>) -> () = { _ in }) -> MQTTClient {
-        MQTTClient(host: "mqtt.eclipse.org", port: 1883, eventLoopGroupProvider: .createNew, publishCallback: cb)
+        MQTTClient(host: "test.mosquitto.org", port: 1883, eventLoopGroupProvider: .createNew, publishCallback: cb)
     }
     func createWebSocketClient(cb: @escaping (Result<MQTTPublishInfo, Swift.Error>) -> () = { _ in }) -> MQTTClient {
         MQTTClient(
-            host: "broker.hivemq.com",
-            port: 8000,
+            host: "test.mosquitto.org",
+            port: 8080,
             eventLoopGroupProvider: .createNew,
             configuration: .init(useWebSockets: true, webSocketURLPath: "/mqtt"),
             publishCallback: cb
         )
     }
     func createSSLClient(cb: @escaping (Result<MQTTPublishInfo, Swift.Error>) -> () = { _ in }) throws -> MQTTClient {
         let rootCertificate = try NIOSSLCertificate.fromPEMBytes([UInt8](mosquittoCertificate.utf8))
-        //let key = try NIOSSLPrivateKey(bytes: [UInt8](macbookProKey.utf8), format: .pem)
         let tlsConfiguration: TLSConfiguration? = TLSConfiguration.forClient(
             trustRoots: .certificates(rootCertificate)
         )
         return MQTTClient(
             host: "test.mosquitto.org",
+            port: 8883,
             eventLoopGroupProvider: .createNew,
             configuration: .init(useSSL: true, tlsConfiguration: tlsConfiguration),
             publishCallback: cb