Merge pull request #170 from appwrite/dev

feat: Add multi-region support to init command

Author: christyjacob4

CHANGELOG.md

@@ -0,0 +1,61 @@
+# Change Log
+
+## 8.1.0
+
+* Add multi-region support to `init` command
+* Update `init` command to clear previous configuration in `appwrite.json`
+* Update localConfig to store multi-region endpoint
+* Fix throw error when creating unknown attribute instead of timing out
+* Fix equal comparison of large numbers and BigNumber instances using proper equality checks
+* Fix duplication of reasons when comparing localConfig with remoteConfig
+* Fix `firstOrNull()` to `firstOrNull` in types generation for dart
+* Refactor to use `isCloud()` method consistently
+
+## 8.0.2
+
+* Add Type generation fixes:
+  * Properly handle enum attributes in dart, java and kotlin
+  * Fix initialisation of null attributes in dart's fromMap method
+  * Fix relationships and enums in swift
+
+## 8.0.1
+
+* Add `resourceId` and `resourceType` attributes to `createRedirectRule`
+* Add `providerReference` to vcs command for getting repository contents
+* Add warning comment to `bulk updateDocuments` method
+* Fix type generation for enums in Typescript and PHP language
+
+## 8.0.0
+
+* Add `types` command to generate language specific typings for collections. Currently supports - `php`, `swift`, `dart`, `js`, `ts`, `kotlin` and `java`
+* Update bulk operation docs to include experiment feature warnings
+* Remove assistant service and commands
+
+## 7.0.0
+
+* Add `sites` command
+* Add `tokens` command
+* Add `devKeys` support to `projects` command
+* Add `init site`, `pull site` and `push site` commands
+* Add bulk operation methods like `createDocuments`, `deleteDocuments` etc.
+* Add new upsert methods: `upsertDocument` and `upsertDocuments`
+* Update GET requests to not include content-type header
+
+## 6.2.3
+
+* Fix hot swapping error in `python-ml` function
+
+## 6.2.2
+
+* Fix GitHub builds by adding `qemu-system` package
+* Fix attribute creation timed out
+
+## 6.2.1
+
+* Add `listOrganizations` method to `organizations` service and fix init project command
+
+## 6.2.0
+
+* Add specifications support to CLI
+* Update package version
+* Fix: Missed specifications param when updating a function

README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-8.0.2
+8.1.0
 ```
 
 ### Install using prebuilt binaries
@@ -60,7 +60,7 @@ $ scoop install https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/sc
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-8.0.2
+8.1.0
 ```
 
 ## Getting Started 

install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.0.2/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.0.2/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.0/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.0/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="8.0.2"
+    GITHUB_LATEST_VERSION="8.1.0"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

lib/client.js

@@ -16,8 +16,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '8.0.2',
-      'user-agent' : `AppwriteCLI/8.0.2 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '8.1.0',
+      'user-agent' : `AppwriteCLI/8.1.0 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.7.0',
     };
   }

lib/commands/init.js

@@ -28,6 +28,7 @@ const { cliConfig, success, log, hint, error, actionRunner, commandDescriptions
 const { accountGet } = require("./account");
 const { sitesListTemplates } = require("./sites");
 const { sdkForConsole } = require("../sdks");
+const { isCloud } = require('../utils');
 
 const initResources = async () => {
     const actions = {
@@ -94,6 +95,9 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         }
     }
 
+    localConfig.clear(); // Clear the config to avoid any conflicts
+    const url = new URL("https://cloud.appwrite.io/v1");
+    
     if (answers.start === 'new') {
         response = await projectsCreate({
             projectId: answers.id,
@@ -103,8 +107,14 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         })
 
         localConfig.setProject(response['$id']);
+        if (answers.region) {
+            localConfig.setEndpoint(`https://${answers.region}.${url.host}${url.pathname}`);
+        }
     } else {
-        localConfig.setProject(answers.project);
+        localConfig.setProject(answers.project["$id"]);
+        if(isCloud()) {
+            localConfig.setEndpoint(`https://${answers.project["region"]}.${url.host}${url.pathname}`);
+        }
     }
 
     success(`Project successfully ${answers.start === 'existing' ? 'linked' : 'created'}. Details are now stored in appwrite.json file.`);

lib/commands/push.js

@@ -568,6 +568,8 @@ const createAttribute = (databaseId, collectionId, attribute) => {
                 onDelete: attribute.onDelete,
                 parseOutput: false
             })
+        default:
+            throw new Error(`Unsupported attribute type: ${attribute.type}`);
     }
 }
 
@@ -685,6 +687,8 @@ const updateAttribute = (databaseId, collectionId, attribute) => {
                 onDelete: attribute.onDelete,
                 parseOutput: false
             })
+        default:
+            throw new Error(`Unsupported attribute type: ${attribute.type}`);
     }
 }
 const deleteAttribute = async (collection, attribute, isIndex = false) => {
@@ -708,6 +712,33 @@ const deleteAttribute = async (collection, attribute, isIndex = false) => {
     });
 }
 
