Skip to content

Commit

Permalink
feat: support http stream response (#4055)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevwan authored Apr 9, 2024
1 parent 5fbe8ff commit 3866b57
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 0 deletions.
21 changes: 21 additions & 0 deletions rest/httpx/responses.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"sync"

Expand Down Expand Up @@ -88,6 +89,26 @@ func SetOkHandler(handler func(context.Context, any) any) {
okHandler = handler
}

// Stream writes data into w with streaming mode.
// The ctx is used to control the streaming loop, typically use r.Context().
// The fn is called repeatedly until it returns false.
func Stream(ctx context.Context, w http.ResponseWriter, fn func(w io.Writer) bool) {
for {
select {
case <-ctx.Done():
return
default:
hasMore := fn(w)
if flusher, ok := w.(http.Flusher); ok {
flusher.Flush()
}
if !hasMore {
return
}
}
}
}

// WriteJson writes v as json string into w with code.
func WriteJson(w http.ResponseWriter, code int, v any) {
if err := doWriteJson(w, code, v); err != nil {
Expand Down
57 changes: 57 additions & 0 deletions rest/httpx/responses_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package httpx

import (
"bytes"
"context"
"errors"
"fmt"
"io"
"net/http"
"net/http/httptest"
"strings"
"testing"

Expand Down Expand Up @@ -239,6 +242,60 @@ func TestWriteJsonMarshalFailed(t *testing.T) {
assert.Equal(t, http.StatusInternalServerError, w.code)
}

func TestStream(t *testing.T) {
t.Run("regular case", func(t *testing.T) {
channel := make(chan string)
go func() {
defer close(channel)
for index := 0; index < 5; index++ {
channel <- fmt.Sprintf("%d", index)
}
}()

w := httptest.NewRecorder()
Stream(context.Background(), w, func(w io.Writer) bool {
output, ok := <-channel
if !ok {
return false
}

outputBytes := bytes.NewBufferString(output)
_, err := w.Write(append(outputBytes.Bytes(), []byte("\n")...))
return err == nil
})

assert.Equal(t, http.StatusOK, w.Code)
assert.Equal(t, "0\n1\n2\n3\n4\n", w.Body.String())
})

t.Run("context done", func(t *testing.T) {
channel := make(chan string)
go func() {
defer close(channel)
for index := 0; index < 5; index++ {
channel <- fmt.Sprintf("num: %d", index)
}
}()

w := httptest.NewRecorder()
ctx, cancel := context.WithCancel(context.Background())
cancel()
Stream(ctx, w, func(w io.Writer) bool {
output, ok := <-channel
if !ok {
return false
}

outputBytes := bytes.NewBufferString(output)
_, err := w.Write(append(outputBytes.Bytes(), []byte("\n")...))
return err == nil
})

assert.Equal(t, http.StatusOK, w.Code)
assert.Equal(t, "", w.Body.String())
})
}

type tracedResponseWriter struct {
headers map[string][]string
builder strings.Builder
Expand Down

0 comments on commit 3866b57

Please sign in to comment.