Response: add support for flushing #215

- Response implement http.Flusher
- Call PreWrite only once on the first Write
- Add CommonWriter to reduce chained writers boilerplate
- Use CommonWriter for log and compress middleware

log/log.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/samber/lo"
 	"goyave.dev/goyave/v5"
-	"goyave.dev/goyave/v5/util/errors"
 )
 
 // Context contains all information needed for a `Formatter`.
@@ -31,9 +30,8 @@ type Formatter func(ctx *Context) (message string, attributes []slog.Attr)
 // Writer chained writer keeping response body in memory.
 // Used for loggin in common format.
 type Writer struct {
-	goyave.Component
+	goyave.CommonWriter
 	formatter Formatter
-	writer    io.Writer
 	request   *goyave.Request
 	response  *goyave.Response
 	length    int
@@ -47,29 +45,20 @@ var _ goyave.PreWriter = (*Writer)(nil)
 // formatter.
 func NewWriter(server *goyave.Server, response *goyave.Response, request *goyave.Request, formatter Formatter) *Writer {
 	writer := &Writer{
-		request:   request,
-		writer:    response.Writer(),
-		response:  response,
-		formatter: formatter,
+		CommonWriter: goyave.NewCommonWriter(response.Writer()),
+		request:      request,
+		response:     response,
+		formatter:    formatter,
 	}
 	writer.Init(server)
 	return writer
 }
 
-// PreWrite calls PreWrite on the
-// child writer if it implements PreWriter.
-func (w *Writer) PreWrite(b []byte) {
-	if pr, ok := w.writer.(goyave.PreWriter); ok {
-		pr.PreWrite(b)
-	}
-}
-
 // Write writes the data as a response and keeps its length in memory
 // for later logging.
 func (w *Writer) Write(b []byte) (int, error) {
 	w.length += len(b)
-	n, err := w.writer.Write(b)
-	return n, errors.New(err)
+	return w.CommonWriter.Write(b)
 }
 
 // Close the writer and its child ResponseWriter, flushing response
@@ -90,10 +79,7 @@ func (w *Writer) Close() error {
 		w.Logger().Info(message, lo.Map(attrs, func(a slog.Attr, _ int) any { return a })...)
 	}
 
-	if wr, ok := w.writer.(io.Closer); ok {
-		return wr.Close()
-	}
-	return nil
+	return w.CommonWriter.Close()
 }
 
 // AccessMiddleware captures response data and outputs it to the logger at the

middleware/compress/compress.go

@@ -27,29 +27,37 @@ type Encoder interface {
 }
 
 type compressWriter struct {
-	io.WriteCloser
-	http.ResponseWriter
-	childWriter io.Writer
+	goyave.CommonWriter
+	responseWriter http.ResponseWriter
+	childWriter    io.Writer
 }
 
 func (w *compressWriter) PreWrite(b []byte) {
 	if pr, ok := w.childWriter.(goyave.PreWriter); ok {
 		pr.PreWrite(b)
 	}
-	h := w.ResponseWriter.Header()
+	h := w.responseWriter.Header()
 	if h.Get("Content-Type") == "" {
 		h.Set("Content-Type", http.DetectContentType(b))
 	}
 	h.Del("Content-Length")
 }
 
