Merge branch 'development'

* development:
  Update and gen docs
  prepare podspec for release
  Regenerate docs
  update docs, remove other prints
  remove print
  Support both v2 and v3
  Start working on migration guide
  update docs
  Add ability to send payload with connect
  more CocoaPods testing
  CocoaPods testing
  Fix tests
  Better timeouts
  Support socket.io 3 + starscream 4
  update examples for new operator
  Add some helpful operators
  fix swift syntax highlighting
  show how to test for ack timeouts

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
 xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
 xcode_scheme: SocketIO-Mac
-osx_image: xcode11.2
+osx_image: xcode12.2
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v16.0.0
+
+- Removed Objective-C support. It's time for you to embrace Swift.
+- Socket.io 3 support.
+
+# v15.3.0
+
+- Add `==` operators for `SocketAckStatus` and `String`
+
 # v15.2.0
 
 - Small fixes.

Cartfile

@@ -1 +1 @@
-github "daltoniam/Starscream" ~> 3.1
+github "daltoniam/Starscream" ~> 4.0

Cartfile.resolved

@@ -1 +1 @@
-github "daltoniam/Starscream" "3.1.0"
+github "daltoniam/Starscream" "4.0.4"

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/daltoniam/Starscream",
         "state": {
           "branch": null,
-          "revision": "9c03ef715d1bc9334b446c90df53586dd38cf849",
-          "version": "3.1.0"
+          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+          "version": "4.0.4"
         }
       }
     ]

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.3
 
 import PackageDescription
 
@@ -8,7 +8,7 @@ let package = Package(
         .library(name: "SocketIO", targets: ["SocketIO"])
     ],
     dependencies: [
-        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "3.1.0")),
+        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.0")),
     ],
     targets: [
         .target(name: "SocketIO", dependencies: ["Starscream"]),

README.md

@@ -18,6 +18,10 @@ 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" == SocketAckValue.noAck {
+            // Handle ack timeout 
+        }
+
         socket.emit("update", ["amount": cur + 2.50])
     }
 
@@ -27,52 +31,23 @@ socket.on("currentAmount") {data, ack in
 socket.connect()
 ```
 
-## Objective-C Example
-```objective-c
-@import SocketIO;
-
-NSURL* url = [[NSURL alloc] initWithString:@"http://localhost:8080"];
-SocketManager* manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @YES, @"compress": @YES}];
-SocketIOClient* socket = manager.defaultSocket;
-
-[socket on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
-    NSLog(@"socket connected");
-}];
-
-[socket on:@"currentAmount" callback:^(NSArray* data, SocketAckEmitter* ack) {
-    double cur = [[data objectAtIndex:0] floatValue];
-
-    [[socket emitWithAck:@"canUpdate" with:@[@(cur)]] timingOutAfter:0 callback:^(NSArray* data) {
-        [socket emit:@"update" with:@[@{@"amount": @(cur + 2.50)}]];
-    }];
-
-    [ack with:@[@"Got your currentAmount, ", @"dude"]];
-}];
-
-[socket connect];
-
-```
-
 ## Features
-- Supports socket.io 2.0+ (For socket.io 1.0 use v9.x)
-- Supports binary
+- Supports socket.io 2.0+/3.0+.
+- Supports Binary
 - Supports Polling and WebSockets
 - Supports TLS/SSL
-- Can be used from Objective-C
 
 ## FAQS
 Checkout the [FAQs](https://nuclearace.github.io/Socket.IO-Client-Swift/faq.html) for commonly asked questions.
 
+
 Checkout the [12to13](https://nuclearace.github.io/Socket.IO-Client-Swift/12to13.html) guide for migrating to v13+ from v12 below.
 
+Checkout the [15to16](https://nuclearace.github.io/Socket.IO-Client-Swift/15to16.html) guide for migrating to v16+ from v15.
 
 ## Installation
 Requires Swift 4/5 and Xcode 10.x
 
-If you need Swift 2.3 use the [swift2.3 tag](https://github.com/socketio/socket.io-client-swift/releases/tag/swift2.3) (Pre-Swift 4 support is no longer maintained)
-
-If you need Swift 3.x use v11.1.3.
-
 ### Swift Package Manager
 Add the project as a dependency to your Package.swift:
 ```swift

Socket.IO-Client-Swift.podspec

@@ -1,24 +1,24 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
   s.module_name  = "SocketIO"
-  s.version      = "15.2.0"
+  s.version      = "16.0.0"
   s.summary      = "Socket.IO-client for iOS and OS X"
   s.description  = <<-DESC
                    Socket.IO-client for iOS and OS X.
                    Supports ws/wss/polling connections and binary.
-                   For socket.io 2.0+ and Swift.
+                   For socket.io 3.0+ and Swift.
                    DESC
   s.homepage     = "https://github.com/socketio/socket.io-client-swift"
   s.license      = { :type => 'MIT' }
   s.author       = { "Erik" => "[email protected]" }
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.10'
-  s.tvos.deployment_target = '9.0'
-  s.watchos.deployment_target = '2.0'
+  s.ios.deployment_target = '10.0'
+  s.osx.deployment_target = '10.13'
+  s.tvos.deployment_target = '10.0'
+  s.watchos.deployment_target = '5.0'
   s.requires_arc = true
   s.source = {
     :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v15.2.0',
+    :tag => 'v16.0.0',
     :submodules => true
   }
 
