@edgedev/firebase 2.1.43 → 2.1.45

package/edgeFirebase.ts

@@ -2104,54 +2104,61 @@ export const EdgeFirebase = class {
     }
   
     try {
-      const chunkSize = 5 * 1024 * 1024; // 5 MB per chunk
-      const totalChunks = Math.ceil(file.size / chunkSize);
-      const uploadPath = `${filePath.replaceAll('/', '-')}/${file.name}`;
-      const chunkPromises = [];
-      let totalBytesTransferred = 0;
-  
-      for (let i = 0; i < totalChunks; i++) {
-        const chunkStart = i * chunkSize;
-        const chunkEnd = Math.min(chunkStart + chunkSize, file.size);
-        const chunk = file.slice(chunkStart, chunkEnd);
-  
-        const chunkFilePath = `${uploadPath}.part-${i + 1}`;
-        const fileRef = ref(this.storage, chunkFilePath);
-        const uploadTask = uploadBytesResumable(fileRef, chunk, { contentType: file.type });
-  
-        chunkPromises.push(new Promise((resolve, reject) => {
-          uploadTask.on(
-            'state_changed',
-            (snapshot) => {
-              const chunkProgress = (snapshot.bytesTransferred / snapshot.totalBytes) * (chunkEnd - chunkStart);
-              totalBytesTransferred += chunkProgress;
-              const overallProgress = (totalBytesTransferred / file.size) * 100;
-              console.log(`Upload is ${overallProgress.toFixed(2)}% done`);
-            },
-            (error) => reject(error),
-            () => resolve(uploadTask.snapshot)
-          );
-        }));
+      let randomId = '';
+      if (isPublic) {
+        randomId = Math.random().toString(36).substring(2, 6) + '-';
       }
+      const tempFilePath = `${filePath.replaceAll('/', '-')}` + '/' + randomId + file.name;
+      const storage = getStorage();
+      const fileRef = ref(storage, tempFilePath);
   
-      // Wait for all chunks to finish uploading
-      await Promise.all(chunkPromises);
+      const metadata = {
+        contentType: file.type,
+        cacheControl: isPublic ? 'public, max-age=31536000' : undefined,
+      };
   
-      return this.sendResponse({
-        success: true,
-        message: "File uploaded successfully in chunks.",
-        meta: {file: uploadPath}
+      // Resumable upload
+      const uploadTask = uploadBytesResumable(fileRef, file, metadata);
+  
+      // Wrap the upload task in a Promise
+      const uploadPromise = new Promise<actionResponse>((resolve, reject) => {
+        uploadTask.on('state_changed',
+          (snapshot) => {
+            // Progress, pause, and resume events
+            const progress = (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
+            console.log('Upload is ' + progress + '% done');
+          },
+          (error) => {
+            // Handle unsuccessful uploads
+            reject(this.sendResponse({
+              success: false,
+              message: "An error occurred during file upload.",
+              meta: { error: error.message }
+            }));
+          },
+          () => {
+            // Handle successful uploads on complete
+            resolve(this.sendResponse({
+              success: true,
+              message: "File uploaded successfully.",
+              meta: { file: tempFilePath }
+            }));
+          }
+        );
       });
   
+      return await uploadPromise;
+  
     } catch (error) {
       return this.sendResponse({
         success: false,
         message: "An error occurred during file upload.",
-        meta: {}
+        meta: { error: error.message }
       });
     }
   };
   
+
   public deleteFile = async (filePath: string): Promise<actionResponse> => {
     let hasDeletePermission = await this.permissionCheck("write", filePath);
     if (filePath.substring(0, 6) === 'public') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgedev/firebase",
-  "version": "2.1.43",
+  "version": "2.1.45",
   "description": "Vue 3 / Nuxt 3 Plugin or Nuxt 3 plugin for firebase authentication and firestore.",
   "main": "index.ts",
   "scripts": {