Merge branch 'development'

* development:
  remove old test server
  update websocket
  Change Void to ()
  Allow changing the socketURL post init Fixes socketio#470
  code style
  Add note about queue safety

Author: nuclearace

Socket.IO-Test-Server/TestCases.js

@@ -120,7 +120,7 @@ extension SocketEnginePollable {
         doLongPoll(for: req)
     }
 
-    func doRequest(for req: URLRequest, callbackWith callback: @escaping (Data?, URLResponse?, Error?) -> Void) {
+    func doRequest(for req: URLRequest, callbackWith callback: @escaping (Data?, URLResponse?, Error?) -> ()) {
         guard polling && !closed && !invalidated && !fastUpgrade else { return }
 
         DefaultSocketLogger.Logger.log("Doing polling %@ %@", type: "SocketEnginePolling",
@@ -147,7 +147,7 @@ extension SocketEnginePollable {
 
             DefaultSocketLogger.Logger.log("Got polling response", type: "SocketEnginePolling")
 
-            if let str = String(data: data!, encoding: String.Encoding.utf8) {
+            if let str = String(data: data!, encoding: .utf8) {
                 this.parsePollingMessage(str)
             }
 

Socket.IO-Test-Server/acknowledgementEvents.js

@@ -155,9 +155,7 @@ extension SocketEngineSpec {
 
             return .left(mutData as Data)
         } else {
-            let str = "b4" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0))
-
-            return .right(str)
+            return .right("b4" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)))
         }
     }
 

Socket.IO-Test-Server/emitEvents.js

@@ -27,13 +27,12 @@ import Foundation
 
 /// The main class for SocketIOClientSwift.
 ///
+/// **NOTE**: The client is not thread/queue safe, all interaction with the socket should be done on the `handleQueue`
+///
 /// Represents a socket.io-client. Most interaction with socket.io will be through this class.
 open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, SocketParsable {
     // MARK: Properties
 
-    /// The URL of the socket.io server. This is set in the initializer.
-    public let socketURL: URL
-
     /// The engine for this client.
     public private(set) var engine: SocketEngineSpec?
 
@@ -76,18 +75,24 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
         return engine?.sid
     }
 
-    private let logType = "SocketIOClient"
+    /// The URL of the socket.io server.
+    ///
+    /// If changed after calling `init`, `forceNew` must be set to `true`, or it will only connect to the url set in the
+    /// init.
+    public var socketURL: URL
 
-    private var anyHandler: ((SocketAnyEvent) -> Void)?
-    private var currentReconnectAttempt = 0
-    private var handlers = [SocketEventHandler]()
-    private var reconnecting = false
+    var ackHandlers = SocketAckManager()
+    var waitingPackets = [SocketPacket]()
 
     private(set) var currentAck = -1
     private(set) var reconnectAttempts = -1
 
-    var ackHandlers = SocketAckManager()
-    var waitingPackets = [SocketPacket]()
+    private let logType = "SocketIOClient"
+
+    private var anyHandler: ((SocketAnyEvent) -> ())?
+    private var currentReconnectAttempt = 0
+    private var handlers = [SocketEventHandler]()
+    private var reconnecting = false
 
     // MARK: Initializers
 
@@ -147,13 +152,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
 
     // MARK: Methods
 
-    private func addEngine() -> SocketEngineSpec {
+    private func addEngine() {
         DefaultSocketLogger.Logger.log("Adding engine", type: logType, args: "")
 
         engine?.client = nil
         engine = SocketEngine(client: self, url: socketURL, config: config)
-
-        return engine!
     }
 
     /// Connect to the server.
@@ -166,7 +169,7 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
     /// - parameter timeoutAfter: The number of seconds after which if we are not connected we assume the connection
     ///                           has failed. Pass 0 to never timeout.
     /// - parameter withHandler: The handler to call when the client fails to connect.
-    open func connect(timeoutAfter: Int, withHandler handler: (() -> Void)?) {
+    open func connect(timeoutAfter: Int, withHandler handler: (() -> ())?) {
         assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)")
 
         guard status != .connected else {
@@ -177,11 +180,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
         status = .connecting
 
         if engine == nil || forceNew {
-            addEngine().connect()
-        } else {
-            engine?.connect()
+            addEngine()
         }
 
+        engine?.connect()
+
         guard timeoutAfter != 0 else { return }
 
         handleQueue.asyncAfter(deadline: DispatchTime.now() + Double(timeoutAfter)) {[weak self] in
@@ -496,7 +499,6 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
         return handler.id
     }
 
-
     /// Adds a single-use handler for an event.
     ///
     /// - parameter event: The event name for this handler.
@@ -522,7 +524,7 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So
     /// Adds a handler that will be called on every event.
     ///
     /// - parameter handler: The callback that will execute whenever an event is received.
-    open func onAny(_ handler: @escaping (SocketAnyEvent) -> Void) {
+    open func onAny(_ handler: @escaping (SocketAnyEvent) -> ()) {
         anyHandler = handler
     }
 

Socket.IO-Test-Server/main.js

@@ -68,10 +68,10 @@ extension NSNull : SocketData { }
 extension String : SocketData { }
 
 /// A typealias for an ack callback.
-public typealias AckCallback = ([Any]) -> Void
+public typealias AckCallback = ([Any]) -> ()
 
 /// A typealias for a normal callback.
-public typealias NormalCallback = ([Any], SocketAckEmitter) -> Void
+public typealias NormalCallback = ([Any], SocketAckEmitter) -> ()
 
 typealias JSON = [String: Any]
 typealias Probe = (msg: String, type: SocketEnginePacketType, data: [Data])

Socket.IO-Test-Server/package.json

@@ -115,7 +115,7 @@ open class WebSocket : NSObject, StreamDelegate {
 
 
     // MARK: - Block based API.
-    public var onConnect: ((Void) -> Void)?
+    public var onConnect: (() -> Void)?
     public var onDisconnect: ((NSError?) -> Void)?
     public var onText: ((String) -> Void)?
     public var onData: ((Data) -> Void)?