Mirror/nws
1
0
Fork 0
mirror of https://github.com/asmogo/nws.git synced 2024-12-12 18:36:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update exit construction (#45)

Browse Source
This commit is contained in:
asmogo 2024-11-11 08:28:43 +01:00 committed by GitHub
parent a77add0859
commit 844bf987a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nws/nws.go
View File

@ -62,7 +62,7 @@ func startExitNode(cmd *cobra.Command, _ []string) {
panic(err)
}
ctx := cmd.Context()
exitNode := exit.NewExit(ctx, cfg)
exitNode := exit.New(ctx, cfg)
exitNode.ListenAndServe(ctx)
}

31
exit/exit.go
View File

@ -53,12 +53,23 @@ type Exit struct {
publicKey string
}
// NewExit creates a new Exit node with the provided context and config.
func newExit(pool *nostr.SimplePool, pubKey string, profile string) *Exit {
exit := &Exit{
nostrConnectionMap: xsync.NewMapOf[string, *netstr.NostrConnection](),
pool: pool,
mutexMap: NewMutexMap(),
publicKey: pubKey,
nprofile: profile,
}
return exit
}
// New creates a newExit Exit node with the provided context and config.
// This function will currently panic if there is an error while creating the Exit node.
func NewExit(ctx context.Context, exitNodeConfig *config.ExitConfig) *Exit {
// generate new private key if it is not set
func New(ctx context.Context, exitNodeConfig *config.ExitConfig) *Exit {
// generate newExit private key if it is not set
if exitNodeConfig.NostrPrivateKey == "" {
// generate new private key
// generate newExit private key
exitNodeConfig.NostrPrivateKey = nostr.GeneratePrivateKey()
slog.Warn(generateKeyMessage, "key", exitNodeConfig.NostrPrivateKey)
}
@ -74,16 +85,10 @@ func NewExit(ctx context.Context, exitNodeConfig *config.ExitConfig) *Exit {
if err != nil {
panic(err)
}
// create a new pool
// create a newExit pool
pool := nostr.NewSimplePool(ctx)
exit := &Exit{
nostrConnectionMap: xsync.NewMapOf[string, *netstr.NostrConnection](),
pool: pool,
mutexMap: NewMutexMap(),
publicKey: pubKey,
nprofile: profile,
}
exit := newExit(pool, pubKey, profile)
// start reverse proxy if https port is set
if exitNodeConfig.HttpsPort != 0 {
exitNodeConfig.BackendHost = fmt.Sprintf(":%d", exitNodeConfig.HttpsPort)
@ -105,7 +110,7 @@ func NewExit(ctx context.Context, exitNodeConfig *config.ExitConfig) *Exit {
continue
}
exit.relays = append(exit.relays, relay)
slog.Info("added relay connection", "url", relayURL) //nolint:forbidigo
slog.Info("added relay connection", "url", relayURL)
}
domain, err := exit.getDomain()
if err != nil {