diff --git a/README.md b/README.md index 09cf4fb..e7cbd56 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Methods 7. `emitWithAck(event: String, withItems items: [AnyObject]) -> (UInt64, (NSArray?) -> Void) -> Void` - `emitWithAck` for Objective-C. Note: The message is not sent until you call the returned function. 8. `connect()` - Establishes a connection to the server. A "connect" event is fired upon successful connection. 9. `connect(timeoutAfter timeoutAfter: Int, withTimeoutHandler handler: (() -> Void)?)` - Connect to the server. If it isn't connected after timeoutAfter seconds, the handler is called. -10. `close(fast fast: Bool)` - Closes the socket. Once a socket is closed it should not be reopened. Pass true to fast if you're closing from a background task. +10. `close()` - Closes the socket. Once a socket is closed it should not be reopened. 11. `reconnect()` - Causes the client to reconnect to the server. 12. `joinNamespace()` - Causes the client to join nsp. Shouldn't need to be called unless you change nsp manually. 13. `leaveNamespace()` - Causes the client to leave the nsp and go back to / diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift index 00b328a..32507fd 100644 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -133,12 +133,11 @@ public final class SocketIOClient: NSObject, SocketEngineClient { Will turn off automatic reconnects. Pass true to fast if you're closing from a background task */ - public func close(fast fast: Bool) { + public func close() { Logger.log("Closing socket", type: logType) reconnects = false - status = SocketIOClientStatus.Closed - engine?.close(fast: fast) + didDisconnect("Closed") } /** @@ -151,8 +150,8 @@ public final class SocketIOClient: NSObject, SocketEngineClient { /** Connect to the server. If we aren't connected after timeoutAfter, call handler */ - public func connect(timeoutAfter timeoutAfter:Int, - withTimeoutHandler handler:(() -> Void)?) { + public func connect(timeoutAfter timeoutAfter: Int, + withTimeoutHandler handler: (() -> Void)?) { assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)") guard status != .Connected else { @@ -222,7 +221,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient { Logger.log("Disconnected: %@", type: logType, args: reason) status = .Closed - reconnects = false // Make sure the engine is actually dead. @@ -241,8 +239,8 @@ public final class SocketIOClient: NSObject, SocketEngineClient { /** Same as close */ - public func disconnect(fast fast: Bool) { - close(fast: fast) + public func disconnect() { + close() } /**