appwrite-utils-cli 0.9.997 → 0.9.998

package/README.md

@@ -147,6 +147,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.998: Fixed transfer finally, added `--targetDbId` and `--sourceDbId` as aliases
 - 0.9.994: Added function deployment management, in BETA, and fixed document transfer between databases
 - 0.9.993: Fixed `updateFunctionSpecifications` resetting functions to default with undefined values (oops)
 - 0.9.992: Added `updateFunctionSpecifications` which lists functions and specifications to allow you to update your functions max CPU and RAM usage per-function

package/dist/main.js

@@ -79,12 +79,12 @@ const argv = yargs(hideBin(process.argv))
     description: "Transfer data between databases or collections",
 })
     .option("fromDbId", {
-    alias: ["fromDb"],
+    alias: ["fromDb", "sourceDbId", "sourceDb"],
     type: "string",
     description: "Set the source database ID for transfer",
 })
     .option("toDbId", {
-    alias: ["toDb"],
+    alias: ["toDb", "targetDbId", "targetDb"],
     type: "string",
     description: "Set the destination database ID for transfer",
 })
@@ -141,7 +141,7 @@ const argv = yargs(hideBin(process.argv))
         "s-4vcpu-4gb",
         "s-4vcpu-8gb",
         "s-8vcpu-4gb",
-        "s-8vcpu-8gb"
+        "s-8vcpu-8gb",
     ],
 })
     .parse();
