Skip to content
Merged
Changes from 2 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
62 changes: 43 additions & 19 deletions lib/api/readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const assert = require('assert')
const { Readable } = require('stream')
const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
const util = require('../core/util')
const { ReadableStreamFrom, toUSVString } = require('../core/util')
const { ReadableStreamFrom } = require('../core/util')

let Blob

Expand Down Expand Up @@ -267,29 +267,53 @@ function consumeStart (consume) {
}
}

const decoder = new TextDecoder()

/**
* @see https://encoding.spec.whatwg.org/#utf-8-decode
* @param {Buffer} buffer
*/
function utf8DecodeBytes (buffer) {
Comment thread
tsctx marked this conversation as resolved.
Outdated
if (buffer.length === 0) {
return ''
}
// 1.
// 2.
if (buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
buffer = buffer.subarray(3)
}
// 3.
const output = decoder.decode(buffer)
// 4.
return output
}

function consumeEnd (consume) {
const { type, body, resolve, stream, length } = consume

try {
if (type === 'text') {
resolve(toUSVString(Buffer.concat(body)))
} else if (type === 'json') {
resolve(JSON.parse(Buffer.concat(body)))
} else if (type === 'arrayBuffer') {
const dst = new Uint8Array(length)

let pos = 0
for (const buf of body) {
dst.set(buf, pos)
pos += buf.byteLength
}

resolve(dst.buffer)
} else if (type === 'blob') {
if (!Blob) {
Blob = require('buffer').Blob
switch (type) {
Comment thread
tsctx marked this conversation as resolved.
Outdated
case 'text':
resolve(utf8DecodeBytes(Buffer.concat(body, length)))
break
case 'json':
resolve(JSON.parse(utf8DecodeBytes(Buffer.concat(body, length))))
Comment thread
tsctx marked this conversation as resolved.
Outdated
break
case 'arrayBuffer': {
const dst = new Uint8Array(length)

let pos = 0
for (const buf of body) {
dst.set(buf, pos)
pos += buf.byteLength
}

resolve(dst.buffer)
break
}
resolve(new Blob(body, { type: stream[kContentType] }))
case 'blob':
resolve(new (Blob ??= require('buffer').Blob)(body, { type: stream[kContentType] }))
Comment thread
tsctx marked this conversation as resolved.
Outdated
break
}

consumeFinish(consume)
Expand Down