From e91d4429ec5ff021554bc5c3f7af5edaa858b1cd Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Mon, 22 Dec 2025 00:18:43 -0300 Subject: [PATCH] switch the local databases to lmdb so they can be accessed by multiple nak instances at the same time. --- event.go | 2 +- go.mod | 2 +- go.sum | 6 ------ main.go | 22 ++++++++++++---------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/event.go b/event.go index fb4de9f..1f351ea 100644 --- a/event.go +++ b/event.go @@ -24,7 +24,7 @@ const ( CATEGORY_EXTRAS = "EXTRAS" ) -var event = &cli.Command{ +var eventCmd = &cli.Command{ Name: "event", Usage: "generates an encoded event and either prints it or sends it to a set of relays", Description: `outputs an event built with the flags. if one or more relays are given as arguments, an attempt is also made to publish the event to these relays. diff --git a/go.mod b/go.mod index bad41df..530648a 100644 --- a/go.mod +++ b/go.mod @@ -32,6 +32,7 @@ require ( require ( github.com/FastFilter/xorfilter v0.2.1 // indirect github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect + github.com/PowerDNS/lmdb-go v1.9.3 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect github.com/andybalholm/brotli v1.1.1 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect @@ -96,7 +97,6 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yuin/goldmark v1.7.8 // indirect github.com/yuin/goldmark-emoji v1.0.5 // indirect - go.etcd.io/bbolt v1.4.2 // indirect golang.org/x/crypto v0.39.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.35.0 // indirect diff --git a/go.sum b/go.sum index 4951c40..df40a3d 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ fiatjaf.com/lib v0.3.1 h1:/oFQwNtFRfV+ukmOCxfBEAuayoLwXp4wu2/fz5iHpwA= fiatjaf.com/lib v0.3.1/go.mod h1:Ycqq3+mJ9jAWu7XjbQI1cVr+OFgnHn79dQR5oTII47g= -fiatjaf.com/nostr v0.0.0-20251201232830-91548fa0a157 h1:14yLsO2HwpS2CLIKFvLMDp8tVEDahwdC8OeG6NGaL+M= -fiatjaf.com/nostr v0.0.0-20251201232830-91548fa0a157/go.mod h1:ue7yw0zHfZj23Ml2kVSdBx0ENEaZiuvGxs/8VEN93FU= -fiatjaf.com/nostr v0.0.0-20251204122254-07061404918d h1:xROmiuT7LrZk+/iGGeTqRI4liqJZrc87AWjsyHtbqDg= -fiatjaf.com/nostr v0.0.0-20251204122254-07061404918d/go.mod h1:ue7yw0zHfZj23Ml2kVSdBx0ENEaZiuvGxs/8VEN93FU= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/FastFilter/xorfilter v0.2.1 h1:lbdeLG9BdpquK64ZsleBS8B4xO/QW1IM0gMzF7KaBKc= @@ -283,8 +279,6 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC4cIk= github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U= -go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I= -go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/main.go b/main.go index e0124c1..b20a338 100644 --- a/main.go +++ b/main.go @@ -8,11 +8,11 @@ import ( "path/filepath" "fiatjaf.com/nostr" - "fiatjaf.com/nostr/eventstore/boltdb" + "fiatjaf.com/nostr/eventstore/lmdb" "fiatjaf.com/nostr/eventstore/nullstore" "fiatjaf.com/nostr/sdk" - "fiatjaf.com/nostr/sdk/hints/bbolth" - "fiatjaf.com/nostr/sdk/kvstore/bbolt" + "fiatjaf.com/nostr/sdk/hints/lmdbh" + lmdbkv "fiatjaf.com/nostr/sdk/kvstore/lmdb" "github.com/fatih/color" "github.com/urfave/cli/v3" ) @@ -29,7 +29,7 @@ var app = &cli.Command{ Usage: "the nostr army knife command-line tool", DisableSliceFlagSeparator: true, Commands: []*cli.Command{ - event, + eventCmd, req, filterCmd, fetch, @@ -105,22 +105,24 @@ var app = &cli.Command{ configPath := c.String("config-path") if configPath != "" { - os.MkdirAll(filepath.Join("outbox"), 0755) - hintsFilePath := filepath.Join(configPath, "outbox/hints.db") - _, err := bbolth.NewBoltHints(hintsFilePath) + hintsPath := filepath.Join(configPath, "outbox/hints") + os.MkdirAll(hintsPath, 0755) + _, err := lmdbh.NewLMDBHints(hintsPath) if err != nil { - log("failed to create bolt hints db at '%s': %s\n", hintsFilePath, err) + log("failed to create lmdb hints db at '%s': %s\n", hintsPath, err) } eventsPath := filepath.Join(configPath, "events") - sys.Store = &boltdb.BoltBackend{Path: eventsPath} + os.MkdirAll(eventsPath, 0755) + sys.Store = &lmdb.LMDBBackend{Path: eventsPath} if err := sys.Store.Init(); err != nil { log("failed to create boltdb events db at '%s': %s\n", eventsPath, err) sys.Store = &nullstore.NullStore{} } kvPath := filepath.Join(configPath, "kvstore") - if kv, err := bbolt.NewStore(kvPath); err != nil { + os.MkdirAll(kvPath, 0755) + if kv, err := lmdbkv.NewStore(kvPath); err != nil { log("failed to create boltdb kvstore db at '%s': %s\n", kvPath, err) } else { sys.KVStore = kv