Introduce explicit config

proxy/stats.go

@@ -2,13 +2,12 @@ package proxy
 
 import (
 	"encoding/json"
-	"fmt"
-	"net"
 	"net/http"
-	"net/url"
 	"strconv"
 	"sync/atomic"
 	"time"
+
+	"github.com/9seconds/mtg/config"
 )
 
 type statsUptime time.Time
@@ -26,13 +25,10 @@ type Stats struct {
 		Incoming uint64 `json:"incoming"`
 		Outgoing uint64 `json:"outgoing"`
 	} `json:"traffic"`
-	URLs struct {
-		TG        string `json:"tg_url"`
-		TMe       string `json:"tme_url"`
-		TGQRCode  string `json:"tg_qrcode"`
-		TMeQRCode string `json:"tme_qrcode"`
-	} `json:"urls"`
-	Uptime statsUptime `json:"uptime"`
+	URLs   config.IPURLs `json:"urls"`
+	Uptime statsUptime   `json:"uptime"`
+
+	conf *config.Config
 }
 
 func (s *Stats) newConnection() {
@@ -53,7 +49,7 @@ func (s *Stats) addOutgoingTraffic(n int) {
 }
 
 // Serve runs statistics HTTP server.
-func (s *Stats) Serve(host fmt.Stringer, port uint16) {
+func (s *Stats) Serve() {
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 
@@ -63,65 +59,16 @@ func (s *Stats) Serve(host fmt.Stringer, port uint16) {
 		encoder.Encode(s) // nolint: errcheck, gas
 	})
 
-	addr := net.JoinHostPort(host.String(), strconv.Itoa(int(port)))
-	http.ListenAndServe(addr, nil) // nolint: errcheck, gas
+	http.ListenAndServe(s.conf.StatAddr(), nil) // nolint: errcheck, gas
 }
 
 // NewStats returns new instance of statistics datastructure.
-func NewStats(serverName string, port uint16, secret string) *Stats {
-	urlQuery := makeURLQuery(serverName, port, secret)
-
-	stat := &Stats{Uptime: statsUptime(time.Now())}
-	stat.URLs.TG = makeTGURL(urlQuery)
-	stat.URLs.TMe = makeTMeURL(urlQuery)
-	stat.URLs.TGQRCode = makeQRCodeURL(stat.URLs.TG)
-	stat.URLs.TMeQRCode = makeQRCodeURL(stat.URLs.TMe)
+func NewStats(conf *config.Config) *Stats {
+	stat := &Stats{
+		Uptime: statsUptime(time.Now()),
+		conf:   conf,
+	}
+	stat.URLs = conf.GetURLs()
 
 	return stat
 }
-
-func makeURLQuery(serverName string, port uint16, secret string) url.Values {
-	values := url.Values{}
-	values.Set("server", serverName)
-	values.Set("port", strconv.Itoa(int(port)))
-	values.Set("secret", secret)
-
-	return values
-}
-
-func makeTGURL(values url.Values) string {
-	tgURL := url.URL{
-		Scheme:   "tg",
-		Host:     "proxy",
-		RawQuery: values.Encode(),
-	}
-
-	return tgURL.String()
-}
-
-func makeTMeURL(values url.Values) string {
-	tMeURL := url.URL{
-		Scheme:   "https",
-		Host:     "t.me",
-		Path:     "proxy",
-		RawQuery: values.Encode(),
-	}
-
-	return tMeURL.String()
-}
-
-func makeQRCodeURL(data string) string {
-	QRURL := url.URL{
-		Scheme: "https",
-		Host:   "api.qrserver.com",
-		Path:   "v1/create-qr-code",
-	}
-
-	values := url.Values{}
-	values.Set("qzone", "4")
-	values.Set("format", "svg")
-	values.Set("data", data)
-	QRURL.RawQuery = values.Encode()
-
-	return QRURL.String()
-}