appwrite-utils-cli 0.0.69 → 0.0.71

package/README.md

@@ -132,6 +132,8 @@ 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.
 - 0.0.67: Fixed `updates` in `importDef`'s update mappings overwriting postImportActions from the original

package/dist/migrations/afterImportActions.js

@@ -1,4 +1,5 @@
-import { Databases, Storage, InputFile, Query, ID, Client, } from "node-appwrite";
+import { Databases, Storage, Query, ID, Client, Compression, } from "node-appwrite";
+import { InputFile } from "node-appwrite/file";
 import path from "path";
 import fs from "fs";
 import os from "os";
@@ -208,11 +209,11 @@ export const afterImportActions = {
                     return await tryAwaitWithRetry(async () => await storage.getBucket(bucketId));
                 }
                 catch (error) {
-                    return await tryAwaitWithRetry(async () => await storage.createBucket(bucketId, bucketName, permissions, fileSecurity, enabled, maxFileSize, allowedExtensions, compression, encryption, antivirus));
+                    return await tryAwaitWithRetry(async () => await storage.createBucket(bucketId, bucketName, permissions, fileSecurity, enabled, maxFileSize, allowedExtensions, compression ? Compression.Gzip : undefined, encryption, antivirus));
                 }
             }
             else {
-                return await tryAwaitWithRetry(async () => await storage.createBucket(bucketId || ID.unique(), bucketName, permissions, fileSecurity, enabled, maxFileSize, allowedExtensions, compression, encryption, antivirus));
+                return await tryAwaitWithRetry(async () => await storage.createBucket(bucketId || ID.unique(), bucketName, permissions, fileSecurity, enabled, maxFileSize, allowedExtensions, compression ? Compression.Gzip : undefined, encryption, antivirus));
             }
         }
         catch (error) {

package/dist/migrations/databases.js

@@ -1,4 +1,4 @@
-import { Client, Databases, Query } from "node-appwrite";
+import { Client, Databases, IndexType, Query, } from "node-appwrite";
 import { getAppwriteClient, tryAwaitWithRetry, } from "../utils/helperFunctions.js";
 import { transferDocumentsBetweenDbsLocalToLocal, transferDocumentsBetweenDbsLocalToRemote, } from "./collections.js";
 import { createOrUpdateAttribute } from "./attributes.js";

package/dist/migrations/importDataActions.js

@@ -1,4 +1,4 @@
-import { ID, InputFile, Query, } from "node-appwrite";
+import {} from "node-appwrite";
 import { validationRules, } from "appwrite-utils";
 import { converterFunctions } from "appwrite-utils";
 import { convertObjectBySchema } from "./converters.js";

package/dist/migrations/indexes.js

@@ -1,5 +1,5 @@
 import { indexSchema } from "appwrite-utils";
-import { Databases, Query } from "node-appwrite";
+import { Databases, IndexType, Query } from "node-appwrite";
 import { tryAwaitWithRetry } from "../utils/helperFunctions.js";
 // import {}
 export const createOrUpdateIndex = async (dbId, db, collectionId, index) => {

package/dist/migrations/storage.js

@@ -1,4 +1,5 @@
-import { Storage, Databases, Query, InputFile, ID, Permission, } from "node-appwrite";
+import { Storage, Databases, Query, ID, Permission, } from "node-appwrite";
+import { InputFile } from "node-appwrite/file";
 import {} from "./backup.js";
 import { splitIntoBatches } from "./migrationHelper.js";
 import { getAppwriteClient, tryAwaitWithRetry, } from "../utils/helperFunctions.js";
@@ -251,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));
@@ -276,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++;
@@ -307,7 +330,9 @@ export const transferStorageLocalToRemote = async (localStorage, endpoint, proje
         }
     }
     for (const file of allFromFiles) {
-        await tryAwaitWithRetry(async () => await remoteStorage.createFile(toBucketId, file.$id, file, file.$permissions));
+        const fileData = await tryAwaitWithRetry(async () => await localStorage.getFileDownload(file.bucketId, file.$id));
+        const fileToCreate = InputFile.fromBuffer(Buffer.from(fileData), file.name);
+        await tryAwaitWithRetry(async () => await remoteStorage.createFile(toBucketId, file.$id, fileToCreate, file.$permissions));
         numberOfFiles++;
     }
     console.log(`Transferred ${numberOfFiles} files from ${fromBucketId} to ${toBucketId}`);

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.69",
+  "version": "0.0.71",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.3.5",
+    "appwrite-utils": "^0.3.6",
     "commander": "^12.0.0",
     "inquirer": "^9.2.20",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "luxon": "^3.4.4",
     "nanostores": "^0.10.3",
