Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(BootAPI) Keep boot host alive #1811

Merged
merged 4 commits into from
Jul 15, 2024
Merged

(BootAPI) Keep boot host alive #1811

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6446098
feat: keep boot host alive
nick-bisonai Jul 15, 2024
f76efa2
feat: send host through c.Locals
nick-bisonai Jul 15, 2024
5f4baa3
fix: update Locals reference
nick-bisonai Jul 15, 2024
1697531
fix: remove host init from sync endpoint
nick-bisonai Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions node/pkg/boot/boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
libp2pSetup "bisonai.com/orakl/node/pkg/libp2p/setup"
libp2pUtils "bisonai.com/orakl/node/pkg/libp2p/utils"
"github.com/gofiber/fiber/v2"
"github.com/libp2p/go-libp2p/core/host"
"github.com/rs/zerolog/log"
)

Expand All @@ -39,12 +40,18 @@ func Run(ctx context.Context) error {
port = "8089"
}

h, err := libp2pSetup.NewHost(ctx)
if err != nil {
log.Error().Err(err).Msg("Failed to make host")
return err
}

refreshTicker := time.NewTicker(REFRESH_INTERVAL)
go func() {
for {
select {
case <-refreshTicker.C:
err = RefreshJob(ctx)
err = RefreshJob(ctx, h)
if err != nil {
log.Error().Err(err).Msg("Failed to refresh peers")
}
Expand All @@ -71,7 +78,7 @@ func Run(ctx context.Context) error {

}

func RefreshJob(ctx context.Context) error {
func RefreshJob(ctx context.Context, h host.Host) error {
log.Info().Msg("Refreshing peers")
peers, err := db.QueryRows[peer.PeerModel](ctx, peer.GetPeer, nil)
if err != nil {
Expand All @@ -83,14 +90,7 @@ func RefreshJob(ctx context.Context) error {
return nil
}

h, err := libp2pSetup.NewHost(ctx, libp2pSetup.WithHolePunch(), libp2pSetup.WithPort(0))
if err != nil {
log.Error().Err(err).Msg("Failed to make host")
return err
}

for _, p := range peers {

isAlive, liveCheckErr := libp2pUtils.IsHostAlive(ctx, h, p.Url)
if liveCheckErr != nil {
log.Error().Err(liveCheckErr).Msg("Failed to check peer")
Expand All @@ -109,11 +109,5 @@ func RefreshJob(ctx context.Context) error {
}
}

err = h.Close()
if err != nil {
log.Error().Err(err).Msg("Failed to close host")
return err
}

return nil
}
10 changes: 8 additions & 2 deletions node/pkg/boot/tests/peer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,13 @@ func TestRefresh(t *testing.T) {

assert.Equal(t, res.Url, url, "expected to have the same url")

err = boot.RefreshJob(ctx)
bootHost, err := libp2pSetup.NewHost(ctx)
if err != nil {
t.Fatalf("error making host: %v", err)
}
defer bootHost.Close()

err = boot.RefreshJob(ctx, bootHost)
if err != nil {
t.Fatalf("error refreshing peers: %v", err)
}
Expand All @@ -117,7 +123,7 @@ func TestRefresh(t *testing.T) {

h.Close()

err = boot.RefreshJob(ctx)
err = boot.RefreshJob(ctx, bootHost)
if err != nil {
t.Fatalf("error refreshing peers: %v", err)
}
Expand Down
Loading