chore: update existing project to fetch region too

Author: ChiragAgg5k

templates/cli/lib/commands/init.js.twig

@@ -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,12 +95,8 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         }
     }
 
-    if (answers.region) {
-        const endpoint = `https://${answers.region}.cloud.appwrite.io/v1`;
-        localConfig.setEndpoint(endpoint);
-    }
-
     if (answers.start === 'new') {
+        localConfig.clear();
         response = await projectsCreate({
             projectId: answers.id,
             name: answers.project,
@@ -108,8 +105,17 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         })
 
         localConfig.setProject(response['$id']);
+
+        if (answers.region) {
+            const endpoint = `https://${answers.region}.cloud.appwrite.io/v1`;
+            localConfig.setEndpoint(endpoint);
+        }
     } else {
-        localConfig.setProject(answers.project);
+        localConfig.setProject(answers.project["$id"]);
+        if(isCloud()) {
+            const endpoint = `https://${answers.project["region"]}.cloud.appwrite.io/v1`;
+            localConfig.setEndpoint(endpoint);
+        }
     }
 
     success(`Project successfully ${answers.start === 'existing' ? 'linked' : 'created'}. Details are now stored in appwrite.json file.`);

templates/cli/lib/questions.js.twig

@@ -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,7 +202,10 @@ const questionsInitProject = [
             let choices = projects.map((project) => {
                 return {
                     name: `${project.name} (${project['$id']})`,
-                    value: project['$id']
+                    value: {
+                        "$id": project['$id'],
+                        "region": project.region || ''
+                    }
                 }
             })
 
@@ -231,14 +233,9 @@ const questionsInitProject = [
                 value: region.$id
             }));
         },
-        when: () => {
-            try {
-                const endpoint = globalConfig.getEndpoint() || "https://cloud.appwrite.io/v1";
-                const hostname = new URL(endpoint).hostname;
-                return hostname.endsWith('appwrite.io');
-            } catch {
-                return false;
-            }
+        when: (answer) => {
+            if (answer.start === 'existing') return false;
+            return isCloud();
         }
     }
 ];

templates/cli/lib/utils.js.twig

@@ -274,10 +274,17 @@ function getUsersPath(action, ids) {
     return path;
 }
 
+function isCloud() {
+    const endpoint = globalConfig.getEndpoint() || "https://cloud.appwrite.io/v1";
+    const hostname = new URL(endpoint).hostname;
+    return hostname.endsWith('appwrite.io');
+}
+
 module.exports = {
     getAllFiles,
     isPortTaken,
     systemHasCommand,
     checkDeployConditions,
-    showConsoleLink
+    showConsoleLink,
+    isCloud
 };