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
4 changes: 2 additions & 2 deletions _examples/hello/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dev:

.PHONY: build
build:
go run ../../cmd/workers-assets-gen
tinygo build -o ./build/app.wasm -target wasm -no-debug ./...
go run ../../cmd/workers-assets-gen -mode=go
GOOS=js GOARCH=wasm go build -o ./build/app.wasm .

.PHONY: deploy
deploy:
Expand Down
2 changes: 1 addition & 1 deletion _examples/hello/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
This project requires these tools to be installed globally.

* wrangler
* tinygo
* Go

### Commands

Expand Down
17 changes: 9 additions & 8 deletions internal/jshttp/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ func newJSResponse(statusCode int, headers http.Header, contentLength int64, bod
status == http.StatusNotModified {
return jsutil.ResponseClass.New(jsutil.Null, respInit)
}
var readableStream js.Value
if rawBody != nil {
readableStream = *rawBody
} else if contentLength > 0 {
readableStream = jsutil.ConvertReaderToFixedLengthStream(body, contentLength)
} else {
readableStream = jsutil.ConvertReaderToReadableStream(body)
}
readableStream := func() js.Value {
if rawBody != nil {
return *rawBody
}
if !jsutil.MaybeFixedLengthStreamClass.IsUndefined() && contentLength > 0 {
return jsutil.ConvertReaderToFixedLengthStream(body, contentLength)
}
return jsutil.ConvertReaderToReadableStream(body)
}()
return jsutil.ResponseClass.New(readableStream, respInit)
}
5 changes: 4 additions & 1 deletion internal/jsutil/jsutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ var (
Uint8ClampedArrayClass = js.Global().Get("Uint8ClampedArray")
ErrorClass = js.Global().Get("Error")
ReadableStreamClass = js.Global().Get("ReadableStream")
FixedLengthStreamClass = js.Global().Get("FixedLengthStream")
DateClass = js.Global().Get("Date")
Null = js.ValueOf(nil)
// MaybeFixedLengthStreamClass is a class for FixedLengthStream.
// * This class is only available in Cloudflare Workers.
// * If this class is not available, the value will be undefined.
MaybeFixedLengthStreamClass = js.Global().Get("FixedLengthStream")
)

func NewObject() js.Value {
Expand Down
4 changes: 3 additions & 1 deletion internal/jsutil/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,12 @@ func ConvertReaderToReadableStream(reader io.ReadCloser) js.Value {

// ConvertReaderToFixedLengthStream converts io.ReadCloser to TransformStream.
func ConvertReaderToFixedLengthStream(rc io.ReadCloser, size int64) js.Value {
stream := FixedLengthStreamClass.New(js.ValueOf(size))
stream := MaybeFixedLengthStreamClass.New(js.ValueOf(size))
go func(writer js.Value) {
defer rc.Close()

chunk := make([]byte, min(size, defaultChunkSize))
AwaitPromise(writer.Get("ready"))
for {
n, err := rc.Read(chunk)
if n > 0 {
Expand All @@ -221,6 +222,7 @@ func ConvertReaderToFixedLengthStream(rc io.ReadCloser, size int64) js.Value {
writer.Call("write", b)
}
if err != nil {
AwaitPromise(writer.Get("ready"))
writer.Call("close")
return
}
Expand Down
Loading