fix(bigFile): calc directory size

withastro-utils · Jul 26, 2024 · 4ab5311 · 4ab5311
1 parent 80ebb4a
commit 4ab5311
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/examples/simple-form/src/middleware.ts b/examples/simple-form/src/middleware.ts
@@ -6,6 +6,7 @@ export const onRequest = sequence(astroForms({
         bigFilesUpload: {
             bigFileServerOptions: {
                 maxUploadSize: 1024 * 1024 * 1024, // 1GB
+                maxDirectorySize: 1024 * 1024 * 1024 * 10, // 10GB
             }
         }
     }

diff --git a/packages/forms/src/components/form/UploadBigFile/uploadBigFileClient.ts b/packages/forms/src/components/form/UploadBigFile/uploadBigFileClient.ts
@@ -40,11 +40,11 @@ async function uploadChunkWithXHR(file: Blob, info: Record<string, any>, progres
             if (xhr.status >= 200 && xhr.status < 300) {
                 resolve(JSON.parse(xhr.responseText));
             } else {
-                reject(new Error('Upload failed'));
+                reject({ok: false, error: xhr.responseText});
             }
         };
         xhr.onerror = () => {
-            reject(new Error('Upload failed'));
+            reject({ok: false, error: xhr.responseText});
         };
 
         xhr.open('POST', location.href, true);
@@ -97,7 +97,7 @@ async function uploadBigFile(fileId: string, file: File, progressCallback: Progr
                 if (retry === 0) {
                     throw error;
                 }
-                return uploadPromise(retry - 1);
+                return await uploadPromise(retry - 1);
             }
         })().then(() => {
             activeLoads.delete(i);

diff --git a/packages/forms/src/components/form/UploadBigFile/uploadBigFileServer.ts b/packages/forms/src/components/form/UploadBigFile/uploadBigFileServer.ts
@@ -70,7 +70,10 @@ export async function loadUploadFiles(astro: AstroGlobal, options: Partial<LoadU
 
     const sendError = async (errorMessage: string) => {
         await fsExtra.emptyDir(uploadDir);
-        await fs.writeFile(path.join(uploadDir, 'error.txt'), errorMessage);
+        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 });
     };
 
@@ -89,7 +92,7 @@ export async function loadUploadFiles(astro: AstroGlobal, options: Partial<LoadU
         return await sendError("Directory size exceeded");
     }
 
-    const newTotalSize = (await totalDirectorySize(tempDirectory)) + uploadSize;
+    const newTotalSize = (await totalDirectorySize(uploadDir)) + uploadSize;
     if (newTotalSize > maxUploadSize) {
         return await sendError("Upload size exceeded");
     }