NIOLock (#123)

* typo

* NIOLock

* Update GH Actions

Author: adam-fowler

.github/workflows/api-breakage.yml

@@ -7,7 +7,7 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     container:
-      image: swift:5.6-focal
+      image: swift:5.7
     steps:
     - name: Checkout
       uses: actions/checkout@v3

.github/workflows/ci.yml

@@ -48,10 +48,10 @@ jobs:
     strategy:
       matrix:
         tag:
-          - swift:5.3
           - swift:5.4
           - swift:5.5
           - swift:5.6
+          - swift:5.7
     container:
       image: ${{ matrix.tag }}
     services:

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.33.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.42.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
         .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.6.0"),
     ],

Sources/MQTTNIO/MQTTClient.swift

@@ -82,6 +82,12 @@ public final class MQTTClient {
     /// flag to tell is client is shutdown
     private let isShutdown = ManagedAtomic(false)
 
+    #if swift(>=5.6)
+    typealias ShutdownCallback = @Sendable (Error?) -> Void
+    #else
+    typealias ShutdownCallback = (Error?) -> Void
+    #endif
+
     /// Create MQTT client
     /// - Parameters:
     ///   - host: host name
@@ -160,7 +166,7 @@ public final class MQTTClient {
             Current eventLoop: \(eventLoop)
             """)
         }
-        let errorStorageLock = Lock()
+        let errorStorageLock = NIOLock()
         var errorStorage: Error?
         let continuation = DispatchWorkItem {}
         self.shutdown(queue: DispatchQueue(label: "mqtt-client.shutdown")) { error in
@@ -403,7 +409,7 @@ public final class MQTTClient {
     var closeListeners = MQTTListeners<Void>()
     var shutdownListeners = MQTTListeners<Void>()
     private var _connection: MQTTConnection?
-    private var lock = Lock()
+    private var lock = NIOLock()
 }
 
 internal extension MQTTClient {

Sources/MQTTNIO/MQTTCoreTypes.swift

@@ -99,7 +99,7 @@ public struct MQTTSuback: _MQTTSendable {
         case failure = 0x80
     }
 
-    /// MQTT v5 subscribute return codes
+    /// MQTT v5 subscribe return codes
     public let returnCodes: [ReturnCode]
 
     init(returnCodes: [MQTTSuback.ReturnCode]) {

Sources/MQTTNIO/MQTTInflight.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the MQTTNIO project
 //
-// Copyright (c) 2020-2021 Adam Fowler
+// Copyright (c) 2020-2022 Adam Fowler
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -17,7 +17,7 @@ import NIOConcurrencyHelpers
 /// Array of inflight packets. Used to resend packets when reconnecting to server
 struct MQTTInflight {
     init() {
-        self.lock = Lock()
+        self.lock = NIOLock()
         self.packets = .init(initialCapacity: 4)
     }
 
@@ -43,6 +43,6 @@ struct MQTTInflight {
         }
     }
 
-    private let lock: Lock
+    private let lock: NIOLock
     private(set) var packets: CircularBuffer<MQTTPacket>
 }

Sources/MQTTNIO/MQTTListeners.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the MQTTNIO project
 //
-// Copyright (c) 2020-2021 Adam Fowler
+// Copyright (c) 2020-2022 Adam Fowler
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -37,6 +37,6 @@ struct MQTTListeners<ReturnType> {
         }
     }
 
-    private let lock = Lock()
+    private let lock = NIOLock()
     private var listeners: [String: Listener] = [:]
 }