foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

refactor(cli/body): use Deno.Buffer in bufferFromStream (#6632)

Browse source
This commit is contained in:
Marcos Casagrande 2020-07-06 00:05:38 +02:00 • committed by GitHub
parent 960800888a
commit f85a0ce634
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cli/js/web/body.ts
View file

@ -3,6 +3,8 @@ import * as encoding from "./text_encoding.ts";
import * as domTypes from "./dom_types.d.ts"; import * as domTypes from "./dom_types.d.ts";
import { ReadableStreamImpl } from "./streams/readable_stream.ts"; import { ReadableStreamImpl } from "./streams/readable_stream.ts";
import { isReadableStreamDisturbed } from "./streams/internals.ts"; import { isReadableStreamDisturbed } from "./streams/internals.ts";
import { Buffer } from "../buffer.ts";
import { import {
getHeaderValueParams, getHeaderValueParams,
hasHeaderValueOf, hasHeaderValueOf,
@ -35,25 +37,11 @@ function validateBodyType(owner: Body, bodySource: BodyInit | null): boolean {
); );
} }
function concatenate(arrays: Uint8Array[]): ArrayBuffer {
let totalLength = 0;
for (const arr of arrays) {
totalLength += arr.length;
}
const result = new Uint8Array(totalLength);
let offset = 0;
for (const arr of arrays) {
result.set(arr, offset);
offset += arr.length;
}
return result.buffer as ArrayBuffer;
}
async function bufferFromStream( async function bufferFromStream(
stream: ReadableStreamReader stream: ReadableStreamReader
): Promise<ArrayBuffer> { ): Promise<ArrayBuffer> {
const parts: Uint8Array[] = [];
const encoder = new TextEncoder(); const encoder = new TextEncoder();
const buffer = new Buffer();
while (true) { while (true) {
const { done, value } = await stream.read(); const { done, value } = await stream.read();
@ -61,11 +49,11 @@ async function bufferFromStream(
if (done) break; if (done) break;
if (typeof value === "string") { if (typeof value === "string") {
parts.push(encoder.encode(value)); buffer.writeSync(encoder.encode(value));
} else if (value instanceof ArrayBuffer) { } else if (value instanceof ArrayBuffer) {
parts.push(new Uint8Array(value)); buffer.writeSync(new Uint8Array(value));
} else if (value instanceof Uint8Array) { } else if (value instanceof Uint8Array) {
parts.push(value); buffer.writeSync(value);
} else if (!value) { } else if (!value) {
// noop for undefined // noop for undefined
} else { } else {
@ -73,7 +61,7 @@ async function bufferFromStream(
} }
} }
return concatenate(parts); return buffer.bytes().buffer;
} }
export const BodyUsedError = export const BodyUsedError =