@@ -27,5 +27,5 @@ Pod::Spec.new do |s|
       'SWIFT_VERSION' => '5.0'
   }
   s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
-  s.dependency "Starscream", "~> 3.1"
+  s.dependency "Starscream", "~> 4.0"
 end

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

@@ -18,14 +18,12 @@
 		1C686BE61F869AFD007D8627 /* SocketAckManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD61F869AF1007D8627 /* SocketAckManagerTest.swift */; };
 		1C686BE71F869AFD007D8627 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD71F869AF1007D8627 /* SocketParserTest.swift */; };
 		1C686BE81F869AFD007D8627 /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD81F869AF1007D8627 /* SocketNamespacePacketTest.swift */; };
-		1C686C001F869EAE007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */; };
 		572EF2431B51F18A00EEBB58 /* SocketIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 572EF2381B51F18A00EEBB58 /* SocketIO.framework */; };
 		6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA08A971D615C0B0061FD2A /* Security.framework */; };
 		74BF53581F894326004972D8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 572EF23C1B51F18A00EEBB58 /* SocketIO.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; };
 		74DA21741F09440F009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
 		74DA217C1F09457B009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
-		9432E00F1F77F8C4006AF628 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432E0061F77F7CA006AF628 /* SSLSecurity.swift */; };
 		DD52B048C71D724ABBD18C71 /* SocketTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BDC9E66AADA2CC5E8246 /* SocketTypes.swift */; };
 		DD52B11AF936352BAE30B2C8 /* SocketStringReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BA240D139F72633D4159 /* SocketStringReader.swift */; };
 		DD52B1F8BA0455EBE7C1B93E /* SocketAckEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BFF2E3216CDC364BB8AF /* SocketAckEmitter.swift */; };
@@ -34,7 +32,6 @@
 		DD52B3A6C1E082841C35C85D /* SocketEngineClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BE5FDCE1D684132E897C /* SocketEngineClient.swift */; };
 		DD52B44AE56F2E07F3F3F991 /* SocketAckManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B09F7984E730513AB7E5 /* SocketAckManager.swift */; };
 		DD52B4DFA12F2599410205D9 /* SocketEngineWebsocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BE9AD8B2BD7F841CD1D4 /* SocketEngineWebsocket.swift */; };
-		DD52B53F2609D91A683DFCDD /* ManagerObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DD52BB5E907D283ACC31E17F /* ManagerObjectiveCTest.m */; };
 		DD52B56DE03CDB4F40BD1A23 /* SocketExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B471D780013E18DF9335 /* SocketExtensions.swift */; };
 		DD52B57E7ABC61B57EE2A4B8 /* SocketPacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B59C11D3D2BC63612E50 /* SocketPacket.swift */; };
 		DD52B883F942CD5A9D29892B /* SocketEnginePollable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B2D110F55723F82B108E /* SocketEnginePollable.swift */; };
@@ -474,7 +471,6 @@
 				DD52BB69B6D260035B652CA4 /* SocketAnyEvent.swift in Sources */,
 				DD52BF924BEF05E1235CFD29 /* SocketIOClient.swift in Sources */,
 				DD52BFEB4DBD3BF8D93DAEFF /* SocketEventHandler.swift in Sources */,
-				9432E00F1F77F8C4006AF628 /* SSLSecurity.swift in Sources */,
 				DD52BB9A3E42FF2DD6BE7C2F /* SocketIOClientSpec.swift in Sources */,
 				DD52B2AFE7D46039C7AE4D19 /* SocketIOClientOption.swift in Sources */,
 				DD52BE4D1E6BB752CD9614A6 /* SocketIOStatus.swift in Sources */,
@@ -495,7 +491,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1C686C001F869EAE007D8627 /* SocketObjectiveCTest.m in Sources */,
 				1C686BE21F869AFD007D8627 /* SocketIOClientConfigurationTest.swift in Sources */,
 				1C686BE31F869AFD007D8627 /* SocketEngineTest.swift in Sources */,
 				1C686BE41F869AFD007D8627 /* SocketSideEffectTest.swift in Sources */,
@@ -504,7 +499,6 @@
 				1C686BE71F869AFD007D8627 /* SocketParserTest.swift in Sources */,
 				1C686BE81F869AFD007D8627 /* SocketNamespacePacketTest.swift in Sources */,
 				DD52BCCD25EFA76E0F9B313C /* SocketMangerTest.swift in Sources */,
-				DD52B53F2609D91A683DFCDD /* ManagerObjectiveCTest.m in Sources */,
 				1C657CDE5D510E8E2E573E39 /* utils.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -583,16 +577,16 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = SocketIO;
 				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64 armv7k";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -657,15 +651,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_NAME = SocketIO;
 				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64 armv7k";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};

Source/SocketIO/Ack/SocketAckManager.swift

@@ -31,6 +31,16 @@ public enum SocketAckStatus : String {
 
     /// The ack timed out.
     case noAck = "NO ACK"
+
+    /// Tests whether a string is equal to a given SocketAckStatus
+    public static func == (lhs: String, rhs: SocketAckStatus) -> Bool {
+        return lhs == rhs.rawValue
+    }
+
+    /// Tests whether a string is equal to a given SocketAckStatus
+    public static func == (lhs: SocketAckStatus, rhs: String) -> Bool {
+        return rhs == lhs
+    }
 }
 
 private struct SocketAck : Hashable {