nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-18 19:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: endless connection attempt loop after user removes relay

Browse Source 
This patch fixes an issue where, after the user removes a misbehaving
relay, the RelayConnection will keep trying to reconnect endlessly. You
can reproduce the issue prior to this change by adding the relay
wss://brb.io. It will fail to connect over and over. Then remove the
relay in the UI. In the console, you will see that it keeps trying to
connect, and the corresponding RelayConnection never gets deallocated.
After the change, it stops connecting and deallocates the
RelayConnection.

Changelog-Fixed: endless connection attempt loop after user removes relay
Signed-off-by: Bryan Montz <bryanmontz@me.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Bryan Montz 2023-07-28 07:34:38 -05:00 committed by William Casarin
parent 593d0e2abe
commit 4fecf72963
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
damus/Nostr/RelayConnection.swift
View File

@ -40,6 +40,7 @@ public struct RelayURL: Hashable {
final class RelayConnection: ObservableObject {
@Published private(set) var isConnected = false
@Published private(set) var isConnecting = false
private var isDisabled = false
private(set) var last_connection_attempt: TimeInterval = 0
private(set) var last_pong: Date? = nil
@ -57,7 +58,11 @@ final class RelayConnection: ObservableObject {
}
func ping() {
socket.ping { err in
socket.ping { [weak self] err in
guard let self else {
return
}
if err == nil {
self.last_pong = .now
self.log?.add("Successful ping")
@ -103,6 +108,10 @@ final class RelayConnection: ObservableObject {
isConnecting = false
}
func disablePermanently() {
isDisabled = true
}
func send_raw(_ req: String) {
socket.send(.string(req))
}
@ -168,8 +177,8 @@ final class RelayConnection: ObservableObject {
}
func reconnect() {
guard !isConnecting else {
return // we're already trying to connect
guard !isConnecting && !isDisabled else {
return // we're already trying to connect or we're disabled
}
disconnect()
connect()

1
damus/Nostr/RelayPool.swift
View File

@ -95,6 +95,7 @@ class RelayPool {
for relay in relays {
if relay.id == relay_id {
relay.connection.disablePermanently()
relays.remove(at: i)
break
}