@devicecloud.dev/dcd 4.4.0 → 4.4.1

package/dist/methods.js

@@ -326,15 +326,15 @@ async function uploadToSupabase(env, tempPath, file, debug) {
  * @returns Upload result with success status and any error
  */
 async function handleBackblazeUpload(config) {
-    const { b2, apiUrl, apiKey, finalPath, file, filePath, debug, supabaseSuccess } = config;
+    const { b2, apiUrl, apiKey, finalPath, file, filePath, debug } = config;
     if (!b2) {
-        if (debug && !supabaseSuccess) {
-            console.log('[DEBUG] Backblaze not configured, cannot fallback');
+        if (debug) {
+            console.log('[DEBUG] Backblaze not configured, will fall back to Supabase');
         }
         return { error: null, success: false };
     }
     if (debug) {
-        console.log(supabaseSuccess ? '[DEBUG] Starting Backblaze backup upload...' : '[DEBUG] Starting Backblaze fallback upload...');
+        console.log('[DEBUG] Starting Backblaze upload (primary)...');
     }
     try {
         const b2UploadStartTime = Date.now();
@@ -484,10 +484,7 @@ async function performUpload(config) {
     // Extract app metadata
     const metadata = await extractBinaryMetadata(filePath, debug);
     const env = apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev';
-    // Upload to Supabase
-    const supabaseResult = await uploadToSupabase(env, tempPath, file, debug);
-    let lastError = supabaseResult.error;
-    // Upload to Backblaze
+    // Upload to Backblaze first (primary)
     const backblazeResult = await handleBackblazeUpload({
         apiKey,
         apiUrl,
@@ -496,26 +493,36 @@ async function performUpload(config) {
         file,
         filePath,
         finalPath,
-        supabaseSuccess: supabaseResult.success,
     });
-    // Update lastError if Supabase also failed
-    if (!supabaseResult.success && backblazeResult.error) {
-        lastError = backblazeResult.error;
+    let lastError = backblazeResult.error;
+    // Only upload to Supabase if Backblaze failed
+    let supabaseResult = { error: null, success: false };
+    if (!backblazeResult.success) {
+        if (debug) {
+            console.log('[DEBUG] Backblaze upload failed, falling back to Supabase...');
+        }
+        supabaseResult = await uploadToSupabase(env, tempPath, file, debug);
+        if (!supabaseResult.success && supabaseResult.error) {
+            lastError = supabaseResult.error;
+        }
+    }
+    else if (debug) {
+        console.log('[DEBUG] Backblaze upload succeeded, skipping Supabase upload');
     }
     // Validate results
     validateUploadResults(supabaseResult.success, backblazeResult.success, lastError, b2, debug);
     // Log upload summary
     if (debug) {
-        const hasWarning = !supabaseResult.success && backblazeResult.success;
-        console.log(`[DEBUG] Upload summary - Supabase: ${supabaseResult.success ? '✓' : '✗'}, Backblaze: ${backblazeResult.success ? '✓' : '✗'}`);
+        const hasWarning = supabaseResult.success && !backblazeResult.success;
+        console.log(`[DEBUG] Upload summary - Backblaze: ${backblazeResult.success ? '✓' : '✗'}, Supabase: ${supabaseResult.success ? '✓' : '✗ (fallback ' + (backblazeResult.success ? 'not needed' : 'attempted') + ')'}`);
         console.log('[DEBUG] Finalizing upload...');
         console.log(`[DEBUG] Target endpoint: ${apiUrl}/uploads/finaliseUpload`);
         console.log(`[DEBUG] Uploaded to staging path: ${tempPath}`);
         console.log(`[DEBUG] API will move to final path: ${finalPath}`);
-        console.log(`[DEBUG] Supabase upload status: ${supabaseResult.success ? 'SUCCESS' : 'FAILED'}`);
         console.log(`[DEBUG] Backblaze upload status: ${backblazeResult.success ? 'SUCCESS' : 'FAILED'}`);
+        console.log(`[DEBUG] Supabase upload status: ${supabaseResult.success ? 'SUCCESS (fallback)' : backblazeResult.success ? 'SKIPPED' : 'FAILED'}`);
         if (hasWarning)
-            console.log('[DEBUG] ⚠ Warning: File only exists in Backblaze (Supabase failed)');
+            console.log('[DEBUG] ⚠ Warning: File only exists in Supabase (Backblaze failed)');
     }
     // Finalize upload
     const finalizeStartTime = Date.now();

package/oclif.manifest.json

@@ -880,5 +880,5 @@
       ]
     }
   },
-  "version": "4.4.0"
+  "version": "4.4.1"
 }

package/package.json

@@ -69,7 +69,7 @@
     "type": "git",
     "url": "https://devicecloud.dev"
   },
-  "version": "4.4.0",
+  "version": "4.4.1",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },