IO-3281 Adjust zip to stream.
This commit is contained in:
@@ -180,10 +180,14 @@ const downloadFiles = async (req, res) => {
|
||||
|
||||
const s3client = new S3Client({ region: InstanceRegion() });
|
||||
const zipfile = new yazl.ZipFile();
|
||||
const passThrough = new stream.PassThrough();
|
||||
|
||||
// Pipe the zipfile output to the passThrough stream
|
||||
zipfile.outputStream.pipe(passThrough);
|
||||
// Set response headers for zip download
|
||||
const filename = `archive-${jobId || "na"}-${new Date().toISOString().replace(/[:.]/g, "-")}.zip`;
|
||||
res.setHeader("Content-Type", "application/zip");
|
||||
res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
|
||||
|
||||
// Pipe the zipfile output directly to the response
|
||||
zipfile.outputStream.pipe(res);
|
||||
|
||||
// Add each file to the zip as a stream
|
||||
for (const doc of data.documents) {
|
||||
@@ -200,27 +204,8 @@ const downloadFiles = async (req, res) => {
|
||||
|
||||
// Finalize the zip after all files are added
|
||||
zipfile.end();
|
||||
// No need to send a JSON response, as the zip is streamed directly
|
||||
|
||||
const archiveKey = `archives/${jobId || "na"}/archive-${new Date().toISOString()}.zip`;
|
||||
|
||||
// Upload the zip stream to S3
|
||||
const parallelUploads3 = new Upload({
|
||||
client: s3client,
|
||||
queueSize: 4,
|
||||
leavePartsOnError: false,
|
||||
params: { Bucket: imgproxyDestinationBucket, Key: archiveKey, Body: passThrough }
|
||||
});
|
||||
|
||||
await parallelUploads3.done();
|
||||
|
||||
// Generate the presigned URL to download it.
|
||||
const presignedUrl = await getSignedUrl(
|
||||
s3client,
|
||||
new GetObjectCommand({ Bucket: imgproxyDestinationBucket, Key: archiveKey }),
|
||||
{ expiresIn: 360 }
|
||||
);
|
||||
|
||||
return res.json({ success: true, url: presignedUrl });
|
||||
} catch (error) {
|
||||
logger.log("imgproxy-download-error", "ERROR", req.user?.email, jobId, {
|
||||
jobId,
|
||||
|
||||
Reference in New Issue
Block a user