nostr/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2025-05-01 12:29:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

precheck for validity of relay URLs and prevent unwanted crash otherwise.

Browse Source
This commit is contained in:
fiatjaf 2025-04-07 23:13:32 -03:00
parent 15aefe3df4
commit 35da063c30
1 changed files with 10 additions and 1 deletions

11
helpers.go

@ -158,6 +158,14 @@ func connectToAllRelays(
preAuthSigner func(ctx context.Context, c *cli.Command, log func(s string, args ...any), authEvent nostr.RelayEvent) (err error), // if this exists we will force preauth preAuthSigner func(ctx context.Context, c *cli.Command, log func(s string, args ...any), authEvent nostr.RelayEvent) (err error), // if this exists we will force preauth
opts ...nostr.PoolOption, opts ...nostr.PoolOption,
) []*nostr.Relay { ) []*nostr.Relay {
// first pass to check if these are valid relay URLs
for _, url := range relayUrls {
if !nostr.IsValidRelayURL(nostr.NormalizeURL(url)) {
log("invalid relay URL: %s\n", url)
os.Exit(4)
}
}
sys.Pool = nostr.NewSimplePool(context.Background(), sys.Pool = nostr.NewSimplePool(context.Background(),
append(opts, append(opts,
nostr.WithEventMiddleware(sys.TrackEventHints), nostr.WithEventMiddleware(sys.TrackEventHints),
@ -374,7 +382,8 @@ func unwrapAll(err error) error {
func clampMessage(msg string, prefixAlreadyPrinted int) string { func clampMessage(msg string, prefixAlreadyPrinted int) string {
termSize, _, _ := term.GetSize(int(os.Stderr.Fd())) termSize, _, _ := term.GetSize(int(os.Stderr.Fd()))
if len(msg) > termSize-prefixAlreadyPrinted {
if len(msg) > termSize-prefixAlreadyPrinted && prefixAlreadyPrinted+1 < termSize {
msg = msg[0:termSize-prefixAlreadyPrinted-1] + "…" msg = msg[0:termSize-prefixAlreadyPrinted-1] + "…"
} }
return msg return msg