OceanSlim/grain
1
0
Fork 0
mirror of https://github.com/0ceanSlim/grain.git synced 2024-10-29 17:16:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

properly update subscriptions, sub ID's per connection

Browse Source
This commit is contained in:
Chris kerr 2024-07-31 20:09:47 -04:00
parent ae2f98aafc
commit 5ea0d36ba3
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/handlers/req.go
View File

@ -17,7 +17,7 @@ import (
var subscriptions = make(map[string]relay.Subscription)
func HandleReq(ws *websocket.Conn, message []interface{}) {
func HandleReq(ws *websocket.Conn, message []interface{}, subscriptions map[string][]relay.Filter) {
if len(message) < 3 {
fmt.Println("Invalid REQ message format")
response.SendClosed(ws, "", "invalid: invalid REQ message format")
@ -52,14 +52,9 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
filters[i] = f
}
// Check if subscription already exists
if _, exists := subscriptions[subID]; exists {
response.SendClosed(ws, subID, "duplicate: subID already opened")
return
}
subscriptions[subID] = relay.Subscription{ID: subID, Filters: filters}
fmt.Println("Subscription added:", subID)
// Update or add the subscription for the given subID
subscriptions[subID] = filters
fmt.Println("Subscription updated:", subID)
// Query the database with filters and send back the results
queriedEvents, err := QueryEvents(filters, db.GetClient(), "grain")

7
server/relay.go
View File

@ -7,6 +7,8 @@ import (
"grain/config"
relay "grain/server/types"
"golang.org/x/net/websocket"
)
@ -16,11 +18,12 @@ func WebSocketHandler(ws *websocket.Conn) {
var msg string
rateLimiter := config.GetRateLimiter()
subscriptions := make(map[string][]relay.Filter) // Subscription map scoped to the connection
for {
err := websocket.Message.Receive(ws, &msg)
if err != nil {
fmt.Println("Error receiving message:", err)
// Send a close message with an error code and reason
ws.Close()
return
}
@ -59,7 +62,7 @@ func WebSocketHandler(ws *websocket.Conn) {
ws.Close()
return
}
handlers.HandleReq(ws, message)
handlers.HandleReq(ws, message, subscriptions)
case "CLOSE":
handlers.HandleClose(ws, message)
default: