diff --git a/kv.go b/kv.go index ff53851..dee0eaf 100644 --- a/kv.go +++ b/kv.go @@ -62,7 +62,7 @@ func (kv *KVNamespace) GetReader(key string, opts *KVNamespaceGetOptions) (io.Re return nil, err } Global.Get("console").Call("log", v) - return convertStreamReaderToReader(v.Call("getReader")), nil + return ConvertStreamReaderToReader(v.Call("getReader")), nil } // KVNamespaceListOptions represents Cloudflare KV namespace list options. diff --git a/r2object.go b/r2object.go index da26cd4..b322978 100644 --- a/r2object.go +++ b/r2object.go @@ -52,7 +52,7 @@ func toR2Object(v js.Value) (*R2Object, error) { bodyVal := v.Get("body") var body io.Reader if !bodyVal.IsUndefined() { - body = convertStreamReaderToReader(v.Get("body").Call("getReader")) + body = ConvertStreamReaderToReader(v.Get("body").Call("getReader")) } return &R2Object{ instance: v, diff --git a/request.go b/request.go index 22da6a7..5c5eed9 100644 --- a/request.go +++ b/request.go @@ -16,7 +16,7 @@ func toBody(streamOrNull js.Value) io.ReadCloser { return nil } sr := streamOrNull.Call("getReader") - return io.NopCloser(convertStreamReaderToReader(sr)) + return io.NopCloser(ConvertStreamReaderToReader(sr)) } // toHeader converts JavaScript sides Headers to http.Header. diff --git a/response.go b/response.go index f490e7d..636bc64 100644 --- a/response.go +++ b/response.go @@ -25,6 +25,6 @@ func toJSResponse(w *responseWriterBuffer) (js.Value, error) { respInit.Set("status", status) respInit.Set("statusText", http.StatusText(status)) respInit.Set("headers", toJSHeader(w.Header())) - readableStream := convertReaderToReadableStream(w.reader) + readableStream := ConvertReaderToReadableStream(w.reader) return ResponseClass.New(readableStream, respInit), nil } diff --git a/stream.go b/stream.go index 683ba33..e3e5c7e 100644 --- a/stream.go +++ b/stream.go @@ -56,8 +56,8 @@ func (sr *streamReaderToReader) Read(p []byte) (n int, err error) { return sr.buf.Read(p) } -// convertStreamReaderToReader converts ReadableStreamDefaultReader to io.Reader. -func convertStreamReaderToReader(sr js.Value) io.Reader { +// ConvertStreamReaderToReader converts ReadableStreamDefaultReader to io.Reader. +func ConvertStreamReaderToReader(sr js.Value) io.Reader { return &streamReaderToReader{ streamReader: sr, } @@ -105,8 +105,8 @@ func (rs *readerToReadableStream) Cancel() error { // https://deno.land/std@0.139.0/streams/conversion.ts#L5 const defaultChunkSize = 16_640 -// convertReaderToReadableStream converts io.ReadCloser to ReadableStream. -func convertReaderToReadableStream(reader io.ReadCloser) js.Value { +// ConvertReaderToReadableStream converts io.ReadCloser to ReadableStream. +func ConvertReaderToReadableStream(reader io.ReadCloser) js.Value { stream := &readerToReadableStream{ reader: reader, chunkBuf: make([]byte, defaultChunkSize),