15 changed files with 26 additions and 85 deletions
--- a/.gitignore
+++ b/.gitignore
@ -50,5 +50,3 @@ Socket.IO-Test-Server/node_modules/*
 .idea/
 docs/docsets/
 docs/undocumented.json
-
-.swiftpm
--- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
--- a/2
+++ b/2
@ -1 +1 @@
-github "daltoniam/Starscream" ~> 4.0.8
+github "daltoniam/Starscream" ~> 4.0.6
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@ -1 +1 @@
-github "daltoniam/Starscream" "4.0.8"
+github "daltoniam/Starscream" "4.0.6"
--- a/Package.resolved
+++ b/Package.resolved
@ -6,8 +6,8 @@
        "repositoryURL": "https://github.com/daltoniam/Starscream",
        "state": {
          "branch": null,
-          "revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
-          "version": "4.0.8"
+          "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
+          "version": "4.0.6"
        }
      }
    ]
--- a/Package.swift
+++ b/Package.swift
@ -8,7 +8,7 @@ let package = Package(
        .library(name: "SocketIO", targets: ["SocketIO"])
    ],
    dependencies: [
-        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "4.0.8")),
+        .package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.6")),
    ],
    targets: [
        .target(name: "SocketIO", dependencies: ["Starscream"]),
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ socket.on("currentAmount") {data, ack in
    guard let cur = data[0] as? Double else { return }
    
    socket.emitWithAck("canUpdate", cur).timingOut(after: 0) {data in
-        if data.first as? String ?? "passed" == SocketAckStatus.noAck {
+        if data.first as? String ?? "passed" == SocketAckValue.noAck {
            // Handle ack timeout 
        }

@ -61,7 +61,7 @@ let package = Package(
        .executable(name: "socket.io-test", targets: ["YourTargetName"])
    ],
    dependencies: [
-        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "16.1.1"))
+        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "15.0.0"))
    ],
    targets: [
        .target(name: "YourTargetName", dependencies: ["SocketIO"], path: "./Path/To/Your/Sources")
@ -74,7 +74,7 @@ Then import `import SocketIO`.
 ### Carthage
 Add this line to your `Cartfile`:
 ```
-github "socketio/socket.io-client-swift" ~> 16.1.1
+github "socketio/socket.io-client-swift" ~> 15.2.0
 ```

 Run `carthage update --platform ios,macosx`.
@ -88,7 +88,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
 use_frameworks!

 target 'YourApp' do
-    pod 'Socket.IO-Client-Swift', '~> 16.1.1'
+    pod 'Socket.IO-Client-Swift', '~> 15.2.0'
 end
 ```

--- a/Socket.IO-Client-Swift.podspec
+++ b/Socket.IO-Client-Swift.podspec
@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
  s.name         = "Socket.IO-Client-Swift"
  s.module_name  = "SocketIO"
-  s.version      = "16.1.1"
+  s.version      = "16.1.0"
  s.summary      = "Socket.IO-client for iOS and OS X"
  s.description  = <<-DESC
                   Socket.IO-client for iOS and OS X.
@ -11,14 +11,14 @@ Pod::Spec.new do |s|
  s.homepage     = "https://github.com/socketio/socket.io-client-swift"
  s.license      = { :type => 'MIT' }
  s.author       = { "Erik" => "nuclear.ace@gmail.com" }
-  s.ios.deployment_target = '12.0'
+  s.ios.deployment_target = '11.0'
  s.osx.deployment_target = '10.13'
  s.tvos.deployment_target = '12.0'
  s.watchos.deployment_target = '5.0'
  s.requires_arc = true
  s.source = {
    :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v16.1.1',
+    :tag => 'v16.1.0',
    :submodules => true
  }

@ -27,5 +27,5 @@ Pod::Spec.new do |s|
      'SWIFT_VERSION' => '5.4'
  }
  s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
-  s.dependency "Starscream", "~> 4.0.8"
+  s.dependency "Starscream", "~> 4.0.6"
 end
--- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
+++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
@ -652,7 +652,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -679,7 +678,7 @@
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@ -729,7 +728,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -754,7 +752,7 @@
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@ -834,7 +832,7 @@
 					"@loader_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
@ -844,7 +842,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 			};
 			name = Debug;
@ -916,7 +914,7 @@
 					"@loader_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@ -924,7 +922,7 @@
 				SUPPORTED_PLATFORMS = "$(inherited)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 			};
 			name = Release;
--- a/Source/SocketIO/Ack/SocketAckEmitter.swift
+++ b/Source/SocketIO/Ack/SocketAckEmitter.swift
@ -136,8 +136,8 @@ 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 else { return }
+        socket.manager?.handleQueue.asyncAfter(deadline: DispatchTime.now() + seconds) {[weak socket, weak self] in
+            guard let socket = socket, let `self` = self else { return }

            socket.ackHandlers.timeoutAck(self.ackNumber)
        }
--- a/Source/SocketIO/Client/SocketIOClient.swift
+++ b/Source/SocketIO/Client/SocketIOClient.swift
@ -150,8 +150,7 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {

        manager.handleQueue.asyncAfter(deadline: DispatchTime.now() + timeoutAfter) {[weak self] in
            guard let this = self, this.status == .connecting || this.status == .notConnected else { return }
-            DefaultSocketLogger.Logger.log("Timeout: Socket not connected, so setting to disconnected", type: this.logType)
-            
+
            this.status = .disconnected
            this.leaveNamespace()

--- a/Source/SocketIO/Engine/SocketEngine.swift
+++ b/Source/SocketIO/Engine/SocketEngine.swift
@ -761,12 +761,6 @@ extension SocketEngine {
        case .disconnected(_, _):
            wsConnected = false
            websocketDidDisconnect(error: nil)
-        case .viabilityChanged(false):
-            wsConnected = false
-            websocketDidDisconnect(error: nil)
-        case .peerClosed:
-            wsConnected = false
-            websocketDidDisconnect(error: nil)
        case let .text(msg):
            parseEngineMessage(msg)
        case let .binary(data):
--- a/Source/SocketIO/Manager/SocketManager.swift
+++ b/Source/SocketIO/Manager/SocketManager.swift
@ -132,7 +132,7 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    private(set) var reconnectAttempts = -1

    private var _config: SocketIOClientConfiguration
-    internal var currentReconnectAttempt = 0
+    private var currentReconnectAttempt = 0
    private var reconnecting = false

    // MARK: Initializers
@ -186,8 +186,9 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    ///
    /// Override if you wish to attach a custom `SocketEngineSpec`.
    open func connect() {
-        if status == .connected || (status == .connecting && currentReconnectAttempt == 0) {
+        guard !status.active else {
            DefaultSocketLogger.Logger.log("Tried connecting an already active socket", type: SocketManager.logType)
+
            return
        }

--- a/Tests/TestSocketIO/SocketMangerTest.swift
+++ b/Tests/TestSocketIO/SocketMangerTest.swift
@ -60,44 +60,6 @@ class SocketMangerTest : XCTestCase {
        waitForExpectations(timeout: 0.3)
    }

-    func testManagerDoesNotCallConnectWhenConnectingWithLessThanOneReconnect() {
-        setUpSockets()
-        
-        let expect = expectation(description: "The manager should not call connect on the engine")
-        expect.isInverted = true
-        
-        let engine = TestEngine(client: manager, url: manager.socketURL, options: nil)
-        
-        engine.onConnect = {
-            expect.fulfill()
-        }
-        manager.setTestStatus(.connecting)
-        manager.setCurrentReconnect(currentReconnect: 0)
-        manager.engine = engine
-        
-        manager.connect()
-
-        waitForExpectations(timeout: 0.3)
-    }
-    
-    func testManagerCallConnectWhenConnectingAndMoreThanOneReconnect() {
-        setUpSockets()
-        
-        let expect = expectation(description: "The manager should call connect on the engine")
-        let engine = TestEngine(client: manager, url: manager.socketURL, options: nil)
-        
-        engine.onConnect = {
-            expect.fulfill()
-        }
-        manager.setTestStatus(.connecting)
-        manager.setCurrentReconnect(currentReconnect: 1)
-        manager.engine = engine
-        
-        manager.connect()
-
-        waitForExpectations(timeout: 0.8)
-    }
-
    func testManagerCallsDisconnect() {
        setUpSockets()

@ -192,10 +154,6 @@ public enum ManagerExpectation: String {
 }

 public class TestManager: SocketManager {
-    public func setCurrentReconnect(currentReconnect: Int) {
-        self.currentReconnectAttempt = currentReconnect
-    }
-    
    public override func disconnect() {
        setTestStatus(.disconnected)
    }
--- a/Tests/TestSocketIO/SocketSideEffectTest.swift
+++ b/Tests/TestSocketIO/SocketSideEffectTest.swift
@ -487,7 +487,7 @@ class TestEngine: SocketEngineSpec {
    private(set) var ws: WebSocket? = nil
    private(set) var version = SocketIOVersion.three

-    internal var onConnect: (() -> ())?
+    fileprivate var onConnect: (() -> ())?

    required init(client: SocketEngineClient, url: URL, options: [String: Any]?) {
        self.client = client