make DataChannelPair.close sync

ronnyf · Oct 30, 2023 · b9bb1da · b9bb1da
1 parent c1cd410
commit b9bb1da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Sources/LiveKit/Core/DataChannelPair.swift b/Sources/LiveKit/Core/DataChannelPair.swift
@@ -72,7 +72,7 @@ internal class DataChannelPair: NSObject, Loggable {
         }
     }
 
-    public func close() -> Promise<Void> {
+    public func close() {
 
         let reliable = _reliableChannel
         let lossy = _lossyChannel
@@ -85,7 +85,7 @@ internal class DataChannelPair: NSObject, Loggable {
         openCompleter = Promise<Void>.pending()
 
         // execute on .webRTC queue
-        return Promise(on: .liveKitWebRTC) {
+        DispatchQueue.liveKitWebRTC.sync {
             reliable?.close()
             lossy?.close()
         }

diff --git a/Sources/LiveKit/Core/Engine.swift b/Sources/LiveKit/Core/Engine.swift
@@ -181,18 +181,12 @@ internal class Engine: MulticastDelegate<EngineDelegate> {
     // Resets state of transports
     func cleanUpRTC() -> Promise<Void> {
 
-        Promise<Void>(on: queue) { [weak self] () -> Promise<Void> in
+        Promise<Void>(on: queue) { [weak self] in
 
             // close data channels
-
-            guard let self = self else { return Promise(()) }
-
-            let closeDataChannelPromises = [
-                self.publisherDC.close(),
-                self.subscriberDC.close()
-            ]
-
-            return closeDataChannelPromises.all(on: self.queue)
+            guard let self = self else { return }
+            self.publisherDC.close()
+            self.subscriberDC.close()
 
         }.then(on: queue) { [weak self] () -> Promise<Void> in