highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-11-19 02:26:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix and improve envelope stuff again, deal with messages as strings on all envelope parsing steps.

Browse Source
This commit is contained in:
fiatjaf
2025-03-12 00:17:01 -03:00
parent 42a2243b72
commit cecc71cd81
11 changed files with 151 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
nip77/envelopes.go
View File

@@ -3,6 +3,8 @@ package nip77
import (
"bytes"
"fmt"
"strings"
"unsafe"
"github.com/mailru/easyjson"
jwriter "github.com/mailru/easyjson/jwriter"
@@ -10,28 +12,28 @@ import (
"github.com/tidwall/gjson"
)
func ParseNegMessage(message []byte) nostr.Envelope {
firstComma := bytes.Index(message, []byte{','})
func ParseNegMessage(message string) nostr.Envelope {
firstComma := strings.Index(message, ",")
if firstComma == -1 {
return nil
}
label := message[0:firstComma]
var v nostr.Envelope
switch {
case bytes.Contains(label, []byte("NEG-MSG")):
switch label {
case "NEG-MSG":
v = &MessageEnvelope{}
case bytes.Contains(label, []byte("NEG-OPEN")):
case "NEG-OPEN":
v = &OpenEnvelope{}
case bytes.Contains(label, []byte("NEG-ERR")):
case "NEG-ERR":
v = &ErrorEnvelope{}
case bytes.Contains(label, []byte("NEG-CLOSE")):
case "NEG-CLOSE":
v = &CloseEnvelope{}
default:
return nil
}
if err := v.UnmarshalJSON(message); err != nil {
if err := v.FromJSON(message); err != nil {
return nil
}
return v
@@ -56,8 +58,8 @@ func (v OpenEnvelope) String() string {
return string(b)
}
func (v *OpenEnvelope) UnmarshalJSON(data []byte) error {
r := gjson.ParseBytes(data)
func (v *OpenEnvelope) FromJSON(data string) error {
r := gjson.Parse(data)
arr := r.Array()
if len(arr) != 4 {
return fmt.Errorf("failed to decode NEG-OPEN envelope")
@@ -65,7 +67,7 @@ func (v *OpenEnvelope) UnmarshalJSON(data []byte) error {
v.SubscriptionID = arr[1].Str
v.Message = arr[3].Str
return easyjson.Unmarshal([]byte(arr[2].Raw), &v.Filter)
return easyjson.Unmarshal(unsafe.Slice(unsafe.StringData(arr[2].Raw), len(arr[2].Raw)), &v.Filter)
}
func (v OpenEnvelope) MarshalJSON() ([]byte, error) {
@@ -97,8 +99,8 @@ func (v MessageEnvelope) String() string {
return string(b)
}
func (v *MessageEnvelope) UnmarshalJSON(data []byte) error {
r := gjson.ParseBytes(data)
func (v *MessageEnvelope) FromJSON(data string) error {
r := gjson.Parse(data)
arr := r.Array()
if len(arr) < 3 {
return fmt.Errorf("failed to decode NEG-MSG envelope")
@@ -130,8 +132,8 @@ func (v CloseEnvelope) String() string {
return string(b)
}
func (v *CloseEnvelope) UnmarshalJSON(data []byte) error {
r := gjson.ParseBytes(data)
func (v *CloseEnvelope) FromJSON(data string) error {
r := gjson.Parse(data)
arr := r.Array()
if len(arr) < 2 {
return fmt.Errorf("failed to decode NEG-CLOSE envelope")
@@ -159,8 +161,8 @@ func (v ErrorEnvelope) String() string {
return string(b)
}
func (v *ErrorEnvelope) UnmarshalJSON(data []byte) error {
r := gjson.ParseBytes(data)
func (v *ErrorEnvelope) FromJSON(data string) error {
r := gjson.Parse(data)
arr := r.Array()
if len(arr) < 3 {
return fmt.Errorf("failed to decode NEG-ERROR envelope")

2
nip77/idsonly.go
View File

@@ -20,7 +20,7 @@ func FetchIDsOnly(
result := make(chan error)
var r *nostr.Relay
r, err := nostr.RelayConnect(ctx, url, nostr.WithCustomHandler(func(data []byte) {
r, err := nostr.RelayConnect(ctx, url, nostr.WithCustomHandler(func(data string) {
envelope := ParseNegMessage(data)
if envelope == nil {
return

2
nip77/nip77.go
View File

@@ -49,7 +49,7 @@ func NegentropySync(
result := make(chan error)
var r *nostr.Relay
r, err = nostr.RelayConnect(ctx, url, nostr.WithCustomHandler(func(data []byte) {
r, err = nostr.RelayConnect(ctx, url, nostr.WithCustomHandler(func(data string) {
envelope := ParseNegMessage(data)
if envelope == nil {
return