@qaecy/cue-cli 0.0.14 → 0.0.15

package/main.js

@@ -5733,7 +5733,7 @@ function turtleFileMetadata(sourceFile, processorId, locationUUID, stored = fals
 
 // apps/desktop/cue-cli/src/helpers/upload-file.ts
 var import_promises6 = require("fs/promises");
-async function uploadFile(file, spaceId, userId, providerId, verbose) {
+async function uploadFile(file, spaceId, userId, providerId) {
   const firebase = CueFirebase.getInstance();
   const rawFileMetadata = uploadedFileMetadata(
     file.relativePath,
@@ -5745,37 +5745,64 @@ async function uploadFile(file, spaceId, userId, providerId, verbose) {
   const storage = firebase.storageRaw;
   const fileRef = (0, import_storage5.ref)(storage, rawFileMetadata.blob_name);
   const fileBuffer = await (0, import_promises6.readFile)(file.fullPath);
-  await new Promise((resolve, reject) => {
-    const uploadTask = (0, import_storage5.uploadBytesResumable)(fileRef, fileBuffer, {
-      customMetadata: rawFileMetadata
-    });
-    uploadTask.on(
-      "state_changed",
-      null,
-      (error) => {
-        console.error("[uploadFile] Error uploading file:", {
-          filePath: file.fullPath,
-          relativePath: file.relativePath,
-          md5: file.md5,
-          blobName: rawFileMetadata.blob_name,
-          errorCode: error?.code,
-          errorMessage: error?.message,
-          errorPayload: error
+  const maxRetries = 3;
+  let attempt = 0;
+  let lastError = null;
+  while (attempt < maxRetries) {
+    try {
+      await new Promise((resolve, reject) => {
+        const uploadTask = (0, import_storage5.uploadBytesResumable)(fileRef, fileBuffer, {
+          customMetadata: rawFileMetadata
         });
-        reject(error);
-      },
-      () => resolve()
-    );
-    if (!uploadTask) {
-      console.error("[uploadFile] Upload task could not be created:", {
-        filePath: file.fullPath,
-        relativePath: file.relativePath,
-        md5: file.md5,
-        blobName: rawFileMetadata.blob_name
+        uploadTask.on(
+          "state_changed",
+          null,
+          (error) => {
+            const blobName = rawFileMetadata.blob_name;
+            console.error("[uploadFile] Error uploading file:", {
+              filePath: file.fullPath,
+              relativePath: file.relativePath,
+              md5: file.md5,
+              blobName,
+              blobNameLength: blobName?.length,
+              blobNameIsUnusual: blobName && (blobName.length > 256 || /[^\w\-./]/.test(blobName)),
+              errorCode: error?.code,
+              errorMessage: error?.message,
+              errorPayload: error,
+              fileBufferSize: fileBuffer?.length,
+              rawFileMetadataKeys: Object.keys(rawFileMetadata),
+              rawFileMetadataLength: Object.keys(rawFileMetadata).length,
+              attempt
+            });
+            reject(error);
+          },
+          () => resolve()
+        );
+        if (!uploadTask) {
+          console.error("[uploadFile] Upload task could not be created:", {
+            filePath: file.fullPath,
+            relativePath: file.relativePath,
+            md5: file.md5,
+            blobName: rawFileMetadata.blob_name,
+            attempt
+          });
+          reject(new Error("Upload task could not be created"));
+        }
       });
-      reject(new Error("Upload task could not be created"));
+      lastError = null;
+      break;
+    } catch (err) {
+      lastError = err;
+      attempt++;
+      if (attempt < maxRetries) {
+        console.warn(`[uploadFile] Retry attempt ${attempt} for file: ${file.fullPath}`);
+        await new Promise((res) => setTimeout(res, 1e3 * attempt));
+      }
     }
-  });
+  }
+  if (lastError) {
+    throw lastError;
+  }
   return rawFileMetadata;
 }
 
@@ -5895,20 +5922,31 @@ async function syncHandler(options) {
     if (verbose && report.localNotOnRemote.length)
       console.info("Syncing missing files \u23F3");
     let rdfWritten = false;
+    let failedUploads = 0;
     for (const file of report.localNotOnRemote) {
-      const rawFileMetadata = await uploadFile(file, space, userId, provider, verbose);
-      await uploadFileRDF(file, rawFileMetadata, verbose);
-      syncCount += 1;
-      syncSize += file.size || 0;
-      const pct = Math.floor(syncCount / report.totalCount * 100);
-      if (verbose && report.totalCount > 0 && syncCount % Math.ceil(report.totalCount / 100) === 0) {
-        console.info(
-          `Progress: ${pct}% (${syncCount}/$${report.totalCount} files, ${fileSizePretty(syncSize)}/${fileSizePretty(
-            report.totalSize
-          )})`
-        );
+      let rawFileMetadata;
+      try {
+        rawFileMetadata = await uploadFile(file, space, userId, provider);
+        await uploadFileRDF(file, rawFileMetadata, verbose);
+        syncCount += 1;
+        syncSize += file.size || 0;
+        const pct = Math.floor(syncCount / report.totalCount * 100);
+        if (verbose && report.totalCount > 0 && syncCount % Math.ceil(report.totalCount / 100) === 0) {
+          console.info(
+            `Progress: ${pct}% (${syncCount}/$${report.totalCount} files, ${fileSizePretty(syncSize)}/${fileSizePretty(
+              report.totalSize
+            )})`
+          );
+        }
+        rdfWritten = true;
+      } catch (err) {
+        failedUploads += 1;
+        console.error(`[syncHandler] Failed to upload file: ${file.fullPath}`);
+        if (verbose) {
+          console.error("[syncHandler] Upload error details:", err);
+        }
+        continue;
       }
-      rdfWritten = true;
     }
     const zipDeletePromise = zip ? deleteUnzipped(path) : Promise.resolve();
     if (verbose && report.localNotOnRemotePathOnly.length)
@@ -5958,6 +5996,9 @@ async function syncHandler(options) {
     if (verbose) {
       console.info("");
       console.info(`Sync finished \u{1F680}\u{1F680}\u{1F680}`);
+      if (failedUploads > 0) {
+        console.warn(`Total files failed to upload: ${failedUploads}`);
+      }
     }
   } catch (err) {
     console.error("Error:", err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qaecy/cue-cli",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Cue CLI for QAECY platform",
   "main": "main.js",
   "bin": {