event: fix handling of -k and kind in stdin event, and default to 1.

event.go

@@ -15,6 +15,7 @@ import (
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nson"
 	"github.com/urfave/cli/v2"
+	"golang.org/x/exp/slices"
 )
 
 const CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
@@ -32,8 +33,7 @@ if an event -- or a partial event -- is given on stdin, the flags can be used to
 
 example:
 		echo '{"id":"a889df6a387419ff204305f4c2d296ee328c3cd4f8b62f205648a541b4554dfb","pubkey":"c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5","created_at":1698623783,"kind":1,"tags":[],"content":"hello from the nostr army knife","sig":"84876e1ee3e726da84e5d195eb79358b2b3eaa4d9bd38456fde3e8a2af3f1cd4cda23f23fda454869975b3688797d4c66e12f4c51c1b43c6d2997c5e61865661"}' | nak event wss://offchain.pub
-		echo '{"tags": [["t", "spam"]]}' | nak event -c 'this is spam'
+		echo '{"tags": [["t", "spam"]]}' | nak event -c 'this is spam'`,
-`,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:        "sec",
@@ -96,6 +96,16 @@ example:
 	},
 	ArgsUsage: "[relay...]",
 	Action: func(c *cli.Context) error {
+		// try to connect to the relays here
+		var relays []*nostr.Relay
+		if relayUrls := c.Args().Slice(); len(relayUrls) > 0 {
+			_, relays = connectToAllRelays(c.Context, relayUrls)
+			if len(relays) == 0 {
+				log("failed to connect to any of the given relays.\n")
+				os.Exit(3)
+			}
+		}
+
 		// gather the secret key first
 		sec := c.String("sec")
 		if c.Bool("prompt-sec") {
@@ -129,18 +139,20 @@ example:
 				Tags: make(nostr.Tags, 0, 3),
 			}
 
+			kindWasSupplied := true
 			mustRehashAndResign := false
 			if stdinEvent != "" {
 				if err := json.Unmarshal([]byte(stdinEvent), &evt); err != nil {
 					lineProcessingError(c, "invalid event received from stdin: %s", err)
 					continue
 				}
+				kindWasSupplied = strings.Contains(stdinEvent, `"kind"`)
 			}
 
-			if kind := c.Int("kind"); kind != 0 {
+			if kind := c.Int("kind"); slices.Contains(c.FlagNames(), "kind") {
 				evt.Kind = kind
 				mustRehashAndResign = true
-			} else if evt.Kind == 0 {
+			} else if !kindWasSupplied {
 				evt.Kind = 1
 				mustRehashAndResign = true
 			}
@@ -203,20 +215,20 @@ example:
 				}
 			}
 
