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.

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

fix: TransferManager#downloadFileInChunks issues #2373

Merged
merged 7 commits into from
Nov 29, 2023
45 changes: 34 additions & 11 deletions src/transfer-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
*/

import {Bucket, UploadOptions, UploadResponse} from './bucket.js';
import {DownloadOptions, DownloadResponse, File} from './file.js';
import {
DownloadOptions,
DownloadResponse,
File,
FileExceptionMessages,
RequestError,
} from './file.js';
import pLimit from 'p-limit';
import * as path from 'path';
import {createReadStream, promises as fsp} from 'fs';
Expand Down Expand Up @@ -105,6 +111,7 @@ export interface DownloadFileInChunksOptions {
chunkSizeBytes?: number;
destination?: string;
validation?: 'crc32c' | false;
noReturnData?: true;
rhodgkins marked this conversation as resolved.
Show resolved Hide resolved
}

export interface UploadFileInChunksOptions {
Expand Down Expand Up @@ -639,7 +646,8 @@ export class TransferManager {
let limit = pLimit(
options.concurrencyLimit || DEFAULT_PARALLEL_CHUNKED_DOWNLOAD_LIMIT
);
const promises: Promise<{bytesWritten: number; buffer: Buffer}>[] = [];
const noReturnData = Boolean(options.noReturnData);
const promises: Promise<Buffer | void>[] = [];
const file: File =
typeof fileOrName === 'string'
? this.bucket.file(fileOrName)
Expand Down Expand Up @@ -667,24 +675,39 @@ export class TransferManager {
end: chunkEnd,
[GCCL_GCS_CMD_KEY]: GCCL_GCS_CMD_FEATURE.DOWNLOAD_SHARDED,
});
return fileToWrite.write(resp[0], 0, resp[0].length, chunkStart);
const result = await fileToWrite.write(
resp[0],
0,
resp[0].length,
chunkStart
);
if (noReturnData) return;
return result.buffer;
})
);

start += chunkSize;
}

let results: DownloadResponse;
let chunks: Array<Buffer | void>;
try {
const data = await Promise.all(promises);
results = data.map(result => result.buffer) as DownloadResponse;
if (options.validation === 'crc32c') {
await CRC32C.fromFile(filePath);
}
return results;
chunks = await Promise.all(promises);
rhodgkins marked this conversation as resolved.
Show resolved Hide resolved
} finally {
fileToWrite.close();
await fileToWrite.close();
}

if (options.validation === 'crc32c' && fileInfo[0].metadata.crc32c) {
const downloadedCrc32C = await CRC32C.fromFile(filePath);
if (!downloadedCrc32C.validate(fileInfo[0].metadata.crc32c)) {
const mismatchError = new RequestError(
FileExceptionMessages.DOWNLOAD_MISMATCH
);
mismatchError.code = 'CONTENT_DOWNLOAD_MISMATCH';
throw mismatchError;
}
}
if (noReturnData) return;
return [Buffer.concat(chunks as Buffer[], size)];
}
rhodgkins marked this conversation as resolved.
Show resolved Hide resolved

/**
Expand Down
1 change: 1 addition & 0 deletions test/transfer-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ describe('Transfer Manager', () => {
{
metadata: {
size: 1024,
crc32c: 'AAAAAA==',
},
},
]);
Expand Down