+const isEqual = (a, b) => {
+    if (a === b) return true;
+    
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
+        if (a.constructor && a.constructor.name === 'BigNumber' && 
+            b.constructor && b.constructor.name === 'BigNumber') {
+            return a.eq(b);
+        }
+        
+        if (typeof a.equals === 'function') {
+            return a.equals(b);
+        }
+        
+        if (typeof a.eq === 'function') {
+            return a.eq(b);
+        }
+    }
+    
+    if (typeof a === 'number' && typeof b === 'number') {
+        if (isNaN(a) && isNaN(b)) return true;
+        if (!isFinite(a) && !isFinite(b)) return a === b;
+        return Math.abs(a - b) < Number.EPSILON;
+    }
+    
+    return false;
+};
+
 const compareAttribute = (remote, local, reason, key) => {
     if (isEmpty(remote) && isEmpty(local)) {
         return reason;
@@ -718,7 +749,7 @@ const compareAttribute = (remote, local, reason, key) => {
             const bol = reason === '' ? '' : '\n';
             reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
         }
-    } else if (remote !== local) {
+    } else if (!isEqual(remote, local)) {
         const bol = reason === '' ? '' : '\n';
         reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
     }
@@ -733,16 +764,16 @@ const compareAttribute = (remote, local, reason, key) => {
  * @param remote
  * @param local
  * @param collection
- * @param recraeting when true will check only non-changeable keys
+ * @param recreating when true will check only non-changeable keys
  * @returns {undefined|{reason: string, action: *, attribute, key: string}}
  */
-const checkAttributeChanges = (remote, local, collection, recraeting = true) => {
+const checkAttributeChanges = (remote, local, collection, recreating = true) => {
     if (local === undefined) {
         return undefined;
     }
 
     const keyName = `${chalk.yellow(local.key)} in ${collection.name} (${collection['$id']})`;
-    const action = chalk.cyan(recraeting ? 'recreating' : 'changing');
+    const action = chalk.cyan(recreating ? 'recreating' : 'changing');
     let reason = '';
     let attribute = remote;
 
@@ -752,17 +783,17 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
         }
 
         if (changeableKeys.includes(key)) {
-            if (!recraeting) {
-                reason += compareAttribute(remote[key], local[key], reason, key)
+            if (!recreating) {
+                reason = compareAttribute(remote[key], local[key], reason, key)
             }
             continue;
         }
 
-        if (!recraeting) {
+        if (!recreating) {
             continue;
         }
 
-        reason += compareAttribute(remote[key], local[key], reason, key)
+        reason = compareAttribute(remote[key], local[key], reason, key)
     }
 
     return reason === '' ? undefined : { key: keyName, attribute, reason, action };

lib/config.js

@@ -150,6 +150,14 @@ class Local extends Config {
         return _path.dirname(this.path)
     }
 
+    getEndpoint() {
+        return this.get('endpoint') || '';
+    }
+
+    setEndpoint(endpoint) {
+        this.set('endpoint', endpoint);
+    }
+
     getSites() {
         if (!this.has("sites")) {
             return [];

lib/parser.js

@@ -5,6 +5,7 @@ const { description } = require('../package.json');
 const { globalConfig } = require("./config.js");
 const os = require('os');
 const Client = require("./client");
+const { isCloud } = require("./utils");
 
 const cliConfig = {
     verbose: false,
@@ -111,7 +112,6 @@ const parseError = (err) => {
         (async () => {
             let appwriteVersion = 'unknown';
             const endpoint = globalConfig.getEndpoint();
-            const isCloud = endpoint.includes('cloud.appwrite.io') ? 'Yes' : 'No';
 
             try {
                 const client = new Client().setEndpoint(endpoint);
@@ -120,9 +120,9 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '8.0.2';
+            const version = '8.1.0';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
-            const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
+            const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud()}`;
 
             const stack = '```\n' + err.stack + '\n```';
 

lib/questions.js

@@ -11,7 +11,7 @@ const { validateRequired } = require("./validations");
 const { paginate } = require('./paginate');
 const { isPortTaken } = require('./utils');
 const { databasesList } = require('./commands/databases');
-const { checkDeployConditions } = require('./utils');
+const { checkDeployConditions, isCloud } = require('./utils');
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { sitesListFrameworks, sitesListSpecifications, sitesList } = require('./commands/sites');
 
@@ -154,8 +154,7 @@ const questionsInitProject = [
         message: "Choose your organization",
         choices: async () => {
             let client = await sdkForConsole(true);
-            const hostname = new URL(client.endpoint).hostname;
-            const { teams } = hostname.endsWith('appwrite.io')
+            const { teams } = isCloud()
                 ? await paginate(organizationsList, { parseOutput: false, sdk: client }, 100, 'teams') 
                 : await paginate(teamsList, { parseOutput: false, sdk: client }, 100, 'teams');
 
@@ -203,17 +202,41 @@ const questionsInitProject = [
             let choices = projects.map((project) => {
                 return {
                     name: `${project.name} (${project['$id']})`,
-                    value: project['$id']
+                    value: {
+                        "$id": project['$id'],
+                        "region": project.region || ''
+                    }
                 }
             })
 
-            if (choices.length == 0) {
+            if (choices.length === 0) {
                 throw new Error("No projects found. Please create a new project.")
             }
 
             return choices;
         },
         when: (answer) => answer.start === 'existing'
+    },
+    {
+        type: "list",
+        name: "region",
+        message: "Select your Appwrite Cloud region",
+        choices: async () => {
+            let client = await sdkForConsole(true);
+            let response = await client.call("GET", "/console/regions");
+            let regions = response.regions || [];
+            if (!regions.length) {
+                throw new Error("No regions found. Please check your network or Appwrite Cloud availability.");
+            }
+            return regions.filter(region => !region.disabled).map(region => ({
+                name: `${region.name} (${region.$id})`,
+                value: region.$id
+            }));
+        },
+        when: (answer) => {
+            if (answer.start === 'existing') return false;
+            return isCloud();
+        }
     }
 ];
 const questionsInitProjectAutopull = [