-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create separate host options for browser and native envs
- Loading branch information
Showing
7 changed files
with
126 additions
and
69 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // +build !js | ||
|
|
||
| package p2p | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/http" | ||
|
|
||
| leveldbStore "github.com/ipfs/go-ds-leveldb" | ||
| libp2p "github.com/libp2p/go-libp2p" | ||
| "github.com/libp2p/go-libp2p-peerstore/pstoreds" | ||
| ma "github.com/multiformats/go-multiaddr" | ||
| ) | ||
|
|
||
| func getOptionsForCurrentEnvironment(ctx context.Context, config Config) ([]libp2p.Option, error) { | ||
| // Note: 0.0.0.0 will use all available addresses. | ||
| tcpBindAddr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", config.TCPPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| wsBindAddr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/0.0.0.0/tcp/%d/ws", config.WebSocketsPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // HACK(albrow): As a workaround for AutoNAT issues, ping ifconfig.me to | ||
| // determine our public IP address on boot. This will work for nodes that | ||
| // would be reachable via a public IP address but don't know what it is (e.g. | ||
| // because they are running in a Docker container). | ||
| publicIP, err := getPublicIP() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not get public IP address: %s", err.Error()) | ||
| } | ||
| tcpAdvertiseAddr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d", publicIP, config.TCPPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| wsAdvertiseAddr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d/ws", publicIP, config.WebSocketsPort)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| advertiseAddrs := []ma.Multiaddr{tcpAdvertiseAddr, wsAdvertiseAddr} | ||
|
|
||
| // Set up the peerstore to use LevelDB. | ||
| store, err := leveldbStore.NewDatastore(config.PeerstoreDir, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| pstore, err := pstoreds.NewPeerstore(ctx, store, pstoreds.DefaultOpts()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return []libp2p.Option{ | ||
| libp2p.ListenAddrs(tcpBindAddr, wsBindAddr), | ||
| libp2p.AddrsFactory(newAddrsFactory(advertiseAddrs)), | ||
| libp2p.Peerstore(pstore), | ||
| }, nil | ||
| } | ||
|
|
||
| func newAddrsFactory(advertiseAddrs []ma.Multiaddr) func([]ma.Multiaddr) []ma.Multiaddr { | ||
| return func(addrs []ma.Multiaddr) []ma.Multiaddr { | ||
| // Note that we append the advertiseAddrs here just in case we are not | ||
| // actually reachable at our public IP address (and are reachable at one of | ||
| // the other addresses). | ||
| return append(addrs, advertiseAddrs...) | ||
| } | ||
| } | ||
|
|
||
| func getPublicIP() (string, error) { | ||
| res, err := http.Get("https://ifconfig.me/ip") | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| defer res.Body.Close() | ||
| ipBytes, err := ioutil.ReadAll(res.Body) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| return string(ipBytes), nil | ||
| } |
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,19 @@ | ||
| // +build js,wasm | ||
|
|
||
| package p2p | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| libp2p "github.com/libp2p/go-libp2p" | ||
| ws "github.com/libp2p/go-ws-transport" | ||
| ) | ||
|
|
||
| func getOptionsForCurrentEnvironment(ctx context.Context, config Config) ([]libp2p.Option, error) { | ||
| return []libp2p.Option{ | ||
| libp2p.Transport(ws.New), | ||
| // Don't listen on any addresses by default. We can't accept incoming | ||
| // connections in the browser. | ||
| libp2p.ListenAddrs(), | ||
| }, nil | ||
| } |
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