Compare commits

..

No commits in common. "0442fc1e2e80a11087681da87795d874711465cb" and "c5ad01daee1a5d959091b96751937421679c39d8" have entirely different histories.

18 changed files with 23 additions and 40 deletions

View file

@ -19,7 +19,6 @@ import (
// Server is the interface for an HTTP server.
type Server interface {
Get(path string, handler Handler)
Ready() chan struct{}
Request(method string, path string, headers []Header, body io.Reader) Response
Router() *router.Router[Handler]
Run(address string) error
@ -32,7 +31,6 @@ type server struct {
contextPool sync.Pool
router *router.Router[Handler]
errorHandler func(Context, error)
ready chan struct{}
}
// NewServer creates a new HTTP server.
@ -56,7 +54,6 @@ func NewServer() Server {
errorHandler: func(ctx Context, err error) {
log.Println(ctx.Request().Path(), err)
},
ready: make(chan struct{}),
}
s.contextPool.New = func() any { return s.newContext() }
@ -68,11 +65,6 @@ func (s *server) Get(path string, handler Handler) {
s.Router().Add("GET", path, handler)
}
// Ready returns a channel that will be closed once the listener is ready for connection handling.
func (s *server) Ready() chan struct{} {
return s.ready
}
// Request performs a synthetic request and returns the response.
// This function keeps the response in memory so it's slightly slower than a real request.
// However it is very useful inside tests where you don't want to spin up a real web server.
@ -107,7 +99,6 @@ func (s *server) Run(address string) error {
stop := make(chan os.Signal, 1)
signal.Notify(stop, os.Interrupt, syscall.SIGTERM)
close(s.ready)
<-stop
return nil
}

View file

@ -35,7 +35,6 @@ func TestRun(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
_, err := http.Get("http://127.0.0.1:8080/")
assert.Nil(t, err)
}()
@ -49,7 +48,6 @@ func TestBadRequest(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -75,7 +73,6 @@ func TestBadRequestHeader(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -98,7 +95,6 @@ func TestBadRequestMethod(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -120,7 +116,6 @@ func TestBadRequestPath(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -146,7 +141,6 @@ func TestBadRequestProtocol(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -169,7 +163,6 @@ func TestConnectionClose(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)
defer conn.Close()
@ -190,7 +183,6 @@ func TestEarlyClose(t *testing.T) {
go func() {
defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-s.Ready()
conn, err := net.Dial("tcp", ":8080")
assert.Nil(t, err)

4
go.mod
View file

@ -3,6 +3,6 @@ module git.urbach.dev/go/web
go 1.24
require (
git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda
git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918
git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf
git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5
)

8
go.sum
View file

@ -1,4 +1,4 @@
git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda h1:VN6ZQwtwLOm2xTms+v8IIeeNjvs55qyEBNArv3dPq9g=
git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda/go.mod h1:PNI/NSBOqvoeU58/7eBsIR09Yoq2S/qtSRiTrctkiq0=
git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918 h1:fdeFr4gwou9KxvQqhcrPbLSYM9xzvaF1pwp53DzU3co=
git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918/go.mod h1:seUQ5raGaj6fDeZP6d7JdgnWQys8oTrtFdvBhAp1IZA=
git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf h1:BQWa5GKNUsA5CSUa/+UlFWYCEVe3IDDKRbVqBLK0mAE=
git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf/go.mod h1:y9jGII9JFiF1HNIju0u87OyPCt82xKCtqnAFyEreCDo=
git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5 h1:3qlZjgWbrHw4LWM4uBzOTldbpqCLJdeSgvcYK6f3xpc=
git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5/go.mod h1:O+doTe0DZdT2XMsTY5pe6qUMqEEIAbwtX6Xp6EqHw34=