laantungir/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2025-12-10 17:38:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

slightly improve some error messages.

Browse Source
This commit is contained in:
fiatjaf
2025-06-27 13:50:28 -03:00
parent 1e9be3ed84
commit 550c89d8d7
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
event.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"os" "os"
"slices" "slices"
@@ -9,6 +10,7 @@ import (
"time" "time"
"fiatjaf.com/nostr" "fiatjaf.com/nostr"
"fiatjaf.com/nostr/keyer"
"fiatjaf.com/nostr/nip13" "fiatjaf.com/nostr/nip13"
"fiatjaf.com/nostr/nip19" "fiatjaf.com/nostr/nip19"
"github.com/fatih/color" "github.com/fatih/color"
@@ -288,6 +290,9 @@ example:
return nil return nil
} }
} else if err := kr.SignEvent(ctx, &evt); err != 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) return fmt.Errorf("error signing with provided key: %w", err)
} }
} }

6
helpers_key.go
View File

@@ -77,19 +77,19 @@ func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) (
clientKey = nostr.Generate() 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) ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel() defer cancel()
bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) { bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) {
log(color.CyanString("[nip46]: open the following URL: %s"), s) log(color.CyanString("[nip46]: open the following URL: %s"), s)
}) })
if err != nil { if err != nil {
if errors.Is(ctx.Err(), context.DeadlineExceeded) { if errors.Is(ctx.Err(), context.DeadlineExceeded) {
err = fmt.Errorf("timeout waiting for bunker to respond: %w", err) 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 return nostr.SecretKey{}, bunker, err