-			relays := c.Args().Slice()
 			if len(relays) > 0 {
 				fmt.Println(evt.String())
-				for _, url := range relays {
+				os.Stdout.Sync()
-					fmt.Fprintf(os.Stderr, "publishing to %s... ", url)
+				for _, relay := range relays {
-					if relay, err := nostr.RelayConnect(c.Context, url); err != nil {
+					log("publishing to %s... ", relay.URL)
-						fmt.Fprintf(os.Stderr, "failed to connect: %s\n", err)
+					if relay, err := nostr.RelayConnect(c.Context, relay.URL); err != nil {
+						log("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)
+							log("failed: %s\n", err)
 						} else {
-							fmt.Fprintf(os.Stderr, "%s.\n", status)
+							log("%s.\n", status)
 						}
 					}
 				}

example_test.go

@@ -0,0 +1,31 @@
+package main
+
+func ExampleEventBasic() {
+	app.Run([]string{"nak", "event", "--ts", "1699485669"})
+	// Output:
+	// {"id":"36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1699485669,"kind":1,"tags":[],"content":"hello from the nostr army knife","sig":"68e71a192e8abcf8582a222434ac823ecc50607450ebe8cc4c145eb047794cc382dc3f888ce879d2f404f5ba6085a47601360a0fa2dd4b50d317bd0c6197c2c2"}
+}
+
+func ExampleEventComplex() {
+	app.Run([]string{"nak", "event", "--ts", "1699485669", "-k", "11", "-c", "skjdbaskd", "--sec", "17", "-t", "t=spam", "-e", "36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c", "-t", "r=https://abc.def;nothing"})
+	// Output:
+	// {"id":"aec4de6d051a7c2b6ca2d087903d42051a31e07fb742f1240970084822de10a6","pubkey":"2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f","created_at":1699485669,"kind":11,"tags":[["t","spam"],["r","https://abc.def","nothing"],["e","36d88cf5fcc449f2390a424907023eda7a74278120eebab8d02797cd92e7e29c"]],"content":"skjdbaskd","sig":"1165ac7a27d774d351ef19c8e918fb22f4005fcba193976c3d7edba6ef87ead7f14467f376a9e199f8371835368d86a8506f591e382528d00287fb168a7b8f38"}
+}
+
+func ExampleReq() {
+	app.Run([]string{"nak", "req", "-k", "1", "-l", "18", "-a", "2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f", "-e", "aec4de6d051a7c2b6ca2d087903d42051a31e07fb742f1240970084822de10a6"})
+	// Output:
+	// ["REQ","nak",{"kinds":[1],"authors":["2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f"],"limit":18,"#e":["aec4de6d051a7c2b6ca2d087903d42051a31e07fb742f1240970084822de10a6"]}]
+}
+
+func ExampleEncodeNpub() {
+	app.Run([]string{"nak", "encode", "npub", "a6a67ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179822"})
+	// Output:
+	// npub156n8a7wuhwk9tgrzjh8gwzc8q2dlekedec5djk0js9d3d7qhnq3qjpdq28
+}
+
+func ExampleEncodeNprofile() {
+	app.Run([]string{"nak", "encode", "nprofile", "-r", "wss://example.com", "a6a67ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179822"})
+	// Output:
+	// nprofile1qqs2dfn7l8wthtz45p3ftn58pvrs9xlumvkuu2xet8egzkcklqtesgspz9mhxue69uhk27rpd4cxcefwvdhk6fl5jug
+}

fetch.go

@@ -46,20 +46,20 @@ var fetch = &cli.Command{
 				if v.Author != "" {
 					authorHint = v.Author
 				}
-				relays = v.Relays
+				relays = append(relays, v.Relays...)
 			case "naddr":
 				v := value.(nostr.EntityPointer)
 				filter.Tags = nostr.TagMap{"d": []string{v.Identifier}}
 				filter.Kinds = append(filter.Kinds, v.Kind)
 				filter.Authors = append(filter.Authors, v.PublicKey)
 				authorHint = v.PublicKey
-				relays = v.Relays
+				relays = append(relays, v.Relays...)
 			case "nprofile":
 				v := value.(nostr.ProfilePointer)
 				filter.Authors = append(filter.Authors, v.PublicKey)
 				filter.Kinds = append(filter.Kinds, 0)
 				authorHint = v.PublicKey
-				relays = v.Relays
+				relays = append(relays, v.Relays...)
 			case "npub":
 				v := value.(string)
 				filter.Authors = append(filter.Authors, v)

go.mod

@@ -7,7 +7,7 @@ toolchain go1.21.0
 require (
 	github.com/bgentry/speakeasy v0.1.0
 	github.com/mailru/easyjson v0.7.7
-	github.com/nbd-wtf/go-nostr v0.25.3
+	github.com/nbd-wtf/go-nostr v0.25.7
 	github.com/nbd-wtf/nostr-sdk v0.0.2
 	github.com/urfave/cli/v2 v2.25.3
 )

go.sum

@@ -82,6 +82,8 @@ 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.25.3 h1:RPPh4cOosw0OZi5KG627pZ3GlKxiKsjARluzen/mB9g=
 github.com/nbd-wtf/go-nostr v0.25.3/go.mod h1:bkffJI+x914sPQWum9ZRUn66D7NpDnAoWo1yICvj3/0=
+github.com/nbd-wtf/go-nostr v0.25.7 h1:DcGOSgKVr/L6w62tRtKeV2t46sRyFcq9pWcyIFkh0eM=
+github.com/nbd-wtf/go-nostr v0.25.7/go.mod h1:bkffJI+x914sPQWum9ZRUn66D7NpDnAoWo1yICvj3/0=
 github.com/nbd-wtf/nostr-sdk v0.0.2 h1:mZIeti+DOF0D1179q+NLL/h0LVMMOPRQAYpOuUrn5Zk=
 github.com/nbd-wtf/nostr-sdk v0.0.2/go.mod h1:KQZOtzcrXBlVhpZYG1tw83ADIONNMMPjUU3ZAH5U2RY=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

helpers.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/nbd-wtf/go-nostr"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,6 +17,10 @@ const (
 	LINE_PROCESSING_ERROR = iota
 )
 
+var log = func(msg string, args ...any) {
+	fmt.Fprintf(os.Stderr, msg, args...)
+}
+
 func isPiped() bool {
 	stat, _ := os.Stdin.Stat()
 	return stat.Mode()&os.ModeCharDevice == 0
@@ -39,6 +44,7 @@ func getStdinLinesOrFirstArgument(c *cli.Context) chan string {
 	if target != "" {
 		single := make(chan string, 1)
 		single <- target
+		close(single)
 		return single
 	}
 
@@ -98,9 +104,24 @@ func validate32BytesHex(target string) error {
 	return nil
 }
 
+func connectToAllRelays(ctx context.Context, relayUrls []string) (*nostr.SimplePool, []*nostr.Relay) {
+	relays := make([]*nostr.Relay, 0, len(relayUrls))
+	pool := nostr.NewSimplePool(ctx)
+	for _, url := range relayUrls {
+		log("connecting to %s... ", url)
+		if relay, err := pool.EnsureRelay(url); err == nil {
+			relays = append(relays, relay)
+			log("ok.\n")
+		} else {
+			log(err.Error() + "\n")
+		}
+	}
+	return pool, relays
+}
+
 func lineProcessingError(c *cli.Context, msg string, args ...any) {
 	c.Context = context.WithValue(c.Context, LINE_PROCESSING_ERROR, true)
-	fmt.Fprintf(os.Stderr, msg+"\n", args...)
+	log(msg+"\n", args...)
 }
 
 func exitIfLineProcessingError(c *cli.Context) {

main.go

@@ -7,21 +7,35 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func main() {
+var app = &cli.App{
-	app := &cli.App{
+	Name:  "nak",
-		Name:  "nak",
+	Usage: "the nostr army knife command-line tool",
-		Usage: "the nostr army knife command-line tool",
+	Commands: []*cli.Command{
-		Commands: []*cli.Command{
+		req,
-			req,
+		count,
-			count,
+		fetch,
-			fetch,
+		event,
-			event,
+		decode,
-			decode,
+		encode,
-			encode,
+		verify,
-			verify,
+		relay,
+	},
+	Flags: []cli.Flag{
+		&cli.BoolFlag{
+			Name:    "silent",
+			Usage:   "do not print logs and info messages to stderr",
+			Aliases: []string{"s"},
+			Action: func(ctx *cli.Context, b bool) error {
+				if b {
+					log = func(msg string, args ...any) {}
+				}
+				return nil
+			},
 		},
-	}
+	},
+}
 
+func main() {
 	if err := app.Run(os.Args); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

relay.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/nbd-wtf/go-nostr/nip11"
+	"github.com/urfave/cli/v2"
+)
+
+var relay = &cli.Command{
+	Name:  "relay",
+	Usage: "gets the relay information document for the given relay, as JSON",
+	Description: `example:
+		nak relay nostr.wine`,
+	ArgsUsage: "<relay-url>",
+	Action: func(c *cli.Context) error {
+		url := c.Args().First()
+		if url == "" {
+			return fmt.Errorf("specify the <relay-url>")
+		}
+
+		if !strings.HasPrefix(url, "wss://") && !strings.HasPrefix(url, "ws://") {
+			url = "wss://" + url
+		}
+
+		info, err := nip11.Fetch(c.Context, url)
+		if err != nil {
+			return fmt.Errorf("failed to fetch '%s' information document: %w", url, err)
+		}
+
+		pretty, _ := json.MarshalIndent(info, "", "  ")
+		fmt.Println(string(pretty))
+		return nil
+	},
+}

req.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/nbd-wtf/go-nostr"
@@ -23,8 +24,7 @@ example:
 it can also take a filter from stdin, optionally modify it with flags and send it to specific relays (or just print it).
 
 example:
-		echo '{"kinds": [1], "#t": ["test"]}' | nak req -l 5 -k 4549 --tag t=spam wss://nostr-pub.wellorder.net
+		echo '{"kinds": [1], "#t": ["test"]}' | nak req -l 5 -k 4549 --tag t=spam wss://nostr-pub.wellorder.net`,
-`,
 	Flags: []cli.Flag{
 		&cli.StringSliceFlag{
 			Name:     "author",
@@ -95,6 +95,21 @@ example:
 	},
 	ArgsUsage: "[relay...]",
 	Action: func(c *cli.Context) error {
+		var pool *nostr.SimplePool
+		relayUrls := c.Args().Slice()
+		if len(relayUrls) > 0 {
+			var relays []*nostr.Relay
+			pool, relays = connectToAllRelays(c.Context, relayUrls)
+			if len(relays) == 0 {
+				log("failed to connect to any of the given relays.\n")
+				os.Exit(3)
+			}
+			relayUrls = make([]string, len(relays))
+			for i, relay := range relays {
+				relayUrls[i] = relay.URL
+			}
+		}
+
 		for stdinFilter := range getStdinLinesOrBlank() {
 			filter := nostr.Filter{}
 			if stdinFilter != "" {
@@ -155,14 +170,12 @@ example:
 				filter.Limit = limit
 			}
 
-			relays := c.Args().Slice()
+			if len(relayUrls) > 0 {
-			if len(relays) > 0 {
-				pool := nostr.NewSimplePool(c.Context)
 				fn := pool.SubManyEose
 				if c.Bool("stream") {
 					fn = pool.SubMany
 				}
-				for ie := range fn(c.Context, relays, nostr.Filters{filter}) {
+				for ie := range fn(c.Context, relayUrls, nostr.Filters{filter}) {
 					fmt.Println(ie.Event)
 				}
 			} else {

verify.go

@@ -13,8 +13,7 @@ var verify = &cli.Command{
 	Description: `example:
 		echo '{"id":"a889df6a387419ff204305f4c2d296ee328c3cd4f8b62f205648a541b4554dfb","pubkey":"c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5","created_at":1698623783,"kind":1,"tags":[],"content":"hello from the nostr army knife","sig":"84876e1ee3e726da84e5d195eb79358b2b3eaa4d9bd38456fde3e8a2af3f1cd4cda23f23fda454869975b3688797d4c66e12f4c51c1b43c6d2997c5e61865661"}' | nak verify
 
-it outputs nothing if the verification is successful.
+it outputs nothing if the verification is successful.`,
-`,
 	Action: func(c *cli.Context) error {
 		for stdinEvent := range getStdinLinesOrBlank() {
 			evt := nostr.Event{}