forked from freifunk-franken/keyserver
Compare commits
2 Commits
4dc8d11538
...
fab15ce226
Author | SHA1 | Date | |
---|---|---|---|
fab15ce226 | |||
9f21834290 |
|
@ -2,6 +2,8 @@ package main
|
|||
|
||||
import (
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"math"
|
||||
"net/http"
|
||||
|
@ -13,10 +15,7 @@ import (
|
|||
geo "github.com/kellydunn/golang-geo"
|
||||
)
|
||||
|
||||
var hoodDir string = "/home/fbl/Desktop/keyserver/hoods"
|
||||
var hoods []Hood
|
||||
|
||||
func hoodVoronoi(lat, long float64) *Hood {
|
||||
func hoodVoronoi(hoods []Hood, lat, long float64) *Hood {
|
||||
var best *Hood
|
||||
var bestDist float64 = math.MaxFloat64
|
||||
|
||||
|
@ -37,7 +36,7 @@ func hoodVoronoi(lat, long float64) *Hood {
|
|||
return best
|
||||
}
|
||||
|
||||
func hoodPoly(lat, long float64) *Hood {
|
||||
func hoodPoly(hoods []Hood, lat, long float64) *Hood {
|
||||
var matches []*Hood
|
||||
var best *Hood
|
||||
|
||||
|
@ -77,7 +76,7 @@ func hoodPoly(lat, long float64) *Hood {
|
|||
return best
|
||||
}
|
||||
|
||||
func hoodId(id uint64) *Hood {
|
||||
func hoodId(hoods []Hood, id uint64) *Hood {
|
||||
for _, hood := range hoods {
|
||||
if hood.HoodInfo.Id == id {
|
||||
return &hood
|
||||
|
@ -87,13 +86,17 @@ func hoodId(id uint64) *Hood {
|
|||
return nil
|
||||
}
|
||||
|
||||
func keyserverV2Time(w http.ResponseWriter, r *http.Request) {
|
||||
func logRequestDuration(h http.Handler) http.Handler {
|
||||
return http.HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
start := time.Now()
|
||||
|
||||
keyserverV2(w, r)
|
||||
h.ServeHTTP(w, r)
|
||||
|
||||
duration := time.Since(start)
|
||||
log.Printf("Processed request in %s", duration)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
func httpHeader(w http.ResponseWriter, r *http.Request, statusCode int) {
|
||||
|
@ -101,12 +104,14 @@ func httpHeader(w http.ResponseWriter, r *http.Request, statusCode int) {
|
|||
w.WriteHeader(statusCode)
|
||||
}
|
||||
|
||||
func keyserverV2(w http.ResponseWriter, r *http.Request) {
|
||||
func keyserverV2Handler(hoods []Hood) http.Handler {
|
||||
return http.HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
hoodid := r.URL.Query().Get("hoodid")
|
||||
lat := r.URL.Query().Get("lat")
|
||||
long := r.URL.Query().Get("long")
|
||||
lon := r.URL.Query().Get("lon")
|
||||
var hood *Hood = hoodId(0)
|
||||
var hood *Hood = hoodId(hoods, 0)
|
||||
|
||||
if lon != "" && long != "" {
|
||||
httpHeader(w, r, http.StatusBadRequest)
|
||||
|
@ -123,7 +128,7 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) {
|
|||
httpHeader(w, r, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
hood = hoodId(id)
|
||||
hood = hoodId(hoods, id)
|
||||
}
|
||||
|
||||
if lat != "" {
|
||||
|
@ -147,8 +152,8 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
|
||||
hoodP := hoodPoly(latF, longF)
|
||||
hood = hoodVoronoi(latF, longF)
|
||||
hoodP := hoodPoly(hoods, latF, longF)
|
||||
hood = hoodVoronoi(hoods, latF, longF)
|
||||
|
||||
if hoodP != nil {
|
||||
hood = hoodP
|
||||
|
@ -177,15 +182,17 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
w.Header().Add("Content-Type", "application/json; charset=utf-8")
|
||||
w.Write(b)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
func parseHoods() {
|
||||
func parseHoods(hoodDir string) ([]Hood, error) {
|
||||
var newHoods []Hood
|
||||
var err error
|
||||
|
||||
items, err := os.ReadDir(hoodDir)
|
||||
if err != nil {
|
||||
log.Fatalf(`Error opening dir ("%s"): %s`, hoodDir, err)
|
||||
return nil, fmt.Errorf(`Error opening dir ("%s"): %w`, hoodDir, err)
|
||||
}
|
||||
for _, item := range items {
|
||||
var tmp Hood
|
||||
|
@ -211,17 +218,31 @@ func parseHoods() {
|
|||
newHoods = append(newHoods, tmp)
|
||||
}
|
||||
|
||||
hoods = newHoods
|
||||
return newHoods, nil
|
||||
}
|
||||
|
||||
func blank(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
}
|
||||
|
||||
func main() {
|
||||
parseHoods()
|
||||
func run() error {
|
||||
hoodDir := flag.String("hoods", "./hoods", "Directory of hood json files")
|
||||
addr := flag.String("addr", ":8080", "HTTP listen addr")
|
||||
flag.Parse()
|
||||
|
||||
http.HandleFunc("/v2/", keyserverV2Time)
|
||||
http.HandleFunc("/v2/hoods.php", blank)
|
||||
log.Fatal(http.ListenAndServe(":8080", nil))
|
||||
hoods, err := parseHoods(*hoodDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
http.Handle("/v2/", logRequestDuration(keyserverV2Handler(hoods)))
|
||||
http.HandleFunc("/v2/hoods.php", blank)
|
||||
log.Printf("Starting HTTP Server on http://%s", *addr)
|
||||
return http.ListenAndServe(*addr, nil)
|
||||
}
|
||||
|
||||
func main() {
|
||||
if err := run(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user