cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't lose ping precision

Browse Source
This commit is contained in:
Erik Little 2017-09-16 10:41:15 -04:00
parent d8104f4bf8
commit f6fa5b79ea
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/SocketIO/Engine/SocketEngine.swift
View File

@ -123,10 +123,10 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
private let url: URL private let url: URL
private var pingInterval: Double? private var pingInterval: Int?
private var pingTimeout = 0.0 { private var pingTimeout = 0 {
didSet { didSet {
pongsMissedMax = Int(pingTimeout / (pingInterval ?? 25)) pongsMissedMax = Int(pingTimeout / (pingInterval ?? 25000))
} }
} }
@ -459,9 +459,9 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
upgradeWs = false upgradeWs = false
} }
if let pingInterval = json["pingInterval"] as? Double, let pingTimeout = json["pingTimeout"] as? Double { if let pingInterval = json["pingInterval"] as? Int, let pingTimeout = json["pingTimeout"] as? Int {
self.pingInterval = pingInterval / 1000.0 self.pingInterval = pingInterval
self.pingTimeout = pingTimeout / 1000.0 self.pingTimeout = pingTimeout
} }
if !forcePolling && !forceWebsockets && upgradeWs { if !forcePolling && !forceWebsockets && upgradeWs {
@ -550,7 +550,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
} }
private func sendPing() { private func sendPing() {
guard connected else { return } guard connected, let pingInterval = pingInterval else { return }
// Server is not responding // Server is not responding
if pongsMissed > pongsMissedMax { if pongsMissed > pongsMissedMax {
@ -559,12 +559,12 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
return return
} }
guard let pingInterval = pingInterval else { return }
pongsMissed += 1 pongsMissed += 1
write("", withType: .ping, withData: []) write("", withType: .ping, withData: [])
engineQueue.asyncAfter(deadline: DispatchTime.now() + Double(pingInterval)) {[weak self] in self?.sendPing() } engineQueue.asyncAfter(deadline: DispatchTime.now() + .milliseconds(pingInterval)) {[weak self] in
self?.sendPing()
}
} }
// Moves from long-polling to websockets // Moves from long-polling to websockets