fix(bigFile): auto fix missing chunks

withastro-utils · Jul 26, 2024 · 6fb76d5 · 6fb76d5
1 parent 7d7ed32
commit 6fb76d5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/packages/forms/src/components/form/UploadBigFile/uploadBigFileClient.ts b/packages/forms/src/components/form/UploadBigFile/uploadBigFileClient.ts
@@ -60,7 +60,7 @@ async function uploadBigFile(fileId: string, file: File, progressCallback: Progr
     const activeLoads = new Map<number, number>();
     let finishedSize = 0;
 
-    for (let i = 0; i < totalChunks; i++) {
+    const uploadChunk = async (i: number) => {
         while (activeChunks.size >= options.parallelChunks) {
             await Promise.race(activeChunks);
         }
@@ -90,6 +90,10 @@ async function uploadBigFile(fileId: string, file: File, progressCallback: Progr
 
             try {
                 const response: any = await upload;
+                if(response?.missingChunk){
+                    await uploadChunk(response?.missingChunk - 1);
+                }
+
                 if (!response?.ok) {
                     throw new Error(response.error);
                 }
@@ -108,6 +112,10 @@ async function uploadBigFile(fileId: string, file: File, progressCallback: Progr
         activeChunks.add(uploadPromiseWithRetry);
     }
 
+    for (let i = 0; i < totalChunks; i++) {
+        await uploadChunk(i);
+    }
+
     await Promise.all(activeChunks);
 }
 

diff --git a/packages/forms/src/components/form/UploadBigFile/uploadBigFileServer.ts b/packages/forms/src/components/form/UploadBigFile/uploadBigFileServer.ts
@@ -68,13 +68,15 @@ export async function loadUploadFiles(astro: AstroGlobal, options: Partial<LoadU
     const uploadDir = path.join(tempDirectory, 'chunks_' + uploadId);
     await fsExtra.ensureDir(uploadDir);
 
-    const sendError = async (errorMessage: string) => {
-        await fsExtra.emptyDir(uploadDir);
+    const sendError = async (errorMessage: string, emptyDir = true, extraInfo?: any) => {
+        if(emptyDir){
+            await fsExtra.emptyDir(uploadDir);
+        }
         const errorPath = path.join(uploadDir, 'error.txt');
         if (!await checkIfFileExists(errorPath)) {
             await fs.writeFile(path.join(uploadDir, 'error.txt'), errorMessage);
         }
-        return Response.json({ ok: false, error: errorMessage });
+        return Response.json({ ok: false, error: errorMessage, ...extraInfo });
     };
 
     if (typeof allowUpload === "function") {
@@ -105,7 +107,8 @@ export async function loadUploadFiles(astro: AstroGlobal, options: Partial<LoadU
 
     const chunkSavePath = path.join(uploadDir, `${part}-${total}`);
     if (!await checkIfFileExists(chunkSavePath)) {
-        await fs.writeFile(chunkSavePath, uploadFile.stream() as any);
+        const buffer = await uploadFile.arrayBuffer();
+        await fs.writeFile(chunkSavePath, Buffer.from(buffer));
     }
 
     if (part !== total) {
@@ -115,7 +118,7 @@ export async function loadUploadFiles(astro: AstroGlobal, options: Partial<LoadU
     const files = await fs.readdir(uploadDir);
     for (let i = 1; i <= total; i++) {
         if (!files.includes(`${i}-${total}`)) {
-            return await sendError(`Missing chunk ${i}, upload failed`);
+            return await sendError(`Missing chunk ${i}, upload failed`, false, { missingChunk: i });
         }
     }