feat: implement url parsing

main.go

@@ -17,13 +17,18 @@ func main() {
 		log.Fatal("please provide an rpc endpoint as the only argument")
 	}
 
-	networkName, err := prevotes.GetNetworkName(os.Args[1])
+	parsedAddress, err := prevotes.NewRPCAddress(os.Args[1])
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	networkName, err := prevotes.GetNetworkName(parsedAddress)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	fmt.Println("Please wait, getting validator information....")
-	v := prevotes.GetValNames(os.Args[1])
+	v := prevotes.GetValNames(parsedAddress)
 	if v == nil {
 		log.Fatal("no validators found")
 	}
@@ -36,7 +41,7 @@ func main() {
 
 	tick := time.NewTicker(refreshRate)
 	for range tick.C {
-		votes, pct, hrs, dur, e := prevotes.GetPreVotes(os.Args[1], v)
+		votes, pct, hrs, dur, e := prevotes.GetPreVotes(parsedAddress, v)
 		if e != nil {
 			SummaryChan <- e.Error()
 			continue

prevotes/addr.go

@@ -0,0 +1,47 @@
+package prevotes
+
+import (
+	"fmt"
+	"net/url"
+)
+
+type RPCAddress struct {
+	Host string
+	Port string
+	TLS  bool
+}
+
+func (r *RPCAddress) HTTPRoute(path string) string {
+	return fmt.Sprintf("%s://%s:%s/%s", r.HTTPScheme(), r.Host, r.Port, path)
+}
+func (r *RPCAddress) HTTPScheme() string {
+	if r.TLS {
+		return "https"
+	}
+	return "http"
+}
+
+func NewRPCAddress(addr string) (*RPCAddress, error) {
+	parsedAddress, err := url.Parse(addr)
+	if err != nil {
+		return nil, err
+	}
+	rpcAddr := RPCAddress{
+		Host: parsedAddress.Hostname(),
+		Port: parsedAddress.Port(),
+		TLS:  false,
+	}
+	switch parsedAddress.Scheme {
+	case "tls", "https":
+		rpcAddr.TLS = true
+	}
+	if rpcAddr.Port == "" {
+		if rpcAddr.TLS {
+			rpcAddr.Port = "443"
+		} else {
+			rpcAddr.Port = "26657"
+		}
+	}
+
+	return &rpcAddr, nil
+}

prevotes/info.go

@@ -32,9 +32,7 @@ type ValNames struct {
 	power  map[int]float64
 }
 
-func GetValNames(addr string) *ValNames {
-	addr = strings.Replace(addr, "tcp://", "http://", 1)
-	httpAddr := strings.TrimRight(addr, "/")
+func GetValNames(addr *RPCAddress) *ValNames {
 	v := &ValNames{
 		key:    make(map[string]int),
 		indice: make(map[int]string),
@@ -47,7 +45,7 @@ func GetValNames(addr string) *ValNames {
 	more := true
 
 	for more {
-		resp, err := http.Get(httpAddr + "/validators?per_page=" + strconv.Itoa(perPage) + "&page=" + strconv.Itoa(page))
+		resp, err := http.Get(addr.HTTPRoute(fmt.Sprintf("/validators?per_page=%d&page=%d", perPage, page)))
 		if err != nil {
 			log.Println(err)
 			continue
@@ -85,7 +83,7 @@ func GetValNames(addr string) *ValNames {
 
 	// do it again, but get the % of voting power
 	for more {
-		resp, err := http.Get(httpAddr + "/validators?per_page=" + strconv.Itoa(perPage) + "&page=" + strconv.Itoa(page))
+		resp, err := http.Get(addr.HTTPRoute(fmt.Sprintf("/validators?per_page=%d&page=%d", perPage, page)))
 		if err != nil {
 			log.Println(err)
 			continue
@@ -116,7 +114,7 @@ func GetValNames(addr string) *ValNames {
 		}
 	}
 
-	client, err := rpchttp.New(addr, "/websocket")
+	client, err := rpchttp.New(addr.HTTPRoute(""), "/websocket")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -239,9 +237,9 @@ type status struct {
 	} `json:"result"`
 }
 
-func GetNetworkName(addr string) (string, error) {
-	addr = strings.TrimRight(strings.Replace(addr, "tcp://", "http://", 1), "/")
-	resp, err := http.Get(addr + "/status")
+func GetNetworkName(addr *RPCAddress) (string, error) {
+	route := addr.HTTPRoute("status")
+	resp, err := http.Get(route)
 	if err != nil {
 		return "", err
 	}

prevotes/votes.go

@@ -54,10 +54,9 @@ type VoteState struct {
 	Voted       bool
 }
 
-func GetPreVotes(url string, names *ValNames) (votes []VoteState, percent float64, hrs string, dur time.Duration, err error) {
+func GetPreVotes(url *RPCAddress, names *ValNames) (votes []VoteState, percent float64, hrs string, dur time.Duration, err error) {
 	votes = make([]VoteState, 0)
-	url = strings.TrimRight(strings.ReplaceAll(url, "tcp://", "http://"), "/")
-	resp, err := http.Get(url + "/consensus_state")
+	resp, err := http.Get(url.HTTPRoute("/consensus_state"))
 	if err != nil {
 		return nil, 0, "", 0, err
 	}