appwrite-utils-cli 1.0.9 → 1.1.0

package/src/interactiveCLI.ts

@@ -2052,49 +2052,144 @@ export class InteractiveCLI {
     MessageFormatter.info("Starting comprehensive transfer configuration...", { prefix: "Transfer" });
 
     try {
-      // Get source configuration
-      const sourceConfig = await inquirer.prompt([
-        {
-          type: "input",
-          name: "sourceEndpoint",
-          message: "Enter the source Appwrite endpoint:",
-          validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
-        },
-        {
-          type: "input",
-          name: "sourceProject",
-          message: "Enter the source project ID:",
-          validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
-        },
-        {
-          type: "password",
-          name: "sourceKey",
-          message: "Enter the source API key:",
-          validate: (input) => input.trim() !== "" || "API key cannot be empty",
-        },
-      ]);
+      // Check if user has an appwrite config for easier setup
+      const hasAppwriteConfig = this.controller?.config?.appwriteEndpoint && 
+                               this.controller?.config?.appwriteProject && 
+                               this.controller?.config?.appwriteKey;
 
-      // Get target configuration
-      const targetConfig = await inquirer.prompt([
-        {
-          type: "input",
-          name: "targetEndpoint",
-          message: "Enter the target Appwrite endpoint:",
-          validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
-        },
-        {
-          type: "input",
-          name: "targetProject",
-          message: "Enter the target project ID:",
-          validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
-        },
-        {
-          type: "password",
-          name: "targetKey",
-          message: "Enter the target API key:",
-          validate: (input) => input.trim() !== "" || "API key cannot be empty",
-        },
-      ]);
+      let sourceConfig: any;
+      let targetConfig: any;
+
+      if (hasAppwriteConfig) {
+        // Offer to use existing config for source
+        const { useConfigForSource } = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "useConfigForSource",
+            message: "Use your current appwriteConfig as the source?",
+            default: true,
+          },
+        ]);
+
+        if (useConfigForSource) {
+          sourceConfig = {
+            sourceEndpoint: this.controller!.config!.appwriteEndpoint,
+            sourceProject: this.controller!.config!.appwriteProject,
+            sourceKey: this.controller!.config!.appwriteKey,
+          };
+          MessageFormatter.info(`Using config source: ${sourceConfig.sourceEndpoint}`, { prefix: "Transfer" });
+        } else {
+          // Get source configuration manually
+          sourceConfig = await inquirer.prompt([
+            {
+              type: "input",
+              name: "sourceEndpoint",
+              message: "Enter the source Appwrite endpoint:",
+              validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
+            },
+            {
+              type: "input",
+              name: "sourceProject",
+              message: "Enter the source project ID:",
+              validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
+            },
+            {
+              type: "password",
+              name: "sourceKey",
+              message: "Enter the source API key:",
+              validate: (input) => input.trim() !== "" || "API key cannot be empty",
+            },
+          ]);
+        }
+
+        // Offer to use existing config for target
+        const { useConfigForTarget } = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "useConfigForTarget",
+            message: "Use your current appwriteConfig as the target?",
+            default: false,
+          },
+        ]);
+
+        if (useConfigForTarget) {
+          targetConfig = {
+            targetEndpoint: this.controller!.config!.appwriteEndpoint,
+            targetProject: this.controller!.config!.appwriteProject,
+            targetKey: this.controller!.config!.appwriteKey,
+          };
+          MessageFormatter.info(`Using config target: ${targetConfig.targetEndpoint}`, { prefix: "Transfer" });
+        } else {
+          // Get target configuration manually
+          targetConfig = await inquirer.prompt([
+            {
+              type: "input",
+              name: "targetEndpoint",
+              message: "Enter the target Appwrite endpoint:",
+              validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
+            },
+            {
+              type: "input",
+              name: "targetProject",
+              message: "Enter the target project ID:",
+              validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
+            },
+            {
+              type: "password",
+              name: "targetKey",
+              message: "Enter the target API key:",
+              validate: (input) => input.trim() !== "" || "API key cannot be empty",
+            },
+          ]);
+        }
+      } else {
+        // No appwrite config found, get both configurations manually
+        MessageFormatter.info("No appwriteConfig found, please enter source and target configurations manually", { prefix: "Transfer" });
+        
+        // Get source configuration
+        sourceConfig = await inquirer.prompt([
+          {
+            type: "input",
+            name: "sourceEndpoint",
+            message: "Enter the source Appwrite endpoint:",
+            validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
+          },
+          {
+            type: "input",
+            name: "sourceProject",
+            message: "Enter the source project ID:",
+            validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
+          },
+          {
+            type: "password",
+            name: "sourceKey",
+            message: "Enter the source API key:",
+            validate: (input) => input.trim() !== "" || "API key cannot be empty",
+          },
+        ]);
+
+        // Get target configuration
+        targetConfig = await inquirer.prompt([
+          {
+            type: "input",
+            name: "targetEndpoint",
+            message: "Enter the target Appwrite endpoint:",
+            validate: (input) => input.trim() !== "" || "Endpoint cannot be empty",
+          },
+          {
+            type: "input",
+            name: "targetProject",
+            message: "Enter the target project ID:",
+            validate: (input) => input.trim() !== "" || "Project ID cannot be empty",
+          },
+          {
+            type: "password",
+            name: "targetKey",
+            message: "Enter the target API key:",
+            validate: (input) => input.trim() !== "" || "API key cannot be empty",
+          },
+        ]);
+      }
 
       // Get transfer options
       const transferOptions = await inquirer.prompt([

package/src/migrations/transfer.ts

@@ -13,6 +13,7 @@ import { getAppwriteClient } from "../utils/helperFunctions.js";
 import {
   createOrUpdateAttribute,
   createUpdateCollectionAttributes,
+  createUpdateCollectionAttributesWithStatusCheck,
 } from "../collections/attributes.js";
 import { parseAttribute } from "appwrite-utils";
 import chalk from "chalk";
@@ -22,6 +23,7 @@ import { ProgressManager } from "../shared/progressManager.js";
 import {
   createOrUpdateIndex,
   createOrUpdateIndexes,
+  createOrUpdateIndexesWithStatusCheck,
 } from "../collections/indexes.js";
 import { getClient } from "../utils/getClientFromConfig.js";
 
@@ -305,44 +307,23 @@ export const transferDatabaseLocalToLocal = async (
         );
       }
 
-      // Handle attributes
-      const existingAttributes = await tryAwaitWithRetry(
-        async () =>
-          await localDb.listAttributes(targetDbId, targetCollection.$id)
+      // Handle attributes with enhanced status checking
+      console.log(chalk.blue(`Creating attributes for collection ${collection.name} with enhanced monitoring...`));
+      
+      const allAttributes = collection.attributes.map(attr => parseAttribute(attr as any));
+      const attributeSuccess = await createUpdateCollectionAttributesWithStatusCheck(
+        localDb,
+        targetDbId,
+        targetCollection,
+        allAttributes
       );
-
-      for (const attribute of collection.attributes) {
-        const parsedAttribute = parseAttribute(attribute as any);
-        const existingAttribute = existingAttributes.attributes.find(
-          (attr: any) => attr.key === parsedAttribute.key
-        );
-
-        if (!existingAttribute) {
-          await tryAwaitWithRetry(async () =>
-            createOrUpdateAttribute(
-              localDb,
-              targetDbId,
-              targetCollection,
-              parsedAttribute
-            )
-          );
-          console.log(chalk.green(`Attribute ${parsedAttribute.key} created`));
-        } else {
-          console.log(
-            chalk.blue(
-              `Attribute ${parsedAttribute.key} exists, checking for updates...`
-            )
-          );
-          await tryAwaitWithRetry(async () =>
-            createOrUpdateAttribute(
-              localDb,
-              targetDbId,
-              targetCollection,
-              parsedAttribute
-            )
-          );
-        }
+      
+      if (!attributeSuccess) {
+        console.log(chalk.red(`❌ Failed to create all attributes for collection ${collection.name}, skipping to next collection`));
+        continue;
       }
+      
+      console.log(chalk.green(`✅ All attributes created successfully for collection ${collection.name}`));
 
       // Handle indexes
       const existingIndexes = await tryAwaitWithRetry(
@@ -474,73 +455,41 @@ export const transferDatabaseLocalToRemote = async (
         );
       }
 
-      // Handle attributes
-      const existingAttributes = await tryAwaitWithRetry(
-        async () => await remoteDb.listAttributes(toDbId, targetCollection.$id)
+      // Handle attributes with enhanced status checking
+      console.log(chalk.blue(`Creating attributes for collection ${collection.name} with enhanced monitoring...`));
+      
+      const attributesToCreate = collection.attributes.map(attr => parseAttribute(attr as any));
+      
+      const attributesSuccess = await createUpdateCollectionAttributesWithStatusCheck(
+        remoteDb,
+        toDbId,
+        targetCollection,
+        attributesToCreate
       );
-
-      for (const attribute of collection.attributes) {
-        const parsedAttribute = parseAttribute(attribute as any);
-        const existingAttribute = existingAttributes.attributes.find(
-          (attr: any) => attr.key === parsedAttribute.key
-        );
-
-        if (!existingAttribute) {
-          await tryAwaitWithRetry(async () =>
-            createOrUpdateAttribute(
-              remoteDb,
-              toDbId,
-              targetCollection,
-              parsedAttribute
-            )
-          );
-          console.log(chalk.green(`Attribute ${parsedAttribute.key} created`));
-        } else {
-          console.log(
-            chalk.blue(
-              `Attribute ${parsedAttribute.key} exists, checking for updates...`
-            )
-          );
-          await tryAwaitWithRetry(async () =>
-            createOrUpdateAttribute(
-              remoteDb,
-              toDbId,
-              targetCollection,
-              parsedAttribute
-            )
-          );
-        }
+      
+      if (!attributesSuccess) {
+        console.log(chalk.red(`Failed to create some attributes for collection ${collection.name}`));
+        // Continue with the transfer even if some attributes failed
+      } else {
+        console.log(chalk.green(`All attributes created successfully for collection ${collection.name}`));
       }
 
-      // Handle indexes
-      const existingIndexes = await tryAwaitWithRetry(
-        async () => await remoteDb.listIndexes(toDbId, targetCollection.$id)
+      // Handle indexes with enhanced status checking
+      console.log(chalk.blue(`Creating indexes for collection ${collection.name} with enhanced monitoring...`));
+      
+      const indexesSuccess = await createOrUpdateIndexesWithStatusCheck(
+        toDbId,
+        remoteDb,
+        targetCollection.$id,
+        targetCollection,
+        collection.indexes as any
       );
-
-      for (const index of collection.indexes) {
-        const existingIndex = existingIndexes.indexes.find(
-          (idx) => idx.key === index.key
-        );
-
-        if (!existingIndex) {
-          await createOrUpdateIndex(
-            toDbId,
-            remoteDb,
-            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(
-            toDbId,
-            remoteDb,
-            targetCollection.$id,
-            index as any
-          );
-        }
+      
+      if (!indexesSuccess) {
+        console.log(chalk.red(`Failed to create some indexes for collection ${collection.name}`));
+        // Continue with the transfer even if some indexes failed
+      } else {
+        console.log(chalk.green(`All indexes created successfully for collection ${collection.name}`));
       }
 
       // Transfer documents