Skip to content

Commit b00f0b7

Browse files
manually add the changes of PR of main library: socketio#1464
1 parent a21af10 commit b00f0b7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
.library(name: "SocketIO", targets: ["SocketIO"])
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.6")),
11+
.package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "4.0.8")),
1212
],
1313
targets: [
1414
.target(name: "SocketIO", dependencies: ["Starscream"]),

Source/SocketIO/Client/SocketIOClient.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
150150

151151
manager.handleQueue.asyncAfter(deadline: DispatchTime.now() + timeoutAfter) {[weak self] in
152152
guard let this = self, this.status == .connecting || this.status == .notConnected else { return }
153-
153+
DefaultSocketLogger.Logger.log("Timeout: Socket not connected, so setting to disconnected", type: this.logType)
154+
154155
this.status = .disconnected
155156
this.leaveNamespace()
156157

Source/SocketIO/Manager/SocketManager.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
132132
private(set) var reconnectAttempts = -1
133133

134134
private var _config: SocketIOClientConfiguration
135-
private var currentReconnectAttempt = 0
135+
internal var currentReconnectAttempt = 0
136136
private var reconnecting = false
137137

138138
// MARK: Initializers
@@ -186,9 +186,8 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
186186
///
187187
/// Override if you wish to attach a custom `SocketEngineSpec`.
188188
open func connect() {
189-
guard !status.active else {
189+
guard status == .connected || (status == .connecting && currentReconnectAttempt == 0) {
190190
DefaultSocketLogger.Logger.log("Tried connecting an already active socket", type: SocketManager.logType)
191-
192191
return
193192
}
194193

0 commit comments

Comments
 (0)