Fix reference cycle created by listeners that reference the client (#129)

adam-fowler · web-flow · commit ed55271ce51c · 2022-12-05T18:39:05.000Z
* Call shutdown listener once

* Clear listeners in shutdown

This will remove any reference cycle where the listener references the client

* Rebuild test certificates

* Build CI docker image for linux/amd64

* Add comment
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,6 +55,8 @@ jobs:
     container:
       image: ${{ matrix.tag }}
     services:
+      # need to update docker image if you update the certificates
+      # run `build-docker-ci-image.sh` 
       mosquitto:
         image: adamfowlerphoto/mqttnio-mosquitto
         ports:
diff --git a/Sources/MQTTNIO/MQTTClient.swift b/Sources/MQTTNIO/MQTTClient.swift
@@ -201,7 +201,6 @@ public final class MQTTClient {
         }
         let eventLoop = self.eventLoopGroup.next()
         let closeFuture: EventLoopFuture<Void>
-        self.shutdownListeners.notify(.success(()))
         if let connection = self.connection {
             closeFuture = connection.close()
         } else {
@@ -216,10 +215,17 @@ public final class MQTTClient {
                 } else {
                     closeError = error
                 }
+                self.shutdownListeners.notify(.failure(error))
             case .success:
                 closeError = nil
+                self.shutdownListeners.notify(.success(()))
             }
-            self.shutdownListeners.notify(.success(()))
+            // remove all listeners as they may contain references to the client and cause
+            // a reference cycle
+            self.publishListeners.removeAll()
+            self.closeListeners.removeAll()
+            self.shutdownListeners.removeAll()
+
             self.shutdownEventLoopGroup(queue: queue) { error in
                 callback(closeError ?? error)
             }
diff --git a/Sources/MQTTNIO/MQTTListeners.swift b/Sources/MQTTNIO/MQTTListeners.swift
@@ -37,6 +37,10 @@ struct MQTTListeners<ReturnType> {
         }
     }
 
+    mutating func removeAll() {
+        self.listeners = [:]
+    }
+
     private let lock = NIOLock()
     private var listeners: [String: Listener] = [:]
 }
