highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-09-18 11:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add mutexes around websockets

Browse Source 
We replace the bare websocket.Conn type with a new Connection type which
implements `WriteJSON`, `WriteMessage`, and `Close`.  The Connection
type adds mutexes around writes since gorilla doesn't support concurrent
writes to websockets.

Signed-off-by: Honza Pokorny <honza@pokorny.ca>
This commit is contained in:
Honza Pokorny
2022-01-12 10:54:45 -04:00
committed by fiatjaf
parent ba0507cce7
commit a3df2cb893
3 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
subscription.go
View File

@@ -1,12 +1,8 @@
package nostr
import (
"github.com/gorilla/websocket"
)
type Subscription struct {
channel string
relays map[string]*websocket.Conn
relays map[string]*Connection
filters EventFilters
Events chan EventMessage
@@ -21,8 +17,8 @@ type EventMessage struct {
}
func (subscription Subscription) Unsub() {
for _, ws := range subscription.relays {
ws.WriteJSON([]interface{}{
for _, conn := range subscription.relays {
conn.WriteJSON([]interface{}{
"CLOSE",
subscription.channel,
})
@@ -37,7 +33,7 @@ func (subscription Subscription) Unsub() {
}
func (subscription Subscription) Sub() {
for _, ws := range subscription.relays {
for _, conn := range subscription.relays {
message := []interface{}{
"REQ",
subscription.channel,
@@ -46,7 +42,7 @@ func (subscription Subscription) Sub() {
message = append(message, filter)
}
ws.WriteJSON(message)
conn.WriteJSON(message)
}
if !subscription.started {
@@ -66,17 +62,17 @@ func (subscription Subscription) startHandlingUnique() {
}
func (subscription Subscription) removeRelay(relay string) {
if ws, ok := subscription.relays[relay]; ok {
if conn, ok := subscription.relays[relay]; ok {
delete(subscription.relays, relay)
ws.WriteJSON([]interface{}{
conn.WriteJSON([]interface{}{
"CLOSE",
subscription.channel,
})
}
}
func (subscription Subscription) addRelay(relay string, ws *websocket.Conn) {
subscription.relays[relay] = ws
func (subscription Subscription) addRelay(relay string, conn *Connection) {
subscription.relays[relay] = conn
message := []interface{}{
"REQ",
@@ -86,5 +82,5 @@ func (subscription Subscription) addRelay(relay string, ws *websocket.Conn) {
message = append(message, filter)
}
ws.WriteJSON(message)
conn.WriteJSON(message)
}