highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-09-08 16:33:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

get rid of WriteJSON() and replace calls with manually marshaled envelopes.

Browse Source
This commit is contained in:
fiatjaf
2023-05-09 17:02:22 -03:00
parent d36fbb95b9
commit ccbb44989f
4 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
relay.go
View File

@@ -141,7 +141,7 @@ func (r *Relay) Connect(ctx context.Context) error {
switch env := envelope.(type) {
case *NoticeEnvelope:
debugLog("{%s} %v\n", r.URL, string(message))
debugLog("{%s} %v\n", r.URL, message)
// TODO: improve this, otherwise if the application doesn't read the notices
// we'll consume ever more memory with each new notice
go func() {
@@ -152,7 +152,7 @@ func (r *Relay) Connect(ctx context.Context) error {
r.mutex.RUnlock()
}()
case *AuthEnvelope:
debugLog("{%s} %v\n", r.URL, string(message))
debugLog("{%s} %v\n", r.URL, message)
if env.Challenge == nil {
continue
}
@@ -165,7 +165,7 @@ func (r *Relay) Connect(ctx context.Context) error {
r.mutex.RUnlock()
}()
case *EventEnvelope:
debugLog("{%s} %v\n", r.URL, string(message))
debugLog("{%s} %v\n", r.URL, message)
if env.SubscriptionID == nil {
continue
}
@@ -202,7 +202,7 @@ func (r *Relay) Connect(ctx context.Context) error {
}()
}
case *EOSEEnvelope:
debugLog("{%s} %v\n", r.URL, string(message))
debugLog("{%s} %v\n", r.URL, message)
if subscription, ok := r.subscriptions.Load(string(*env)); ok {
subscription.emitEose.Do(func() {
subscription.EndOfStoredEvents <- struct{}{}
@@ -256,10 +256,10 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
defer r.okCallbacks.Delete(event.ID)
// publish event
message := []any{"EVENT", event}
debugLog("{%s} sending %v\n", r.URL, message)
envb, _ := EventEnvelope{Event: event}.MarshalJSON()
debugLog("{%s} sending %v\n", r.URL, envb)
status = PublishStatusSent
if err := r.Connection.WriteJSON(message); err != nil {
if err := r.Connection.WriteMessage(envb); err != nil {
status = PublishStatusFailed
return status, err
}
@@ -338,9 +338,9 @@ func (r *Relay) Auth(ctx context.Context, event Event) (Status, error) {
defer r.okCallbacks.Delete(event.ID)
// send AUTH
authResponse := []any{"AUTH", event}
authResponse, _ := AuthEnvelope{Event: event}.MarshalJSON()
debugLog("{%s} sending %v\n", r.URL, authResponse)
if err := r.Connection.WriteJSON(authResponse); err != nil {
if err := r.Connection.WriteMessage(authResponse); err != nil {
// status will be "failed"
return status, err
}