-    "node-appwrite": "^12.0.1",
+    "node-appwrite": "^13.0.0",
     "tsx": "^4.9.3",
     "ulid": "^2.3.0",
     "winston": "^3.13.0",

package/src/migrations/afterImportActions.ts

@@ -1,12 +1,13 @@
 import {
   Databases,
   Storage,
-  InputFile,
   Query,
   ID,
   type Models,
   Client,
+  Compression,
 } from "node-appwrite";
+import { InputFile } from "node-appwrite/file";
 import path from "path";
 import fs from "fs";
 import os from "os";
@@ -385,7 +386,7 @@ export const afterImportActions = {
                 enabled,
                 maxFileSize,
                 allowedExtensions,
-                compression,
+                compression ? Compression.Gzip : undefined,
                 encryption,
                 antivirus
               )
@@ -402,7 +403,7 @@ export const afterImportActions = {
               enabled,
               maxFileSize,
               allowedExtensions,
-              compression,
+              compression ? Compression.Gzip : undefined,
               encryption,
               antivirus
             )

package/src/migrations/databases.ts

@@ -1,4 +1,10 @@
-import { Client, Databases, Query, type Models } from "node-appwrite";
+import {
+  Client,
+  Databases,
+  IndexType,
+  Query,
+  type Models,
+} from "node-appwrite";
 import {
   getAppwriteClient,
   tryAwaitWithRetry,
@@ -139,7 +145,7 @@ export const transferDatabaseLocalToLocal = async (
               targetDbId,
               newCollection.$id,
               index.key,
-              index.type,
+              index.type as IndexType,
               index.attributes,
               index.orders
             )
@@ -226,7 +232,7 @@ export const transferDatabaseLocalToRemote = async (
             toDbId,
             toCollection.$id,
             index.key,
-            index.type,
+            index.type as IndexType,
             index.attributes,
             index.orders
           )

package/src/migrations/importDataActions.ts

@@ -1,10 +1,4 @@
-import {
-  ID,
-  InputFile,
-  Query,
-  type Databases,
-  type Storage,
-} from "node-appwrite";
+import { type Databases, type Storage } from "node-appwrite";
 import type { AppwriteConfig } from "appwrite-utils";
 import {
   validationRules,

package/src/migrations/indexes.ts

@@ -1,5 +1,5 @@
 import { indexSchema, type Index } from "appwrite-utils";
-import { Databases, Query, type Models } from "node-appwrite";
+import { Databases, IndexType, Query, type Models } from "node-appwrite";
 import { tryAwaitWithRetry } from "../utils/helperFunctions.js";
 // import {}
 
@@ -19,7 +19,7 @@ export const createOrUpdateIndex = async (
     dbId,
     collectionId,
     index.key,
-    index.type,
+    index.type as IndexType,
     index.attributes,
     index.orders
   );

package/src/migrations/storage.ts

@@ -2,11 +2,11 @@ import {
   Storage,
   Databases,
   Query,
-  InputFile,
   type Models,
   ID,
   Permission,
 } from "node-appwrite";
+import { InputFile } from "node-appwrite/file";
 import { type OperationCreate, type BackupCreate } from "./backup.js";
 import { splitIntoBatches } from "./migrationHelper.js";
 import type { AppwriteConfig } from "appwrite-utils";
@@ -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
@@ -490,12 +512,16 @@ export const transferStorageLocalToRemote = async (
   }
 
   for (const file of allFromFiles) {
+    const fileData = await tryAwaitWithRetry(
+      async () => await localStorage.getFileDownload(file.bucketId, file.$id)
+    );
+    const fileToCreate = InputFile.fromBuffer(Buffer.from(fileData), file.name);
     await tryAwaitWithRetry(
       async () =>
         await remoteStorage.createFile(
           toBucketId,
           file.$id,
-          file,
+          fileToCreate,
           file.$permissions
         )
     );