update go-nostr so subscriptions can end.

README.md

@@ -19,6 +19,13 @@ It pairs nicely with https://github.com/blakejakopovic/nostcat using unix pipes.
 
 ~> nak event -c hello --sec e8314053e76f5fff73481f6a1a1affce3f34645f0c10df0a8d33fd80f0f03255
 {"id":"ed840ef37a40cce4f4b8c361e5df13457ad664209cf4a297fd7df7e84fdd32e0","pubkey":"5b36b874b2b983197ba4be80553b2e4b6db2895a04567cea0aa47585b2e0c620","created_at":1683201092,"kind":1,"tags":[],"content":"hello","sig":"304a87dbbdf986a187eb9417316cfe3d6f8f31793ba20c9c6d7e4ebeeefe950d6ecba6098c201b7170c04e27c2f920d607a90f5c8763c35ac806dce37df1d05d"}
+~> nak event -c hello --sec e8314053e76f5fff73481f6a1a1affce3f34645f0c10df0a8d33fd80f0f03255 wss://relay.stoner.com wss://nos.lol wss://nostr.wine wss://atlas.nostr.land wss://relay.damus.io
+{"id":"54a534647bdcd2751d743fea4fc9eee5dba613887d69425f0891d9c2f82772a5","pubkey":"5b36b874b2b983197ba4be80553b2e4b6db2895a04567cea0aa47585b2e0c620","created_at":1684895417,"kind":1,"tags":[],"content":"hello","sig":"81a14cfe628fab6cd6135bb66f6e8b3bb4bfce4f666462a1303fdfbc9038fd141e73db3fe7e774a8f023fc70622c50a67d4fa41d3d09806c78f051985c11e0bd"}
+publishing to wss://relay.stoner.com... failed: msg: blocked: pubkey is not allowed to publish to this relay
+publishing to wss://nos.lol... success.
+publishing to wss://nostr.wine... failed: msg: blocked: not an active paid member
+publishing to wss://atlas.nostr.land... failed: msg: blocked: pubkey not admitted
+publishing to wss://relay.damus.io... success.
 
 ~> nak decode nevent1qqs29yet5tp0qq5xu5qgkeehkzqh5qu46739axzezcxpj4tjlkx9j7gpr4mhxue69uhkummnw3ez6ur4vgh8wetvd3hhyer9wghxuet5sh59ud
 {
@@ -30,6 +37,9 @@ It pairs nicely with https://github.com/blakejakopovic/nostcat using unix pipes.
 
 ~> nak req -a a2932ba2c2f00286e5008b6737b0817a0395d7a25e9859160c195572fd8c5979 -k 1 -a e8b487c079b0f67c695ae6c4c2552a47f38adfa2533cc5926bd2c102942fdcb7
 ["REQ","nak",{"kinds":[1],"authors":["a2932ba2c2f00286e5008b6737b0817a0395d7a25e9859160c195572fd8c5979","e8b487c079b0f67c695ae6c4c2552a47f38adfa2533cc5926bd2c102942fdcb7"]}]
+
+~> nak req -k 1 -l 1 --stream wss://relay.stoner.com
+{"id":"1d73832917bf5a72276c53e9246c28b97225b51cd5735843434f7756fc0ddead","pubkey":"3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d","created_at":1684894689,"kind":1,"tags":[["p","bcbeb5a2e6b547f6d0c3d8c16145f7bb94f3639ec7ecbcfe50045dbb2eede70b","wss://nos.lol","artk42"],["e","b5af6815c8d89a7d5b6201b9e624fbd5389fca3337ba2dc05c6187234a7c1bd5","wss://nos.lol","root"],["e","5795e27aff0a459a30c64a61a32c43d968cd19c8f1926cf01fc02e9da7c56f2b","wss://nos.lol","reply"],["client","coracle"]],"content":"Because that makes no sense.","sig":"3ee5b2b26ec6b116ef1a6b1c10bc7e56674a3c36841814f68b57f63259f3d78e23629d4599afe67e72c220e27b4b0966cc51adc1da808c8c6111dedb531ac0c3"}
 ```
 
 ### documentation
@@ -44,7 +54,7 @@ USAGE:
 
 COMMANDS:
    req      generates encoded REQ messages and optionally use them to talk to relays
-   event    generates an encoded event
+   event    generates an encoded event and either prints it or sends it to a set of relays
    decode   decodes nip19, nip21, nip05 or hex entities
    help, h  Shows a list of commands or help for one command
 
@@ -53,7 +63,7 @@ GLOBAL OPTIONS:
 
 ~> nak event --help
 NAME:
-   nak event - generates an encoded event
+   nak event - generates an encoded event and either prints it or sends it to a set of relays
 
 USAGE:
    nak event [command options] [arguments...]
@@ -61,6 +71,8 @@ USAGE:
 DESCRIPTION:
    example usage (for sending directly to a relay with 'nostcat'):
        nak event -k 1 -c hello --envelope | nostcat wss://nos.lol
+   standalone:
+       nak event -k 1 -c hello wss://nos.lol`,
 
 OPTIONS:
    --envelope   print the event enveloped in a ["EVENT", ...] message ready to be sent to a relay (default: false)
@@ -87,7 +99,6 @@ DESCRIPTION:
 
    example usage (with 'nostcat'):
        nak req -k 1 -a 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d | nostcat wss://nos.lol
-
    standalone:
        nak req -k 1 wss://nos.lol
 

event.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -15,9 +17,11 @@ const CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
 
 var event = &cli.Command{
 	Name:  "event",
-	Usage: "generates an encoded event",
+	Usage: "generates an encoded event and either prints it or sends it to a set of relays",
 	Description: `example usage (for sending directly to a relay with 'nostcat'):
-		nak event -k 1 -c hello --envelope | nostcat wss://nos.lol`,
+		nak event -k 1 -c hello --envelope | nostcat wss://nos.lol
+standalone:
+		nak event -k 1 -c hello wss://nos.lol`,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:        "sec",
@@ -70,6 +74,7 @@ var event = &cli.Command{
 			Category:    CATEGORY_EVENT_FIELDS,
 		},
 	},
+	ArgsUsage: "[relay...]",
 	Action: func(c *cli.Context) error {
 		evt := nostr.Event{
 			Kind:    c.Int("kind"),
@@ -111,6 +116,24 @@ var event = &cli.Command{
 			return fmt.Errorf("error signing with provided key: %w", err)
 		}
 
+		relays := c.Args().Slice()
+		if len(relays) > 0 {
+			fmt.Println(evt.String())
+			for _, url := range relays {
+				fmt.Fprintf(os.Stderr, "publishing to %s... ", url)
+				if relay, err := nostr.RelayConnect(c.Context, url); err != nil {
+					fmt.Fprintf(os.Stderr, "failed to connect: %s\n", err)
+				} else {
+					ctx, cancel := context.WithTimeout(c.Context, 10*time.Second)
+					defer cancel()
+					if status, err := relay.Publish(ctx, evt); err != nil {
+						fmt.Fprintf(os.Stderr, "failed: %s\n", err)
+					} else {
+						fmt.Fprintf(os.Stderr, "%s.\n", status)
+					}
+				}
+			}
+		} else {
 			var result string
 			if c.Bool("envelope") {
 				j, _ := json.Marshal([]any{"EVENT", evt})
@@ -118,8 +141,9 @@ var event = &cli.Command{
 			} else {
 				result = evt.String()
 			}
-
 			fmt.Println(result)
+		}
+
 		return nil
 	},
 }

go.mod

@@ -3,12 +3,11 @@ module github.com/fiatjaf/nak
 go 1.20
 
 require (
-	github.com/nbd-wtf/go-nostr v0.18.3
+	github.com/nbd-wtf/go-nostr v0.18.7
 	github.com/urfave/cli/v2 v2.25.3
 )
 
 require (
-	github.com/SaveTheRbtz/generic-sync-map-go v0.0.0-20220414055132-a37292614db8 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
@@ -20,6 +19,7 @@ require (
 	github.com/gobwas/ws v1.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/puzpuzpuz/xsync v1.5.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect

go.sum

@@ -1,5 +1,3 @@
-github.com/SaveTheRbtz/generic-sync-map-go v0.0.0-20220414055132-a37292614db8 h1:Xa6tp8DPDhdV+k23uiTC/GrAYOe4IdyJVKtob4KW3GA=
-github.com/SaveTheRbtz/generic-sync-map-go v0.0.0-20220414055132-a37292614db8/go.mod h1:ihkm1viTbO/LOsgdGoFPBSvzqvx7ibvkMzYp3CgtHik=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
@@ -63,8 +61,8 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/nbd-wtf/go-nostr v0.18.3 h1:ofMYxlFAptyoErlOGOCUk7zGHQNJ8/ZkIXXOsveFZ+c=
-github.com/nbd-wtf/go-nostr v0.18.3/go.mod h1:GPJOOK8US38kz+bfb9nWe873Xu0e6bXlThejOs1LTkc=
+github.com/nbd-wtf/go-nostr v0.18.7 h1:UZBc5ewiosuTVEWi9rXRDEu83oH1W6Gf8n0QzyTP/UQ=
+github.com/nbd-wtf/go-nostr v0.18.7/go.mod h1:F9y6+M8askJCjilLgMC3rD0moA6UtG1MCnyClNYXeys=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -75,6 +73,8 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/puzpuzpuz/xsync v1.5.2 h1:yRAP4wqSOZG+/4pxJ08fPTwrfL0IzE/LKQ/cw509qGY=
+github.com/puzpuzpuz/xsync v1.5.2/go.mod h1:K98BYhX3k1dQ2M63t1YNVDanbwUPmBCAhNmVrrxfiGg=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

req.go

@@ -18,7 +18,6 @@ var req = &cli.Command{
 
 example usage (with 'nostcat'):
 		nak req -k 1 -a 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d | nostcat wss://nos.lol
-
 standalone:
 		nak req -k 1 wss://nos.lol`,
 	Flags: []cli.Flag{