@edgedev/firebase 2.1.47 → 2.1.49

package/edgeFirebase.ts

@@ -56,12 +56,11 @@ import {
 } from "firebase/auth";
 
 
-import { getStorage, ref, uploadBytesResumable, getDownloadURL, connectStorageEmulator, listAll, deleteObject} from "firebase/storage";
+import { getStorage, ref, uploadBytesResumable, getDownloadURL, connectStorageEmulator, listAll, deleteObject, getMetadata} from "firebase/storage";
 
 import { getFunctions, httpsCallable, connectFunctionsEmulator } from "firebase/functions";
 
 import { getAnalytics, logEvent } from "firebase/analytics";
-import { get } from "http";
 
 interface FirestoreQuery {
   field: string;
@@ -206,7 +205,6 @@ interface Meta {
   [key: string]: unknown;
 }
 
-
 export const EdgeFirebase = class {
   constructor(
     firebaseConfig: firebaseConfig = {
@@ -1235,6 +1233,7 @@ export const EdgeFirebase = class {
     registrationCode: "",
     registrationMeta: {},
     ruleHelpers: {},
+    currentUploadProgress: 0,
   });
 
   public getDocData = async (
@@ -2095,8 +2094,13 @@ export const EdgeFirebase = class {
 
 
   // File functions
-  public uploadFile = async (filePath: string, file: Blob, isPublic: boolean): Promise<actionResponse> => {
-
+  public uploadFile = async (orgId: string, file: Blob,  filePath: string = "", isPublic: boolean = false, toR2: boolean = false): Promise<actionResponse> => {
+   // Finish toCF function hook.
+    this.state.currentUploadProgress = 0;
+    let collectionPath = "organizations/" + orgId;
+    if (filePath) {
+      collectionPath = "organizations/" + orgId + "/" + filePath;
+    }
     // Validate if file is provided
     if (!file) {
       return this.sendResponse({
@@ -2107,10 +2111,11 @@ export const EdgeFirebase = class {
     }
   
     // Check if the user has write permission to the filePath
-    let hasWritePermission = await this.permissionCheck("write", filePath);
+    let hasWritePermission = await this.permissionCheck("write", collectionPath);
     if (isPublic) {
       hasWritePermission = true;
       filePath = "public";
+      collectionPath = "public";
     }
     if (!hasWritePermission) {
       return this.sendResponse({
@@ -2121,17 +2126,44 @@ export const EdgeFirebase = class {
     }
   
     try {
-      let randomId = '';
+      const fileDoc = {
+        orgId,
+        uploadCompleted: false,
+        uploadCompletedToR2: false,
+        fileName: file.name,
+        name: file.name,
+        fileSize: file.size,
+        fileType: file.type,
+        directory: filePath,
+        filePath: '',
+        r2filePath: '',
+        r2URL: '',
+        isPublic: isPublic,
+        toR2: toR2,
+      };
+
+      const result: any =  await this.runFunction("edgeFirebase-addUpdateFileDoc", fileDoc);
+      const fileDocId = (result.data as { docId: string }).docId;
+      let tempFilePath = `${collectionPath.replaceAll('/', '-')}` + '/' + fileDocId + '-' + file.name;
       if (isPublic) {
-        randomId = Math.random().toString(36).substring(2, 6) + '-';
+        tempFilePath = `${collectionPath.replaceAll('/', '-')}` + '/' + orgId + '-' + fileDocId + '-' + file.name;
       }
-      const tempFilePath = `${filePath.replaceAll('/', '-')}` + '/' + randomId + file.name;
+      await this.runFunction("edgeFirebase-addUpdateFileDoc", {orgId, docId: fileDocId, filePath: tempFilePath });
       const storage = getStorage();
       const fileRef = ref(storage, tempFilePath);
   
       const metadata = {
-        contentType: file.type,
         cacheControl: isPublic ? 'public, max-age=31536000' : undefined,
+        customMetadata: {
+          orgId,
+          uid: this.user.uid,
+          contentType: file.type,
+          fileName: file.name,
+          fileDocId: fileDocId,
+          filePath: tempFilePath,
+          toR2: toR2 ? 'true' : '',
+          isPublic: isPublic ? 'true' : ''
+        }
       };
   
       // Resumable upload
@@ -2143,14 +2175,14 @@ export const EdgeFirebase = class {
           (snapshot) => {
             // Progress, pause, and resume events
             const progress = (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
-            console.log('Upload is ' + progress + '% done');
+            this.state.currentUploadProgress = progress;
           },
           (error) => {
             // Handle unsuccessful uploads
             reject(this.sendResponse({
               success: false,
               message: "An error occurred during file upload.",
-              meta: { error: error.message }
+              meta: { error: error.message, fileDocId}
             }));
           },
           () => {
@@ -2158,13 +2190,16 @@ export const EdgeFirebase = class {
             resolve(this.sendResponse({
               success: true,
               message: "File uploaded successfully.",
-              meta: { file: tempFilePath }
+              meta: { file: tempFilePath, fileDocId }
             }));
           }
         );
       });
-  
-      return await uploadPromise;
+     
+      
+      const uploadStatus = await uploadPromise;
+      await this.runFunction("edgeFirebase-addUpdateFileDoc", {orgId, docId: fileDocId, uploadStatus, uploadCompleted: true });
+      return uploadStatus;
   
     } catch (error) {
       return this.sendResponse({
@@ -2191,11 +2226,11 @@ export const EdgeFirebase = class {
     try {
       const fileRef = ref(this.storage, filePath);
       await deleteObject(fileRef);
-      return this.sendResponse({
-        success: true,
-        message: "File deleted successfully.",
-        meta: {}
-      });
+      this.sendResponse({
+              success: true,
+              message: "File deleted successfully.",
+              meta: {}
+            });
     } catch (error) {
       return this.sendResponse({
         success: false,

package/package.json

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

package/src/.env.dev

@@ -4,4 +4,13 @@ STRIPE_RETURN_URL=
 OPENAI_API_KEY=
 TWILIO_SID=
 TWILIO_AUTH_TOKEN=
-TWILIO_SYSTEM_NUMBER=
+TWILIO_SYSTEM_NUMBER=
+FIREBASE_STORAGE_BUCKET=
+FIREBASE_STORAGE_BUCKET_REGION=
+FIREBASE_STORAGE_BUCKET=
+FIREBASE_STORAGE_BUCKET_REGION=
+CLOUDFLARE_R2_PUBLIC_URL=
+CLOUDFLARE_R2_ENDPOINT=
+CLOUDFLARE_R2_ACCESS_KEY_ID=
+CLOUDFLARE_R2_SECRET_ACCESS_KEY=
+CLOUDFLARE_R2_BUCKET_NAME=

package/src/.env.prod

@@ -4,4 +4,13 @@ STRIPE_RETURN_URL=
 OPENAI_API_KEY=
 TWILIO_SID=
 TWILIO_AUTH_TOKEN=
-TWILIO_SYSTEM_NUMBER=
+TWILIO_SYSTEM_NUMBER=
+FIREBASE_STORAGE_BUCKET=
+FIREBASE_STORAGE_BUCKET_REGION=
+FIREBASE_STORAGE_BUCKET=
+FIREBASE_STORAGE_BUCKET_REGION=
+CLOUDFLARE_R2_PUBLIC_URL=
+CLOUDFLARE_R2_ENDPOINT=
+CLOUDFLARE_R2_ACCESS_KEY_ID=
+CLOUDFLARE_R2_SECRET_ACCESS_KEY=
+CLOUDFLARE_R2_BUCKET_NAME=

package/src/config.js

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable no-undef */
 const functions = require('firebase-functions')
 const { PubSub } = require('@google-cloud/pubsub')
 const admin = require('firebase-admin')
@@ -13,6 +11,7 @@ const { onMessagePublished } = require('firebase-functions/v2/pubsub')
 const { onCall, HttpsError, onRequest } = require('firebase-functions/v2/https')
 const { onSchedule } = require('firebase-functions/v2/scheduler')
 const { Storage } = require('@google-cloud/storage')
+const { onObjectFinalized, onObjectDeleted } = require('firebase-functions/v2/storage')
 const {
   onDocumentWritten,
   onDocumentCreated,
@@ -22,18 +21,18 @@ const {
   FirestoreEvent,
 } = require('firebase-functions/v2/firestore')
 const { logger } = require('firebase-functions/v2')
-const { getFirestore } = require('firebase-admin/firestore')
+const { Firestore, getFirestore } = require('firebase-admin/firestore')
 const twilio = require('twilio')
 const db = getFirestore()
 
 // The permissionCheck function
 
 const permissions = {
-  'admin': {'assign': true, 'delete': true, 'read': true, 'write': true},
-  'editor': {'assign': false, 'delete': true, 'read': true, 'write': true},
-  'user': {'assign': false, 'delete': false, 'read': true, 'write': false},
-  'writer': {'assign': false, 'delete': false, 'read': true, 'write': true}
-};
+  admin: { assign: true, delete: true, read: true, write: true },
+  editor: { assign: false, delete: true, read: true, write: true },
+  user: { assign: false, delete: false, read: true, write: false },
+  writer: { assign: false, delete: false, read: true, write: true },
+}
 
 const permissionCheck = async (userId, action, originalFilePath) => {
   // Fetch user document
@@ -52,16 +51,17 @@ const permissionCheck = async (userId, action, originalFilePath) => {
     // Check if the role's collectionPath is a prefix of the collectionPath
     if (collectionPath.startsWith(role.collectionPath)) {
       // Use permissions object instead of fetching collection data
-      const rolePermissions = permissions[role.role];
+      const rolePermissions = permissions[role.role]
       if (rolePermissions && rolePermissions[action]) {
-        return true;
+        return true
       }
     }
   }
-  return false;
+  return false
 }
 
 module.exports = {
+  Firestore,
   pubsub,
   onMessagePublished,
   onRequest,
@@ -82,6 +82,6 @@ module.exports = {
   db,
   Storage,
   permissionCheck,
+  onObjectFinalized,
+  onObjectDeleted,
 }
-
-

package/src/edgeFirebase.js

@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable no-undef */
-const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db, onSchedule, onDocumentUpdated, pubsub, Storage, permissionCheck } = require('./config.js')
+const AWS = require('aws-sdk')
+const { onCall, HttpsError, logger, getFirestore, functions, admin, twilio, db, onSchedule, onDocumentUpdated, pubsub, Storage, permissionCheck, onObjectFinalized, onObjectDeleted, onDocumentDeleted } = require('./config.js')
 
 const authToken = process.env.TWILIO_AUTH_TOKEN
 const accountSid = process.env.TWILIO_SID
@@ -13,6 +12,153 @@ function formatPhoneNumber(phone) {
   return `+1${numericPhone}`
 }
 
+exports.uploadDocumentDeleted = onDocumentDeleted(
+  { document: 'organizations/{orgId}/files/{docId}', timeoutSeconds: 180 },
+  async (event) => {
+    const fileData = event.data.data()
+    const filePath = fileData.filePath
+    // Check if the file exists in the bucket
+    const bucket = admin.storage().bucket()
+    const [exists] = await bucket.file(filePath).exists()
+    if (exists) {
+      // Delete the file if it exists
+      await bucket.file(filePath).delete()
+      console.log(`File deleted: ${filePath}`)
+    }
+    else {
+      console.log(`File not found: ${filePath}`)
+    }
+  },
+)
+
+exports.addUpdateFileDoc = onCall(async (request) => {
+  const data = request.data
+  const auth = request.auth
+  let docId = data?.docId
+  if (data.uid === auth.uid) {
+    console.log(data)
+    const orgId = data.orgId
+    if (docId) {
+      const docRef = db.collection(`organizations/${orgId}/files`).doc(docId)
+      await docRef.set(data, { merge: true })
+    }
+    else {
+      const docRef = db.collection(`organizations/${orgId}/files`).doc()
+      await docRef.set(data)
+      docId = docRef.id
+    }
+  }
+  console.log(docId)
+  return { docId }
+})
+
+const deleteR2File = async (filePath) => {
+  const r2 = new AWS.S3({
+    endpoint: process.env.CLOUDFLARE_R2_ENDPOINT, // e.g., "https://<account-id>.r2.cloudflarestorage.com"
+    accessKeyId: process.env.CLOUDFLARE_R2_ACCESS_KEY_ID,
+    secretAccessKey: process.env.CLOUDFLARE_R2_SECRET_ACCESS_KEY,
+    region: 'auto', // Cloudflare R2 uses "auto" for region
+  })
+  const params = {
+    Bucket: 'files',
+    Key: filePath,
+  }
+  try {
+    await r2.deleteObject(params).promise()
+    console.log(`File deleted from Cloudflare R2: ${filePath}`)
+  }
+  catch (error) {
+    console.error('Error deleting file from Cloudflare R2:', error)
+  }
+}
+
+exports.fileDeleted = onObjectDeleted(async (event) => {
+  const docId = event.data.metadata?.fileDocId
+  const toR2 = event.data.metadata?.toR2
+  if (toR2) {
+    await deleteR2File(event.data.metadata?.r2FilePath)
+  }
+  if (docId) {
+    const orgId = event.data.metadata?.orgId
+    const docRef = db.collection(`organizations/${orgId}/files`).doc(docId)
+    const docSnapshot = await docRef.get()
+    if (docSnapshot.exists) {
+      console.log('Deleting file document:', docId)
+      await docRef.delete()
+    }
+    else {
+      console.log('File document not found:', docId)
+    }
+  }
+})
+
+exports.toR2 = onObjectFinalized(
+  {
+    bucket: process.env.FIREBASE_STORAGE_BUCKET,
+    region: process.env.FIREBASE_STORAGE_BUCKET_REGION,
+    memory: '2GiB',
+    cpu: 2,
+    timeoutSeconds: 540,
+  }, async (event) => {
+    const toR2 = event.data.metadata?.toR2
+    if (toR2) {
+      const r2 = new AWS.S3({
+        endpoint: process.env.CLOUDFLARE_R2_ENDPOINT, // e.g., "https://<account-id>.r2.cloudflarestorage.com"
+        accessKeyId: process.env.CLOUDFLARE_R2_ACCESS_KEY_ID,
+        secretAccessKey: process.env.CLOUDFLARE_R2_SECRET_ACCESS_KEY,
+        region: 'auto', // Cloudflare R2 uses "auto" for region
+      })
+      const fileBucket = event.data.bucket // Storage bucket containing the file.
+      const filePath = event.data.name // File path in the bucket.
+      const r2FilePath = `${process.env.FIREBASE_STORAGE_BUCKET}/${event.data.metadata?.filePath}`
+      const r2URL = `${process.env.CLOUDFLARE_R2_PUBLIC_URL}/${r2FilePath}`
+      const fileName = event.data.metadata?.fileName // File name.
+      const contentType = event.data.contentType // File content type.
+
+      // Download file into memory from bucket.
+      const bucket = admin.storage().bucket(fileBucket)
+      const downloadResponse = await bucket.file(filePath).download()
+      const file = downloadResponse[0]
+
+      // Upload the file to Cloudflare R2.
+      const params = {
+        Bucket: 'files',
+        Key: r2FilePath,
+        Body: file,
+        ContentType: contentType,
+      }
+      try {
+        await r2.upload(params).promise()
+        const fileDocId = event.data.metadata?.fileDocId
+        const orgId = event.data.metadata?.orgId
+        const docRef = db.collection(`organizations/${orgId}/files`).doc(fileDocId)
+        await docRef.set({ r2FilePath, r2URL, uploadCompletedToR2: true }, { merge: true })
+        const fileRef = bucket.file(filePath)
+
+        const blankBuffer = Buffer.from('')
+        await fileRef.save(blankBuffer, {
+          contentType: 'application/octet-stream',
+        })
+
+        // Step 2: Update metadata with additional fields
+        const updatedMetadata = {
+          metadata: {
+            ...event.data.metadata,
+            r2FilePath,
+            r2URL,
+            uploadCompletedToR2: 'true', // Add custom metadata after file save
+          },
+        }
+
+        await fileRef.setMetadata(updatedMetadata)
+        console.log(`File uploaded to Cloudflare R2: ${fileName}`)
+      }
+      catch (error) {
+        console.error('Error uploading file to Cloudflare R2:', error)
+      }
+    }
+  })
+
 exports.topicQueue = onSchedule({ schedule: 'every 1 minutes', timeoutSeconds: 180 }, async (event) => {
   const queuedTopicsRef = db.collection('topic-queue')
   const snapshot = await queuedTopicsRef.get()

package/src/package.json

@@ -15,6 +15,7 @@
     },
     "dependencies": {
         "@google-cloud/pubsub": "^4.9.0",
+        "aws-sdk": "^2.1692.0",
         "crypto": "^1.0.1",
         "dotenv": "^16.3.1",
         "exceljs": "^4.4.0",
@@ -28,6 +29,6 @@
         "twilio": "^4.18.0"
     },
     "devDependencies": {
-        "firebase-functions-test": "^0.2.0"
+        "firebase-functions-test": "^3.4.0"
     }
 }

package/src/postinstall.sh

@@ -73,4 +73,26 @@ if [ ! -f "$project_root/functions/package.json" ]; then
   cd "$project_root/functions"
   npm install --no-audit --silent
   cd "$project_root"
-fi
+fi
+
+# Upgrade specific npm packages in the functions directory
+cd "$project_root/functions"
+
+# List of packages to upgrade
+npm install --save \
+    "@google-cloud/pubsub@^4.9.0" \
+    "aws-sdk@^2.1692.0" \
+    "crypto@^1.0.1" \
+    "dotenv@^16.3.1" \
+    "exceljs@^4.4.0" \
+    "firebase-admin@^13.0.2" \
+    "firebase-functions@^6.2.0" \
+    "form-data@^4.0.0" \
+    "formidable-serverless@^1.1.1" \
+    "moment-timezone@^0.5.43" \
+    "openai@^4.11.1" \
+    "stripe@^13.8.0" \
+    "twilio@^4.18.0"
+
+# Return to the project root
+cd "$project_root"