fix: remove listeners when client disconnects

This commit is contained in:
0x0ff 2022-12-29 15:02:59 +01:00 committed by fiatjaf
parent 9ba4326085
commit 8b3ff7ac26
2 changed files with 15 additions and 2 deletions

View File

@ -60,6 +60,7 @@ func (s *Server) handleWebsocket(w http.ResponseWriter, r *http.Request) {
if _, ok := s.clients[conn]; ok {
conn.Close()
delete(s.clients, conn)
removeListener(ws)
}
s.clientsMu.Unlock()
}()
@ -214,7 +215,7 @@ func (s *Server) handleWebsocket(w http.ResponseWriter, r *http.Request) {
return
}
removeListener(ws, id)
removeListenerId(ws, id)
break
default:
if cwh, ok := s.relay.(CustomWebSocketHandler); ok {

View File

@ -63,7 +63,8 @@ func setListener(id string, ws *WebSocket, filters nostr.Filters) {
}
}
func removeListener(ws *WebSocket, id string) {
// Remove a specific subscription id from listeners for a given ws client
func removeListenerId(ws *WebSocket, id string) {
listenersMutex.Lock()
defer func() {
listenersMutex.Unlock()
@ -78,6 +79,17 @@ func removeListener(ws *WebSocket, id string) {
}
}
// Remove WebSocket conn from listeners
func removeListener(ws *WebSocket) {
listenersMutex.Lock()
defer listenersMutex.Unlock()
_, ok := listeners[ws]
if ok {
delete(listeners, ws)
}
}
func notifyListeners(event *nostr.Event) {
listenersMutex.Lock()
defer func() {