Skip to content

Commit 091797f

Browse files
nuclearacenuclearace
authored
Merge pull request #1231 from salpeev/fix/reconnection
Fixed endless reconnection loop
2 parents 0d44b10 + 1db9232 commit 091797f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+153
-205
lines changed

‎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 = "SocketIO"
4-
s.version = "15.0.0"
4+
s.version = "15.1.0"
55
s.summary = "Socket.IO-client for iOS and OS X"
66
s.description = <<-DESC
77
Socket.IO-client for iOS and OS X.
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818
s.requires_arc = true
1919
s.source = {
2020
:git => "https://github.com/socketio/socket.io-client-swift.git",
21-
:tag => 'v15.0.0',
21+
:tag => 'v15.1.0',
2222
:submodules => true
2323
}
2424

‎Source/SocketIO/Ack/SocketAckEmitter.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public final class OnAckCallback : NSObject {
115115
self.binary = binary
116116
}
117117

118+
/// :nodoc:
118119
deinit {
119120
DefaultSocketLogger.Logger.log("OnAckCallback for \(ackNumber) being released", type: "OnAckCallback")
120121
}

‎Source/SocketIO/Client/SocketIOClient.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ open class SocketIOClient : NSObject, SocketIOClientSpec {
107107
super.init()
108108
}
109109

110+
/// :nodoc:
110111
deinit {
111112
DefaultSocketLogger.Logger.log("Client is being released", type: logType)
112113
}

‎Source/SocketIO/Engine/SocketEngine.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So
113113
/// If `true`, then the engine is currently in WebSockets mode.
114114
@available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets")
115115
public private(set) var websocket = false
116-
116+
117117
/// When `true`, the WebSocket `stream` will be configured with the enableSOCKSProxy `true`.
118118
public private(set) var enableSOCKSProxy = false
119119

@@ -170,6 +170,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So
170170
self.init(client: client, url: url, config: options?.toSocketConfiguration() ?? [])
171171
}
172172

173+
/// :nodoc:
173174
deinit {
174175
DefaultSocketLogger.Logger.log("Engine is being released", type: SocketEngine.logType)
175176
closed = true
@@ -226,7 +227,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So
226227
if connected {
227228
DefaultSocketLogger.Logger.error("Engine tried opening while connected. Assuming this was a reconnect",
228229
type: SocketEngine.logType)
229-
disconnect(reason: "reconnect")
230+
_disconnect(reason: "reconnect")
230231
}
231232

232233
DefaultSocketLogger.Logger.log("Starting engine. Server: \(url)", type: SocketEngine.logType)

‎Source/SocketIO/Manager/SocketManager.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
158158
self.init(socketURL: socketURL, config: config?.toSocketConfiguration() ?? [])
159159
}
160160

161+
/// :nodoc:
161162
deinit {
162163
DefaultSocketLogger.Logger.log("Manager is being released", type: SocketManager.logType)
163164

‎docs/12to13.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<a class="header-link" href="index.html">
2323
SocketIO Docs
2424
</a>
25-
(98% documented)
25+
(100% documented)
2626
</p>
2727

2828
<p class="header-col--secondary">
@@ -283,7 +283,7 @@ <h2 id='what-to-call-connect-on' class='heading'>What to call connect on</h2>
283283
</article>
284284
</div>
285285
<section class="footer">
286-
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-03-28)</p>
286+
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
287287
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
288288
</section>
289289
</body>

‎docs/Classes.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a class="header-link" href="index.html">
2424
SocketIO Docs
2525
</a>
26-
(98% documented)
26+
(100% documented)
2727
</p>
2828

2929
<p class="header-col--secondary">
@@ -525,7 +525,7 @@ <h4>Declaration</h4>
525525
</article>
526526
</div>
527527
<section class="footer">
528-
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-03-28)</p>
528+
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
529529
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
530530
</section>
531531
</body>

‎docs/Classes/OnAckCallback.html‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a class="header-link" href="../index.html">
2424
SocketIO Docs
2525
</a>
26-
(98% documented)
26+
(100% documented)
2727
</p>
2828

2929
<p class="header-col--secondary">
@@ -205,37 +205,6 @@ <h1>OnAckCallback</h1>
205205

206206
<section class="section">
207207
<div class="section-content">
208-
<div class="task-group">
209-
<ul class="item-container">
210-
<li class="item">
211-
<div>
212-
<code>
213-
<a name="/c:@M@SocketIO@objc(cs)OnAckCallback(im)dealloc"></a>
214-
<a name="//apple_ref/swift/Method/deinit" class="dashAnchor"></a>
215-
<a class="token" href="#/c:@M@SocketIO@objc(cs)OnAckCallback(im)dealloc">deinit</a>
216-
</code>
217-
</div>
218-
<div class="height-container">
219-
<div class="pointer-container"></div>
220-
<section class="section">
221-
<div class="pointer"></div>
222-
<div class="abstract">
223-
<p>Undocumented</p>
224-
225-
</div>
226-
<div class="declaration">
227-
<h4>Declaration</h4>
228-
<div class="language">
229-
<p class="aside-title">Swift</p>
230-
<pre class="highlight swift"><code><span class="kd">deinit</span></code></pre>
231-
232-
</div>
233-
</div>
234-
</section>
235-
</div>
236-
</li>
237-
</ul>
238-
</div>
239208
<div class="task-group">
240209
<div class="task-name-container">
241210
<a name="/Methods"></a>
@@ -313,7 +282,7 @@ <h4>Parameters</h4>
313282
</article>
314283
</div>
315284
<section class="footer">
316-
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-03-28)</p>
285+
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
317286
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
318287
</section>
319288
</body>

‎docs/Classes/SSLSecurity.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a class="header-link" href="../index.html">
2424
SocketIO Docs
2525
</a>
26-
(98% documented)
26+
(100% documented)
2727
</p>
2828

2929
<p class="header-col--secondary">
@@ -428,7 +428,7 @@ <h4>Return Value</h4>
428428
</article>
429429
</div>
430430
<section class="footer">
431-
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-03-28)</p>
431+
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
432432
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
433433
</section>
434434
</body>

‎docs/Classes/SocketAckEmitter.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a class="header-link" href="../index.html">
2424
SocketIO Docs
2525
</a>
26-
(98% documented)
26+
(100% documented)
2727
</p>
2828

2929
<p class="header-col--secondary">
@@ -459,7 +459,7 @@ <h4>Parameters</h4>
459459
</article>
460460
</div>
461461
<section class="footer">
462-
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-03-28)</p>
462+
<p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
463463
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
464464
</section>
465465
</body>

0 commit comments

Comments
 (0)