enable configuration of reseed friends who we can poll for upness. Fix some bugs in that whole process so it works better.

cmd/reseed.go

@@ -47,6 +47,12 @@ func getHostName() string {
 	return strings.Replace(hostname, "\n", "", -1)
 }
 
+func providedReseeds(c *cli.Context) []string {
+	reseedArg := c.StringSlice("friends")
+	reseed.AllReseeds = reseedArg
+	return reseed.AllReseeds
+}
+
 func NewReseedCommand() *cli.Command {
 	ndb, err := getmeanetdb.WhereIstheNetDB()
 	if err != nil {
@@ -158,6 +164,11 @@ func NewReseedCommand() *cli.Command {
 				Value: "127.0.0.1:7656",
 				Usage: "Use this SAM address to set up I2P connections for in-network reseed",
 			},
+			&cli.StringSliceFlag{
+				Name:  "friends",
+				Value: cli.NewStringSlice(reseed.AllReseeds...),
+				Usage: "Ping other reseed servers and display the result on the homepage to provide information about reseed uptime.",
+			},
 			&cli.BoolFlag{
 				Name:  "acme",
 				Usage: "Automatically generate a TLS certificate with the ACME protocol, defaults to Let's Encrypt",

reseed/content/style.css

@@ -19,6 +19,10 @@ h3 {
 	width: 55%;
 	margin-left: 45%;
 }
+h4 {
+	width: 55%;
+	margin-left: 45%;
+}
 ul {
 	width: 55%;
 	display: block;
@@ -37,6 +41,10 @@ p {
 	margin-left: 45%;
 }
 
+.pingtest {
+	margin-left: 45%;
+}
+
 img {
 	position: absolute;
 	margin-top: 3%;

reseed/homepage.go

@@ -109,7 +109,7 @@ func (srv *Server) HandleARealBrowser(w http.ResponseWriter, r *http.Request) {
 			HandleAFile(w, "images", strings.TrimPrefix(strings.TrimPrefix(r.URL.Path, "/"), "images"))
 		} else if strings.HasPrefix(image, "ping") {
 			PingEverybody()
-			http.Redirect(w, r, "/readout", http.StatusFound)
+			http.Redirect(w, r, "/", http.StatusFound)
 		} else if strings.HasPrefix(image, "readout") {
 			w.Header().Set("Content-Type", "text/html")
 			w.Write([]byte(header))

reseed/ping.go

@@ -5,20 +5,22 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 )
 
-// Ping requests an `.su3` from another reseed server and return true if
+// Ping requests an ".su3" from another reseed server and return true if
 // the reseed server is alive If the reseed server is not alive, returns
 // false and the status of the request as an error
-func Ping(url string) (bool, error) {
-	if strings.HasSuffix(url, "i2pseeds.su3") {
-		url = url + "i2pseeds.su3"
+func Ping(urlInput string) (bool, error) {
+	if !strings.HasSuffix(urlInput, "i2pseeds.su3") {
+		urlInput = fmt.Sprintf("%s%s", urlInput, "i2pseeds.su3")
 	}
-	req, err := http.NewRequest("GET", url, nil)
+	log.Println("Pinging:", urlInput)
+	req, err := http.NewRequest("GET", urlInput, nil)
 	if err != nil {
 		return false, err
 	}
@@ -35,21 +37,33 @@ func Ping(url string) (bool, error) {
 	return true, nil
 }
 
-func PingWriteContent(url string) error {
+func trimPath(s string) string {
+	tmp := strings.ReplaceAll(s, "https://", "")
+	tmp = strings.ReplaceAll(s, "http://", "")
+	tmp = strings.ReplaceAll(s, "/", "")
+	return tmp
+}
+
+func PingWriteContent(urlInput string) error {
+	log.Println("Calling PWC", urlInput)
 	date := time.Now().Format("2006-01-02")
-	path := strings.Replace(url, "http://", "", 1)
-	path = strings.Replace(path, "https://", "", 1)
-	path = strings.Replace(path, "/", "", -1)
+	u, err := url.Parse(urlInput)
+	if err != nil {
+		log.Println("PWC", err)
+		return fmt.Errorf("PingWriteContent:%s", err)
+	}
+	path := trimPath(u.Host)
+	log.Println("Calling PWC path", path)
 	BaseContentPath, _ := StableContentPath()
 	path = filepath.Join(BaseContentPath, path+"-"+date+".ping")
 	if _, err := os.Stat(path); err != nil {
-		result, err := Ping(url)
+		result, err := Ping(urlInput)
 		if result {
-			log.Printf("Ping: %s OK", url)
+			log.Printf("Ping: %s OK", urlInput)
 			err := ioutil.WriteFile(path, []byte("Alive: Status OK"), 0644)
 			return err
 		} else {
-			log.Printf("Ping: %s %s", url, err)
+			log.Printf("Ping: %s %s", urlInput, err)
 			err := ioutil.WriteFile(path, []byte("Dead: "+err.Error()), 0644)
 			return err
 		}
@@ -58,7 +72,7 @@ func PingWriteContent(url string) error {
 }
 
 // TODO: make this a configuration option
-var AllReseeds = []string{
+/*var AllReseeds = []string{
 	"https://banana.incognet.io/",
 	"https://i2p.novg.net/",
 	"https://i2pseed.creativecowpat.net:8443/",
@@ -67,16 +81,30 @@ var AllReseeds = []string{
 	"https://reseed.memcpy.io/",
 	"https://reseed.onion.im/",
 	"https://reseed2.i2p.net/",
+}*/
+
+var AllReseeds = []string{
+	"https://banana.incognet.io/",
+	"https://i2p.novg.net/",
+	"https://i2pseed.creativecowpat.net:8443/",
+	"https://reseed-fr.i2pd.xyz/",
+	"https://reseed-pl.i2pd.xyz/",
+	"https://reseed.diva.exchange/",
+	"https://reseed.i2pgit.org/",
+	"https://reseed.memcpy.io/",
+	"https://reseed.onion.im/",
+	"https://reseed2.i2p.net/",
+	"https://www2.mk16.de/",
 }
 
 func PingEverybody() []string {
 	var nonerrs []string
-	for _, url := range AllReseeds {
-		err := PingWriteContent(url)
+	for _, urlInput := range AllReseeds {
+		err := PingWriteContent(urlInput)
 		if err == nil {
-			nonerrs = append(nonerrs, url)
+			nonerrs = append(nonerrs, urlInput)
 		} else {
-			nonerrs = append(nonerrs, err.Error()+"-"+url)
+			nonerrs = append(nonerrs, err.Error()+"-"+urlInput)
 		}
 	}
 	return nonerrs
@@ -106,8 +134,8 @@ func ReadOut(w http.ResponseWriter) {
 	pinglist, err := GetPingFiles()
 	if err == nil {
 		fmt.Fprintf(w, "<h3>Reseed Server Statuses</h3>")
-		fmt.Fprintf(w, "<div><p>This feature is experimental and may not always provide accurate results.</p></div>")
-		fmt.Fprintf(w, "<div><p><ul>")
+		fmt.Fprintf(w, "<div class=\"pingtest\">This feature is experimental and may not always provide accurate results.</div>")
+		fmt.Fprintf(w, "<div class=\"homepage\"><p><ul>")
 		for _, file := range pinglist {
 			ping, err := ioutil.ReadFile(file)
 			host := strings.Replace(file, ".ping", "", 1)