cmd/flatend, flathttp: move http.Handler for forward http requests to…

… services/nodes and middleware into separate flathttp pkg

cmd/flatend/main.go

@@ -7,6 +7,7 @@ import (
 	"github.com/caddyserver/certmagic"
 	"github.com/julienschmidt/httprouter"
 	"github.com/lithdew/flatend"
+	"github.com/lithdew/flatend/flathttp"
 	"github.com/spf13/pflag"
 	"io/ioutil"
 	"log"
@@ -25,12 +26,12 @@ func check(err error) {
 	}
 }
 
-var Methods = map[string]struct{}{
-	http.MethodGet:    {},
-	http.MethodPost:   {},
-	http.MethodPut:    {},
-	http.MethodDelete: {},
-	http.MethodPatch:  {},
+func hostOnly(hostPort string) string {
+	host, _, err := net.SplitHostPort(hostPort)
+	if err != nil {
+		return hostPort
+	}
+	return host
 }
 
 func main() {
@@ -43,7 +44,7 @@ func main() {
 	pflag.Uint16VarP(&bindPort, "port", "p", 9000, "bind port")
 	pflag.Parse()
 
-	var cfg Config
+	var cfg flathttp.Config
 
 	buf, err := ioutil.ReadFile(configPath)
 	if err == nil {
@@ -115,12 +116,12 @@ func main() {
 					})
 				}
 			case len(services) > 0:
-				handler = HandleService(node, services)
+				handler = flathttp.Handle(node, services)
 			}
 
 			if handler != nil {
 				if route.NoCache {
-					handler = NoCache(handler)
+					handler = flathttp.NoCache(handler)
 				}
 				router.Handler(fields[0], fields[1], handler)
 			}

cmd/flatend/config.go → flathttp/config.go

@@ -1,4 +1,4 @@
-package main
+package flathttp
 
 import (
 	"errors"
@@ -10,6 +10,14 @@ import (
 	"time"
 )
 
+var Methods = map[string]struct{}{
+	http.MethodGet:    {},
+	http.MethodPost:   {},
+	http.MethodPut:    {},
+	http.MethodDelete: {},
+	http.MethodPatch:  {},
+}
+
 type Config struct {
 	Addr string
 	HTTP []ConfigHTTP

cmd/flatend/http.go → flathttp/middleware.go

@@ -1,7 +1,6 @@
-package main
+package flathttp
 
 import (
-	"net"
 	"net/http"
 	"time"
 )
@@ -41,11 +40,3 @@ func NoCache(h http.Handler) http.Handler {
 
 	return http.HandlerFunc(fn)
 }
-
-func hostOnly(hostPort string) string {
-	host, _, err := net.SplitHostPort(hostPort)
-	if err != nil {
-		return hostPort // OK; probably had no port to begin with
-	}
-	return host
-}

cmd/flatend/node.go → flathttp/service.go

@@ -1,4 +1,4 @@
-package main
+package flathttp
 
 import (
 	"github.com/julienschmidt/httprouter"
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-func HandleService(node *flatend.Node, services []string) http.Handler {
+func Handle(node *flatend.Node, services []string) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		headers := make(map[string]string)
 		for key := range r.Header {