Execute acks sync. Implement #950

Author: nuclearace

.swift-version

@@ -1 +1 @@
-4.0.2
+system

Source/SocketIO/Ack/SocketAckEmitter.swift

@@ -121,9 +121,9 @@ public final class OnAckCallback : NSObject {
         guard seconds != 0 else { return }
 
         socket.manager?.handleQueue.asyncAfter(deadline: DispatchTime.now() + seconds) {[weak socket] in
-            guard let socket = socket, let manager = socket.manager else { return }
+            guard let socket = socket else { return }
 
-            socket.ackHandlers.timeoutAck(self.ackNumber, onQueue: manager.handleQueue)
+            socket.ackHandlers.timeoutAck(self.ackNumber)
         }
     }
 

Source/SocketIO/Ack/SocketAckManager.swift

@@ -60,29 +60,18 @@ private struct SocketAck : Hashable {
 
 struct SocketAckManager {
     private var acks = Set<SocketAck>(minimumCapacity: 1)
-    private let ackSemaphore = DispatchSemaphore(value: 1)
 
     mutating func addAck(_ ack: Int, callback: @escaping AckCallback) {
         acks.insert(SocketAck(ack: ack, callback: callback))
     }
 
     /// Should be called on handle queue
-    mutating func executeAck(_ ack: Int, with items: [Any], onQueue: DispatchQueue) {
-        ackSemaphore.wait()
-        defer { ackSemaphore.signal() }
-        let ack = acks.remove(SocketAck(ack: ack))
-
-        onQueue.async() { ack?.callback(items) }
+    mutating func executeAck(_ ack: Int, with items: [Any]) {
+        acks.remove(SocketAck(ack: ack))?.callback(items)
     }
 
     /// Should be called on handle queue
-    mutating func timeoutAck(_ ack: Int, onQueue: DispatchQueue) {
-        ackSemaphore.wait()
-        defer { ackSemaphore.signal() }
-        let ack = acks.remove(SocketAck(ack: ack))
-
-        onQueue.async() {
-            ack?.callback?([SocketAckStatus.noAck.rawValue])
-        }
+    mutating func timeoutAck(_ ack: Int) {
+       acks.remove(SocketAck(ack: ack))?.callback?([SocketAckStatus.noAck.rawValue])
     }
 }

Source/SocketIO/Client/SocketIOClient.swift

@@ -314,11 +314,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec {
     /// - parameter data: The data sent back with this ack.
     @objc
     open func handleAck(_ ack: Int, data: [Any]) {
-        guard status == .connected, let manager = self.manager else { return }
+        guard status == .connected else { return }
 
         DefaultSocketLogger.Logger.log("Handling ack: \(ack) with data: \(data)", type: logType)
 
-        ackHandlers.executeAck(ack, with: data, onQueue: manager.handleQueue)
+        ackHandlers.executeAck(ack, with: data)
     }
 
     /// Called on socket.io specific events.

Tests/TestSocketIO/SocketAckManagerTest.swift

@@ -21,7 +21,7 @@ class SocketAckManagerTest : XCTestCase {
         }
 
         ackManager.addAck(1, callback: callback)
-        ackManager.executeAck(1, with: itemsArray, onQueue: DispatchQueue.main)
+        ackManager.executeAck(1, with: itemsArray)
 
         waitForExpectations(timeout: 3.0, handler: nil)
     }
@@ -44,7 +44,7 @@ class SocketAckManagerTest : XCTestCase {
         }
 
         ackManager.addAck(1, callback: callback)
-        ackManager.timeoutAck(1, onQueue: DispatchQueue.main)
+        ackManager.timeoutAck(1)
 
         waitForExpectations(timeout: 0.2, handler: nil)
     }