diff --git a/BUILD.bazel b/BUILD.bazel index 11117c9..fa41a73 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -10,6 +10,7 @@ go_library( importpath = "git.eve.moe/jackyyf/navigator", visibility = ["//visibility:private"], deps = [ + "//api/beacon:go_default_library", "//api/beacon/v1:go_default_library", "//api/navigator:go_default_library", "//ipgeo:go_default_library", diff --git a/api/beacon/BUILD.bazel b/api/beacon/BUILD.bazel index a6f0a81..1461fb0 100644 --- a/api/beacon/BUILD.bazel +++ b/api/beacon/BUILD.bazel @@ -3,6 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["api.go"], + data = ["beacon.html"], importpath = "git.eve.moe/jackyyf/navigator/api/beacon", visibility = ["//visibility:public"], + deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/api/beacon/api.go b/api/beacon/api.go index 5a53e06..53c51b0 100644 --- a/api/beacon/api.go +++ b/api/beacon/api.go @@ -1,12 +1,17 @@ package beacon import ( + "flag" "fmt" + "github.com/sirupsen/logrus" + "io/ioutil" "net/http" + "strconv" ) var ( - apiServeMux = http.NewServeMux() + apiServeMux = http.NewServeMux() + beaconFrontendPath = flag.String("beacon-html", "./api/beacon/beacon.html", "Path to the html file of beacon frontend") ) func init() { @@ -16,3 +21,19 @@ func init() { func RegisterApi(version string, handler http.Handler) { apiServeMux.Handle(fmt.Sprintf("/%s/", version), http.StripPrefix(fmt.Sprint("/", version), handler)) } + +func Initialize() { + content, err := ioutil.ReadFile(*beaconFrontendPath) + if err != nil { + panic(err) + } + apiServeMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Content-Length", strconv.Itoa(len(content))) + w.WriteHeader(200) + _, err := w.Write(content) + if err != nil { + logrus.WithError(err).Error("Unable to write html data") + } + }) +} diff --git a/api/beacon/beacon.html b/api/beacon/beacon.html new file mode 100644 index 0000000..303e160 --- /dev/null +++ b/api/beacon/beacon.html @@ -0,0 +1,256 @@ + + + + + + + + EveEdge Speedtest + + + + + + +
+
+

Please click the button below to start speedtest.

+ +
+
+ +
+
+ + + + + diff --git a/api/beacon/v1/api.go b/api/beacon/v1/api.go index b66677d..dbe1755 100644 --- a/api/beacon/v1/api.go +++ b/api/beacon/v1/api.go @@ -2,6 +2,7 @@ package v1 import ( "encoding/json" + "fmt" "git.eve.moe/jackyyf/navigator/api/beacon" "git.eve.moe/jackyyf/navigator/mapping" "git.eve.moe/jackyyf/navigator/mapping/firefly" @@ -42,7 +43,9 @@ func init() { } remoteIp := utils.GetRemoteIP(req) go firefly.AddSpeedTestResult(remoteIp, request) + resp.Header().Set("Content-Type", "application/json") resp.WriteHeader(http.StatusOK) + fmt.Fprint(resp, "true") }) beacon.RegisterApi("v1", serveMux) } diff --git a/main.go b/main.go index 2acd9c6..7d312c4 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "git.eve.moe/jackyyf/navigator/api/beacon" _ "git.eve.moe/jackyyf/navigator/api/beacon/v1" _ "git.eve.moe/jackyyf/navigator/api/navigator" "git.eve.moe/jackyyf/navigator/ipgeo" @@ -23,6 +24,7 @@ func main() { logrus.SetOutput(os.Stderr) ipgeo.Initialize() mapping.Initialize() + beacon.Initialize() log.Println("HTTP server is running on", *listen_spec) http.ListenAndServe(*listen_spec, nil) }