From 550c89d8d70b557cb46a20a0be291769cb9f4426 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Fri, 27 Jun 2025 13:50:28 -0300 Subject: [PATCH] slightly improve some error messages. --- event.go | 5 +++++ helpers_key.go | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/event.go b/event.go index 0a205fc..f8b3705 100644 --- a/event.go +++ b/event.go @@ -2,6 +2,7 @@ package main import ( "context" + "errors" "fmt" "os" "slices" @@ -9,6 +10,7 @@ import ( "time" "fiatjaf.com/nostr" + "fiatjaf.com/nostr/keyer" "fiatjaf.com/nostr/nip13" "fiatjaf.com/nostr/nip19" "github.com/fatih/color" @@ -288,6 +290,9 @@ example: return nil } } else if err := kr.SignEvent(ctx, &evt); err != nil { + if _, isBunker := kr.(keyer.BunkerSigner); isBunker && errors.Is(ctx.Err(), context.DeadlineExceeded) { + err = fmt.Errorf("timeout waiting for bunker to respond") + } return fmt.Errorf("error signing with provided key: %w", err) } } diff --git a/helpers_key.go b/helpers_key.go index 782724a..2c21fa5 100644 --- a/helpers_key.go +++ b/helpers_key.go @@ -77,19 +77,19 @@ func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) ( clientKey = nostr.Generate() } - logverbose("[nip46]: connecting to bunker %s with client key %s", bunkerURL, clientKey.Hex()) + logverbose("[nip46]: connecting to %s with client key %s", bunkerURL, clientKey.Hex()) ctx, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() + bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) { log(color.CyanString("[nip46]: open the following URL: %s"), s) }) - if err != nil { if errors.Is(ctx.Err(), context.DeadlineExceeded) { err = fmt.Errorf("timeout waiting for bunker to respond: %w", err) } - return nostr.SecretKey{}, nil, fmt.Errorf("failed to connect to bunker %s: %w", bunkerURL, err) + return nostr.SecretKey{}, nil, fmt.Errorf("failed to connect to %s: %w", bunkerURL, err) } return nostr.SecretKey{}, bunker, err