-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The p2p package had ended up in dependency hell, but was also overengineered. With a little gardening to get out the weeds, the package is now much better balanced and easy to use. It's much nicer to call peer.ConnectAndProtect() than some DHT function.
- Loading branch information
Showing
28 changed files
with
377 additions
and
463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package p2p | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "github.com/bahner/go-ma" | ||
| "github.com/bahner/go-ma-actor/config" | ||
| "github.com/libp2p/go-libp2p/core/discovery" | ||
| "github.com/libp2p/go-libp2p/p2p/discovery/routing" | ||
| "github.com/libp2p/go-libp2p/p2p/discovery/util" | ||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func advertisementLoop(ctx context.Context, routingDiscovery *routing.RoutingDiscovery, discoveryOpts ...discovery.Option) { | ||
|
|
||
| ticker := time.NewTicker(config.P2PDiscoveryAdvertiseInterval()) | ||
| defer ticker.Stop() | ||
|
|
||
| for { | ||
| select { | ||
| case <-ticker.C: | ||
| util.Advertise(ctx, routingDiscovery, ma.RENDEZVOUS, discoveryOpts...) | ||
| log.Debugf("Advertising rendezvous string: %s", ma.RENDEZVOUS) | ||
| case <-ctx.Done(): | ||
| return | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package p2p | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/bahner/go-ma" | ||
| "github.com/bahner/go-ma-actor/p2p/connmgr" | ||
| "github.com/bahner/go-ma-actor/p2p/peer" | ||
| p2pDHT "github.com/libp2p/go-libp2p-kad-dht" | ||
| "github.com/libp2p/go-libp2p/core/host" | ||
| p2peer "github.com/libp2p/go-libp2p/core/peer" | ||
| "github.com/libp2p/go-libp2p/p2p/discovery/routing" | ||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| type DHT struct { | ||
| *p2pDHT.IpfsDHT | ||
| Host host.Host | ||
| ConnectionGater *connmgr.ConnectionGater | ||
| } | ||
|
|
||
| // Initialise The Kademlia DHT and bootstrap it. | ||
| // The context is used to abort the process, but context.Background() probably works fine. | ||
| // If nil is passed, a background context will be used. | ||
| // | ||
| // The host is a libp2p host. | ||
| // | ||
| // Takes a variadic list of dht.Option. You'll need this if you want to set a custom routing table. | ||
| // or set the mode to server. None is fine for ordinary use. | ||
|
|
||
| func NewDHT(h host.Host, cg *connmgr.ConnectionGater, dhtOpts ...p2pDHT.Option) (*DHT, error) { | ||
|
|
||
| var err error | ||
|
|
||
| d := &DHT{ | ||
| Host: h, | ||
| ConnectionGater: cg, | ||
| } | ||
|
|
||
| d.IpfsDHT, err = p2pDHT.New(context.Background(), h, dhtOpts...) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create Kademlia DHT: %w", err) | ||
| } | ||
|
|
||
| d.Bootstrap(context.Background()) | ||
|
|
||
| return d, nil | ||
| } | ||
|
|
||
| var ( | ||
| ErrFailedToCreateRoutingDiscovery = fmt.Errorf("failed to create routing discovery") | ||
| ) | ||
|
|
||
| // Run a continuous discovery loop to find new peers | ||
| // The ctx should probably be a background context | ||
| func (d *DHT) discoveryLoop(ctx context.Context) error { | ||
| routingDiscovery := routing.NewRoutingDiscovery(d.IpfsDHT) | ||
| if routingDiscovery == nil { | ||
| return ErrFailedToCreateRoutingDiscovery | ||
| } | ||
|
|
||
| peerChan, err := routingDiscovery.FindPeers(ctx, ma.RENDEZVOUS) | ||
| if err != nil { | ||
| return fmt.Errorf("peer discovery error: %w", err) | ||
| } | ||
|
|
||
| go advertisementLoop(ctx, routingDiscovery) // Run advertisement continuously in the background | ||
| go discover(ctx, peerChan, d) // Run discovery continuously in the background | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func discover(ctx context.Context, peerChan <-chan p2peer.AddrInfo, d *DHT) error { | ||
| for { | ||
| select { | ||
| case p, ok := <-peerChan: | ||
| if !ok { | ||
| log.Fatalf("DHT peer channel closed, but it was supposed to be running in the background.") | ||
| } | ||
|
|
||
| if p.ID == d.Host.ID() { | ||
| continue // Skip self | ||
| } | ||
|
|
||
| if err := peer.ConnectAndProtect(context.Background(), d.Host, p); err != nil { | ||
| log.Warnf("Failed to connect to discovered peer: %s: %v", p.ID.String(), err) | ||
| } | ||
| case <-ctx.Done(): | ||
| return nil | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.