appwrite-cli 2.0.2 → 4.0.0

package/lib/commands/generic.js

@@ -80,6 +80,7 @@ const client = new Command("client")
                 }
 
                 let client = new Client().setEndpoint(endpoint);
+                client.setProject('console');
                 if (selfSigned || globalConfig.getSelfSigned()) {
                     client.setSelfSigned(true);
                 }

package/lib/commands/graphql.js

@@ -18,7 +18,7 @@ const graphqlQuery = async ({ query, parseOutput = true, sdk = undefined}) => {
     /* @param {object} query */
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/graphql';
+    let apiPath = '/graphql';
     let payload = {};
     
     /** Body Params */
@@ -27,7 +27,7 @@ const graphqlQuery = async ({ query, parseOutput = true, sdk = undefined}) => {
     }
 
     let response = undefined;
-    response = await client.call('post', path, {
+    response = await client.call('post', apiPath, {
         'x-sdk-graphql': 'true',
         'content-type': 'application/json',
     }, payload);
@@ -43,7 +43,7 @@ const graphqlMutation = async ({ query, parseOutput = true, sdk = undefined}) =>
     /* @param {object} query */
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/graphql/mutation';
+    let apiPath = '/graphql/mutation';
     let payload = {};
     
     /** Body Params */
@@ -52,7 +52,7 @@ const graphqlMutation = async ({ query, parseOutput = true, sdk = undefined}) =>
     }
 
     let response = undefined;
-    response = await client.call('post', path, {
+    response = await client.call('post', apiPath, {
         'x-sdk-graphql': 'true',
         'content-type': 'application/json',
     }, payload);

package/lib/commands/health.js

@@ -17,10 +17,10 @@ const health = new Command("health").description(commandDescriptions['health']).
 const healthGet = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health';
+    let apiPath = '/health';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -34,10 +34,10 @@ const healthGet = async ({ parseOutput = true, sdk = undefined}) => {
 const healthGetAntivirus = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/anti-virus';
+    let apiPath = '/health/anti-virus';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -51,10 +51,10 @@ const healthGetAntivirus = async ({ parseOutput = true, sdk = undefined}) => {
 const healthGetCache = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/cache';
+    let apiPath = '/health/cache';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -68,10 +68,44 @@ const healthGetCache = async ({ parseOutput = true, sdk = undefined}) => {
 const healthGetDB = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/db';
+    let apiPath = '/health/db';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+    
+    if (parseOutput) {
+        parse(response)
+        success()
+    }
+    return response;
+}
+
+const healthGetPubSub = async ({ parseOutput = true, sdk = undefined}) => {
+
+    let client = !sdk ? await sdkForProject() : sdk;
+    let apiPath = '/health/pubsub';
+    let payload = {};
+    let response = undefined;
+    response = await client.call('get', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+    
+    if (parseOutput) {
+        parse(response)
+        success()
+    }
+    return response;
+}
+
+const healthGetQueue = async ({ parseOutput = true, sdk = undefined}) => {
+
+    let client = !sdk ? await sdkForProject() : sdk;
+    let apiPath = '/health/queue';
+    let payload = {};
+    let response = undefined;
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -85,10 +119,10 @@ const healthGetDB = async ({ parseOutput = true, sdk = undefined}) => {
 const healthGetQueueCertificates = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/queue/certificates';
+    let apiPath = '/health/queue/certificates';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -102,10 +136,10 @@ const healthGetQueueCertificates = async ({ parseOutput = true, sdk = undefined}
 const healthGetQueueFunctions = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/queue/functions';
+    let apiPath = '/health/queue/functions';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -119,10 +153,10 @@ const healthGetQueueFunctions = async ({ parseOutput = true, sdk = undefined}) =
 const healthGetQueueLogs = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/queue/logs';
+    let apiPath = '/health/queue/logs';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -136,10 +170,10 @@ const healthGetQueueLogs = async ({ parseOutput = true, sdk = undefined}) => {
 const healthGetQueueWebhooks = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/queue/webhooks';
+    let apiPath = '/health/queue/webhooks';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -153,10 +187,10 @@ const healthGetQueueWebhooks = async ({ parseOutput = true, sdk = undefined}) =>
 const healthGetStorageLocal = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/storage/local';
+    let apiPath = '/health/storage/local';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -170,10 +204,10 @@ const healthGetStorageLocal = async ({ parseOutput = true, sdk = undefined}) =>
 const healthGetTime = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/health/time';
+    let apiPath = '/health/time';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -197,14 +231,24 @@ health
 
 health
     .command(`getCache`)
-    .description(`Check the Appwrite in-memory cache server is up and connection is successful.`)
+    .description(`Check the Appwrite in-memory cache servers are up and connection is successful.`)
     .action(actionRunner(healthGetCache))
 
 health
     .command(`getDB`)
-    .description(`Check the Appwrite database server is up and connection is successful.`)
+    .description(`Check the Appwrite database servers are up and connection is successful.`)
     .action(actionRunner(healthGetDB))
 
+health
+    .command(`getPubSub`)
+    .description(`Check the Appwrite pub-sub servers are up and connection is successful.`)
+    .action(actionRunner(healthGetPubSub))
+
+health
+    .command(`getQueue`)
+    .description(`Check the Appwrite queue messaging servers are up and connection is successful.`)
+    .action(actionRunner(healthGetQueue))
+
 health
     .command(`getQueueCertificates`)
     .description(`Get the number of certificates that are waiting to be issued against [Letsencrypt](https://letsencrypt.org/) in the Appwrite internal queue server.`)
@@ -242,6 +286,8 @@ module.exports = {
     healthGetAntivirus,
     healthGetCache,
     healthGetDB,
+    healthGetPubSub,
+    healthGetQueue,
     healthGetQueueCertificates,
     healthGetQueueFunctions,
     healthGetQueueLogs,

package/lib/commands/init.js

@@ -72,16 +72,22 @@ const initFunction = async () => {
         log(`Entrypoint for this runtime not found. You will be asked to configure entrypoint when you first deploy the function.`);
     }
 
+    if (!answers.runtime.commands) {
+        log(`Installation command for this runtime not found. You will be asked to configure the install command when you first deploy the function.`);
+    }
+
     let response = await functionsCreate({
         functionId: answers.id,
         name: answers.name,
         runtime: answers.runtime.id,
+        entrypoint: answers.runtime.entrypoint || '',
+        commands: answers.runtime.commands || '',
         parseOutput: false
     })
 
     fs.mkdirSync(functionDir, "777");
 
-    let gitInitCommands = "git clone --depth 1 --sparse https://github.com/appwrite/functions-starter ."; // depth prevents fetching older commits reducing the amount fetched
+    let gitInitCommands = "git clone -b v3 --single-branch --depth 1 --sparse https://github.com/appwrite/functions-starter ."; // depth prevents fetching older commits reducing the amount fetched
 
     let gitPullCommands = `git sparse-checkout add ${answers.runtime.id}`;
 
@@ -138,13 +144,16 @@ const initFunction = async () => {
         $id: response['$id'],
         name: response.name,
         runtime: response.runtime,
-        path: `functions/${answers.name}`,
-        entrypoint: answers.runtime.entrypoint || '',
-        ignore: answers.runtime.ignore || null,
         execute: response.execute,
         events: response.events,
         schedule: response.schedule,
         timeout: response.timeout,
+        enabled: response.enabled,
+        logging: response.logging,
+        entrypoint: response.entrypoint,
+        commands: response.commands,
+        ignore: answers.runtime.ignore || null,
+        path: `functions/${answers.name}`,
     };
 
     localConfig.addFunction(data);

package/lib/commands/locale.js

@@ -17,10 +17,27 @@ const locale = new Command("locale").description(commandDescriptions['locale']).
 const localeGet = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale';
+    let apiPath = '/locale';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+    
+    if (parseOutput) {
+        parse(response)
+        success()
+    }
+    return response;
+}
+
+const localeListCodes = async ({ parseOutput = true, sdk = undefined}) => {
+
+    let client = !sdk ? await sdkForProject() : sdk;
+    let apiPath = '/locale/codes';
+    let payload = {};
+    let response = undefined;
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -34,10 +51,10 @@ const localeGet = async ({ parseOutput = true, sdk = undefined}) => {
 const localeListContinents = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/continents';
+    let apiPath = '/locale/continents';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -51,10 +68,10 @@ const localeListContinents = async ({ parseOutput = true, sdk = undefined}) => {
 const localeListCountries = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/countries';
+    let apiPath = '/locale/countries';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -68,10 +85,10 @@ const localeListCountries = async ({ parseOutput = true, sdk = undefined}) => {
 const localeListCountriesEU = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/countries/eu';
+    let apiPath = '/locale/countries/eu';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -85,10 +102,10 @@ const localeListCountriesEU = async ({ parseOutput = true, sdk = undefined}) =>
 const localeListCountriesPhones = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/countries/phones';
+    let apiPath = '/locale/countries/phones';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -102,10 +119,10 @@ const localeListCountriesPhones = async ({ parseOutput = true, sdk = undefined})
 const localeListCurrencies = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/currencies';
+    let apiPath = '/locale/currencies';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -119,10 +136,10 @@ const localeListCurrencies = async ({ parseOutput = true, sdk = undefined}) => {
 const localeListLanguages = async ({ parseOutput = true, sdk = undefined}) => {
 
     let client = !sdk ? await sdkForProject() : sdk;
-    let path = '/locale/languages';
+    let apiPath = '/locale/languages';
     let payload = {};
     let response = undefined;
-    response = await client.call('get', path, {
+    response = await client.call('get', apiPath, {
         'content-type': 'application/json',
     }, payload);
     
@@ -139,6 +156,11 @@ locale
     .description(`Get the current user location based on IP. Returns an object with user country code, country name, continent name, continent code, ip address and suggested currency. You can use the locale header to get the data in a supported language.  ([IP Geolocation by DB-IP](https://db-ip.com))`)
     .action(actionRunner(localeGet))
 
+locale
+    .command(`listCodes`)
+    .description(`List of all locale codes in [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).`)
+    .action(actionRunner(localeListCodes))
+
 locale
     .command(`listContinents`)
     .description(`List of all continents. You can use the locale header to get the data in a supported language.`)
@@ -173,6 +195,7 @@ locale
 module.exports = {
     locale,
     localeGet,
+    localeListCodes,
     localeListContinents,
     localeListCountries,
     localeListCountriesEU,