From f74eb8c88ab0c0f89758ecb99473ca825ff7d6b4 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Wed, 20 Dec 2017 07:11:31 -0500 Subject: [PATCH 1/7] Fix #894 --- Source/SocketIO/Util/SocketExtensions.swift | 2 +- Tests/TestSocketIO/SocketEngineTest.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/SocketIO/Util/SocketExtensions.swift b/Source/SocketIO/Util/SocketExtensions.swift index eaee76b..fe9086f 100644 --- a/Source/SocketIO/Util/SocketExtensions.swift +++ b/Source/SocketIO/Util/SocketExtensions.swift @@ -38,7 +38,7 @@ extension Array { extension CharacterSet { static var allowedURLCharacterSet: CharacterSet { - return CharacterSet(charactersIn: "!*'();:@&=+$,/?%#[]\" {}").inverted + return CharacterSet(charactersIn: "!*'();:@&=+$,/?%#[]\" {}^").inverted } } diff --git a/Tests/TestSocketIO/SocketEngineTest.swift b/Tests/TestSocketIO/SocketEngineTest.swift index 2ce7c7d..3270318 100644 --- a/Tests/TestSocketIO/SocketEngineTest.swift +++ b/Tests/TestSocketIO/SocketEngineTest.swift @@ -87,11 +87,11 @@ class SocketEngineTest: XCTestCase { XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200") engine.connectParams = [ - "forbidden": "!*'();:@&=+$,/?%#[]\" {}" + "forbidden": "!*'();:@&=+$,/?%#[]\" {}^" ] - XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D") - XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D") + XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E") + XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E") } func testBase64Data() { From c395fa3f0f0f7edd58de936c08953ff27ba68277 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Wed, 20 Dec 2017 07:12:14 -0500 Subject: [PATCH 2/7] update starscream --- Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2893ff4..3f29cea 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/daltoniam/Starscream", "state": { "branch": null, - "revision": "44ce58956fae7db22fb0106cb4ce3dbef3d06d00", - "version": "3.0.2" + "revision": "6cb1c474e09b0a3aa60bcdc7553b570336d6a61a", + "version": "3.0.3" } } ] From 9224e2b3e6775e588344dcbf639557516edf9eae Mon Sep 17 00:00:00 2001 From: Erik Little Date: Fri, 5 Jan 2018 09:25:54 -0500 Subject: [PATCH 3/7] update reconnect documentation --- Source/SocketIO/Manager/SocketManager.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index 5aa53c4..624715c 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -414,7 +414,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa /// Tries to reconnect to the server. /// - /// This will cause a `disconnect` event to be emitted, as well as an `reconnectAttempt` event. + /// This will cause a `SocketClientEvent.reconnect` event to be emitted, as well as + /// `SocketClientEvent.reconnectAttempt` events. open func reconnect() { guard !reconnecting else { return } From 658d5f5b71472dd2f63b53cbe8224715dd8968f1 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 7 Jan 2018 12:20:17 -0500 Subject: [PATCH 4/7] Fix #923 --- CHANGELOG.md | 4 ++++ Socket.IO-Client-Swift.podspec | 4 ++-- Source/SocketIO/Manager/SocketManager.swift | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 826a3d6..3c6de32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 13.1.1 + +- Fix [#923](https://github.com/socketio/socket.io-client-swift/issues/923) + # v13.1.0 - Allow setting `SocketEngineSpec.extraHeaders` after init. diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index 62d19be..520eaef 100644 --- 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 = "13.1.0" + s.version = "13.1.1" s.summary = "Socket.IO-client for iOS and OS X" s.description = <<-DESC Socket.IO-client for iOS and OS X. @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", - :tag => 'v13.1.0', + :tag => 'v13.1.1', :submodules => true } s.pod_target_xcconfig = { diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index 624715c..21dd972 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -205,7 +205,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa return } - engine?.send("0\(socket.nsp)", withData: []) + engine?.send("0\(socket.nsp),", withData: []) } /// Called when the manager has disconnected from socket.io. From 3d9b2b2c1c1f1745dde306d0ef1aaaa8b3f64c38 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 7 Jan 2018 12:34:53 -0500 Subject: [PATCH 5/7] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c6de32..415de90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 13.1.1 - Fix [#923](https://github.com/socketio/socket.io-client-swift/issues/923) +- Fix [#894](https://github.com/socketio/socket.io-client-swift/issues/894) # v13.1.0 From 8eca6249c09d286ebe1ccdafe79f2cfc72211283 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 7 Jan 2018 18:23:36 -0500 Subject: [PATCH 6/7] add , to disconnect --- Source/SocketIO/Manager/SocketManager.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index 21dd972..2d1b209 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -233,7 +233,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa /// /// - parameter socket: The socket to disconnect. open func disconnectSocket(_ socket: SocketIOClient) { - engine?.send("1\(socket.nsp)", withData: []) + engine?.send("1\(socket.nsp),", withData: []) + socket.didDisconnect(reason: "Namespace leave") } From fa7fcc8c3bbc20dfdbe3fb17b38682f34cd19bea Mon Sep 17 00:00:00 2001 From: slidoooor Date: Wed, 10 Jan 2018 13:21:30 +0800 Subject: [PATCH 7/7] fix insert invoked twice --- Source/SocketIO/Manager/SocketManager.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index 5aa53c4..2a4a9f5 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -139,8 +139,6 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa self._config.insert(.secure(true)) } - self._config.insert(.path("/socket.io/"), replacing: false) - super.init() setConfigs(_config)