Add support for net.Listener

Co-authored-by: Elwin Tamminga <elwintamminga@gmail.com>
Co-committed-by: Elwin Tamminga <elwintamminga@gmail.com>

context.go

@@ -105,14 +105,17 @@ func (c *Context) Get(key string) interface{} {
 
 // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
 func (c *Context) RealIP() string {
+	reqIP := c.Request.RemoteAddr
+
 	if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` {
-		return strings.Split(ip, `, `)[0]
+		reqIP = strings.Split(ip, `, `)[0]
+	} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
+		reqIP = ip
 	}
 
-	if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-		return ip
+	ra, _, _ := net.SplitHostPort(reqIP)
+	if ra != `` {
+		reqIP = ra
 	}
-
-	ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
-	return ra
+	return reqIP
 }

go.mod

@@ -0,0 +1,5 @@
+module git.fuyu.moe/Fuyu/router
+
+go 1.13
+
+require github.com/julienschmidt/httprouter v1.3.0

go.sum

@@ -0,0 +1,2 @@
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=

router.go

@@ -3,6 +3,7 @@ package router
 import (
 	"context"
 	"crypto/tls"
+	"net"
 	"net/http"
 	"reflect"
 	"time"
@@ -38,6 +39,7 @@ type Router struct {
 	NotFoundHandler         Handle
 	MethodNotAllowedHandler Handle
 	ErrorHandler            ErrorHandle
+	TrimTrailingSlashes     bool
 	server                  *http.Server
 }
 
@@ -94,6 +96,14 @@ func (r *Router) OPTIONS(path string, handle Handle, middleware ...Middleware) {
 	r.routes = append(r.routes, route{`OPTIONS`, path, handle, middleware})
 }
 
+// Serve accepts incoming HTTP connections on the listener
+func (r *Router) Serve(l net.Listener) error {
+	httpr := r.getHttpr()
+
+	r.server = &http.Server{Handler: httpr}
+	return r.server.Serve(l)
+}
+
 // Start starts the web server and binds to the given address
 func (r *Router) Start(addr string) error {
 	httpr := r.getHttpr()
@@ -127,7 +137,7 @@ func (r *Router) Stop() error {
 	return err
 }
 
-func (r *Router) getHttpr() *httprouter.Router {
+func (r *Router) getHttpr() http.Handler {
 	httpr := httprouter.New()
 
 	for _, v := range r.routes {
@@ -156,6 +166,18 @@ func (r *Router) getHttpr() *httprouter.Router {
 		r.ErrorHandler(c, err)
 	}
 
+	if r.TrimTrailingSlashes {
+		httpr.RedirectTrailingSlash = false
+
+		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			l := len(req.URL.Path)
+			if l > 1 && req.URL.Path[l-1] == '/' {
+				req.URL.Path = req.URL.Path[:l-1]
+			}
+			httpr.ServeHTTP(w, req)
+		})
+	}
+
 	return httpr
 }