feat: stream zip

Author: baptadn

web/components/pdfs/ApplicationDocument.tsx

@@ -1,4 +1,4 @@
-import { Document, Font, Page, Text, View } from '@react-pdf/renderer'
+import { Document, Page, Text, View } from '@react-pdf/renderer'
 import ApplicationCreation from '~components/pdfs/ApplicationCreation'
 
 import ApplicationHeader from '~components/pdfs/ApplicationHeader'
@@ -28,8 +28,9 @@ const ApplicationDocument = ({ application }: { application: Application }) => {
         <View style={styles.container}>
           {creations?.map((reference, i) => (
             <ApplicationReference
-              reference={reference}
+              key={i}
               index={i}
+              reference={reference}
               referencesTotal={creations.length}
             />
           ))}

web/package.json

@@ -65,6 +65,7 @@
     "swagger-typescript-api": "^7.0.1",
     "swiper": "^6.5.3",
     "tsconfig-paths": "^3.9.0",
+    "yazl": "^3.3.1",
     "yup": "^0.32.9"
   },
   "devDependencies": {

web/pages/api/pdfs/campaign/[id].tsx

@@ -1,9 +1,9 @@
 // @ts-nocheck
 import { renderToStream } from '@react-pdf/renderer'
-import AdmZip from 'adm-zip'
 import crypto from 'crypto'
 import ExcelJS from 'exceljs'
 import { getSession } from 'next-auth/client'
+import yazl from 'yazl'
 import { client } from '~api/client-api'
 import ApplicationDocument from '~components/pdfs/ApplicationDocument'
 import { Application, Espace, UsersPermissionsUser } from '~typings/api'
@@ -375,7 +375,7 @@ const SelectedCampaignApplications = async (req, res) => {
     return
   }
 
-  const zip = new AdmZip()
+  const zip = new yazl.ZipFile()
   const { data: campaign } = await client.campaigns.campaignsDetail(campaignId)
 
   try {
@@ -451,19 +451,20 @@ const SelectedCampaignApplications = async (req, res) => {
         const subFolder = `${application?.espace?.name} - ${disponibilityLabel} - ${refLabel} - ${structureName}`
 
         const streamBuffer = await getBufferFromStream(stream)
-        await zip.addFile(
+        await zip.addBuffer(
+          Buffer.from(streamBuffer),
           `${name}/${subFolder}/${refLabel} - Candidature.pdf`,
-          streamBuffer,
         )
 
         if (application?.creation_file?.[0]?.url) {
+          console.log(application?.creation_file?.[0]?.url)
           const creationFile = await fetch(application?.creation_file?.[0]?.url)
           // @ts-ignore
           const creationFileArrayBuffer = await creationFile.buffer()
 
-          await zip.addFile(
+          await zip.addBuffer(
+            Buffer.from(creationFileArrayBuffer),
             `${name}/${subFolder}/${refLabel} - Dossier artistique.pdf`,
-            creationFileArrayBuffer,
           )
         }
       }
@@ -478,13 +479,16 @@ const SelectedCampaignApplications = async (req, res) => {
       withAllApplications,
     )
 
-    await zip.addFile(
-      `${campaign?.title} candidatures.xlsx`,
+    console.log('Adding candidatures.xlsx')
+    await zip.addBuffer(
       applicationsSpreadsheetBuffer,
+      `${campaign?.title} candidatures.xlsx`,
     )
-    await zip.addFile(
-      `${campaign?.title} récap ${all ? 'complet' : 'présélection'}.xlsx`,
+
+    console.log('Adding récap.xlsx')
+    await zip.addBuffer(
       summarySpreadsheetBuffer,
+      `${campaign?.title} récap ${all ? 'complet' : 'présélection'}.xlsx`,
     )
   } catch (error) {
     console.error(error)
@@ -494,14 +498,22 @@ const SelectedCampaignApplications = async (req, res) => {
     return
   }
 
-  const zipBuffer = zip.toBuffer()
+  console.log('Adding zip')
 
   res.setHeader('Content-Type', 'application/zip')
   res.setHeader(
     'Content-Disposition',
     'attachment; filename=' + formatCampaignZipName(campaign),
   )
-  res.send(zipBuffer)
+
+  zip.end()
+
+  const zipStream = zip.outputStream
+  zipStream.pipe(res)
+
+  return new Promise((resolve) => {
+    zipStream.on('end', resolve)
+  })
 }
 
 export default SelectedCampaignApplications

web/yarn.lock

@@ -2885,6 +2885,11 @@ buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
+buffer-crc32@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-1.0.0.tgz#a10993b9055081d55304bd9feb4a072de179f405"
+  integrity sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==
+
 [email protected]:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
@@ -7210,6 +7215,13 @@ yargs@^16.0.0, yargs@^16.0.3, yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yazl@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/yazl/-/yazl-3.3.1.tgz#a69abad02d80739d3b1a7ffcca8434422477432c"
+  integrity sha512-BbETDVWG+VcMUle37k5Fqp//7SDOK2/1+T7X8TD96M3D9G8jK5VLUdQVdVjGi8im7FGkazX7kk5hkU8X4L5Bng==
+  dependencies:
+    buffer-crc32 "^1.0.0"
+
 yup@^0.32.9:
   version "0.32.9"
   resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.9.tgz#9367bec6b1b0e39211ecbca598702e106019d872"