mirror of
https://github.com/fiatjaf/nak.git
synced 2024-11-22 16:19:07 -05:00
bunker: repeat connection info every now and then.
This commit is contained in:
parent
e008e08105
commit
c5f7926471
33
bunker.go
33
bunker.go
|
@ -1,11 +1,13 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/nbd-wtf/go-nostr"
|
"github.com/nbd-wtf/go-nostr"
|
||||||
|
@ -66,13 +68,18 @@ var bunker = &cli.Command{
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
npub, _ := nip19.EncodePublicKey(pubkey)
|
npub, _ := nip19.EncodePublicKey(pubkey)
|
||||||
|
bunkerURI := fmt.Sprintf("bunker://%s?%s", pubkey, qs.Encode())
|
||||||
bold := color.New(color.Bold).Sprint
|
bold := color.New(color.Bold).Sprint
|
||||||
|
|
||||||
|
printBunkerInfo := func() {
|
||||||
log("listening at %v:\n pubkey: %s \n npub: %s\n bunker: %s\n\n",
|
log("listening at %v:\n pubkey: %s \n npub: %s\n bunker: %s\n\n",
|
||||||
bold(relayURLs),
|
bold(relayURLs),
|
||||||
bold(pubkey),
|
bold(pubkey),
|
||||||
bold(npub),
|
bold(npub),
|
||||||
bold(fmt.Sprintf("bunker://%s?%s", pubkey, qs.Encode())),
|
bold(bunkerURI),
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
printBunkerInfo()
|
||||||
|
|
||||||
alwaysYes := c.Bool("yes")
|
alwaysYes := c.Bool("yes")
|
||||||
|
|
||||||
|
@ -88,7 +95,16 @@ var bunker = &cli.Command{
|
||||||
signer := nip46.NewStaticKeySigner(sec)
|
signer := nip46.NewStaticKeySigner(sec)
|
||||||
handlerWg := sync.WaitGroup{}
|
handlerWg := sync.WaitGroup{}
|
||||||
printLock := sync.Mutex{}
|
printLock := sync.Mutex{}
|
||||||
|
|
||||||
|
// just a gimmick
|
||||||
|
var cancelPreviousBunkerInfoPrint context.CancelFunc
|
||||||
|
_, cancel := context.WithCancel(c.Context)
|
||||||
|
cancelPreviousBunkerInfoPrint = cancel
|
||||||
|
|
||||||
for ie := range events {
|
for ie := range events {
|
||||||
|
cancelPreviousBunkerInfoPrint() // this prevents us from printing a million bunker info blocks
|
||||||
|
|
||||||
|
// handle the NIP-46 request event
|
||||||
req, resp, eventResponse, harmless, err := signer.HandleRequest(ie.Event)
|
req, resp, eventResponse, harmless, err := signer.HandleRequest(ie.Event)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log("< failed to handle request from %s: %s\n", ie.Event.PubKey, err.Error())
|
log("< failed to handle request from %s: %s\n", ie.Event.PubKey, err.Error())
|
||||||
|
@ -119,6 +135,21 @@ var bunker = &cli.Command{
|
||||||
}
|
}
|
||||||
handlerWg.Wait()
|
handlerWg.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// just after handling one request we trigger this
|
||||||
|
go func() {
|
||||||
|
ctx, cancel := context.WithCancel(c.Context)
|
||||||
|
defer cancel()
|
||||||
|
cancelPreviousBunkerInfoPrint = cancel
|
||||||
|
// the idea is that we will print the bunker URL again so it is easier to copy-paste by users
|
||||||
|
// but we will only do if the bunker is inactive for more than 5 minutes
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
case <-time.After(time.Minute * 5):
|
||||||
|
fmt.Fprintf(os.Stderr, "\n")
|
||||||
|
printBunkerInfo()
|
||||||
|
}
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in New Issue
Block a user