Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions internal/replay/replay_http_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (r *ReplayHTTPServer) handleRequest(w http.ResponseWriter, req *http.Reques
return
}

err = r.writeResponse(w, resp)
err = r.writeResponse(w, resp, redactedReq)
if err != nil {
fmt.Printf("Error writing response: %v\n", err)
panic(err)
Expand Down Expand Up @@ -170,7 +170,7 @@ func (r *ReplayHTTPServer) loadResponse(fileName string, shaSum string) (*store.
return nil, fmt.Errorf("response with shaSum %s not found in file", shaSum)
}

func (r *ReplayHTTPServer) writeResponse(w http.ResponseWriter, resp *store.RecordedResponse) error {
func (r *ReplayHTTPServer) writeResponse(w http.ResponseWriter, resp *store.RecordedResponse, req *store.RecordedRequest) error {
for key, value := range resp.Headers {
if key == "Content-Length" || key == "Content-Encoding" {
continue
Expand All @@ -180,7 +180,7 @@ func (r *ReplayHTTPServer) writeResponse(w http.ResponseWriter, resp *store.Reco

w.WriteHeader(int(resp.StatusCode))

if len(resp.BodySegments) == 1 {
if !strings.Contains(req.URL, "alt=sse") {
jsonBytes, err := json.Marshal(resp.BodySegments[0])
if err != nil {
return err
Expand All @@ -189,7 +189,6 @@ func (r *ReplayHTTPServer) writeResponse(w http.ResponseWriter, resp *store.Reco
_, err = w.Write(jsonBytes)
return err
} else {
respToWrite := []byte{}
for _, bodySegment := range resp.BodySegments {
jsonBytes, err := json.Marshal(bodySegment)
if err != nil {
Expand All @@ -199,11 +198,9 @@ func (r *ReplayHTTPServer) writeResponse(w http.ResponseWriter, resp *store.Reco
line := append([]byte("data: "), jsonBytes...)
line = append(line, []byte("\n\n")...)

respToWrite = append(respToWrite, line...)
}

if _, err := w.Write(respToWrite); err != nil {
return err
if _, err := w.Write(line); err != nil {
return err
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions internal/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
)

const HeadSHA = "b4d6e60a9b97e7b98c63df9308728c5c88c0b40c398046772c63447b94608b4d"
const ReadBufferSize = 10 * 1024 * 1024 // 10MB

// Represents a single interaction, request and response in a replay.
type RecordInteraction struct {
Expand Down Expand Up @@ -106,6 +107,9 @@ func readBody(req *http.Request) (map[string]any, error) {
return nil, err
}
var resultMap map[string]any
if string(body) == "" {
return resultMap, nil
}
err = json.Unmarshal(body, &resultMap)
if err != nil {
log.Fatalf("Error unmarshaling JSON: %v", err)
Expand Down Expand Up @@ -186,6 +190,9 @@ func NewRecordedResponse(resp *http.Response, body []byte) (*RecordedResponse, e
reader := bytes.NewReader(body)
scanner := bufio.NewScanner(reader)

buf := make([]byte, ReadBufferSize)
scanner.Buffer(buf, ReadBufferSize)

for scanner.Scan() {
lineBytes := scanner.Bytes()
if len(lineBytes) == 0 {
Expand Down
Loading