github action to publish the cli binaries.

.github/workflows/release-cli.yml

@@ -0,0 +1,39 @@
+name: build cli for all platforms
+
+on:
+  push:
+    tags:
+      - '*'
+
+permissions:
+  contents: write
+
+jobs:
+  make-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+  build-all-for-all:
+    runs-on: ubuntu-latest
+    needs:
+      - make-release
+    strategy:
+      matrix:
+        goos: [linux, freebsd, darwin, windows]
+        goarch: [amd64, arm64]
+        exclude:
+          - goarch: arm64
+            goos: windows
+    steps:
+      - uses: actions/checkout@v3
+      - uses: wangyoucao577/go-release-action@v1.40
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          goos: ${{ matrix.goos }}
+          goarch: ${{ matrix.goarch }}
+          overwrite: true

README.md

@@ -54,6 +54,7 @@ USAGE:
 
 COMMANDS:
    req      generates encoded REQ messages and optionally use them to talk to relays
+   count    generates encoded COUNT messages and optionally use them to talk to relays
    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
    encode   encodes notes and other stuff to nip19 entities
@@ -136,6 +137,36 @@ OPTIONS:
    -e value [ -e value ]                                  shortcut for --tag e=<value>
    -p value [ -p value ]                                  shortcut for --tag p=<value>
 
+~> nak count --help
+NAME:
+   nak count - generates encoded COUNT messages and optionally use them to talk to relays
+
+USAGE:
+   nak count [command options] [relay...]
+
+DESCRIPTION:
+   outputs a NIP-45 request. Mostly same as req.
+
+   example usage (with 'nostcat'):
+       nak count -k 1 -a 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d | nostcat wss://nos.lol
+   standalone:
+       nak count -k 1 wss://nos.lol
+
+OPTIONS:
+   --bare    when printing the filter, print just the filter, not enveloped in a ["COUNT", ...] array (default: false)
+   --stream  keep the subscription open, printing all events as they are returned (default: false, will close on EOSE)
+
+   FILTER ATTRIBUTES
+
+   --author value, -a value [ --author value, -a value ]  only accept events from these authors (pubkey as hex)
+   --id value, -i value [ --id value, -i value ]          only accept events with these ids (hex)
+   --kind value, -k value [ --kind value, -k value ]      only accept events with these kind numbers
+   --limit value, -l value                                only accept up to this number of events (default: 0)
+   --since value, -s value                                only accept events newer than this (unix timestamp) (default: 0)
+   --tag value, -t value [ --tag value, -t value ]        takes a tag like -t e=<id>, only accept events with these tags
+   --until value, -u value                                only accept events older than this (unix timestamp) (default: 0)
+   -e value [ -e value ]                                  shortcut for --tag e=<value>
+   -p value [ -p value ]                                  shortcut for --tag p=<value>
 
 ~> nak decode --help
 NAME:

count.go

