@edgedev/firebase 2.1.58 → 2.1.60

package/edgeFirebase.ts

@@ -601,8 +601,17 @@ export const EdgeFirebase = class {
         }
       }
     }
-    const userRef = doc(this.db, "staged-users", userRegister.registrationCode);
-    const userSnap = await getDoc(userRef);
+    let userSnap = null;
+    try {
+      const userRef = doc(this.db, "staged-users", userRegister.registrationCode);
+      userSnap = await getDoc(userRef);
+    } catch (error) {
+      return this.sendResponse({
+        success: false,
+        message: "Registration code already used.",
+        meta: {}
+      });
+    }
     if (userSnap.exists()) {
       const user = userSnap.data();
       if (user.userId) {
@@ -2095,7 +2104,7 @@ export const EdgeFirebase = class {
 
   // File functions
   // TODO... add object to pass merge with customMetadata as var....
-  public uploadFile = async (orgId: string, file: Blob,  filePath: string = "", isPublic: boolean = false, toR2: boolean = false): Promise<actionResponse> => {
+  public uploadFile = async (orgId: string, file: Blob,  filePath: string = "", isPublic: boolean = false, toR2: boolean = false, extraMeta: object = null): Promise<actionResponse> => {
    // Finish toCF function hook.
     this.state.currentUploadProgress = 0;
     let collectionPath = "organizations/" + orgId;
@@ -2206,7 +2215,7 @@ export const EdgeFirebase = class {
      
       
       const uploadStatus = await uploadPromise;
-      await this.runFunction("edgeFirebase-addUpdateFileDoc", {orgId, docId: fileDocId, uploadStatus, uploadCompleted: true });
+      await this.runFunction("edgeFirebase-addUpdateFileDoc", {orgId, docId: fileDocId, uploadStatus, uploadCompleted: true, extraMeta });
       return uploadStatus;
   
     } catch (error) {

package/package.json

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

package/src/edgeFirebase.js

@@ -1,6 +1,8 @@
 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 FormData = require('form-data')
+const fetch = require('node-fetch')
 
+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
 const systemNumber = process.env.TWILIO_SYSTEM_NUMBER
@@ -75,7 +77,11 @@ const deleteR2File = async (filePath) => {
 exports.fileDeleted = onObjectDeleted({ region: process.env.FIREBASE_STORAGE_BUCKET_REGION }, async (event) => {
   const docId = event.data.metadata?.fileDocId
   const toR2 = event.data.metadata?.toR2
+  const cloudflareImageId = event.data.metadata?.cloudflareImageId
   const r2ProcessCompleted = event.data.metadata?.r2ProcessCompleted
+  if (cloudflareImageId) {
+    await deleteCloudflareImage(cloudflareImageId)
+  }
   if (toR2) {
     if (r2ProcessCompleted === 'true') {
       await deleteR2File(event.data.metadata?.r2FilePath)
@@ -119,6 +125,7 @@ exports.toR2 = onObjectFinalized(
       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 fileSize = event.data.metadata?.fileSize
       const contentType = event.data.contentType // File content type.
 
       // Download file into memory from bucket.
@@ -139,6 +146,7 @@ exports.toR2 = onObjectFinalized(
       const fileRef = bucket.file(filePath)
       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)
@@ -157,7 +165,7 @@ exports.toR2 = onObjectFinalized(
         })
 
         // Step 2: Update metadata with additional fields
-        const updatedMetadata = {
+        let updatedMetadata = {
           metadata: {
             ...event.data.metadata,
             r2FilePath,
@@ -166,6 +174,36 @@ exports.toR2 = onObjectFinalized(
             r2ProcessCompleted: 'true',
           },
         }
+        if (contentType.startsWith('image/')) {
+          try {
+            const cloudflareImage = await uploadToCloudflareImage({
+              r2FilePath,
+              r2URL,
+              fileDocId,
+              orgId,
+              fileName,
+              fileSize,
+            })
+            console.log(cloudflareImage)
+
+            updatedMetadata = {
+              metadata: {
+                ...event.data.metadata,
+                r2FilePath,
+                r2URL,
+                uploadCompletedToR2: 'true', // Add custom metadata after file save
+                r2ProcessCompleted: 'true',
+                cloudflareImageId: cloudflareImage.id,
+                cloudflareImageVariants: cloudflareImage.variants,
+                cloudflareUploadCompleted: true,
+              },
+            }
+            await docRef.set({ cloudflareImageId: cloudflareImage.id, cloudflareImageVariants: cloudflareImage.variants, cloudflareUploadCompleted: true }, { merge: true })
+          }
+          catch (e) {
+            console.error('Cloudflare Image Upload Failed', e)
+          }
+        }
 
         await fileRef.setMetadata(updatedMetadata)
         console.log(`File uploaded to Cloudflare R2: ${fileName}`)
@@ -593,3 +631,71 @@ function markProcessed(eventRef) {
     return null
   })
 }
+
+async function uploadToCloudflareImage({ r2FilePath, r2URL, fileDocId, orgId, fileName, fileSize }) {
+  const cleanedr2FilePath = r2FilePath.replaceAll('/', '-').replace('.firebasestorage.app-organizations', '')
+  const metadata = {
+    orgId,
+    fileDocId,
+    fileName: cleanedr2FilePath,
+    fileSize,
+  }
+
+  const API_TOKEN = process.env.CF_IMAGES_TOKEN
+  const ACCOUNT_ID = process.env.CF_ACCOUNT_ID
+
+  const formData = new FormData()
+  formData.append('url', r2URL)
+  formData.append('metadata', JSON.stringify(metadata))
+  formData.append('id', cleanedr2FilePath)
+
+  const response = await fetch(
+  `https://api.cloudflare.com/client/v4/accounts/${ACCOUNT_ID}/images/v1`,
+  {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${API_TOKEN}`,
+      ...formData.getHeaders(),
+    },
+    body: formData,
+  },
+  )
+
+  const result = await response.json()
+
+  const { result: imageData, success, errors } = result
+
+  if (!success) {
+    const errorMessages = (errors || [])
+      .map(error => (error.message ? error.message : 'Unknown error'))
+      .join('; ')
+    throw new Error(`Cloudflare upload failed: ${errorMessages}`)
+  }
+
+  return {
+    id: imageData.id,
+    variants: imageData.variants,
+    meta: imageData.meta || {},
+  }
+}
+
+async function deleteCloudflareImage(imageId) {
+  const API_TOKEN = process.env.CF_IMAGES_TOKEN
+  const ACCOUNT_ID = process.env.CF_ACCOUNT_ID
+
+  const response = await fetch(
+    `https://api.cloudflare.com/client/v4/accounts/${ACCOUNT_ID}/images/v1/${imageId}`,
+    {
+      method: 'DELETE',
+      headers: {
+        Authorization: `Bearer ${API_TOKEN}`,
+      },
+    },
+  )
+
+  if (!response.ok) {
+    throw new Error(`Failed to delete Cloudflare image: ${response.statusText}`)
+  }
+
+  return true
+}