💥 Drop regexp based router for better performance

Author: aisk

application.go

@@ -2,20 +2,24 @@ package vox
 
 import (
 	"net/http"
+
+	"github.com/aisk/route122"
 )
 
 // An Application is a container which includes middlewares and config, and implemented the GO's net/http.Handler interface https://golang.org/pkg/net/http/#Handler.
 type Application struct {
+	router      *route122.Router
 	middlewares []Handler
 	configs     map[string]string
 }
 
 // New returns a new vox Application.
 func New() *Application {
 	app := &Application{
-		middlewares: []Handler{logging, respond},
-		configs:     map[string]string{},
+		router:  route122.New(),
+		configs: map[string]string{},
 	}
+	app.middlewares = []Handler{logging, app.routeHandler, respond}
 	return app
 }
 

go.mod

@@ -1,3 +1,12 @@
 module github.com/aisk/vox
 
-go 1.12
+go 1.22
+
+toolchain go1.23.5
+
+require github.com/aisk/route122 v0.0.0-20251129140018-16cd6cc48089
+
+require (
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+)

go.sum

@@ -0,0 +1,6 @@
+github.com/aisk/route122 v0.0.0-20251129140018-16cd6cc48089 h1:FN73eBiN0dKR4WI1RjxiKssNVD+MMJAz4r/+BxrER5A=
+github.com/aisk/route122 v0.0.0-20251129140018-16cd6cc48089/go.mod h1:wV8INfN/2tGkuHol+j0Fjrz3iZijZrMJkB+A8LoZQNU=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=

route.go

@@ -1,38 +1,30 @@
 package vox
 
-import (
-	"regexp"
-)
-
-// Route will register a new path handler to a given path.
-func (app *Application) Route(method string, path string, handler Handler) {
-	// TODO: support string based path
-	r := routeToRegexp(path)
-	app.middlewares = append(app.middlewares, func(ctx *Context, req *Request, res *Response) {
-		if match(req, method, r) {
-			handler(ctx, req, res)
-			return
+// routeHandler handles route matching and parameter extraction
+func (app *Application) routeHandler(ctx *Context, req *Request, res *Response) {
+	match, found := app.router.Match(req.Method, "", req.URL.Path)
+	if found {
+		for k, v := range match.Params {
+			req.Params[k] = v
 		}
-		ctx.Next()
-	})
+		if h, ok := match.Handler.(Handler); ok {
+			h(ctx, req, res)
+		}
+	}
+	ctx.Next()
 }
 
-func match(req *Request, method string, path *regexp.Regexp) bool {
-	if req.Method != method && method != "*" {
-		// TODO(asaka): ignore case?
-		return false
-	}
-	match := path.FindStringSubmatch(req.URL.Path)
-	if match == nil {
-		return false
+// Route will register a new path handler to a given path.
+func (app *Application) Route(method string, path string, handler Handler) {
+	var err error
+	if method == "*" {
+		err = app.router.Handle(path, handler)
+	} else {
+		err = app.router.Handle(method+" "+path, handler)
 	}
-	for i, name := range path.SubexpNames() {
-		if i == 0 || name == "" {
-			continue
-		}
-		req.Params[name] = match[i]
+	if err != nil {
+		panic(err)
 	}
-	return true
 }
 
 // Get register a new path handler for GET method.
@@ -74,10 +66,3 @@ func (app *Application) Options(path string, handler Handler) {
 func (app *Application) Trace(path string, handler Handler) {
 	app.Route("TRACE", path, handler)
 }
-
-func routeToRegexp(path string) *regexp.Regexp {
-	replaced := regexp.MustCompile(`{(?P<param>\w+)}`).ReplaceAllStringFunc(path, func(s string) string {
-		return "(?P<" + s[1:len(s)-1] + ">[-_.\\p{Lu}\\p{Ll}0-9]+)"
-	})
-	return regexp.MustCompile("^" + replaced + "$")
-}

route_test.go

@@ -48,7 +48,7 @@ func TestMatchAnyMethod(t *testing.T) {
 func TestRouteWithParams(t *testing.T) {
 	app := New()
 	app.SetConfig("logging:disable", "true")
-	app.Route("GET", `/(?P<first>\w+)/\w+/(?P<second>\w+)`, func(ctx *Context, req *Request, res *Response) {
+	app.Route("GET", "/{first}/xxxxx/{second}", func(ctx *Context, req *Request, res *Response) {
 		res.Body = "Hello Vox!"
 		if req.Params["first"] != "foo" {
 			t.Fail()
@@ -114,23 +114,10 @@ func TestRouteFallthrough(t *testing.T) {
 	}
 }
 
-func TestRouteToRegexp(t *testing.T) {
-	fn := func(input, expect string) {
-		result := routeToRegexp(input)
-		if result.String() != expect {
-			t.Errorf("expect %s, got %s", expect, result)
-		}
-	}
-	fn("/xxx/foo", "^/xxx/foo$")
-	fn(`/xxx/(?P<name>\w+)`, `^/xxx/(?P<name>\w+)$`)
-	fn(`/xxx/{name}`, `^/xxx/(?P<name>[-_.\p{Lu}\p{Ll}0-9]+)$`)
-	fn(`/xxx/{name2}`, `^/xxx/(?P<name2>[-_.\p{Lu}\p{Ll}0-9]+)$`)
-}
-
 func TestRouteWithUnicodeParams(t *testing.T) {
 	app := New()
 	app.SetConfig("logging:disable", "true")
-	app.Route("GET", `/{first}/\w+/{second}`, func(ctx *Context, req *Request, res *Response) {
+	app.Route("GET", "/{first}/xxxxx/{second}", func(ctx *Context, req *Request, res *Response) {
 		res.Body = "Hello Vox!"
 		if req.Params["first"] != "éèçà" {
 			t.Fail()