From 45373ad680f05d7def1f4ab1a28c74a629ee727f Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jun 2016 10:05:20 -0400 Subject: [PATCH 1/4] bump version --- README.md | 6 +++--- Socket.IO-Client-Swift.podspec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 94d0a3c..ca6b3a3 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Carthage ----------------- Add this line to your `Cartfile`: ``` -github "socketio/socket.io-client-swift" ~> 6.1.2 # Or latest version +github "socketio/socket.io-client-swift" ~> 6.1.3 # Or latest version ``` Run `carthage update --platform ios,macosx`. @@ -102,7 +102,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' use_frameworks! -pod 'Socket.IO-Client-Swift', '~> 6.1.2' # Or latest version +pod 'Socket.IO-Client-Swift', '~> 6.1.3' # Or latest version ``` Install pods: @@ -130,7 +130,7 @@ CocoaSeeds Add this line to your `Seedfile`: ``` -github "socketio/socket.io-client-swift", "v6.1.2", :files => "Source/*.swift" # Or latest version +github "socketio/socket.io-client-swift", "v6.1.3", :files => "Source/*.swift" # Or latest version ``` Run `seed install`. diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index ddf7a2d..eb2c5bb 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 = "SocketIOClientSwift" - s.version = "6.1.2" + s.version = "6.1.3" s.summary = "Socket.IO-client for iOS and OS X" s.description = <<-DESC Socket.IO-client for iOS and OS X. @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' - s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.2' } + s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.3' } s.source_files = "Source/**/*.swift" s.requires_arc = true # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files From 4383ddfe6539bb8dcb19eaefbf0ead1ac358c99a Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 24 Jun 2016 02:21:25 -0400 Subject: [PATCH 2/4] notify client when engine disconnects --- Source/SocketEngine.swift | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index 80443ec..b9478e3 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -166,7 +166,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe } } - private func closeOutEngine() { + private func closeOutEngine(reason: String) { sid = "" closed = true invalidated = true @@ -174,6 +174,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe ws?.disconnect() stopPolling() + client?.engineDidClose(reason) } /// Starts the connection to the server @@ -280,32 +281,30 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe } public func disconnect(reason: String) { - guard connected else { return closeOutEngine() } + guard connected else { return closeOutEngine(reason) } DefaultSocketLogger.Logger.log("Engine is being closed.", type: logType) if closed { - closeOutEngine() - client?.engineDidClose(reason) - return + return closeOutEngine(reason) } if websocket { sendWebSocketMessage("", withType: .Close, withData: []) - closeOutEngine() + closeOutEngine(reason) } else { - disconnectPolling() + disconnectPolling(reason) } } // We need to take special care when we're polling that we send it ASAP // Also make sure we're on the emitQueue since we're touching postWait - private func disconnectPolling() { + private func disconnectPolling(reason: String) { dispatch_sync(emitQueue) { self.postWait.append(String(SocketEnginePacketType.Close.rawValue)) let req = self.createRequestForPostWithPostWait() self.doRequest(req) {_, _, _ in } - self.closeOutEngine() + self.closeOutEngine(reason) } } From f9ae0cfdb3246746e61264729511ef9345174e8e Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 24 Jun 2016 02:22:23 -0400 Subject: [PATCH 3/4] bump version --- README.md | 6 +++--- Socket.IO-Client-Swift.podspec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ca6b3a3..9114c86 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Carthage ----------------- Add this line to your `Cartfile`: ``` -github "socketio/socket.io-client-swift" ~> 6.1.3 # Or latest version +github "socketio/socket.io-client-swift" ~> 6.1.4 # Or latest version ``` Run `carthage update --platform ios,macosx`. @@ -102,7 +102,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' use_frameworks! -pod 'Socket.IO-Client-Swift', '~> 6.1.3' # Or latest version +pod 'Socket.IO-Client-Swift', '~> 6.1.4' # Or latest version ``` Install pods: @@ -130,7 +130,7 @@ CocoaSeeds Add this line to your `Seedfile`: ``` -github "socketio/socket.io-client-swift", "v6.1.3", :files => "Source/*.swift" # Or latest version +github "socketio/socket.io-client-swift", "v6.1.4", :files => "Source/*.swift" # Or latest version ``` Run `seed install`. diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index eb2c5bb..a694ffa 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 = "SocketIOClientSwift" - s.version = "6.1.3" + s.version = "6.1.4" s.summary = "Socket.IO-client for iOS and OS X" s.description = <<-DESC Socket.IO-client for iOS and OS X. @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' - s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.3' } + s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.4' } s.source_files = "Source/**/*.swift" s.requires_arc = true # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files From 2e5442d3863394e24edfb9b39ccfe1ffae7183da Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 24 Jun 2016 02:35:18 -0400 Subject: [PATCH 4/4] unknown message isn't fatal --- Source/SocketEngine.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index b9478e3..c6244e0 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -147,7 +147,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe didError(error) } } catch { - didError("Got unknown error from server \(msg)") + client?.engineDidError("Got unknown error from server \(msg)") } }