@@ -0,0 +1,147 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/nbd-wtf/go-nostr"
+	"github.com/urfave/cli/v2"
+)
+
+var count = &cli.Command{
+	Name:        "count",
+	Usage:       "generates encoded COUNT messages and optionally use them to talk to relays",
+	Description: `outputs a NIP-45 request (the flags are mostly the same as 'nak req').`,
+	Flags: []cli.Flag{
+		&cli.StringSliceFlag{
+			Name:     "author",
+			Aliases:  []string{"a"},
+			Usage:    "only accept events from these authors (pubkey as hex)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.IntSliceFlag{
+			Name:     "kind",
+			Aliases:  []string{"k"},
+			Usage:    "only accept events with these kind numbers",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "tag",
+			Aliases:  []string{"t"},
+			Usage:    "takes a tag like -t e=<id>, only accept events with these tags",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "e",
+			Usage:    "shortcut for --tag e=<value>",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.StringSliceFlag{
+			Name:     "p",
+			Usage:    "shortcut for --tag p=<value>",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.IntFlag{
+			Name:     "since",
+			Aliases:  []string{"s"},
+			Usage:    "only accept events newer than this (unix timestamp)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.IntFlag{
+			Name:     "until",
+			Aliases:  []string{"u"},
+			Usage:    "only accept events older than this (unix timestamp)",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+		&cli.IntFlag{
+			Name:     "limit",
+			Aliases:  []string{"l"},
+			Usage:    "only accept up to this number of events",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
+	},
+	ArgsUsage: "[relay...]",
+	Action: func(c *cli.Context) error {
+		filter := nostr.Filter{}
+
+		if authors := c.StringSlice("author"); len(authors) > 0 {
+			filter.Authors = authors
+		}
+		if ids := c.StringSlice("id"); len(ids) > 0 {
+			filter.IDs = ids
+		}
+		if kinds := c.IntSlice("kind"); len(kinds) > 0 {
+			filter.Kinds = kinds
+		}
+
+		tags := make([][]string, 0, 5)
+		for _, tagFlag := range c.StringSlice("tag") {
+			spl := strings.Split(tagFlag, "=")
+			if len(spl) == 2 && len(spl[0]) == 1 {
+				tags = append(tags, spl)
+			} else {
+				return fmt.Errorf("invalid --tag '%s'", tagFlag)
+			}
+		}
+		for _, etag := range c.StringSlice("e") {
+			tags = append(tags, []string{"e", etag})
+		}
+		for _, ptag := range c.StringSlice("p") {
+			tags = append(tags, []string{"p", ptag})
+		}
+		if len(tags) > 0 {
+			filter.Tags = make(nostr.TagMap)
+			for _, tag := range tags {
+				if _, ok := filter.Tags[tag[0]]; !ok {
+					filter.Tags[tag[0]] = make([]string, 0, 3)
+				}
+				filter.Tags[tag[0]] = append(filter.Tags[tag[0]], tag[1])
+			}
+		}
+
+		if since := c.Int("since"); since != 0 {
+			ts := nostr.Timestamp(since)
+			filter.Since = &ts
+		}
+		if until := c.Int("until"); until != 0 {
+			ts := nostr.Timestamp(until)
+			filter.Until = &ts
+		}
+		if limit := c.Int("limit"); limit != 0 {
+			filter.Limit = limit
+		}
+
+		relays := c.Args().Slice()
+		successes := 0
+		failures := make([]error, 0, len(relays))
+		if len(relays) > 0 {
+			for _, relayUrl := range relays {
+				relay, err := nostr.RelayConnect(c.Context, relayUrl)
+				if err != nil {
+					failures = append(failures, err)
+					continue
+				}
+				count, err := relay.Count(c.Context, nostr.Filters{filter})
+				if err != nil {
+					failures = append(failures, err)
+					continue
+				}
+				fmt.Printf("%s: %d\n", relay.URL, count)
+				successes++
+			}
+			if successes == 0 {
+				return errors.Join(failures...)
+			}
+		} else {
+			// no relays given, will just print the filter
+			var result string
+			j, _ := json.Marshal([]any{"COUNT", "nak", filter})
+			result = string(j)
+			fmt.Println(result)
+		}
+
+		return nil
+	},
+}

encode.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/hex"
 	"fmt"
-	"net/url"
 	"strings"
 
 	"github.com/nbd-wtf/go-nostr/nip19"
@@ -21,27 +20,22 @@ var encode = &cli.Command{
 		nak encode nevent --author <pubkey-hex> --relay <relay-url> --relay <other-relay> <event-id>
 		nak encode nsec <privkey-hex>`,
 	Before: func(c *cli.Context) error {
-		if c.Args().First() == "naddr" {
-			// validation will be done on the specific handler
-			return nil
+		if c.Args().Len() < 1 {
+			return fmt.Errorf("expected more than 1 argument.")
 		}
-
-		if c.Args().Len() < 2 {
-			return fmt.Errorf("expected more than 2 arguments.")
-		}
-		target := c.Args().Get(c.Args().Len() - 1)
-		if target == "--help" {
-			return nil
-		}
-
-		return validate32BytesHex(target)
+		return nil
 	},
 	Subcommands: []*cli.Command{
 		{
 			Name:  "npub",
 			Usage: "encode a hex private key into bech32 'npub' format",
 			Action: func(c *cli.Context) error {
-				if npub, err := nip19.EncodePublicKey(c.Args().First()); err == nil {
+				target := getStdinOrFirstArgument(c)
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
+				if npub, err := nip19.EncodePublicKey(target); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -53,7 +47,12 @@ var encode = &cli.Command{
 			Name:  "nsec",
 			Usage: "encode a hex private key into bech32 'nsec' format",
 			Action: func(c *cli.Context) error {
-				if npub, err := nip19.EncodePrivateKey(c.Args().First()); err == nil {
+				target := getStdinOrFirstArgument(c)
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
+				if npub, err := nip19.EncodePrivateKey(target); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -72,12 +71,17 @@ var encode = &cli.Command{
 				},
 			},
 			Action: func(c *cli.Context) error {
+				target := getStdinOrFirstArgument(c)
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
 				relays := c.StringSlice("relay")
 				if err := validateRelayURLs(relays); err != nil {
 					return err
 				}
 
-				if npub, err := nip19.EncodeProfile(c.Args().First(), relays); err == nil {
+				if npub, err := nip19.EncodeProfile(target, relays); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -100,17 +104,24 @@ var encode = &cli.Command{
 				},
 			},
 			Action: func(c *cli.Context) error {
-				author := c.String("author")
-				if err := validate32BytesHex(author); err != nil {
+				target := getStdinOrFirstArgument(c)
+				if err := validate32BytesHex(target); err != nil {
 					return err
 				}
 
+				author := c.String("author")
+				if author != "" {
+					if err := validate32BytesHex(author); err != nil {
+						return err
+					}
+				}
+
 				relays := c.StringSlice("relay")
 				if err := validateRelayURLs(relays); err != nil {
 					return err
 				}
 
-				if npub, err := nip19.EncodeEvent(c.Args().First(), relays, author); err == nil {
+				if npub, err := nip19.EncodeEvent(target, relays, author); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -175,6 +186,23 @@ var encode = &cli.Command{
 				}
 			},
 		},
+		{
+			Name:  "note",
+			Usage: "generate note1 event codes (not recommended)",
+			Action: func(c *cli.Context) error {
+				target := getStdinOrFirstArgument(c)
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
+				if npub, err := nip19.EncodeNote(target); err == nil {
+					fmt.Println(npub)
+					return nil
+				} else {
+					return err
+				}
+			},
+		},
 	},
 }
 
@@ -191,22 +219,3 @@ func validate32BytesHex(target string) error {
 
 	return nil
 }
-
-func validateRelayURLs(wsurls []string) error {
-	for _, wsurl := range wsurls {
-		u, err := url.Parse(wsurl)
-		if err != nil {
-			return fmt.Errorf("invalid relay url '%s': %s", wsurl, err)
-		}
-
-		if u.Scheme != "ws" && u.Scheme != "wss" {
-			return fmt.Errorf("relay url must use wss:// or ws:// schemes, got '%s'", wsurl)
-		}
-
-		if u.Host == "" {
-			return fmt.Errorf("relay url '%s' is missing the hostname", wsurl)
-		}
-	}
-
-	return nil
-}

event.go

@@ -20,10 +20,18 @@ const CATEGORY_EVENT_FIELDS = "EVENT FIELDS"
 var event = &cli.Command{
 	Name:  "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
-standalone:
-		nak event -k 1 -c hello wss://nos.lol`,
+	Description: `outputs an event built with the flags. if one or more relays are given as arguments, an attempt is also made to publish the event to these relays.
+
+example:
+		nak event -c hello wss://nos.lol
+		nak event -k 3 -p 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d
+
+if an event -- or a partial event -- is given on stdin, the flags can be used to optionally modify it. if it is modified it is rehashed and resigned, otherwise it is just returned as given, but that can be used to just publish to relays.
+
+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'
+`,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:        "sec",
@@ -44,7 +52,7 @@ standalone:
 			Aliases:     []string{"k"},
 			Usage:       "event kind",
 			DefaultText: "1",
-			Value:       1,
+			Value:       0,
 			Category:    CATEGORY_EVENT_FIELDS,
 		},
 		&cli.StringFlag{
@@ -52,7 +60,7 @@ standalone:
 			Aliases:     []string{"c"},
 			Usage:       "event content",
 			DefaultText: "hello from the nostr army knife",
-			Value:       "hello from the nostr army knife",
+			Value:       "",
 			Category:    CATEGORY_EVENT_FIELDS,
 		},
 		&cli.StringSliceFlag{
@@ -76,16 +84,38 @@ standalone:
 			Aliases:     []string{"time", "ts"},
 			Usage:       "unix timestamp value for the created_at field",
 			DefaultText: "now",
-			Value:       "now",
+			Value:       "",
 			Category:    CATEGORY_EVENT_FIELDS,
 		},
 	},
 	ArgsUsage: "[relay...]",
 	Action: func(c *cli.Context) error {
 		evt := nostr.Event{
-			Kind:    c.Int("kind"),
-			Content: c.String("content"),
-			Tags:    make(nostr.Tags, 0, 3),
+			Tags: make(nostr.Tags, 0, 3),
+		}
+
+		mustRehashAndResign := false
+
+		if stdinEvent := getStdin(); stdinEvent != "" {
+			if err := json.Unmarshal([]byte(stdinEvent), &evt); err != nil {
+				return fmt.Errorf("invalid event received from stdin: %w", err)
+			}
+		}
+
+		if kind := c.Int("kind"); kind != 0 {
+			evt.Kind = kind
+			mustRehashAndResign = true
+		} else if evt.Kind == 0 {
+			evt.Kind = 1
+			mustRehashAndResign = true
+		}
+
+		if content := c.String("content"); content != "" {
+			evt.Content = content
+			mustRehashAndResign = true
+		} else if evt.Content == "" && evt.Kind == 1 {
+			evt.Content = "hello from the nostr army knife"
+			mustRehashAndResign = true
 		}
 
 		tags := make(nostr.Tags, 0, 5)
@@ -103,29 +133,39 @@ standalone:
 		}
 		for _, etag := range c.StringSlice("e") {
 			tags = append(tags, []string{"e", etag})
+			mustRehashAndResign = true
 		}
 		for _, ptag := range c.StringSlice("p") {
 			tags = append(tags, []string{"p", ptag})
+			mustRehashAndResign = true
 		}
 		if len(tags) > 0 {
 			for _, tag := range tags {
 				evt.Tags = append(evt.Tags, tag)
 			}
+			mustRehashAndResign = true
 		}
 
-		createdAt := c.String("created-at")
-		ts := time.Now()
-		if createdAt != "now" {
-			if v, err := strconv.ParseInt(createdAt, 10, 64); err != nil {
-				return fmt.Errorf("failed to parse timestamp '%s': %w", createdAt, err)
-			} else {
-				ts = time.Unix(v, 0)
+		if createdAt := c.String("created-at"); createdAt != "" {
+			ts := time.Now()
+			if createdAt != "now" {
+				if v, err := strconv.ParseInt(createdAt, 10, 64); err != nil {
+					return fmt.Errorf("failed to parse timestamp '%s': %w", createdAt, err)
+				} else {
+					ts = time.Unix(v, 0)
+				}
 			}
+			evt.CreatedAt = nostr.Timestamp(ts.Unix())
+			mustRehashAndResign = true
+		} else if evt.CreatedAt == 0 {
+			evt.CreatedAt = nostr.Now()
+			mustRehashAndResign = true
 		}
-		evt.CreatedAt = nostr.Timestamp(ts.Unix())
 
-		if err := evt.Sign(c.String("sec")); err != nil {
-			return fmt.Errorf("error signing with provided key: %w", err)
+		if evt.Sig == "" || mustRehashAndResign {
+			if err := evt.Sign(c.String("sec")); err != nil {
+				return fmt.Errorf("error signing with provided key: %w", err)
+			}
 		}
 
 		relays := c.Args().Slice()

fetch.go

@@ -0,0 +1,90 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/nbd-wtf/go-nostr"
+	"github.com/nbd-wtf/go-nostr/nip19"
+	"github.com/nbd-wtf/go-nostr/sdk"
+	"github.com/urfave/cli/v2"
+)
+
+var fetch = &cli.Command{
+	Name:  "fetch",
+	Usage: "fetches events related to the given nip19 code from the included relay hints",
+	Description: `example usage:
+        nak fetch nevent1qqsxrwm0hd3s3fddh4jc2574z3xzufq6qwuyz2rvv3n087zvym3dpaqprpmhxue69uhhqatzd35kxtnjv4kxz7tfdenju6t0xpnej4
+        echo npub1h8spmtw9m2huyv6v2j2qd5zv956z2zdugl6mgx02f2upffwpm3nqv0j4ps | nak fetch --relay wss://relay.nostr.band`,
+	Flags: []cli.Flag{
+		&cli.StringSliceFlag{
+			Name:    "relay",
+			Aliases: []string{"r"},
+			Usage:   "also use these relays to fetch from",
+		},
+	},
+	ArgsUsage: "[nip19code]",
+	Action: func(c *cli.Context) error {
+		filter := nostr.Filter{}
+		code := getStdinOrFirstArgument(c)
+
+		prefix, value, err := nip19.Decode(code)
+		if err != nil {
+			return err
+		}
+
+		relays := c.StringSlice("relay")
+		if err := validateRelayURLs(relays); err != nil {
+			return err
+		}
+		var authorHint string
+
+		switch prefix {
+		case "nevent":
+			v := value.(nostr.EventPointer)
+			filter.IDs = append(filter.IDs, v.ID)
+			if v.Author != "" {
+				authorHint = v.Author
+			}
+			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
+		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
+		case "npub":
+			v := value.(string)
+			filter.Authors = append(filter.Authors, v)
+			filter.Kinds = append(filter.Kinds, 0)
+			authorHint = v
+		}
+
+		pool := nostr.NewSimplePool(c.Context)
+		if authorHint != "" {
+			relayList := sdk.FetchRelaysForPubkey(c.Context, pool, authorHint,
+				"wss://purplepag.es", "wss://offchain.pub", "wss://public.relaying.io")
+			for _, relayListItem := range relayList {
+				if relayListItem.Outbox {
+					relays = append(relays, relayListItem.URL)
+				}
+			}
+		}
+
+		if len(relays) == 0 {
+			return fmt.Errorf("no relay hints found")
+		}
+
+		for ie := range pool.SubManyEose(c.Context, relays, nostr.Filters{filter}) {
+			fmt.Println(ie.Event)
+		}
+
+		return nil
+	},
+}

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/mailru/easyjson v0.7.7
-	github.com/nbd-wtf/go-nostr v0.19.2
+	github.com/nbd-wtf/go-nostr v0.24.2
 	github.com/urfave/cli/v2 v2.25.3
 )
 
@@ -12,14 +12,19 @@ require (
 	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
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.2.0 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync v1.5.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/puzpuzpuz/xsync/v2 v2.5.0 // 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

@@ -22,6 +22,8 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku
 github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -33,6 +35,12 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
+github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
+github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
@@ -41,6 +49,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.2.0 h1:u0p9s3xLYpZCA1z5JgCkMeB34CKCMMQbM+G8Ii7YD0I=
 github.com/gobwas/ws v1.2.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -61,8 +71,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.19.2 h1:Oofhe5+EKvf74fZQmYyX5G4RS74/na1aNabsB/cW9b4=
-github.com/nbd-wtf/go-nostr v0.19.2/go.mod h1:F9y6+M8askJCjilLgMC3rD0moA6UtG1MCnyClNYXeys=
+github.com/nbd-wtf/go-nostr v0.24.2 h1:1PdFED7uHh3BlXfDVD96npBc0YAgj9hPT+l6NWog4kc=
+github.com/nbd-wtf/go-nostr v0.24.2/go.mod h1:eE8Qf8QszZbCd9arBQyotXqATNUElWsTEEx+LLORhyQ=
 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=
@@ -72,12 +82,17 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 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/puzpuzpuz/xsync/v2 v2.5.0 h1:2k4qrO/orvmEXZ3hmtHqIy9XaQtPTwzMZk1+iErpE8c=
+github.com/puzpuzpuz/xsync/v2 v2.5.0/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU=
 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=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
@@ -111,6 +126,7 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -129,6 +145,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

helpers.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net/url"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+)
+
+func getStdin() string {
+	stat, _ := os.Stdin.Stat()
+	if (stat.Mode() & os.ModeCharDevice) == 0 {
+		read := bytes.NewBuffer(make([]byte, 0, 1000))
+		_, err := io.Copy(read, os.Stdin)
+		if err == nil {
+			return strings.TrimSpace(read.String())
+		}
+	}
+	return ""
+}
+
+func getStdinOrFirstArgument(c *cli.Context) string {
+	target := c.Args().First()
+	if target != "" {
+		return target
+	}
+	return getStdin()
+}
+
+func validateRelayURLs(wsurls []string) error {
+	for _, wsurl := range wsurls {
+		u, err := url.Parse(wsurl)
+		if err != nil {
+			return fmt.Errorf("invalid relay url '%s': %s", wsurl, err)
+		}
+
+		if u.Scheme != "ws" && u.Scheme != "wss" {
+			return fmt.Errorf("relay url must use wss:// or ws:// schemes, got '%s'", wsurl)
+		}
+
+		if u.Host == "" {
+			return fmt.Errorf("relay url '%s' is missing the hostname", wsurl)
+		}
+	}
+
+	return nil
+}

main.go

@@ -13,6 +13,8 @@ func main() {
 		Usage: "the nostr army knife command-line tool",
 		Commands: []*cli.Command{
 			req,
+			count,
+			fetch,
 			event,
 			decode,
 			encode,

req.go

@@ -16,10 +16,15 @@ var req = &cli.Command{
 	Usage: "generates encoded REQ messages and optionally use them to talk to relays",
 	Description: `outputs a NIP-01 Nostr filter. when a relay is not given, will print the filter, otherwise will connect to the given relay and send the filter.
 
-example usage (with 'nostcat'):
-		nak req -k 1 -a 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d | nostcat wss://nos.lol
-standalone:
-		nak req -k 1 wss://nos.lol`,
+example:
+		nak req -k 1 -l 15 wss://nostr.wine wss://nostr-pub.wellorder.net
+		nak req -k 0 -a 3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d wss://nos.lol | jq '.content | fromjson | .name'
+
+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
+`,
 	Flags: []cli.Flag{
 		&cli.StringSliceFlag{
 			Name:     "author",
@@ -73,6 +78,11 @@ standalone:
 			Usage:    "only accept up to this number of events",
 			Category: CATEGORY_FILTER_ATTRIBUTES,
 		},
+		&cli.StringFlag{
+			Name:     "search",
+			Usage:    "a NIP-50 search query, use it only with relays that explicitly support it",
+			Category: CATEGORY_FILTER_ATTRIBUTES,
+		},
 		&cli.BoolFlag{
 			Name:  "bare",
 			Usage: "when printing the filter, print just the filter, not enveloped in a [\"REQ\", ...] array",
@@ -86,17 +96,24 @@ standalone:
 	ArgsUsage: "[relay...]",
 	Action: func(c *cli.Context) error {
 		filter := nostr.Filter{}
+		if stdinFilter := getStdin(); stdinFilter != "" {
+			if err := json.Unmarshal([]byte(stdinFilter), &filter); err != nil {
+				return fmt.Errorf("invalid filter received from stdin: %w", err)
+			}
+		}
 
 		if authors := c.StringSlice("author"); len(authors) > 0 {
-			filter.Authors = authors
+			filter.Authors = append(filter.Authors, authors...)
 		}
 		if ids := c.StringSlice("id"); len(ids) > 0 {
-			filter.IDs = ids
+			filter.IDs = append(filter.IDs, ids...)
 		}
 		if kinds := c.IntSlice("kind"); len(kinds) > 0 {
-			filter.Kinds = kinds
+			filter.Kinds = append(filter.Kinds, kinds...)
+		}
+		if search := c.String("search"); search != "" {
+			filter.Search = search
 		}
-
 		tags := make([][]string, 0, 5)
 		for _, tagFlag := range c.StringSlice("tag") {
 			spl := strings.Split(tagFlag, "=")
@@ -112,14 +129,16 @@ standalone:
 		for _, ptag := range c.StringSlice("p") {
 			tags = append(tags, []string{"p", ptag})
 		}
-		if len(tags) > 0 {
+
+		if len(tags) > 0 && filter.Tags == nil {
 			filter.Tags = make(nostr.TagMap)
-			for _, tag := range tags {
-				if _, ok := filter.Tags[tag[0]]; !ok {
-					filter.Tags[tag[0]] = make([]string, 0, 3)
-				}
-				filter.Tags[tag[0]] = append(filter.Tags[tag[0]], tag[1])
+		}
+
+		for _, tag := range tags {
+			if _, ok := filter.Tags[tag[0]]; !ok {
+				filter.Tags[tag[0]] = make([]string, 0, 3)
 			}
+			filter.Tags[tag[0]] = append(filter.Tags[tag[0]], tag[1])
 		}
 
 		if since := c.Int("since"); since != 0 {
@@ -141,8 +160,8 @@ standalone:
 			if c.Bool("stream") {
 				fn = pool.SubMany
 			}
-			for evt := range fn(c.Context, relays, nostr.Filters{filter}) {
-				fmt.Println(evt)
+			for ie := range fn(c.Context, relays, nostr.Filters{filter}) {
+				fmt.Println(ie.Event)
 			}
 		} else {
 			// no relays given, will just print the filter