diff --git a/Tests/MQTTNIOTests/MQTTNIOTests.swift b/Tests/MQTTNIOTests/MQTTNIOTests.swift
@@ -94,7 +94,7 @@ final class MQTTNIOTests: XCTestCase {
     func testSSLConnect() throws {
         #if os(macOS)
         // p12 loading crashes when debugger other than Xcode is attached
-        guard !self.isVSCodeDebugging() else { throw XCTSkip() }
+        // guard !self.isVSCodeDebugging() else { throw XCTSkip() }
         #endif
 
         let client = try createSSLClient(identifier: "testSSLConnect")
@@ -107,7 +107,7 @@ final class MQTTNIOTests: XCTestCase {
     func testWebsocketAndSSLConnect() throws {
         #if os(macOS)
         // p12 loading crashes when debugger other than Xcode is attached
-        guard !self.isVSCodeDebugging() else { throw XCTSkip() }
+        // guard !self.isVSCodeDebugging() else { throw XCTSkip() }
         #endif
 
         let client = try createWebSocketAndSSLClient(identifier: "testWebsocketAndSSLConnect")
@@ -121,7 +121,7 @@ final class MQTTNIOTests: XCTestCase {
     func testSSLConnectFromP12() throws {
         #if os(macOS)
         // p12 loading crashes when debugger other than Xcode is attached
-        guard !self.isVSCodeDebugging() else { throw XCTSkip() }
+        // guard !self.isVSCodeDebugging() else { throw XCTSkip() }
         #endif
 
         let client = try MQTTClient(
@@ -506,6 +506,20 @@ final class MQTTNIOTests: XCTestCase {
         try client2.disconnect().wait()
     }
 
+    /// Check listeners don't create a reference cycle if they reference the client
+    func testListenerReferenceCycle() throws {
+        func createClient() throws -> MQTTClient? {
+            let client = self.createClient(identifier: "testListenerReferenceCycle")
+            client.addPublishListener(named: "refcycle") { _ in
+                print(client)
+            }
+            try client.syncShutdownGracefully()
+            return client
+        }
+        weak var client = try createClient()
+        XCTAssertNil(client)
+    }
+
     func testSubscribeAll() throws {
         if ProcessInfo.processInfo.environment["CI"] != nil {
             return
diff --git a/mosquitto/certs/ca.der b/mosquitto/certs/ca.der
diff --git a/mosquitto/certs/ca.key b/mosquitto/certs/ca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDDDxlrL/whSh48
-DFZhrlfAhx5ifd0v1RqBYFLF/DiA9//XPsD4RRUb8oZOqblFMDWWdERnvXRT+dlB
-IPoA+5ilN3bViTfnhusCxS5NA4WaK7RIbzkzf/OPMsrkaoLGFWymBNlMvpUpPAjD
-SALahfpNsD55pPxADP+N/wf01l/uv7xPisOSqDYMFMm5MvfK8o+LK7pfSAhZtLSo
-5quRnAvDqSD2//B8J1aaZO/X8bFLj24QbmgNxETTGx/XOosqKYXeG8/aLqHi+2h1
-o0tK+Qfd/Y/YPXmqYQxvgkWQ+rJ/Ca3UIafso7NKbE/Vl4WgJqNl4WD6NAFobTEq
-1zt2C6BvAgMBAAECggEBAKexFXM2/5VG+RM6sBCuJ7bW8uJNvpheprjPLJoVKiaG
-DqbnxlIqYely6NA7zZGTzp4YOq7NC3Meew4o4YVyx1pSgpE1tKARN31cM1/2RSez
-pvwW0qBZwfQ8AH26q87LoGpiBMabmfSnLglkoT9oqzWa7Tr7Afm2swVKWXa9zh+b
-p9/jUJYXpO+nrcfkMwJt2aPMynjTiDs/4s06Tk5vroEk4Kwyff0xQSGK8v+BSs8v
-pBhEB9YxyVf7ymwGxEPNV8HGKpWoBxJlteeCh4CbazAZ9mQtXzRDx5DXPWOCqe1b
-hFIy8TwZzO5lzbWbKC26GqOexCSZz2BrNbj+b71TyXECgYEA+wLfq3gRQthobbZL
-0nNlIUlyftFad+5klQNXoYG0i4xN88/WCyykV3IoHFxFgwjxKk4JOgv7ks4Ki/y1
-PQ8n03TGKjJM4HXnCvC0NmCCggGrzRWa6nj9LFfJYImHohpOgTgV+eavHikd4mzH
-2jerHwUY2K9lZzRKEz/h8TBT33UCgYEAxu+LdXqrVAo5GREUS/8sinvRLTULZKRO
-8SjpV67XnvbPu0+NOpQm52iFboCWZ+0q8LXc+lgkkhjQxfr1Cr0CPoGWzUS1bubf
-tjcnOldvNWBFjeFcRXysqCOT3NQyT2C8OIPptru5oyIAs+TG6166/+5ZUoZylXfV
-2K4nZ1ENR9MCgYEA1fOUHL6hz91P3bwVktNDLwVAr3HY8ALl/tGzfvlkn9G+nAPa
-SPoLNnIaWFoZ8d/MWCfd23ldPLuc58dF4D6rzqRpSIxJVMWKYpvar8LBWvj7rDov
-Ko5oFcTZ5Aw17OkJY0EgEjsbptSbIWVhT9JFbJJWpFOUVkyOmyvHdWKhCwUCgYAN
-DXKNBrtvDCyq5F/8jIWToIQc/zn8JHu5fwGwaxxipbcDhziw+z+CN21pzq4Pq5QB
-ry0Mj/P2UgKAuvKQ/c3D5CTM2xE8cZGEFyJPxaTaT7LAmGTBemipr4voFVQnuSUg
-YCdZgf+wIG8DXqNelhyW5kCeFYw3GmHBkcusD7lbWQKBgFv7OWDcILqncpvbtNco
-Ejpi6yMt1p7t0O+MvbOubg8JIk9d6YvEYhfdzaO3K/g8Wi78dBV02p7S+//HWB+j
-RA/dXCSJ9KnQSo8LGk8j7Hqm4cIhWbGHJw6nnDA3iMfCBdS7cXbnOBPGW0XniDdE
-fGgzS4qmoY9Csb6u+fVJWOzc
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoQMyD2Dqi+rBn
++G4KTySuwVGyafAXfnGCmUdyO7Rz3ACthWnh9Wij7pTvwump7U4CNEDiYa6V8P3l
+8w5AInlOIwMhG9o1oq03CUHniHmDzzpk47h0d+oF/Z8aRTe7iNfYwfcPvZjFVBvI
+nuJqgC2aEk81zBo4pUixbWHXVOXmWct2BU90qb4ZceCi6c9AF58on8gr7S8hwx6r
+CFdrb713rNCLYvUwTClq40DpYvKoCRnOr+/KjoYECzqi+dCcEBFL3KsnoaPTtxRx
+DLaRUH01rf0OF3NYYPAfHISZdcbN4qNtKrg7m3p5Pzb3O9ZFwrPxAmtSLpGiVyDF
+s1PGFYO7AgMBAAECggEBAIQoKbwh2qTrjiaMbzqvwZt2g4pFRe3eRqCTbxgeJ3ad
+xvaFBY8TqTaijt/o1IrBt/VpP9HRckWaPoQhLv9XVLr4K1wVOYfJmI7TOa34d6H9
+4tseN2NcUTiVZyRGXCl0qj461KnLfbT5hL1Hd4a52Zfca9VQ1QPLZ9bdmO1/ZPlS
+JdJ+ES6ObrFRrAoymVsYuyFV8DzpmOPNxDVjQ/MiN01T6sddvSV22UOurgd6llFJ
+i2OMXbFrXEWftbwx9+qID9ycH2VA+PYlIDWwLi5q9xOPOW5a6DvmvD083vX765uE
+eu4l2+8SvY4mT3cONovntLGsLu+v1SAbq6uQh++XGAECgYEA39+y/MUrZuW7curf
+NEIlfk8sx2gDpKQeuea4Ff1LnQE6UKSFAZf1CbRrfef1zgjjw5zAWpXEHdItwvFw
+I6vvDjvf+ptTa/ZNdQfvfbK1YZwTo6GX1viIc/yiWaRHSHjSMwP2d00P8dKHq+nt
+uHBN0G+lfUsvMbdy1rZLB0bijAECgYEAwGXMtR6vE2KY3eH7OI0Tdjttxf52GfzJ
+OCXBA4xMEYuw9Mh2wdz1iIDQOX5lq2Sl5I8z16NMKqIHQ766WL75mSWo7sjThqNc
+eNmjb8oYmztcfTFB3e+HSJQoGc5m6k+X52tBC0W/+NHna8tUJVpAe/VpKRu8jBLu
+YDbSuwIlP7sCgYAD360LLqY3m5YIwQOntdVMQDZ4JNabTLOzZ8ibqMxcJR9LMe2T
+P3vf9R0/Cnp4XDMEuXuilaDVG0PrcZ4NH/Z8+pA/l9xzq8lfUwnT1PnKfJbiZ/Nm
+ptpFl4N/pZYOLPkGJPVozw6NkqUCVoPkgxz1lFj6uAhTBeeYy4K014coAQKBgE/H
+Jn4HziLkpGyE8u29Gc/Rzq/l1sTp2+oLRaCaAUTZPrQRl6TFYY6Lk0vzzGaoYl2G
+v8FvtfqLmyWNJan87nSBeC4jWgqfHI4D+NA25cMgdzZ2QVCsrNT8kjA5NNV90Ygl
+IiBxeKvNJf+9nROr+8cquMNR+/m9M9jzgqgGuLlXAoGAByAFK57hBTUiTNxXz0oF
+VzgU4WD/6Kx8lyXHT3XXUeN6OYn4Xfhulow2PDWeW0T/iGUOXSvlUB3lr/wtxk4y
+q51G8HfoVwnPvZGOM6n1UUo4gjJbhP29J7NQW1gJ0514e+qHae6AtWqI/DaLbdGu
+EfQ1KLUe6ocgWChCit3Ty08=
 -----END PRIVATE KEY-----
diff --git a/mosquitto/certs/ca.pem b/mosquitto/certs/ca.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMPGWsv/CFKHjwMVmGuV8CHHmJ93S/V
-GoFgUsX8OID3/9c+wPhFFRvyhk6puUUwNZZ0RGe9dFP52UEg+gD7mKU3dtWJN+eG
-6wLFLk0DhZortEhvOTN/848yyuRqgsYVbKYE2Uy+lSk8CMNIAtqF+k2wPnmk/EAM
-/43/B/TWX+6/vE+Kw5KoNgwUybky98ryj4srul9ICFm0tKjmq5GcC8OpIPb/8Hwn
-Vppk79fxsUuPbhBuaA3ERNMbH9c6iyophd4bz9ouoeL7aHWjS0r5B939j9g9eaph
-DG+CRZD6sn8JrdQhp+yjs0psT9WXhaAmo2XhYPo0AWhtMSrXO3YLoG8CAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAStVD06Pb0+NHS1gunO+bkmNjHttDXS12j1K2fGFI
-xSjPyNMxsPxvWh6mfzT1eRwiGz+b/+aFG7aZsl/o8ZBS6hfcuxG33ljcfljbhQgM
-0jLaRAwogcfO89Ktg822ZujbLFr3wxfqu/n4mlovZuZq6iLNKRqVot3ibXK+8XRL
-apAVVHeTHb2d25HCap/rHHCrMXenTnMyAj/uByc98zhWnn2KUfH58yXjztjnLQSO
-0CfTdkUspYqNI2oJ/mQM6jm9jpKHjYUQh9CkznXsMVXTSXK7nVNZo/1dDeHVXwUS
-oSChl2SendYSlxBO3dOwnXyxHWpYmqK1DqCdkqUJqFqB2A==
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhAzIPYOqL6sGf4bgpPJK7BUbJp8Bd+
+cYKZR3I7tHPcAK2FaeH1aKPulO/C6antTgI0QOJhrpXw/eXzDkAieU4jAyEb2jWi
+rTcJQeeIeYPPOmTjuHR36gX9nxpFN7uI19jB9w+9mMVUG8ie4mqALZoSTzXMGjil
+SLFtYddU5eZZy3YFT3Spvhlx4KLpz0AXnyifyCvtLyHDHqsIV2tvvXes0Iti9TBM
+KWrjQOli8qgJGc6v78qOhgQLOqL50JwQEUvcqyeho9O3FHEMtpFQfTWt/Q4Xc1hg
+8B8chJl1xs3io20quDubenk/Nvc71kXCs/ECa1IukaJXIMWzU8YVg7sCAwEAATAN
+BgkqhkiG9w0BAQsFAAOCAQEAUrdJEu8taDl/lLtm+jaj6WnIR9o4ir3tjmqFj5Tg
+1MKDuZa38MRO07f3tyued7FW5hFUooaHbieoRyYvkbLnQSszPreg9Gt9KolDTrKr
+ZZP0blEKi/fsWn9G2UwEZPvB+F/qNmo/KwkDoNl14sRpyujY0nrOSA49o4f8EYuH
+x4Qc9EEkJXpccj/KWT0wuNw+a10ASzuaCNWlHesDwFPutbNvl9Wu8fcyYfyZEdqc
+/jUJx4iUuoOEHFvo3PaAPjlxme2Go+3iAsXjmfx91bSup3NFkWuUUKJUaHVIJWsl
+TEYqcTtKdbG1fyUMVRcFc5ZBJ0/8pw2Q2kCmPSKhkAmlQA==
 -----END CERTIFICATE-----
diff --git a/mosquitto/certs/ca.srl b/mosquitto/certs/ca.srl
@@ -1 +1 @@
-C0BAD048C3DEF2BE
+C0BAD048C3DEF2C0
diff --git a/mosquitto/certs/client.csr b/mosquitto/certs/client.csr
@@ -2,16 +2,16 @@
 MIICsjCCAZoCAQAwbTELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDES
 MBAGA1UEBwwJRWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQ8wDQYDVQQLDAZD
 bGllbnQxEzARBgNVBAMMCnNvdG8uY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCkhVbHeMhe/hon1GfspFWTR8R0HGbuQceP0n043V3249Bvoxr7
-elNo7y7Z783dF0qV12mTnaZWgApEHYiN4aPODjU0ijlVskI3mQ7PmkJnO0DogpZd
-jT3dgWx6SBErnjbFhy4mxomB9bebqwkbJGjn37mt7n9ii5bWNyG1+MRR/Qod75as
-zpfhXkR+/lY3MhPSRCe/4BOltvuJzlPr3BJIKjCyf+OtJMelxyfWP5NGRQ0FUH+m
-RyD3TvXawtGdad8jHWkq+UAOcoPQOXnQNAxqPETzQb8cXbk51FTYuPs2YhxG/sNk
-1+kGWVBNS1Dutn8t7vij3E7ELFXf9P2B0v53AgMBAAGgADANBgkqhkiG9w0BAQsF
-AAOCAQEAlnictoayWZ6fD4TEuM+eMSw7ojiEU5MEc8KBDfB9sqtwuk/LL7peR604
-O4vgMehMj3uy+pZV3D+3f4zOm+BpDEdp0n+oyCrnsfqK4tfWciVDUJ6/WeaAei5l
-+80OftPveV22RCWnkmSnaOsUdaPLiQ9V/sZUR1dg2jWjMRTBr6QHc6sHUpF8mWWs
-5pOqiOkxBJq/vorjk40H99hiMMPPnhQ6xzr1JbWw9vkG7Ku/tbcV+bN2ML2qQ0nm
-nz8sBTKyex23gJ7Y5nYBE3w5wrOGG54IKMG1P+f1C+DiN8ZVrk9lWXzh9DRhJSFw
-nKO7PQU2mXZmKMYi89KcEbmALdUICg==
+DwAwggEKAoIBAQCsJzHV2ISidmxNeaopQp9lf0rDWhzo1Q7KqUt9U5mM7l43zlGL
++jtSHwCD23LATsKB3lXCd4VKWc2dAlks2rN0p8KCSoSeWvxLyuiBEuW1yk7dKSfF
+RhBwZkP3qGo3Rk4yq9UrTvs5u4eP+kQXt4VfaF9eBIeVjWaZr4ec9o05XNZpmHX5
+IzZikDAoBtiSARUgZ293G3BYC1Xyqi9hMKJ7AvDd2+va0iTBnc58z/M2SkwMdr1H
+bJH7Nj1mqGnDImOKqmOJOahH2TFSJ56zFdPe2uicW7dUxWYbZl4PmBmeorrC4sYA
+4m3V4tlvXlQ/qeCmEjEGXGMhQ9wJ3L5XmBhVAgMBAAGgADANBgkqhkiG9w0BAQsF
+AAOCAQEAXV6zAMYanGT2JCa1PgXM4VV8Ycg5MlaF0fvCVP9lQhquPhegsoA2b4HX
+fftz8RUd7fevmjmrbyb4sn7ftPPBNbu4T/thvshtLyWU3h8wsRRbObVOKhXGW+dV
+pFOTkW8Ixxvd/FkETWG4DcS4wcUg90bTjidLgwVOLlFyA7Zw6HCeQ3So/RUGUWs9
+ZZe6jxW9B39I44RU0D70h63Ajozavkx3SEhBqIrePJxs0qHM+jwZEYH4FFhP/l/Z
+Y6Np/5qGc8iuIvESeUTcNtPOJNhDW12TCuMBYUq2UtEdemNigJ3ei5sWSlQozMU+
+AVmG7mV3nusIKxhI0Zr9yWdDB27Kew==
 -----END CERTIFICATE REQUEST-----
diff --git a/mosquitto/certs/client.key b/mosquitto/certs/client.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkhVbHeMhe/hon
-1GfspFWTR8R0HGbuQceP0n043V3249Bvoxr7elNo7y7Z783dF0qV12mTnaZWgApE
-HYiN4aPODjU0ijlVskI3mQ7PmkJnO0DogpZdjT3dgWx6SBErnjbFhy4mxomB9beb
-qwkbJGjn37mt7n9ii5bWNyG1+MRR/Qod75aszpfhXkR+/lY3MhPSRCe/4BOltvuJ
-zlPr3BJIKjCyf+OtJMelxyfWP5NGRQ0FUH+mRyD3TvXawtGdad8jHWkq+UAOcoPQ
-OXnQNAxqPETzQb8cXbk51FTYuPs2YhxG/sNk1+kGWVBNS1Dutn8t7vij3E7ELFXf
-9P2B0v53AgMBAAECggEARwPrdoTzcNWccq7kASjaa42iBkCwSY4JV1KTjPU49zZV
-JasxHXYrBPOhtJ8nrJS+NDncr8RwJYx1YfuhkyTf8TT+0GQN5ajhnmAqHYDHwwm3
-teWQhGdQWgngylPLXZmYqOD2EfTHLFrlW4OTlay8v8I5wxNc1yvL+0GnAoaUL5Mp
-/iOahhKFlblAQgX6/5HwdCUq0KPdQk72brTO3v1clygA7+FZnTio8gUTUrOxGnkg
-QTyTs4Yghd0RjODkdc7S6WztmOES/fxOXv/k/zKxeGFgbSGhHpEB0HiayOJ9KOL7
-qMC8ANCuFQeXAaXKuDyB+nHou7DjeZ9sZnqa8umEyQKBgQDUvJhLyPY62DefC1Nu
-x/EV+jSmSPJBjHrFUQC1ZlDwgDsF7bKNveGGjFkEVDLhrvvIPFIxqqD+KuLnp7DM
-R0mULAvLImt19b0kxUYnzmtXLBpfFe5lIkpID4fG4kxjwnFEWqgmDIJaPrnVUIpk
-1h77vk4rkUBaGlCY+itbDaV+NQKBgQDF+o1I3an6oTgvLpmZ7hnDESgxZ+H1MNfd
-YJm7xXUp5xheTnNjgO3l+WduEYdOeIZoxYLHtyDIYrEk8PXK44MiLU27jfIfNMJT
-rIRbIMNajGS62RATWBbug5FvyYujz6Dp6nh4iTRBtU0A3N/LsJD6T2LNOJor5ZFL
-/1yA24lPewKBgEkESkmIumrMF5sxKfvWCHuAm12PoAa7js/204VvjsxdVuTcBvL7
-f1LNDSidNbGce7LocVW2uPdEBQl51wbmWOzQiWO5dqTQKZFbXI8BHHqZGpwUTPTN
-Zi2Blxq+RXXgITxS2W/lzz/mU6ZRtI6Tp6LEWNQ/UJUcfxlilEr2Th0ZAoGAC6z4
-EhkIgkBpyNaNtndFS6zCWw+OUuB7ipG830cI3tzDIiSsR2z+Grb3s5UTDryq6Jjl
-WpPhOhAf9FbFmB6MyEI1uF7prY91+mtNLvairr9i3WYZvZpPV+eodxhCxPlkuwbZ
-7fnhfBKOJQPhquiR1EFESWgSJ46VYA8CTJMl6OsCgYEAoaCmNbESBS9OyG0DnyW0
-bRhyg7I7UyoInZFWMrcqOLXHcdXK7UuF1fiPHJznyRcitdpRM96q7n3A3IWmkld5
-KmkBrwxnXDtzUdJeK4knfysLVhSYXKH3mfD1xhEZEn23VjcyDZeVAFfvEXnS5e3l
-pjA4+2WH5mqNO0lv5MeTePI=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCsJzHV2ISidmxN
+eaopQp9lf0rDWhzo1Q7KqUt9U5mM7l43zlGL+jtSHwCD23LATsKB3lXCd4VKWc2d
+Alks2rN0p8KCSoSeWvxLyuiBEuW1yk7dKSfFRhBwZkP3qGo3Rk4yq9UrTvs5u4eP
++kQXt4VfaF9eBIeVjWaZr4ec9o05XNZpmHX5IzZikDAoBtiSARUgZ293G3BYC1Xy
+qi9hMKJ7AvDd2+va0iTBnc58z/M2SkwMdr1HbJH7Nj1mqGnDImOKqmOJOahH2TFS
+J56zFdPe2uicW7dUxWYbZl4PmBmeorrC4sYA4m3V4tlvXlQ/qeCmEjEGXGMhQ9wJ
+3L5XmBhVAgMBAAECggEAda5VYtmf0W8imdORfqMMU1WwxdnT6VW7xs3zzLhZPv2z
+anKfTBDCfGC0+W4KA2vTivNxrH4Hn8vDwpDYZNEb26LSVD6caaPI1Abg6VsBrEOf
+pY98oF5E3pEJ5UI7WY215u2PywsysUSAZuutoIjTo2S1zI9MH++JM4XKLoJcB9lO
+yJuYDKzaUwqxw6oj/FvKQ/UL5ABk9KxV7JkMSMmn2qLi3Yp5hH0hX4eU6hZagsuG
+Jz3kjMq8WvKy8HdsWCVt/M1uFTKbbRH6MSTP6FiYJ+inpD3HO7TvKen8XEzjdHaq
+QZChvMrT0rJXcD/WNgphGDBsU+uoc4/UZgp2mqD0AQKBgQDjdKg7T7H9WeWAchmD
+k3h5pLR+6BBUUHfFInD1wvC2XDOIcY+Ok7qq/s52UxADnUhBoBV3syyuBImoEEsm
+xxsMtkAmHgwb3gX231P/YqN09AQzzW9WmEts7zU/VfRBz37Z7sLQszLir/vGv7Yg
+Mq36w6qTx8ZoKqcmesQ9Ah3T0wKBgQDBwdyo4KMaUIA8bbjO7D/K2DqHdKRK50t1
+m6hxYQzPYyMrtkd6cwfmNt+AeTpshzyA/YuglLX2w+/LoLpaqr0Qar/wDhmFpkY0
+NqwegfPUrKmicupNBl9lnQ3K8M9dSYFTV3IKzcv5bNDjrVRq9zh5b3hpSckzeHwd
+es4Z/ZJSNwKBgB2POpHCsKnxNd80dNZhouWEHyTi+cRLVNVcvXti4y9/2f6ga3ym
+/DpetOwxrUIa/ZnxuPh+Y48V7eHWhD284GoNgVayzvYMK5BCw8LLydxYHfexegex
+8RNuHuhlPkITOjQOUGkY8ML/BeR1Y7DZhTyykwdzjfhZmrFogPpAvSmbAoGAGcJ1
+XLpo1NHJCr+np1L/dC9lMKcQRKkVfjBQp6o4csYCYghc3mm2riOzeTgkzVL5d0i+
+LH445vLLya23uOAkPK+EjxzAxeUCRmTSY0fxq9+8uc0/WzgyrKbBs65qU0O3fuYM
+UmVj7ehKqUpdA8+UYYixYIYfyskE70JpbkkpD+cCgYAK/etRGMrH3GDdpu8Syc5J
+hIipR/jgWWMC+7JrlDMa86ngp0mv7bft1W7TzdNg5QntmhKSiWmm59R636kfE0At
+U22ettaxlAGsjM+6qR8QwTZqZYVR+z3PggZinjyXY3GClspOhR1Opu0vV1HvkyqX
+OhmWpBt7YpbBj0NQs02l9A==
 -----END PRIVATE KEY-----
diff --git a/mosquitto/certs/client.p12 b/mosquitto/certs/client.p12
diff --git a/mosquitto/certs/client.pem b/mosquitto/certs/client.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDUjCCAjoCCQDAutBIw97yvjANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJV
+MIIDUjCCAjoCCQDAutBIw97ywDANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJV
 SzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQHDAlFZGluYnVyZ2gxEDAOBgNV
 BAoMB01RVFROSU8xCzAJBgNVBAsMAkNBMRMwEQYDVQQDDApzb3RvLmNvZGVzMB4X
-DTIxMTEwNDExMDkyNFoXDTIyMTEwNDExMDkyNFowbTELMAkGA1UEBhMCVUsxEjAQ
+DTIyMTIwMzA3NTQ0N1oXDTIzMTIwMzA3NTQ0N1owbTELMAkGA1UEBhMCVUsxEjAQ
 BgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJRWRpbmJ1cmdoMRAwDgYDVQQKDAdN
 UVRUTklPMQ8wDQYDVQQLDAZDbGllbnQxEzARBgNVBAMMCnNvdG8uY29kZXMwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkhVbHeMhe/hon1GfspFWTR8R0
-HGbuQceP0n043V3249Bvoxr7elNo7y7Z783dF0qV12mTnaZWgApEHYiN4aPODjU0
-ijlVskI3mQ7PmkJnO0DogpZdjT3dgWx6SBErnjbFhy4mxomB9bebqwkbJGjn37mt
-7n9ii5bWNyG1+MRR/Qod75aszpfhXkR+/lY3MhPSRCe/4BOltvuJzlPr3BJIKjCy
-f+OtJMelxyfWP5NGRQ0FUH+mRyD3TvXawtGdad8jHWkq+UAOcoPQOXnQNAxqPETz
-Qb8cXbk51FTYuPs2YhxG/sNk1+kGWVBNS1Dutn8t7vij3E7ELFXf9P2B0v53AgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBALti09MqzZXnwPcH1u5JysPIGfnq55DbN1qD
-1iNYBu+lT446HMevj+pN7+9icLq7r6FvT9qLCIPax5I+i5BAAdt0NJuNqty8HK/u
-PY3WywZP1NLHapEoafukni/4iLeZUxwoM5CTtYSsMvYkWafU4UeIIK0BF1Xnjyn+
-rh3/KhJCyOSar4p5+kuIt89CBIaYytyU+prHqBbSExdWH343DwKn4Ceispytg1uk
-XFsfH6EyK7sGoTz9Kce3RFBn2vbfA5KiX1LGLPObcw5COaWKnjKq1Vw1K+K3A7h4
-Ovz6ifsruEFCpMo5y6Quu9oHWLFjeT6QwpFuFVOMEV4iqz0NUUA=
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsJzHV2ISidmxNeaopQp9lf0rD
+Whzo1Q7KqUt9U5mM7l43zlGL+jtSHwCD23LATsKB3lXCd4VKWc2dAlks2rN0p8KC
+SoSeWvxLyuiBEuW1yk7dKSfFRhBwZkP3qGo3Rk4yq9UrTvs5u4eP+kQXt4VfaF9e
+BIeVjWaZr4ec9o05XNZpmHX5IzZikDAoBtiSARUgZ293G3BYC1Xyqi9hMKJ7AvDd
+2+va0iTBnc58z/M2SkwMdr1HbJH7Nj1mqGnDImOKqmOJOahH2TFSJ56zFdPe2uic
+W7dUxWYbZl4PmBmeorrC4sYA4m3V4tlvXlQ/qeCmEjEGXGMhQ9wJ3L5XmBhVAgMB
+AAEwDQYJKoZIhvcNAQELBQADggEBAHnf3nZAPlIs6art4UKxm5ZVOB9Vm54I8FV9
+968fycSSEs2vr4wMVrUc0pHWJxzHO1cxlW3KyLtGNVy3z9WAmg35NUPgP/eRre7+
+2Et+IAVf9WmegJLH1uDlbZduldx3ciHLPvXI1bA1kracy0uHBSiJ0s33egRjcD/N
+6lSuThelioqW10Tm7HYTX2qEKzuTtqAlPd0NmjhRVtR4x0lIqsvLP00FRu+EoLIJ
+bY+7GFBy/L8WpyiImGpoY79TvRNR4VmqPRmrRKadkKCXT5IQiznTra0U4cR1u6t9
+ao4A0fhvqKXgvOyJ7K9OHUFJcpvl2gAZIO1DdNWzepz8OLs/V3s=
 -----END CERTIFICATE-----
diff --git a/mosquitto/certs/server.csr b/mosquitto/certs/server.csr
@@ -2,17 +2,17 @@
 MIIC2jCCAcICAQAwbTELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDES
 MBAGA1UEBwwJRWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQ8wDQYDVQQLDAZT
 ZXJ2ZXIxEzARBgNVBAMMCnNvdG8uY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDiWZn/VYMmvVFhIM4ITrP/vcwqiNyLFEzekuEGXJwUE8Qnv4Hk
-CwfkFXtvfYk0BC1fXcvwZAQ43wGWlAeSpLPtfUR+j3Xj4SuklxGCxIv/ioSy85Vw
-xhND+6B9BOjHeVjiP5KuwYU89J7otKM0L73KaRQA8o7fsZ6+n0aNMwB5IFfE8ovb
-EiOL+3H4Qsf1WAgeLkOowYU3fHMBXdKPlEBN4vcmYAKHEfSHENTntrNtqvNjuOIo
-RB4sFvOl+OrjAHIkpnmqFvrSD7qJRiS/ybWwUcNg/eDEMERNYA2JUsYAYc8snsmu
-c26EBv5ijpT5jBWIq1PXcrfnb2nxKblUY3v1AgMBAAGgKDAmBgkqhkiG9w0BCQ4x
-GTAXMBUGA1UdEQQOMAyCCnNvdG8uY29kZXMwDQYJKoZIhvcNAQELBQADggEBANj6
-DxRYpCqDOzQHuLqK+X8zg//B+KIi5jp43/+5h5ODDKrfebaX/wOYhR/UqasZoREW
-mnXJa0NZlOru1UuL7rDuYSl2z/Qif6vx4dJuXaGpgWkOJexWOds7C+LBvDf8wBki
-ZcH1y5ZMgBS7yVJrrffp9y0kRjpKWXQYfHBhUUszMSszV5lquQwLapDT/V0TyEtb
-IZqsxPU2M08sqRhoM2kI4XRxoQ+KVaePtOJJT1x5ZvUPFKgjP0uPbSelMwzRWmOD
-280sO/8YkJGlBzAbBzfEcMCcTtruVcQYxF8qZ5tTjugylGLYK9KiUj6MfN9/mTH9
-IeIyJxbUCq74droRltI=
+DwAwggEKAoIBAQC80v6/vM/xZc6YDzqiGmlp0CWWoi3jI+EXswXFIykPCzQVymfa
+/6YaowfI76JRP42DWsdk6pDyaegc6BSgA7S2kBUljv/AHeH6SX1FgoDco5cPo9Qq
+iYRXfPNQalWr/6iFjt/Q9Q09ZrE9dHwf3RaVCU8fKZd2H19UHn3CQfijguPInSws
+CU04xyE52tuSyd5tSF9KdT7Nhqo+yTjBFxx//cm6w+tpnKeHquNgoXWBkwd1BdZr
+bDByQR2v7hTcOx1VZsUYD/GxpfGTB2GcQESLO84/osMyliVX1MxajPGPOLWgjT4C
+PP9VSnw1LuacKx47nfsFirNAYCxL9Na+jxXZAgMBAAGgKDAmBgkqhkiG9w0BCQ4x
+GTAXMBUGA1UdEQQOMAyCCnNvdG8uY29kZXMwDQYJKoZIhvcNAQELBQADggEBACzl
+RPeootadexgnt5N0VaDpx5K2HW31LDFsnoZycM+DljIVRpfKr6QVY7wR/8MwkAR6
+FmYUVMoYI2TC4G+KeIgdCNAWcJhcx6wsH9D4bhTydVEXb7Ne6ksz/bDvw54m2RV2
+1eccv3u0/c8mv69fVZAkOqMgaKhiidAOECxkgdsbJ3WoyC1XiBLdyLL3405WeQ97
+QB0YzaMdDzceqZW5VM4AzAl6UZqjIk8aCvwt1evnp0ijvkUy8G8LcaRe+wPMRi7b
+RXbG++1WaZRZt+5bzj/fxqeYO4vE2XKvR9NiBOhy8mzLPUrF4FIr/9F7nGZd2ID4
+QgiVUPKcwza6QESFWH4=
 -----END CERTIFICATE REQUEST-----
diff --git a/mosquitto/certs/server.key b/mosquitto/certs/server.key
diff --git a/mosquitto/certs/server.pem b/mosquitto/certs/server.pem
diff --git a/scripts/build-docker-ci-image.sh b/scripts/build-docker-ci-image.sh

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ struct MQTTListeners<ReturnType> {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ mutating func removeAll() {`
	`41`	`+ self.listeners = [:]`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`private let lock = NIOLock()`
`41`	`45`	`private var listeners: [String: Listener] = [:]`
`42`	`46`	`}`