appwrite-utils-cli 0.0.70 → 0.0.71

package/README.md

@@ -132,6 +132,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.71: Slight change to file download logic after errors
 - 0.0.70: Bump to `node-appwrite` version
 - 0.0.69: Fixed single ID not getting replaced due to the below change =D also, `nice`
 - 0.0.68: Fixed the occasional case where, when mapping ID's from old data to new, there would be an array of ID's to match against. `idMappings` now supports arrays.

package/dist/migrations/storage.js

@@ -252,9 +252,27 @@ export const transferStorageLocalToLocal = async (storage, fromBucketId, toBucke
     let fromFiles = await tryAwaitWithRetry(async () => await storage.listFiles(fromBucketId, [Query.limit(100)]));
     const allFromFiles = fromFiles.files;
     let numberOfFiles = 0;
+    const downloadFileWithRetry = async (bucketId, fileId) => {
+        let attempts = 3;
+        while (attempts > 0) {
+            try {
+                return await storage.getFileDownload(bucketId, fileId);
+            }
+            catch (error) {
+                console.error(`Error downloading file ${fileId}: ${error}`);
+                attempts--;
+                if (attempts === 0)
+                    throw error;
+            }
+        }
+    };
     if (fromFiles.files.length < 100) {
         for (const file of allFromFiles) {
-            const fileData = await tryAwaitWithRetry(async () => await storage.getFileDownload(file.bucketId, file.$id));
+            const fileData = await tryAwaitWithRetry(async () => await downloadFileWithRetry(file.bucketId, file.$id));
+            if (!fileData) {
+                console.error(`Error downloading file ${file.$id}`);
+                continue;
+            }
             const fileToCreate = InputFile.fromBuffer(Buffer.from(fileData), file.name);
             console.log(`Creating file: ${file.name}`);
             tryAwaitWithRetry(async () => await storage.createFile(toBucketId, file.$id, fileToCreate, file.$permissions));
@@ -277,7 +295,11 @@ export const transferStorageLocalToLocal = async (storage, fromBucketId, toBucke
             }
         }
         for (const file of allFromFiles) {
-            const fileData = await tryAwaitWithRetry(async () => await storage.getFileDownload(file.bucketId, file.$id));
+            const fileData = await tryAwaitWithRetry(async () => await downloadFileWithRetry(file.bucketId, file.$id));
+            if (!fileData) {
+                console.error(`Error downloading file ${file.$id}`);
+                continue;
+            }
             const fileToCreate = InputFile.fromBuffer(Buffer.from(fileData), file.name);
             await tryAwaitWithRetry(async () => await storage.createFile(toBucketId, file.$id, fileToCreate, file.$permissions));
             numberOfFiles++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/storage.ts

@@ -388,11 +388,29 @@ export const transferStorageLocalToLocal = async (
   );
   const allFromFiles = fromFiles.files;
   let numberOfFiles = 0;
+
+  const downloadFileWithRetry = async (bucketId: string, fileId: string) => {
+    let attempts = 3;
+    while (attempts > 0) {
+      try {
+        return await storage.getFileDownload(bucketId, fileId);
+      } catch (error) {
+        console.error(`Error downloading file ${fileId}: ${error}`);
+        attempts--;
+        if (attempts === 0) throw error;
+      }
+    }
+  };
+
   if (fromFiles.files.length < 100) {
     for (const file of allFromFiles) {
       const fileData = await tryAwaitWithRetry(
-        async () => await storage.getFileDownload(file.bucketId, file.$id)
+        async () => await downloadFileWithRetry(file.bucketId, file.$id)
       );
+      if (!fileData) {
+        console.error(`Error downloading file ${file.$id}`);
+        continue;
+      }
       const fileToCreate = InputFile.fromBuffer(
         Buffer.from(fileData),
         file.name
@@ -428,8 +446,12 @@ export const transferStorageLocalToLocal = async (
     }
     for (const file of allFromFiles) {
       const fileData = await tryAwaitWithRetry(
-        async () => await storage.getFileDownload(file.bucketId, file.$id)
+        async () => await downloadFileWithRetry(file.bucketId, file.$id)
       );
+      if (!fileData) {
+        console.error(`Error downloading file ${file.$id}`);
+        continue;
+      }
       const fileToCreate = InputFile.fromBuffer(
         Buffer.from(fileData),
         file.name