@edgedev/firebase 2.1.44 → 2.1.46

package/edgeFirebase.ts

@@ -25,6 +25,7 @@ import {
   arrayRemove,
   arrayUnion,
   connectFirestoreEmulator,
+  getCountFromServer,
 } from "firebase/firestore";
 
 import {
@@ -60,6 +61,7 @@ import { getStorage, ref, uploadBytesResumable, getDownloadURL, connectStorageEm
 import { getFunctions, httpsCallable, connectFunctionsEmulator } from "firebase/functions";
 
 import { getAnalytics, logEvent } from "firebase/analytics";
+import { get } from "http";
 
 interface FirestoreQuery {
   field: string;
@@ -1285,9 +1287,22 @@ export const EdgeFirebase = class {
     return { data, next: nextLast };
   };
 
+  private getTotalCount = async (
+    collectionPath: string,
+    queryList: FirestoreQuery[] = []
+  ): Promise<number> => {
+    console.log('getTotalCount')
+    console.log(collectionPath )
+    console.log(queryList)
+    const q = this.getQuery(collectionPath, queryList);
+    const snapshot = await getCountFromServer(q);
+    return snapshot.data().count;
+  };
+
   get SearchStaticData() {
     const getStaticData = this.getStaticData;
     const permissionCheckOnly = this.permissionCheckOnly;
+    const getTotalCount = this.getTotalCount;
     const sendResponse = this.sendResponse;
     return class {
       private collectionPath = "";
@@ -1300,7 +1315,8 @@ export const EdgeFirebase = class {
         pagination: [],
         staticIsLastPage: true,
         staticIsFirstPage: true,
-        staticCurrentPage: ""
+        staticCurrentPage: "",
+        total: 0
       });
 
       public prev = async (): Promise<void> => {
@@ -1408,6 +1424,7 @@ export const EdgeFirebase = class {
             orderList,
             max
           );
+          this.results.total = await getTotalCount(this.collectionPath, this.queryList);
           if (Object.keys(results.data).length > 0) {
             this.results.staticIsLastPage = false;
             this.results.data = results.data;
@@ -2082,76 +2099,82 @@ export const EdgeFirebase = class {
 
     // Validate if file is provided
     if (!file) {
-        return this.sendResponse({
-            success: false,
-            message: "No file provided for upload.",
-            meta: {}
-        });
+      return this.sendResponse({
+        success: false,
+        message: "No file provided for upload.",
+        meta: {}
+      });
     }
-
+  
     // Check if the user has write permission to the filePath
     let hasWritePermission = await this.permissionCheck("write", filePath);
     if (isPublic) {
-        hasWritePermission = true;
-        filePath = "public";
+      hasWritePermission = true;
+      filePath = "public";
     }
     if (!hasWritePermission) {
-        return this.sendResponse({
-            success: false,
-            message: "You do not have permission to upload files to this path.",
-            meta: {}
-        });
+      return this.sendResponse({
+        success: false,
+        message: "You do not have permission to upload files to this path.",
+        meta: {}
+      });
     }
-
+  
     try {
-        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);
-
-        const metadata = {
-            contentType: file.type,
-            cacheControl: isPublic ? 'public, max-age=31536000' : undefined,
-        };
-
-        // Resumable upload
-        const uploadTask = uploadBytesResumable(fileRef, file, metadata);
-
-        // Monitor progress and handle completion
+      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);
+  
+      const metadata = {
+        contentType: file.type,
+        cacheControl: isPublic ? 'public, max-age=31536000' : undefined,
+      };
+  
+      // 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
-                return this.sendResponse({
-                    success: false,
-                    message: "An error occurred during file upload.",
-                    meta: { error: error.message }
-                });
-            },
-            () => {
-                // Handle successful uploads on complete
-                return this.sendResponse({
-                    success: true,
-                    message: "File uploaded successfully.",
-                    meta: { file: tempFilePath }
-                });
-            }
+          (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: { error: error.message }
-        });
+      return this.sendResponse({
+        success: false,
+        message: "An error occurred during file upload.",
+        meta: { error: error.message }
+      });
     }
   };
+  
 
   public deleteFile = async (filePath: string): Promise<actionResponse> => {
     let hasDeletePermission = await this.permissionCheck("write", filePath);

package/package.json

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