Skip to content

Commit 7060849

Browse files
waybackarchiverwaybackarchiver
authored
Supports publishing to multiple nostr relay (#318)
* Supports publishing to multiple nostr relay * Recover panic * Refine parameter
1 parent 8d3da0b commit 7060849

File tree

7 files changed

+47
-28
lines changed

7 files changed

+47
-28
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ You can also specify configuration options either via command flags or via envir
280280
| - | `WAYBACK_SLACK_BOT_TOKEN` | - | `Bot User OAuth Token` for Slack workspace, use `User OAuth Token` if requires create external link |
281281
| - | `WAYBACK_SLACK_CHANNEL` | - | Channel ID of Slack channel |
282282
| - | `WAYBACK_SLACK_HELPTEXT` | - | The help text for Slack slash command |
283-
| - | `WAYBACK_NOSTR_RELAY_URL` | `wss://nostr.developer.li` | Nostr relay server url |
284-
| - | `WAYBACK_NOSTR_PRIVATE_KEY` | - | The private key of a Nostr account |
283+
| - | `WAYBACK_NOSTR_RELAY_URL` | `wss://nostr.developer.li` | Nostr relay server url, multiple separated by comma |
284+
| - | `WAYBACK_NOSTR_PRIVATE_KEY` | - | The private key of a Nostr account |
285285
| `--tor` | `WAYBACK_USE_TOR` | `false` | Snapshot webpage via Tor anonymity network |
286286
| `--tor-key` | `WAYBACK_TOR_PRIVKEY` | - | The private key for Tor Hidden Service |
287287
| - | `WAYBACK_TOR_LOCAL_PORT` | `8964` | Local port for Tor Hidden Service, also support for a **reverse proxy**. This is ignored if `WAYBACK_LISTEN_ADDR` is set. |

‎config/config_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -1285,19 +1285,19 @@ func TestPublishToSlackChannel(t *testing.T) {
12851285
func TestNostrRelayURL(t *testing.T) {
12861286
var tests = []struct {
12871287
url string
1288-
exp string
1288+
exp []string
12891289
}{
12901290
{
12911291
url: "",
1292-
exp: defNostrRelayURL,
1292+
exp: []string{defNostrRelayURL},
12931293
},
12941294
{
12951295
url: "wss://example.com",
1296-
exp: "wss://example.com",
1296+
exp: []string{"wss://example.com"},
12971297
},
12981298
{
12991299
url: "example.com",
1300-
exp: "example.com",
1300+
exp: []string{"example.com"},
13011301
},
13021302
}
13031303

@@ -1313,7 +1313,10 @@ func TestNostrRelayURL(t *testing.T) {
13131313
}
13141314

13151315
got := opts.NostrRelayURL()
1316-
if got != test.exp {
1316+
if len(got) < 1 {
1317+
t.Fatalf(`Unexpected set nostr relay url, got %v instead of %v`, got, test.exp)
1318+
}
1319+
if got[0] != test.exp[0] {
13171320
t.Fatalf(`Unexpected set nostr relay url, got %v instead of %v`, got, test.exp)
13181321
}
13191322
})

‎config/options.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ func (o *Options) PublishToNotion() bool {
653653
}
654654

655655
// NostrRelayURL returns the relay url of Nostr server.
656-
func (o *Options) NostrRelayURL() string {
657-
return o.nostr.url
656+
func (o *Options) NostrRelayURL() []string {
657+
return strings.Split(o.nostr.url, ",")
658658
}
659659

660660
// NostrPrivateKey returns the private key of Nostr account.
@@ -664,7 +664,7 @@ func (o *Options) NostrPrivateKey() string {
664664

665665
// PublishToNostr determines whether the results should be published on Nostr.
666666
func (o *Options) PublishToNostr() bool {
667-
return o.NostrRelayURL() != "" && o.NostrPrivateKey() != ""
667+
return len(o.NostrRelayURL()) > 0 && o.NostrPrivateKey() != ""
668668
}
669669

670670
// TorPrivKey returns the private key of Tor service.

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/iawia002/lux v0.14.0
2525
github.com/jedib0t/go-pretty/v6 v6.4.0
2626
github.com/mattn/go-mastodon v0.0.5-0.20210515144304-86627ec7d635
27-
github.com/nbd-wtf/go-nostr v0.13.1-0.20230205201056-ab2db2dfc5d9
27+
github.com/nbd-wtf/go-nostr v0.13.1
2828
github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d
2929
github.com/pkg/errors v0.9.1
3030
github.com/prometheus/client_golang v1.14.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/n
551551
github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
552552
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
553553
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
554-
github.com/nbd-wtf/go-nostr v0.13.1-0.20230205201056-ab2db2dfc5d9 h1:YIJjaVL5Xogzq7mEeJauXGMumE6IZJSAcBb42mF5eJo=
555-
github.com/nbd-wtf/go-nostr v0.13.1-0.20230205201056-ab2db2dfc5d9/go.mod h1:qFFTIxh15H5GGN0WsBI/P73DteqsevnhSEW/yk8nEf4=
554+
github.com/nbd-wtf/go-nostr v0.13.1 h1:YwjO5fhipinxOZ7MQztFhaHCLfUoCc36skEJ36dWwVg=
555+
github.com/nbd-wtf/go-nostr v0.13.1/go.mod h1:qFFTIxh15H5GGN0WsBI/P73DteqsevnhSEW/yk8nEf4=
556556
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
557557
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
558558
github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k=

‎publish/nostr.go

+30-14
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/wabarc/wayback/errors"
1919
"github.com/wabarc/wayback/metrics"
2020
"github.com/wabarc/wayback/template/render"
21+
"golang.org/x/sync/errgroup"
2122
)
2223

2324
var _ Publisher = (*nostrBot)(nil)
@@ -33,10 +34,6 @@ func NewNostr(client *nostr.Relay) *nostrBot {
3334
return new(nostrBot)
3435
}
3536

36-
if client == nil {
37-
client = relayConnect(config.Opts.NostrRelayURL())
38-
}
39-
4037
return &nostrBot{client: client}
4138
}
4239

@@ -64,12 +61,9 @@ func (n *nostrBot) Publish(ctx context.Context, cols []wayback.Collect, args ...
6461
}
6562

6663
func (n *nostrBot) publish(ctx context.Context, note string) error {
67-
if !config.Opts.PublishToNostr() || n.client == nil {
64+
if !config.Opts.PublishToNostr() {
6865
return fmt.Errorf("publish to nostr abort")
6966
}
70-
if n.client.Connection == nil {
71-
return fmt.Errorf("publish to nostr failed: %v", <-n.client.ConnectionError)
72-
}
7367

7468
if note == "" {
7569
return fmt.Errorf("nostr validation failed: note can't be blank")
@@ -98,17 +92,39 @@ func (n *nostrBot) publish(ctx context.Context, note string) error {
9892
if err := ev.Sign(sk); err != nil {
9993
return fmt.Errorf("calling sign err: %v", err)
10094
}
101-
// send the text note
102-
status := n.client.Publish(ctx, ev)
103-
if status != nostr.PublishStatusSucceeded {
104-
return fmt.Errorf("published status is %s, not %s", status, nostr.PublishStatusSucceeded)
95+
96+
g, ctx := errgroup.WithContext(ctx)
97+
for _, relay := range config.Opts.NostrRelayURL() {
98+
logger.Debug(`publish note to relay: %s`, relay)
99+
relay := relay
100+
g.Go(func() error {
101+
defer func() {
102+
// recover from upstream panic
103+
if r := recover(); r != nil {
104+
logger.Error("publish to %s failed: %v", relay, r)
105+
}
106+
}()
107+
client := relayConnect(ctx, relay)
108+
if client.Connection == nil {
109+
return fmt.Errorf("publish to %s failed: %v", relay, <-client.ConnectionError)
110+
}
111+
// send the text note
112+
status := client.Publish(ctx, ev)
113+
if status != nostr.PublishStatusSucceeded {
114+
return fmt.Errorf("published to %s status is %s, not %s", relay, status, nostr.PublishStatusSucceeded)
115+
}
116+
return nil
117+
})
118+
}
119+
if err := g.Wait(); err != nil {
120+
return err
105121
}
106122

107123
return nil
108124
}
109125

110-
func relayConnect(url string) *nostr.Relay {
111-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
126+
func relayConnect(ctx context.Context, url string) *nostr.Relay {
127+
ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
112128
defer cancel()
113129
relay, err := nostr.RelayConnect(ctx, url)
114130
if err != nil {

‎wayback.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ Notion integration token\&.
265265
Notion database ID for archiving results\&.
266266
.TP
267267
.B WAYBACK_NOSTR_RELAY_URL
268-
Nostr relay server url\&.
268+
Nostr relay server url, multiple separated by comma\&.
269269
.TP
270270
.B WAYBACK_NOSTR_PRIVATE_KEY
271271
The private key of a Nostr account\&.

0 commit comments

Comments
 (0)