mirror of
https://github.com/0ceanSlim/grain.git
synced 2024-11-23 17:07:13 +00:00
Compare commits
No commits in common. "7009533c8dc6df0e2b80974e9811e65fa4673edf" and "462fa0a4b1e7419357690d86f0a1f8bc1f02d90a" have entirely different histories.
7009533c8d
...
462fa0a4b1
@ -16,55 +16,55 @@ import (
|
||||
)
|
||||
|
||||
func HandleEvent(ws *websocket.Conn, message []interface{}) {
|
||||
config.LimitedGoRoutine(func() {
|
||||
if len(message) != 2 {
|
||||
fmt.Println("Invalid EVENT message format")
|
||||
response.SendNotice(ws, "", "Invalid EVENT message format")
|
||||
return
|
||||
}
|
||||
|
||||
if len(message) != 2 {
|
||||
fmt.Println("Invalid EVENT message format")
|
||||
response.SendNotice(ws, "", "Invalid EVENT message format")
|
||||
return
|
||||
}
|
||||
eventData, ok := message[1].(map[string]interface{})
|
||||
if !ok {
|
||||
fmt.Println("Invalid event data format")
|
||||
response.SendNotice(ws, "", "Invalid event data format")
|
||||
return
|
||||
}
|
||||
eventBytes, err := json.Marshal(eventData)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshaling event data:", err)
|
||||
response.SendNotice(ws, "", "Error marshaling event data")
|
||||
return
|
||||
}
|
||||
|
||||
eventData, ok := message[1].(map[string]interface{})
|
||||
if !ok {
|
||||
fmt.Println("Invalid event data format")
|
||||
response.SendNotice(ws, "", "Invalid event data format")
|
||||
return
|
||||
}
|
||||
eventBytes, err := json.Marshal(eventData)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshaling event data:", err)
|
||||
response.SendNotice(ws, "", "Error marshaling event data")
|
||||
return
|
||||
}
|
||||
var evt nostr.Event
|
||||
err = json.Unmarshal(eventBytes, &evt)
|
||||
if err != nil {
|
||||
fmt.Println("Error unmarshaling event data:", err)
|
||||
response.SendNotice(ws, "", "Error unmarshaling event data")
|
||||
return
|
||||
}
|
||||
|
||||
var evt nostr.Event
|
||||
err = json.Unmarshal(eventBytes, &evt)
|
||||
if err != nil {
|
||||
fmt.Println("Error unmarshaling event data:", err)
|
||||
response.SendNotice(ws, "", "Error unmarshaling event data")
|
||||
return
|
||||
}
|
||||
// Signature check moved here
|
||||
if !utils.CheckSignature(evt) {
|
||||
response.SendOK(ws, evt.ID, false, "invalid: signature verification failed")
|
||||
return
|
||||
}
|
||||
|
||||
// Signature check moved here
|
||||
if !utils.CheckSignature(evt) {
|
||||
response.SendOK(ws, evt.ID, false, "invalid: signature verification failed")
|
||||
return
|
||||
}
|
||||
eventSize := len(eventBytes) // Calculate event size
|
||||
|
||||
eventSize := len(eventBytes) // Calculate event size
|
||||
if !handleBlacklistAndWhitelist(ws, evt) {
|
||||
return
|
||||
}
|
||||
|
||||
if !handleBlacklistAndWhitelist(ws, evt) {
|
||||
return
|
||||
}
|
||||
if !handleRateAndSizeLimits(ws, evt, eventSize) {
|
||||
return
|
||||
}
|
||||
|
||||
if !handleRateAndSizeLimits(ws, evt, eventSize) {
|
||||
return
|
||||
}
|
||||
|
||||
// This is where I'll handle storage for multiple database types in the future
|
||||
db.StoreMongoEvent(context.TODO(), evt, ws)
|
||||
|
||||
fmt.Println("Event processed:", evt.ID)
|
||||
// This is where I'll handle storage for multiple database types in the future
|
||||
db.StoreMongoEvent(context.TODO(), evt, ws)
|
||||
|
||||
fmt.Println("Event processed:", evt.ID)
|
||||
})
|
||||
}
|
||||
|
||||
func handleBlacklistAndWhitelist(ws *websocket.Conn, evt nostr.Event) bool {
|
||||
|
||||
@ -16,135 +16,98 @@ import (
|
||||
var subscriptions = make(map[string]relay.Subscription)
|
||||
var mu sync.Mutex // Protect concurrent access to subscriptions map
|
||||
|
||||
// RequestQueue holds incoming requests
|
||||
var RequestQueue = make(chan Request, 1000) // Adjust buffer size as needed
|
||||
|
||||
type Request struct {
|
||||
Ws *websocket.Conn
|
||||
Message []interface{}
|
||||
}
|
||||
|
||||
// StartWorkerPool initializes a pool of worker goroutines
|
||||
func StartWorkerPool(numWorkers int) {
|
||||
for i := 0; i < numWorkers; i++ {
|
||||
go worker()
|
||||
}
|
||||
}
|
||||
|
||||
// worker processes requests from the RequestQueue
|
||||
func worker() {
|
||||
for req := range RequestQueue {
|
||||
processRequest(req.Ws, req.Message)
|
||||
}
|
||||
}
|
||||
|
||||
// HandleReq now just adds the request to the queue
|
||||
func HandleReq(ws *websocket.Conn, message []interface{}, subscriptions map[string][]relay.Filter) {
|
||||
select {
|
||||
case RequestQueue <- Request{Ws: ws, Message: message}:
|
||||
// Request added to queue
|
||||
default:
|
||||
// Queue is full, log the dropped request
|
||||
fmt.Println("Warning: Request queue is full, dropping request")
|
||||
}
|
||||
}
|
||||
|
||||
// processRequest handles the actual processing of each request
|
||||
func processRequest(ws *websocket.Conn, message []interface{}) {
|
||||
if len(message) < 3 {
|
||||
fmt.Println("Invalid REQ message format")
|
||||
response.SendClosed(ws, "", "invalid: invalid REQ message format")
|
||||
return
|
||||
}
|
||||
|
||||
subID, ok := message[1].(string)
|
||||
if !ok {
|
||||
fmt.Println("Invalid subscription ID format")
|
||||
response.SendClosed(ws, "", "invalid: invalid subscription ID format")
|
||||
return
|
||||
}
|
||||
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
// Check the current number of subscriptions for the client
|
||||
if len(subscriptions) >= config.GetConfig().Server.MaxSubscriptionsPerClient {
|
||||
// Find and remove the oldest subscription (FIFO)
|
||||
var oldestSubID string
|
||||
for id := range subscriptions {
|
||||
oldestSubID = id
|
||||
break
|
||||
config.LimitedGoRoutine(func() {
|
||||
if len(message) < 3 {
|
||||
fmt.Println("Invalid REQ message format")
|
||||
response.SendClosed(ws, "", "invalid: invalid REQ message format")
|
||||
return
|
||||
}
|
||||
delete(subscriptions, oldestSubID)
|
||||
fmt.Println("Dropped oldest subscription:", oldestSubID)
|
||||
}
|
||||
|
||||
// Prepare filters based on the incoming message
|
||||
filters := make([]relay.Filter, len(message)-2)
|
||||
for i, filter := range message[2:] {
|
||||
filterData, ok := filter.(map[string]interface{})
|
||||
subID, ok := message[1].(string)
|
||||
if !ok {
|
||||
fmt.Println("Invalid filter format")
|
||||
response.SendClosed(ws, subID, "invalid: invalid filter format")
|
||||
fmt.Println("Invalid subscription ID format")
|
||||
response.SendClosed(ws, "", "invalid: invalid subscription ID format")
|
||||
return
|
||||
}
|
||||
|
||||
var f relay.Filter
|
||||
f.IDs = utils.ToStringArray(filterData["ids"])
|
||||
f.Authors = utils.ToStringArray(filterData["authors"])
|
||||
f.Kinds = utils.ToIntArray(filterData["kinds"])
|
||||
f.Tags = utils.ToTagsMap(filterData["tags"])
|
||||
f.Since = utils.ToTime(filterData["since"])
|
||||
f.Until = utils.ToTime(filterData["until"])
|
||||
f.Limit = utils.ToInt(filterData["limit"])
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
filters[i] = f
|
||||
}
|
||||
// Check the current number of subscriptions for the client
|
||||
if len(subscriptions) >= config.GetConfig().Server.MaxSubscriptionsPerClient {
|
||||
// Find and remove the oldest subscription (FIFO)
|
||||
var oldestSubID string
|
||||
for id := range subscriptions {
|
||||
oldestSubID = id
|
||||
break
|
||||
}
|
||||
delete(subscriptions, oldestSubID)
|
||||
fmt.Println("Dropped oldest subscription:", oldestSubID)
|
||||
}
|
||||
|
||||
// Add the new subscription or update the existing one
|
||||
subscriptions[subID] = relay.Subscription{Filters: filters}
|
||||
fmt.Printf("Subscription updated: %s with %d filters\n", subID, len(filters))
|
||||
// Prepare filters based on the incoming message
|
||||
filters := make([]relay.Filter, len(message)-2)
|
||||
for i, filter := range message[2:] {
|
||||
filterData, ok := filter.(map[string]interface{})
|
||||
if !ok {
|
||||
fmt.Println("Invalid filter format")
|
||||
response.SendClosed(ws, subID, "invalid: invalid filter format")
|
||||
return
|
||||
}
|
||||
|
||||
// Query the database with filters and send back the results
|
||||
queriedEvents, err := db.QueryEvents(filters, db.GetClient(), "grain")
|
||||
if err != nil {
|
||||
fmt.Println("Error querying events:", err)
|
||||
response.SendClosed(ws, subID, "error: could not query events")
|
||||
return
|
||||
}
|
||||
var f relay.Filter
|
||||
f.IDs = utils.ToStringArray(filterData["ids"])
|
||||
f.Authors = utils.ToStringArray(filterData["authors"])
|
||||
f.Kinds = utils.ToIntArray(filterData["kinds"])
|
||||
f.Tags = utils.ToTagsMap(filterData["tags"])
|
||||
f.Since = utils.ToTime(filterData["since"])
|
||||
f.Until = utils.ToTime(filterData["until"])
|
||||
f.Limit = utils.ToInt(filterData["limit"])
|
||||
|
||||
// Log the number of events retrieved
|
||||
fmt.Printf("Retrieved %d events for subscription %s\n", len(queriedEvents), subID)
|
||||
if len(queriedEvents) == 0 {
|
||||
fmt.Printf("No matching events found for subscription %s\n", subID)
|
||||
}
|
||||
filters[i] = f
|
||||
}
|
||||
|
||||
// Send each event back to the client
|
||||
for _, evt := range queriedEvents {
|
||||
msg := []interface{}{"EVENT", subID, evt}
|
||||
msgBytes, _ := json.Marshal(msg)
|
||||
err = websocket.Message.Send(ws, string(msgBytes))
|
||||
// Add the new subscription or update the existing one
|
||||
subscriptions[subID] = filters
|
||||
fmt.Printf("Subscription updated: %s with %d filters\n", subID, len(filters))
|
||||
|
||||
// Query the database with filters and send back the results
|
||||
queriedEvents, err := db.QueryEvents(filters, db.GetClient(), "grain")
|
||||
if err != nil {
|
||||
fmt.Println("Error sending event:", err)
|
||||
response.SendClosed(ws, subID, "error: could not send event")
|
||||
fmt.Println("Error querying events:", err)
|
||||
response.SendClosed(ws, subID, "error: could not query events")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Indicate end of stored events
|
||||
eoseMsg := []interface{}{"EOSE", subID}
|
||||
eoseBytes, _ := json.Marshal(eoseMsg)
|
||||
err = websocket.Message.Send(ws, string(eoseBytes))
|
||||
if err != nil {
|
||||
fmt.Println("Error sending EOSE:", err)
|
||||
response.SendClosed(ws, subID, "error: could not send EOSE")
|
||||
return
|
||||
}
|
||||
// Log the number of events retrieved
|
||||
fmt.Printf("Retrieved %d events for subscription %s\n", len(queriedEvents), subID)
|
||||
if len(queriedEvents) == 0 {
|
||||
fmt.Printf("No matching events found for subscription %s\n", subID)
|
||||
}
|
||||
|
||||
fmt.Println("Subscription handling completed, keeping connection open.")
|
||||
}
|
||||
|
||||
// Initialize the worker pool when your server starts
|
||||
func init() {
|
||||
StartWorkerPool(10) // Adjust the number of workers as needed
|
||||
// Send each event back to the client
|
||||
for _, evt := range queriedEvents {
|
||||
msg := []interface{}{"EVENT", subID, evt}
|
||||
msgBytes, _ := json.Marshal(msg)
|
||||
err = websocket.Message.Send(ws, string(msgBytes))
|
||||
if err != nil {
|
||||
fmt.Println("Error sending event:", err)
|
||||
response.SendClosed(ws, subID, "error: could not send event")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Indicate end of stored events
|
||||
eoseMsg := []interface{}{"EOSE", subID}
|
||||
eoseBytes, _ := json.Marshal(eoseMsg)
|
||||
err = websocket.Message.Send(ws, string(eoseBytes))
|
||||
if err != nil {
|
||||
fmt.Println("Error sending EOSE:", err)
|
||||
response.SendClosed(ws, subID, "error: could not send EOSE")
|
||||
return
|
||||
}
|
||||
|
||||
fmt.Println("Subscription handling completed, keeping connection open.")
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user