forked from binaryholdings/tenderseed
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from Terran-Stakers/master
Small refactoring & better web server implem
- Loading branch information
Showing
6 changed files
with
139 additions
and
67 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,31 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "embed" | ||
| "fmt" | ||
| "github.com/mitchellh/go-homedir" | ||
| "github.com/tendermint/tendermint/config" | ||
| "github.com/tendermint/tendermint/libs/log" | ||
| tmos "github.com/tendermint/tendermint/libs/os" | ||
| tmstrings "github.com/tendermint/tendermint/libs/strings" | ||
| "github.com/tendermint/tendermint/p2p" | ||
| "github.com/tendermint/tendermint/p2p/pex" | ||
| "github.com/tendermint/tendermint/version" | ||
| "html/template" | ||
| "net/http" | ||
| "os" | ||
| "path/filepath" | ||
| "time" | ||
|
|
||
| "github.com/mitchellh/go-homedir" | ||
| ) | ||
|
|
||
| var ( | ||
| // https://blog.jetbrains.com/go/2021/06/09/how-to-use-go-embed-in-go-1-16/ | ||
| //go:embed resources | ||
| res embed.FS | ||
| pages = map[string]string{ | ||
| "/": "web/index.html", | ||
| } | ||
| configDir = ".tinyseed" | ||
| logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout)) | ||
| ) | ||
|
|
||
| // Config defines the configuration format | ||
| type Config struct { | ||
| ListenAddress string `toml:"laddr" comment:"Address to listen for incoming connections"` | ||
| HttpPort string `toml:"http_port" comment:"Port for the http server"` | ||
| ChainID string `toml:"chain_id" comment:"network identifier (todo move to cli flag argument? keeps the config network agnostic)"` | ||
| NodeKeyFile string `toml:"node_key_file" comment:"path to node_key (relative to tendermint-seed home directory or an absolute path)"` | ||
| AddrBookFile string `toml:"addr_book_file" comment:"path to address book (relative to tendermint-seed home directory or an absolute path)"` | ||
|
|
@@ -43,48 +39,95 @@ type Config struct { | |
| func DefaultConfig() *Config { | ||
| return &Config{ | ||
| ListenAddress: "tcp://0.0.0.0:6969", | ||
| HttpPort: "3000", | ||
| ChainID: "osmosis-1", | ||
| NodeKeyFile: "config/node_key.json", | ||
| AddrBookFile: "data/addrbook.json", | ||
| NodeKeyFile: "node_key.json", | ||
| AddrBookFile: "addrbook.json", | ||
| AddrBookStrict: true, | ||
| MaxNumInboundPeers: 1000, | ||
| MaxNumInboundPeers: 3000, | ||
| MaxNumOutboundPeers: 1000, | ||
| Seeds: "[email protected]:26656,[email protected]:26656,[email protected]:26656,[email protected]:26656", | ||
| } | ||
| } | ||
|
|
||
| func startWebServer() { | ||
| http.Handle("/", http.FileServer(http.Dir("/tmp"))) | ||
|
|
||
|
|
||
| s := &http.Server{ | ||
| Addr: ":8080", | ||
| Handler: myHandler, | ||
| ReadTimeout: 10 * time.Second, | ||
| WriteTimeout: 10 * time.Second, | ||
| MaxHeaderBytes: 1 << 20, | ||
| } | ||
| } | ||
|
|
||
| func main() { | ||
| idOverride := os.Getenv("ID") | ||
| seedOverride := os.Getenv("SEEDS") | ||
| userHomeDir, err := homedir.Dir() | ||
| seedConfig := DefaultConfig() | ||
|
|
||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| homeDir := filepath.Join(userHomeDir, ".terranseed") | ||
| configFile := "config/config.toml" | ||
| configFilePath := filepath.Join(homeDir, configFile) | ||
|
|
||
| // init config directory & files | ||
| homeDir := filepath.Join(userHomeDir, configDir, "config") | ||
| configFilePath := filepath.Join(homeDir, "config.toml") | ||
| nodeKeyFilePath := filepath.Join(homeDir, seedConfig.NodeKeyFile) | ||
| addrBookFilePath := filepath.Join(homeDir, seedConfig.AddrBookFile) | ||
|
|
||
| MkdirAllPanic(filepath.Dir(nodeKeyFilePath), os.ModePerm) | ||
| MkdirAllPanic(filepath.Dir(addrBookFilePath), os.ModePerm) | ||
| MkdirAllPanic(filepath.Dir(configFilePath), os.ModePerm) | ||
| SeedConfig := DefaultConfig() | ||
|
|
||
| if idOverride != "" { | ||
| SeedConfig.ChainID = idOverride | ||
| seedConfig.ChainID = idOverride | ||
| } | ||
| if seedOverride != "" { | ||
| SeedConfig.Seeds = seedOverride | ||
| seedConfig.Seeds = seedOverride | ||
| } | ||
| logger.Info("Starting Web Server...") | ||
| StartWebServer(*seedConfig) | ||
| logger.Info("Starting Seed Node...") | ||
| Start(*seedConfig) | ||
| } | ||
|
|
||
| func StartWebServer(seedConfig Config) { | ||
|
|
||
| // serve static assets | ||
| fs := http.FileServer(http.Dir("./web/assets")) | ||
| http.Handle("/assets/", http.StripPrefix("/assets/", fs)) | ||
|
|
||
| // serve html files | ||
| http.HandleFunc("/", serveTemplate) | ||
|
|
||
| // start web server in non-blocking | ||
| go func() { | ||
| err := http.ListenAndServe(":"+seedConfig.HttpPort, nil) | ||
| logger.Info("HTTP Server started", "port", seedConfig.HttpPort) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| }() | ||
| } | ||
|
|
||
| func serveTemplate(w http.ResponseWriter, r *http.Request) { | ||
| index := filepath.Join("./web/templates", "index.html") | ||
| templates := filepath.Join("./web/templates", filepath.Clean(r.URL.Path)) | ||
| logger.Info("index", "i", index, "t", templates) | ||
|
|
||
| // Return a 404 if the template doesn't exist | ||
| fileInfo, err := os.Stat(templates) | ||
|
|
||
| if err != nil || fileInfo.IsDir() { | ||
| http.Redirect(w, r, "/index.html", 302) | ||
| return | ||
| } | ||
|
|
||
| tmpl, err := template.ParseFiles(index, templates) | ||
| if err != nil { | ||
| // Log the detailed error | ||
| logger.Error(err.Error()) | ||
| // Return a generic "Internal Server Error" message | ||
| http.Error(w, http.StatusText(500), 500) | ||
| return | ||
| } | ||
|
|
||
| err = tmpl.ExecuteTemplate(w, "index", nil) | ||
| if err != nil { | ||
| logger.Error(err.Error()) | ||
| http.Error(w, http.StatusText(500), 500) | ||
| } | ||
| Start(*SeedConfig) | ||
| } | ||
|
|
||
| // MkdirAllPanic invokes os.MkdirAll but panics if there is an error | ||
|
|
@@ -96,42 +139,30 @@ func MkdirAllPanic(path string, perm os.FileMode) { | |
| } | ||
|
|
||
| // Start starts a Tenderseed | ||
| func Start(SeedConfig Config) { | ||
| logger := log.NewTMLogger( | ||
| log.NewSyncWriter(os.Stdout), | ||
| ) | ||
|
|
||
| chainID := SeedConfig.ChainID | ||
| nodeKeyFilePath := SeedConfig.NodeKeyFile | ||
| addrBookFilePath := SeedConfig.AddrBookFile | ||
| func Start(seedConfig Config) { | ||
|
|
||
| MkdirAllPanic(filepath.Dir(nodeKeyFilePath), os.ModePerm) | ||
| MkdirAllPanic(filepath.Dir(addrBookFilePath), os.ModePerm) | ||
| chainID := seedConfig.ChainID | ||
|
|
||
| cfg := config.DefaultP2PConfig() | ||
| cfg.AllowDuplicateIP = true | ||
|
|
||
| // allow a lot of inbound peers since we disconnect from them quickly in seed mode | ||
| cfg.MaxNumInboundPeers = 3000 | ||
|
|
||
| // keep trying to make outbound connections to exchange peering info | ||
| cfg.MaxNumOutboundPeers = 400 | ||
|
|
||
| userHomeDir, err := homedir.Dir() | ||
| nodeKeyFilePath := filepath.Join(userHomeDir, configDir, "config", seedConfig.NodeKeyFile) | ||
| nodeKey, err := p2p.LoadOrGenNodeKey(nodeKeyFilePath) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| logger.Info("terranseed", | ||
| logger.Info("Configuration", | ||
| "key", nodeKey.ID(), | ||
| "listen", SeedConfig.ListenAddress, | ||
| "node listen", seedConfig.ListenAddress, | ||
| "http server port", seedConfig.HttpPort, | ||
| "chain", chainID, | ||
| "strict-routing", SeedConfig.AddrBookStrict, | ||
| "max-inbound", SeedConfig.MaxNumInboundPeers, | ||
| "max-outbound", SeedConfig.MaxNumOutboundPeers, | ||
| "strict-routing", seedConfig.AddrBookStrict, | ||
| "max-inbound", seedConfig.MaxNumInboundPeers, | ||
| "max-outbound", seedConfig.MaxNumOutboundPeers, | ||
| ) | ||
|
|
||
| // TODO(roman) expose per-module log levels in the config | ||
| filteredLogger := log.NewFilter(logger, log.AllowInfo()) | ||
|
|
||
| protocolVersion := | ||
|
|
@@ -141,11 +172,11 @@ func Start(SeedConfig Config) { | |
| 0, | ||
| ) | ||
|
|
||
| // NodeInfo gets info on yhour node | ||
| // NodeInfo gets info on your node | ||
| nodeInfo := p2p.DefaultNodeInfo{ | ||
| ProtocolVersion: protocolVersion, | ||
| DefaultNodeID: nodeKey.ID(), | ||
| ListenAddr: SeedConfig.ListenAddress, | ||
| ListenAddr: seedConfig.ListenAddress, | ||
| Network: chainID, | ||
| Version: "0.6.9", | ||
| Channels: []byte{pex.PexChannel}, | ||
|
|
@@ -162,12 +193,15 @@ func Start(SeedConfig Config) { | |
| panic(err) | ||
| } | ||
|
|
||
| book := pex.NewAddrBook(addrBookFilePath, SeedConfig.AddrBookStrict) | ||
| addrBookFilePath := filepath.Join(userHomeDir, configDir, "config", seedConfig.AddrBookFile) | ||
| book := pex.NewAddrBook(addrBookFilePath, seedConfig.AddrBookStrict) | ||
| book.SetLogger(filteredLogger.With("module", "book")) | ||
|
|
||
| pexReactor := pex.NewReactor(book, &pex.ReactorConfig{ | ||
| SeedMode: true, | ||
| Seeds: tmstrings.SplitAndTrim(SeedConfig.Seeds, ",", " "), | ||
| SeedMode: true, | ||
| Seeds: tmstrings.SplitAndTrim(seedConfig.Seeds, ",", " "), | ||
| SeedDisconnectWaitPeriod: 1 * time.Second, // default is 28 hours, we just want to harvest as many addresses as possible | ||
| PersistentPeersMaxDialPeriod: 0, // use exponential back-off | ||
| }) | ||
| pexReactor.SetLogger(filteredLogger.With("module", "pex")) | ||
|
|
||
|
|
@@ -194,5 +228,17 @@ func Start(SeedConfig Config) { | |
| panic(err) | ||
| } | ||
|
|
||
| go func() { | ||
| // Fire periodically | ||
| ticker := time.NewTicker(5 * time.Second) | ||
|
|
||
| for { | ||
| select { | ||
| case <-ticker.C: | ||
| logger.Info("Peers list", "peers", sw.Peers().List()) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| sw.Wait() | ||
| } | ||
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,3 @@ | ||
| h2 { | ||
| color: grey; | ||
| } |
This file was deleted.
Oops, something went wrong.
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,12 @@ | ||
| {{define "index"}} | ||
|
|
||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <link rel="stylesheet" type="text/css" href="/assets/css/main.css" /> | ||
| </head> | ||
| <body> | ||
| <h2>It works!</h2> | ||
| </body> | ||
| </html> | ||
| {{end}} |