-func (w *compressWriter) Write(b []byte) (int, error) {
-	n, err := w.WriteCloser.Write(b)
-	return n, errors.New(err)
+func (w *compressWriter) Flush() error {
+	if err := w.CommonWriter.Flush(); err != nil {
+		return errors.New(err)
+	}
+	switch flusher := w.childWriter.(type) {
+	case goyave.Flusher:
+		return errors.New(flusher.Flush())
+	case http.Flusher:
+		flusher.Flush()
+	}
+	return nil
 }
 
 func (w *compressWriter) Close() error {
-	err := errors.New(w.WriteCloser.Close())
+	err := errors.New(w.CommonWriter.Close())
 
 	if wr, ok := w.childWriter.(io.Closer); ok {
 		return errors.New(wr.Close())
@@ -106,8 +114,8 @@ func (m *Middleware) Handle(next goyave.Handler) goyave.Handler {
 
 		respWriter := response.Writer()
 		compressWriter := &compressWriter{
-			WriteCloser:    encoder.NewWriter(respWriter),
-			ResponseWriter: response,
+			CommonWriter:   goyave.NewCommonWriter(encoder.NewWriter(respWriter)),
+			responseWriter: response,
 			childWriter:    respWriter,
 		}
 		response.SetWriter(compressWriter)

middleware/compress/compress_test.go

@@ -158,8 +158,8 @@ func TestCompressWriter(t *testing.T) {
 	response := httptest.NewRecorder()
 
 	writer := &compressWriter{
-		WriteCloser:    encoder.NewWriter(closeableWriter),
-		ResponseWriter: response,
+		CommonWriter:   goyave.NewCommonWriter(encoder.NewWriter(closeableWriter)),
+		responseWriter: response,
 		childWriter:    closeableWriter,
 	}
 
@@ -169,6 +169,8 @@ func TestCompressWriter(t *testing.T) {
 
 	require.NoError(t, writer.Close())
 	assert.True(t, closeableWriter.closed)
+
+	// TODO flush test
 }
 
 type testEncoder struct {

response.go

@@ -26,11 +26,68 @@ var (
 
 // PreWriter is a writter that needs to alter the response headers or status
 // before they are written.
-// If implemented, PreWrite will be called right before the Write operation.
+// If implemented, PreWrite will be called right before the first `Write` operation.
 type PreWriter interface {
 	PreWrite(b []byte)
 }
 
+// The Flusher interface is implemented by writers that allow
+// handlers to flush buffered data to the client.
+//
+// Note that even for writers that support flushing, if the client
+// is connected through an HTTP proxy, the buffered data may not reach
+// the client until the response completes.
+type Flusher interface {
+	Flush() error
+}
+
+// CommonWriter is a component meant to be used with composition
+// to avoid having to implement the base behavior of the common interfaces
+// a chained writer has to implement (`PreWrite()`, `Write()`, `Close()`, `Flush()`)
+type CommonWriter struct { // TODO test CommonWriter
+	Component
+	wr io.Writer
+}
+
+// NewCommonWriter create a new common writer that will output to the given `io.Writer`.
+func NewCommonWriter(wr io.Writer) CommonWriter {
+	return CommonWriter{
+		wr: wr,
+	}
+}
+
+// PreWrite calls PreWrite on the
+// child writer if it implements PreWriter.
+func (w CommonWriter) PreWrite(b []byte) {
+	if pr, ok := w.wr.(PreWriter); ok {
+		pr.PreWrite(b)
+	}
+}
+
+func (w CommonWriter) Write(b []byte) (int, error) {
+	n, err := w.wr.Write(b)
+	return n, errorutil.New(err)
+}
+
+// Close the underlying writer if it implements `io.Closer`.
+func (w CommonWriter) Close() error {
+	if wr, ok := w.wr.(io.Closer); ok {
+		return errorutil.New(wr.Close())
+	}
+	return nil
+}
+
+// Flush the underlying writer if it implements `goyave.Flusher` or `http.Flusher`.
+func (w *CommonWriter) Flush() error {
+	switch flusher := w.wr.(type) {
+	case Flusher:
+		return errorutil.New(flusher.Flush())
+	case http.Flusher:
+		flusher.Flush()
+	}
+	return nil
+}
+
 // Response implementation wrapping `http.ResponseWriter`. Writing an HTTP response without
 // using it is incorrect. This acts as a proxy to one or many `io.Writer` chained, with the original
 // `http.ResponseWriter` always last.
@@ -81,10 +138,12 @@ func (r *Response) reset(server *Server, request *Request, writer http.ResponseW
 // PreWrite writes the response header after calling PreWrite on the
 // child writer if it implements PreWriter.
 func (r *Response) PreWrite(b []byte) {
-	r.empty = false
-	if pr, ok := r.writer.(PreWriter); ok {
-		pr.PreWrite(b)
+	if r.empty {
+		if pr, ok := r.writer.(PreWriter); ok {
+			pr.PreWrite(b)
+		}
 	}
+	r.empty = false
 	if !r.wroteHeader {
 		if r.status == 0 {
 			r.status = http.StatusOK
@@ -97,7 +156,7 @@ func (r *Response) PreWrite(b []byte) {
 // http.ResponseWriter implementation
 
 // Write writes the data as a response.
-// See http.ResponseWriter.Write
+// See `http.ResponseWriter.Write`.
 func (r *Response) Write(data []byte) (int, error) {
 	r.PreWrite(data)
 	n, err := r.writer.Write(data)
@@ -128,6 +187,25 @@ func (r *Response) Cookie(cookie *http.Cookie) {
 	http.SetCookie(r.responseWriter, cookie)
 }
 
+// Flush sends any buffered data to the client if the underlying
+// writer implements `goyave.Flusher`.
+//
+// If the response headers have not been written already, `PreWrite()` will
+// be called with an empty byte slice.
+func (r *Response) Flush() {
+	if !r.wroteHeader {
+		r.PreWrite([]byte{})
+	}
+	switch flusher := r.writer.(type) {
+	case Flusher:
+		if err := flusher.Flush(); err != nil {
+			r.server.Logger.Error(errorutil.New(err))
+		}
+	case http.Flusher:
+		flusher.Flush()
+	}
+}
+
 // --------------------------------------
 // http.Hijacker implementation
 
@@ -254,7 +332,6 @@ func (r *Response) writeFile(fs fs.StatFS, file string, disposition string) {
 		r.Status(http.StatusNotFound)
 		return
 	}
-	r.empty = false
 	r.status = http.StatusOK
 	mime, size, err := fsutil.GetMIMEType(fs, file)
 	if err != nil {

response_test.go

@@ -235,6 +235,8 @@ func TestResponse(t *testing.T) {
 		assert.Equal(t, http.StatusOK, resp.status) // Ensures PreWrite has been called
 		assert.Equal(t, http.StatusOK, res.StatusCode)
 		assert.Equal(t, "hello world", string(body))
+
+		// TODO test PreWrite only called once
 	})
 
 	t.Run("Hijack", func(t *testing.T) {
@@ -510,4 +512,6 @@ func TestResponse(t *testing.T) {
 			assert.False(t, resp.WriteDBError(nil))
 		})
 	})
+
+	// TODO flush test
 }