ping: switch to async style

because reasons
This commit is contained in:
William Casarin
2023-06-20 11:21:07 +02:00
parent 296d96d6df
commit bcaa1d2354
2 changed files with 18 additions and 7 deletions

View File

@@ -56,15 +56,18 @@ final class RelayConnection: ObservableObject {
} }
func ping() { func ping() {
socket.ping { err in Task {
if err == nil { do {
self.last_pong = .now try await socket.ping()
} else { } catch {
print("pong failed, reconnecting \(self.url.id)") print("pong failed (\(error)), reconnecting \(self.url.id)")
self.isConnected = false self.isConnected = false
self.isConnecting = false self.isConnecting = false
self.reconnect_with_backoff() self.reconnect_with_backoff()
return
} }
self.last_pong = .now
} }
} }

View File

@@ -45,8 +45,16 @@ final class WebSocket: NSObject, URLSessionWebSocketDelegate {
self.session = session self.session = session
} }
func ping(receiveHandler: @escaping (Error?) -> Void) { func ping() async throws -> () {
self.webSocketTask.sendPing(pongReceiveHandler: receiveHandler) return try await withCheckedThrowingContinuation { cont in
self.webSocketTask.sendPing { err in
if let err {
cont.resume(throwing: err)
} else {
cont.resume(returning: ())
}
}
}
} }
func connect() { func connect() {