context.go

@@ -20,8 +20,7 @@ type Context struct {
 	store    map[string]interface{}
 }
 
-// NewContext creates a new context, this function is only exported for use in tests
+func newContext(router *Router, res http.ResponseWriter, req *http.Request, param httprouter.Params) *Context {
-func NewContext(router *Router, res http.ResponseWriter, req *http.Request, param httprouter.Params) *Context {
 	return &Context{router, req, res, param.ByName, make(map[string]interface{})}
 }
 
@@ -70,17 +69,9 @@ func (c *Context) NoContent(code int) error {
 
 // JSON returns the given status code and writes JSON to the body
 func (c *Context) JSON(code int, data interface{}) error {
-	// write to buffer first in case of error
-	var buf bytes.Buffer
-	err := json.NewEncoder(&buf).Encode(data)
-	if err != nil {
-		return err
-	}
-
 	c.Response.Header().Set(`Content-Type`, `application/json`)
 	c.Response.WriteHeader(code)
-	_, err = io.Copy(c.Response, &buf)
+	return json.NewEncoder(c.Response).Encode(data) // TODO: Encode to buffer first to prevent partial responses on error
-	return err
 }
 
 // Render renders a templating using the Renderer set in router
@@ -113,17 +104,14 @@ 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 != `` {
-		reqIP = strings.Split(ip, `, `)[0]
+		return strings.Split(ip, `, `)[0]
-	} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-		reqIP = ip
 	}
 
-	ra, _, _ := net.SplitHostPort(reqIP)
+	if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-	if ra != `` {
+		return ip
-		reqIP = ra
 	}
-	return reqIP
+
+	ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
+	return ra
 }

default.go

@@ -13,7 +13,7 @@ func defaultMethodNotAllowedHandler(c *Context) error {
 	return c.StatusText(http.StatusMethodNotAllowed)
 }
 
-func defaultErrorHandler(c *Context, _ interface{}) {
+func defaultErrorHandler(c *Context, err interface{}) {
 	_ = c.StatusText(http.StatusInternalServerError)
 }
 

go.mod

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

go.sum

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

group.go

@@ -1,9 +1,6 @@
 package router
 
-import (
+import urlpath "path"
-	urlpath "path"
-	"slices"
-)
 
 func join(prefix, path string) string {
 	return urlpath.Join(prefix, urlpath.Clean(path))
@@ -18,40 +15,40 @@ type Group struct {
 
 // Group creates a new router group with a shared prefix and set of middlewares
 func (g *Group) Group(prefix string, middleware ...Middleware) *Group {
-	return &Group{prefix: join(g.prefix, prefix), router: g.router, middleware: slices.Concat(g.middleware, middleware)}
+	return &Group{prefix: join(g.prefix, prefix), router: g.router, middleware: append(g.middleware, middleware...)}
 }
 
 // GET adds a GET route
 func (g *Group) GET(path string, handle Handle, middleware ...Middleware) {
-	g.router.GET(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.GET(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // POST adds a POST route
 func (g *Group) POST(path string, handle interface{}, middleware ...Middleware) {
-	g.router.POST(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.POST(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // DELETE adds a DELETE route
 func (g *Group) DELETE(path string, handle Handle, middleware ...Middleware) {
-	g.router.DELETE(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.DELETE(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // PUT adds a PUT route
 func (g *Group) PUT(path string, handle interface{}, middleware ...Middleware) {
-	g.router.PUT(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.PUT(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // PATCH adds a PATCH route
 func (g *Group) PATCH(path string, handle interface{}, middleware ...Middleware) {
-	g.router.PATCH(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.PATCH(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // HEAD adds a HEAD route
 func (g *Group) HEAD(path string, handle Handle, middleware ...Middleware) {
-	g.router.HEAD(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.HEAD(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }
 
 // OPTIONS adds a OPTIONS route
 func (g *Group) OPTIONS(path string, handle Handle, middleware ...Middleware) {
-	g.router.OPTIONS(join(g.prefix, path), handle, slices.Concat(g.middleware, middleware)...)
+	g.router.OPTIONS(join(g.prefix, path), handle, append(g.middleware, middleware...)...)
 }

router.go

@@ -3,10 +3,8 @@ package router
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"net/http"
 	"reflect"
-	"slices"
 	"time"
 
 	"github.com/julienschmidt/httprouter"
@@ -40,18 +38,12 @@ type Router struct {
 	NotFoundHandler         Handle
 	MethodNotAllowedHandler Handle
 	ErrorHandler            ErrorHandle
-	TrimTrailingSlashes     bool
 	server                  *http.Server
 }
 
 // New returns a new Router
 func New() *Router {
-	return &Router{
+	return &Router{Reader: defaultReader, NotFoundHandler: defaultNotFoundHandler, MethodNotAllowedHandler: defaultMethodNotAllowedHandler, ErrorHandler: defaultErrorHandler}
-		Reader:                  defaultReader,
-		NotFoundHandler:         defaultNotFoundHandler,
-		MethodNotAllowedHandler: defaultMethodNotAllowedHandler,
-		ErrorHandler:            defaultErrorHandler,
-	}
 }
 
 // Use adds a global middleware
@@ -127,7 +119,7 @@ func (r *Router) Stop() error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 	err := r.server.Shutdown(ctx)
-	if errors.Is(err, context.DeadlineExceeded) {
+	if err == context.DeadlineExceeded {
 		err = r.server.Close()
 	}
 	r.server = nil
@@ -135,7 +127,7 @@ func (r *Router) Stop() error {
 	return err
 }
 
-func (r *Router) getHttpr() http.Handler {
+func (r *Router) getHttpr() *httprouter.Router {
 	httpr := httprouter.New()
 
 	for _, v := range r.routes {
@@ -144,9 +136,11 @@ func (r *Router) getHttpr() http.Handler {
 			handle = handlePOST(r, v.Handle)
 		}
 
-		httpr.Handle(v.Method, v.Path, handleReq(r, handle,
+		middleware := make([]Middleware, len(r.middleware)+len(v.Middleware))
-			slices.Concat(r.middleware, v.Middleware),
+		copy(middleware, r.middleware)
-		))
+		copy(middleware[len(r.middleware):], v.Middleware)
+
+		httpr.Handle(v.Method, v.Path, handleReq(r, handle, middleware))
 	}
 
 	httpr.NotFound = http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
@@ -158,22 +152,10 @@ func (r *Router) getHttpr() http.Handler {
 	})
 
 	httpr.PanicHandler = func(res http.ResponseWriter, req *http.Request, err interface{}) {
-		c := NewContext(r, res, req, nil)
+		c := newContext(r, res, req, nil)
 		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
 }
 
@@ -199,6 +181,8 @@ func checkInterfaceHandle(f interface{}) {
 	if rt.In(0) != reflect.TypeOf(&Context{}) {
 		panic(`handle should accept Context as first argument`)
 	}
+
+	return
 }
 
 func handlePOST(r *Router, f interface{}) Handle {
@@ -229,7 +213,7 @@ func handlePOST(r *Router, f interface{}) Handle {
 
 func handleReq(r *Router, handle Handle, m []Middleware) httprouter.Handle {
 	return func(res http.ResponseWriter, req *http.Request, param httprouter.Params) {
-		c := NewContext(r, res, req, param)
+		c := newContext(r, res, req, param)
 
 		f := handle
 		for i := len(m) - 1; i >= 0; i-- {
@@ -237,6 +221,7 @@ func handleReq(r *Router, handle Handle, m []Middleware) httprouter.Handle {
 		}
 
 		err := f(c)
+
 		if err != nil {
 			r.ErrorHandler(c, err)
 		}