@@ -264,66 +264,65 @@ async function main() {
             await controller.importData(options);
         }
         if (parsedArgv.transfer) {
-            if (parsedArgv.transfer) {
-                const isRemote = !!parsedArgv.remoteEndpoint;
-                let fromDb, toDb;
-                let targetDatabases;
-                let targetStorage;
-                // Only fetch databases if database IDs are provided
-                if (parsedArgv.fromDbId && parsedArgv.toDbId) {
-                    fromDb = (await controller.getDatabasesByIds([parsedArgv.fromDbId]))[0];
-                    if (isRemote) {
-                        if (!parsedArgv.remoteEndpoint ||
-                            !parsedArgv.remoteProjectId ||
-                            !parsedArgv.remoteApiKey) {
-                            throw new Error("Remote transfer details are missing");
-                        }
-                        const remoteClient = getClient(parsedArgv.remoteEndpoint, parsedArgv.remoteProjectId, parsedArgv.remoteApiKey);
-                        targetDatabases = new Databases(remoteClient);
-                        targetStorage = new Storage(remoteClient);
-                        const remoteDbs = await fetchAllDatabases(targetDatabases);
-                        toDb = remoteDbs.find((db) => db.$id === parsedArgv.toDbId);
-                    }
-                    else {
-                        toDb = (await controller.getDatabasesByIds([parsedArgv.toDbId]))[0];
-                    }
-                    if (!fromDb || !toDb) {
-                        throw new Error("Source or target database not found");
+            const isRemote = !!parsedArgv.remoteEndpoint;
+            let fromDb, toDb;
+            let targetDatabases;
+            let targetStorage;
+            // Only fetch databases if database IDs are provided
+            if (parsedArgv.fromDbId && parsedArgv.toDbId) {
+                console.log(chalk.blue(`Starting database transfer from ${parsedArgv.fromDbId} to ${parsedArgv.toDbId}`));
+                fromDb = (await controller.getDatabasesByIds([parsedArgv.fromDbId]))[0];
+                if (isRemote) {
+                    if (!parsedArgv.remoteEndpoint ||
+                        !parsedArgv.remoteProjectId ||
+                        !parsedArgv.remoteApiKey) {
+                        throw new Error("Remote transfer details are missing");
                     }
+                    const remoteClient = getClient(parsedArgv.remoteEndpoint, parsedArgv.remoteProjectId, parsedArgv.remoteApiKey);
+                    targetDatabases = new Databases(remoteClient);
+                    targetStorage = new Storage(remoteClient);
+                    const remoteDbs = await fetchAllDatabases(targetDatabases);
+                    toDb = remoteDbs.find((db) => db.$id === parsedArgv.toDbId);
                 }
-                // Handle storage setup
-                let sourceBucket, targetBucket;
-                if (parsedArgv.fromBucketId) {
-                    sourceBucket = await controller.storage?.getBucket(parsedArgv.fromBucketId);
+                else {
+                    toDb = (await controller.getDatabasesByIds([parsedArgv.toDbId]))[0];
                 }
-                if (parsedArgv.toBucketId) {
-                    if (isRemote) {
-                        if (!targetStorage) {
-                            const remoteClient = getClient(parsedArgv.remoteEndpoint, parsedArgv.remoteProjectId, parsedArgv.remoteApiKey);
-                            targetStorage = new Storage(remoteClient);
-                        }
-                        targetBucket = await targetStorage?.getBucket(parsedArgv.toBucketId);
-                    }
-                    else {
-                        targetBucket = await controller.storage?.getBucket(parsedArgv.toBucketId);
+                if (!fromDb || !toDb) {
+                    throw new Error("Source or target database not found");
+                }
+            }
+            // Handle storage setup
+            let sourceBucket, targetBucket;
+            if (parsedArgv.fromBucketId) {
+                sourceBucket = await controller.storage?.getBucket(parsedArgv.fromBucketId);
+            }
+            if (parsedArgv.toBucketId) {
+                if (isRemote) {
+                    if (!targetStorage) {
+                        const remoteClient = getClient(parsedArgv.remoteEndpoint, parsedArgv.remoteProjectId, parsedArgv.remoteApiKey);
+                        targetStorage = new Storage(remoteClient);
                     }
+                    targetBucket = await targetStorage?.getBucket(parsedArgv.toBucketId);
                 }
-                // Validate that at least one transfer type is specified
-                if (!fromDb && !sourceBucket) {
-                    throw new Error("No source database or bucket specified for transfer");
+                else {
+                    targetBucket = await controller.storage?.getBucket(parsedArgv.toBucketId);
                 }
-                const transferOptions = {
-                    isRemote,
-                    fromDb,
-                    targetDb: toDb,
-                    transferEndpoint: parsedArgv.remoteEndpoint,
-                    transferProject: parsedArgv.remoteProjectId,
-                    transferKey: parsedArgv.remoteApiKey,
-                    sourceBucket: sourceBucket,
-                    targetBucket: targetBucket,
-                };
-                await controller.transferData(transferOptions);
             }
+            // Validate that at least one transfer type is specified
+            if (!fromDb && !sourceBucket) {
+                throw new Error("No source database or bucket specified for transfer");
+            }
+            const transferOptions = {
+                isRemote,
+                fromDb,
+                targetDb: toDb,
+                transferEndpoint: parsedArgv.remoteEndpoint,
+                transferProject: parsedArgv.remoteProjectId,
+                transferKey: parsedArgv.remoteApiKey,
+                sourceBucket: sourceBucket,
+                targetBucket: targetBucket,
+            };
+            await controller.transferData(transferOptions);
         }
     }
 }

package/dist/migrations/transfer.js

@@ -249,6 +249,7 @@ export const transferDocumentsBetweenDbsLocalToRemote = async (localDb, endpoint
  * @return {Promise<void>} A promise that resolves when the transfer is complete.
  */
 export const transferDatabaseLocalToLocal = async (localDb, fromDbId, targetDbId) => {
+    console.log(chalk.blue(`Starting database transfer from ${fromDbId} to ${targetDbId}`));
     // Get all collections from source database
     const sourceCollections = await fetchAllCollections(fromDbId, localDb);
     console.log(chalk.blue(`Found ${sourceCollections.length} collections in source database`));
@@ -296,12 +297,12 @@ export const transferDatabaseLocalToLocal = async (localDb, fromDbId, targetDbId
             for (const index of collection.indexes) {
                 const existingIndex = existingIndexes.indexes.find((idx) => idx.key === index.key);
                 if (!existingIndex) {
-                    await createOrUpdateIndex(targetDbId, localDb, targetCollection.$id, index);
+                    await tryAwaitWithRetry(async () => createOrUpdateIndex(targetDbId, localDb, targetCollection.$id, index));
                     console.log(chalk.green(`Index ${index.key} created`));
                 }
                 else {
                     console.log(chalk.blue(`Index ${index.key} exists, checking for updates...`));
-                    await createOrUpdateIndex(targetDbId, localDb, targetCollection.$id, index);
+                    await tryAwaitWithRetry(async () => createOrUpdateIndex(targetDbId, localDb, targetCollection.$id, index));
                 }
             }
             // Transfer documents

package/dist/utilsController.js

@@ -314,7 +314,6 @@ export class UtilsController {
             if (!fromDb || !targetDb) {
                 throw new Error("Source or target database not found");
             }
-            console.log(chalk.blue(`Starting database transfer from ${fromDb.$id} to ${targetDb.$id}`));
             if (options.isRemote && targetClient) {
                 await transferDatabaseLocalToRemote(sourceClient, options.transferEndpoint, options.transferProject, options.transferKey, fromDb.$id, targetDb.$id);
             }

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.9.997",
+  "version": "0.9.998",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/main.ts

@@ -120,12 +120,12 @@ const argv = yargs(hideBin(process.argv))
     description: "Transfer data between databases or collections",
   })
   .option("fromDbId", {
-    alias: ["fromDb"],
+    alias: ["fromDb", "sourceDbId", "sourceDb"],
     type: "string",
     description: "Set the source database ID for transfer",
   })
   .option("toDbId", {
-    alias: ["toDb"],
+    alias: ["toDb", "targetDbId", "targetDb"],
     type: "string",
     description: "Set the destination database ID for transfer",
   })
@@ -182,7 +182,7 @@ const argv = yargs(hideBin(process.argv))
       "s-4vcpu-4gb",
       "s-4vcpu-8gb",
       "s-8vcpu-4gb",
-      "s-8vcpu-8gb"
+      "s-8vcpu-8gb",
     ],
   })
   .parse() as ParsedArgv;
@@ -220,15 +220,32 @@ async function main() {
 
     if (parsedArgv.updateFunctionSpec) {
       if (!parsedArgv.functionId || !parsedArgv.specification) {
-        throw new Error("Function ID and specification are required for updating function specs");
+        throw new Error(
+          "Function ID and specification are required for updating function specs"
+        );
       }
-      console.log(chalk.yellow(`Updating function specification for ${parsedArgv.functionId} to ${parsedArgv.specification}, checking if specification exists...`));
-      const specifications = await listSpecifications(controller.appwriteServer!);
-      if (!specifications.specifications.some((s: { slug: string }) => s.slug === parsedArgv.specification)) {
-        console.log(chalk.red(`Specification ${parsedArgv.specification} not found`));
+      console.log(
+        chalk.yellow(
+          `Updating function specification for ${parsedArgv.functionId} to ${parsedArgv.specification}, checking if specification exists...`
+        )
+      );
+      const specifications = await listSpecifications(
+        controller.appwriteServer!
+      );
+      if (
+        !specifications.specifications.some(
+          (s: { slug: string }) => s.slug === parsedArgv.specification
+        )
+      ) {
+        console.log(
+          chalk.red(`Specification ${parsedArgv.specification} not found`)
+        );
         return;
       }
-      await controller.updateFunctionSpecifications(parsedArgv.functionId, parsedArgv.specification as Specification);
+      await controller.updateFunctionSpecifications(
+        parsedArgv.functionId,
+        parsedArgv.specification as Specification
+      );
     }
 
     // Add default databases if not specified
@@ -332,91 +349,88 @@ async function main() {
     }
 
     if (parsedArgv.transfer) {
-      if (parsedArgv.transfer) {
-        const isRemote = !!parsedArgv.remoteEndpoint;
-        let fromDb, toDb: Models.Database | undefined;
-        let targetDatabases: Databases | undefined;
-        let targetStorage: Storage | undefined;
+      const isRemote = !!parsedArgv.remoteEndpoint;
+      let fromDb, toDb: Models.Database | undefined;
+      let targetDatabases: Databases | undefined;
+      let targetStorage: Storage | undefined;
 
-        // Only fetch databases if database IDs are provided
-        if (parsedArgv.fromDbId && parsedArgv.toDbId) {
-          fromDb = (
-            await controller.getDatabasesByIds([parsedArgv.fromDbId])
-          )[0];
+      // Only fetch databases if database IDs are provided
+      if (parsedArgv.fromDbId && parsedArgv.toDbId) {
+        console.log(
+          chalk.blue(
+            `Starting database transfer from ${parsedArgv.fromDbId} to ${parsedArgv.toDbId}`
+          )
+        );
+        fromDb = (await controller.getDatabasesByIds([parsedArgv.fromDbId]))[0];
 
-          if (isRemote) {
-            if (
-              !parsedArgv.remoteEndpoint ||
-              !parsedArgv.remoteProjectId ||
-              !parsedArgv.remoteApiKey
-            ) {
-              throw new Error("Remote transfer details are missing");
-            }
-            const remoteClient = getClient(
-              parsedArgv.remoteEndpoint,
-              parsedArgv.remoteProjectId,
-              parsedArgv.remoteApiKey
-            );
-            targetDatabases = new Databases(remoteClient);
-            targetStorage = new Storage(remoteClient);
-            const remoteDbs = await fetchAllDatabases(targetDatabases);
-            toDb = remoteDbs.find((db) => db.$id === parsedArgv.toDbId);
-          } else {
-            toDb = (await controller.getDatabasesByIds([parsedArgv.toDbId]))[0];
-          }
-
-          if (!fromDb || !toDb) {
-            throw new Error("Source or target database not found");
+        if (isRemote) {
+          if (
+            !parsedArgv.remoteEndpoint ||
+            !parsedArgv.remoteProjectId ||
+            !parsedArgv.remoteApiKey
+          ) {
+            throw new Error("Remote transfer details are missing");
           }
+          const remoteClient = getClient(
+            parsedArgv.remoteEndpoint,
+            parsedArgv.remoteProjectId,
+            parsedArgv.remoteApiKey
+          );
+          targetDatabases = new Databases(remoteClient);
+          targetStorage = new Storage(remoteClient);
+          const remoteDbs = await fetchAllDatabases(targetDatabases);
+          toDb = remoteDbs.find((db) => db.$id === parsedArgv.toDbId);
+        } else {
+          toDb = (await controller.getDatabasesByIds([parsedArgv.toDbId]))[0];
         }
 
-        // Handle storage setup
-        let sourceBucket, targetBucket;
-        if (parsedArgv.fromBucketId) {
-          sourceBucket = await controller.storage?.getBucket(
-            parsedArgv.fromBucketId
-          );
+        if (!fromDb || !toDb) {
+          throw new Error("Source or target database not found");
         }
-        if (parsedArgv.toBucketId) {
-          if (isRemote) {
-            if (!targetStorage) {
-              const remoteClient = getClient(
-                parsedArgv.remoteEndpoint!,
-                parsedArgv.remoteProjectId!,
-                parsedArgv.remoteApiKey!
-              );
-              targetStorage = new Storage(remoteClient);
-            }
-            targetBucket = await targetStorage?.getBucket(
-              parsedArgv.toBucketId
-            );
-          } else {
-            targetBucket = await controller.storage?.getBucket(
-              parsedArgv.toBucketId
+      }
+
+      // Handle storage setup
+      let sourceBucket, targetBucket;
+      if (parsedArgv.fromBucketId) {
+        sourceBucket = await controller.storage?.getBucket(
+          parsedArgv.fromBucketId
+        );
+      }
+      if (parsedArgv.toBucketId) {
+        if (isRemote) {
+          if (!targetStorage) {
+            const remoteClient = getClient(
+              parsedArgv.remoteEndpoint!,
+              parsedArgv.remoteProjectId!,
+              parsedArgv.remoteApiKey!
             );
+            targetStorage = new Storage(remoteClient);
           }
-        }
-
-        // Validate that at least one transfer type is specified
-        if (!fromDb && !sourceBucket) {
-          throw new Error(
-            "No source database or bucket specified for transfer"
+          targetBucket = await targetStorage?.getBucket(parsedArgv.toBucketId);
+        } else {
+          targetBucket = await controller.storage?.getBucket(
+            parsedArgv.toBucketId
           );
         }
+      }
 
-        const transferOptions: TransferOptions = {
-          isRemote,
-          fromDb,
-          targetDb: toDb,
-          transferEndpoint: parsedArgv.remoteEndpoint,
-          transferProject: parsedArgv.remoteProjectId,
-          transferKey: parsedArgv.remoteApiKey,
-          sourceBucket: sourceBucket,
-          targetBucket: targetBucket,
-        };
-
-        await controller.transferData(transferOptions);
+      // Validate that at least one transfer type is specified
+      if (!fromDb && !sourceBucket) {
+        throw new Error("No source database or bucket specified for transfer");
       }
+
+      const transferOptions: TransferOptions = {
+        isRemote,
+        fromDb,
+        targetDb: toDb,
+        transferEndpoint: parsedArgv.remoteEndpoint,
+        transferProject: parsedArgv.remoteProjectId,
+        transferKey: parsedArgv.remoteApiKey,
+        sourceBucket: sourceBucket,
+        targetBucket: targetBucket,
+      };
+
+      await controller.transferData(transferOptions);
     }
   }
 }

package/src/migrations/transfer.ts

@@ -439,6 +439,9 @@ export const transferDatabaseLocalToLocal = async (
   fromDbId: string,
   targetDbId: string
 ) => {
+  console.log(
+    chalk.blue(`Starting database transfer from ${fromDbId} to ${targetDbId}`)
+  );
   // Get all collections from source database
   const sourceCollections = await fetchAllCollections(fromDbId, localDb);
   console.log(
@@ -557,22 +560,26 @@ export const transferDatabaseLocalToLocal = async (
         );
 
         if (!existingIndex) {
-          await createOrUpdateIndex(
-            targetDbId,
-            localDb,
-            targetCollection.$id,
-            index as any
+          await tryAwaitWithRetry(async () =>
+            createOrUpdateIndex(
+              targetDbId,
+              localDb,
+              targetCollection.$id,
+              index as any
+            )
           );
           console.log(chalk.green(`Index ${index.key} created`));
         } else {
           console.log(
             chalk.blue(`Index ${index.key} exists, checking for updates...`)
           );
-          await createOrUpdateIndex(
-            targetDbId,
-            localDb,
-            targetCollection.$id,
-            index as any
+          await tryAwaitWithRetry(async () =>
+            createOrUpdateIndex(
+              targetDbId,
+              localDb,
+              targetCollection.$id,
+              index as any
+            )
           );
         }
       }

package/src/utilsController.ts

@@ -468,12 +468,6 @@ export class UtilsController {
         throw new Error("Source or target database not found");
       }
 
-      console.log(
-        chalk.blue(
-          `Starting database transfer from ${fromDb.$id} to ${targetDb.$id}`
-        )
-      );
-
       if (options.isRemote && targetClient) {
         await transferDatabaseLocalToRemote(
           sourceClient,