Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(lib-storage): chunk from readable only when defined #1886

Merged
merged 3 commits into from
Jan 8, 2021
Merged

fix(lib-storage): chunk from readable only when defined #1886

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
686a429
fix: fix readable chunking to work with node 12+ readable interface
alexforsyth Jan 8, 2021
32de677
fix: adding new line
alexforsyth Jan 8, 2021
4b26e87
chore(lib-storage): style updates to readable-helper
alexforsyth Jan 8, 2021
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
38 changes: 17 additions & 21 deletions lib/storage/src/data-chunk/readable-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,25 @@ import { Readable } from "stream";
import { DEFAULT } from "../upload/defaults";
import { DataPart } from "./yield-chunk";

interface StreamChunk {
Body: Buffer;
ended: boolean;
}

export async function* chunkFromReadable(reader: Readable, chunkSize: number): AsyncGenerator<DataPart, void, unknown> {
let partNumber = DEFAULT.MIN_PART_NUMBER;
let oldBuffer = Buffer.from("");
while (partNumber < DEFAULT.MAX_PART_NUMBER) {
reader.resume();
const result = await _chunkFromStream(reader, chunkSize, oldBuffer);
reader.pause();
let currentBuffer = oldBuffer;
if (reader.readable) {
reader.resume();
currentBuffer = await _chunkFromStream(reader, chunkSize, oldBuffer);
reader.pause();
}

yield {
Body: result.Body.slice(0, chunkSize),
Body: currentBuffer.slice(0, chunkSize),
PartNumber: partNumber,
};
oldBuffer = result.Body.slice(chunkSize) as Buffer;
oldBuffer = currentBuffer.slice(chunkSize) as Buffer;
partNumber += 1;

if (result.ended && oldBuffer.length == 0) {
if (!reader.readable && oldBuffer.length == 0) {
return;
}
}
Expand All @@ -33,7 +31,11 @@ export async function* chunkFromReadable(reader: Readable, chunkSize: number): A
}
}

function _chunkFromStream(stream: Readable, chunkSize: number, oldBuffer: Buffer): Promise<StreamChunk> {
function _chunkFromStream(stream: Readable, chunkSize: number, oldBuffer: Buffer): Promise<Buffer> {
if (!stream.readable) {
return Promise.resolve(oldBuffer);
}

let currentChunk = oldBuffer;
return new Promise((resolve, reject) => {
const cleanupListeners = () => {
Expand All @@ -44,12 +46,9 @@ function _chunkFromStream(stream: Readable, chunkSize: number, oldBuffer: Buffer

stream.on("data", (chunk) => {
currentChunk = Buffer.concat([currentChunk, Buffer.from(chunk)]);
if (currentChunk.length >= chunkSize) {
if (currentChunk.length >= chunkSize || !stream.readable) {
cleanupListeners();
resolve({
Body: currentChunk,
ended: false,
});
resolve(currentChunk);
}
});
stream.on("error", (err) => {
Expand All @@ -58,10 +57,7 @@ function _chunkFromStream(stream: Readable, chunkSize: number, oldBuffer: Buffer
});
stream.on("end", () => {
cleanupListeners();
resolve({
Body: currentChunk,
ended: true,
});
resolve(currentChunk);
});
});
}