Skip to content

Commit ad33cfb

Browse files
authored
Merge pull request #124 from syumai/fix-fetch-stream-empty-response
fixed panic on fetch returning empty response
2 parents 50d520d + cf3b68b commit ad33cfb

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

cloudflare/fetch/bind.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ func fetch(namespace js.Value, req *http.Request, init *RequestInit) (*http.Resp
3030
return nil, err
3131
}
3232

33-
return jshttp.ToStreamResponse(jsRes)
33+
return jshttp.ToResponse(jsRes)
3434
}

internal/jshttp/response.go

-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ func ToResponse(res js.Value) (*http.Response, error) {
3030
return toResponse(res, body)
3131
}
3232

33-
// ToStreamResponse pipes JavaScript sides Response to TransformStream and converts to *http.Response.
34-
// - see: https://developers.cloudflare.com/workers/runtime-apis/streams/
35-
func ToStreamResponse(res js.Value) (*http.Response, error) {
36-
ts := js.Global().Get("IdentityTransformStream").New()
37-
readable := ts.Get("readable")
38-
writable := ts.Get("writable")
39-
res.Get("body").Call("pipeTo", writable)
40-
body := jsutil.ConvertReadableStreamToReadCloser(readable)
41-
return toResponse(res, body)
42-
}
43-
4433
// ToJSResponse converts *http.Response to JavaScript sides Response class object.
4534
func ToJSResponse(res *http.Response) js.Value {
4635
return newJSResponse(res.StatusCode, res.Header, res.Body, nil)

0 commit comments

Comments
 (0)