Skip to content

Commit 05c0874

Browse files
authored
Merge pull request #408 from socketio/development
Development
2 parents 45373ad + 2e5442d commit 05c0874

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Carthage
8888
-----------------
8989
Add this line to your `Cartfile`:
9090
```
91-
github "socketio/socket.io-client-swift" ~> 6.1.3 # Or latest version
91+
github "socketio/socket.io-client-swift" ~> 6.1.4 # Or latest version
9292
```
9393

9494
Run `carthage update --platform ios,macosx`.
@@ -102,7 +102,7 @@ source 'https://github.com/CocoaPods/Specs.git'
102102
platform :ios, '8.0'
103103
use_frameworks!
104104

105-
pod 'Socket.IO-Client-Swift', '~> 6.1.3' # Or latest version
105+
pod 'Socket.IO-Client-Swift', '~> 6.1.4' # Or latest version
106106
```
107107

108108
Install pods:
@@ -130,7 +130,7 @@ CocoaSeeds
130130
Add this line to your `Seedfile`:
131131

132132
```
133-
github "socketio/socket.io-client-swift", "v6.1.3", :files => "Source/*.swift" # Or latest version
133+
github "socketio/socket.io-client-swift", "v6.1.4", :files => "Source/*.swift" # Or latest version
134134
```
135135

136136
Run `seed install`.

Socket.IO-Client-Swift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Socket.IO-Client-Swift"
33
s.module_name = "SocketIOClientSwift"
4-
s.version = "6.1.3"
4+
s.version = "6.1.4"
55
s.summary = "Socket.IO-client for iOS and OS X"
66
s.description = <<-DESC
77
Socket.IO-client for iOS and OS X.
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.ios.deployment_target = '8.0'
1515
s.osx.deployment_target = '10.10'
1616
s.tvos.deployment_target = '9.0'
17-
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.3' }
17+
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v6.1.4' }
1818
s.source_files = "Source/**/*.swift"
1919
s.requires_arc = true
2020
# s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files

Source/SocketEngine.swift

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
147147
didError(error)
148148
}
149149
} catch {
150-
didError("Got unknown error from server \(msg)")
150+
client?.engineDidError("Got unknown error from server \(msg)")
151151
}
152152
}
153153

@@ -166,14 +166,15 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
166166
}
167167
}
168168

169-
private func closeOutEngine() {
169+
private func closeOutEngine(reason: String) {
170170
sid = ""
171171
closed = true
172172
invalidated = true
173173
connected = false
174174

175175
ws?.disconnect()
176176
stopPolling()
177+
client?.engineDidClose(reason)
177178
}
178179

179180
/// Starts the connection to the server
@@ -280,32 +281,30 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
280281
}
281282

282283
public func disconnect(reason: String) {
283-
guard connected else { return closeOutEngine() }
284+
guard connected else { return closeOutEngine(reason) }
284285

285286
DefaultSocketLogger.Logger.log("Engine is being closed.", type: logType)
286287

287288
if closed {
288-
closeOutEngine()
289-
client?.engineDidClose(reason)
290-
return
289+
return closeOutEngine(reason)
291290
}
292291

293292
if websocket {
294293
sendWebSocketMessage("", withType: .Close, withData: [])
295-
closeOutEngine()
294+
closeOutEngine(reason)
296295
} else {
297-
disconnectPolling()
296+
disconnectPolling(reason)
298297
}
299298
}
300299

301300
// We need to take special care when we're polling that we send it ASAP
302301
// Also make sure we're on the emitQueue since we're touching postWait
303-
private func disconnectPolling() {
302+
private func disconnectPolling(reason: String) {
304303
dispatch_sync(emitQueue) {
305304
self.postWait.append(String(SocketEnginePacketType.Close.rawValue))
306305
let req = self.createRequestForPostWithPostWait()
307306
self.doRequest(req) {_, _, _ in }
308-
self.closeOutEngine()
307+
self.closeOutEngine(reason)
309308
}
310309
}
311310

0 commit comments

Comments
 (0)