appwrite-cli 6.0.0-rc.4 → 6.0.0-rc.6

package/lib/emulation/docker.js

@@ -1,10 +1,14 @@
+const tar = require("tar");
+const ignore = require("ignore");
+const net = require('net');
 const chalk = require('chalk');
 const childProcess = require('child_process');
 const { localConfig } = require("../config");
 const path = require('path');
 const fs = require('fs');
-const { log, success, hint } = require("../parser");
+const { log, error, success, hint } = require("../parser");
 const { openRuntimesVersion, systemTools, Queue } = require("./utils");
+const { getAllFiles } = require("../utils");
 
 async function dockerStop(id) {
     const stopProcess = childProcess.spawn('docker', ['rm', '--force', id], {
@@ -47,9 +51,34 @@ async function dockerBuild(func, variables) {
 
     const id = func.$id;
 
+    const ignorer = ignore();
+    ignorer.add('.appwrite');
+    if (func.ignore) {
+        ignorer.add(func.ignore);
+    } else if (fs.existsSync(path.join(functionDir, '.gitignore'))) {
+        ignorer.add(fs.readFileSync(path.join(functionDir, '.gitignore')).toString());
+    }
+    
+    const files = getAllFiles(functionDir).map((file) => path.relative(functionDir, file)).filter((file) => !ignorer.ignores(file));
+    const tmpBuildPath = path.join(functionDir, '.appwrite/tmp-build');
+    if (!fs.existsSync(tmpBuildPath)) {
+        fs.mkdirSync(tmpBuildPath, { recursive: true });
+    }
+
+    for(const f of files) {
+        const filePath = path.join(tmpBuildPath, f);
+        const fileDir = path.dirname(filePath);
+        if (!fs.existsSync(fileDir)) {
+            fs.mkdirSync(fileDir, { recursive: true });
+        }
+
+        const sourcePath = path.join(functionDir, f);
+        fs.copyFileSync(sourcePath, filePath);
+    }
+
     const params = [ 'run' ];
     params.push('--name', id);
-    params.push('-v', `${functionDir}/:/mnt/code:rw`);
+    params.push('-v', `${tmpBuildPath}/:/mnt/code:rw`);
     params.push('-e', 'APPWRITE_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_SECRET=');
@@ -91,12 +120,11 @@ async function dockerBuild(func, variables) {
 
     await new Promise((res) => { buildProcess.on('close', res) });
 
-    clearInterval(interval);
-
+    clearInterval(killInterval);
     if(!Queue.isEmpty()) {
         return;
     }
-    
+
     const copyPath = path.join(process.cwd(), func.path, '.appwrite', 'build.tar.gz');
     const copyDir = path.dirname(copyPath);
     if (!fs.existsSync(copyDir)) {
@@ -120,18 +148,21 @@ async function dockerBuild(func, variables) {
     if (fs.existsSync(tempPath)) {
         fs.rmSync(tempPath, { force: true });
     }
+
+    fs.rmSync(tmpBuildPath, { recursive: true, force: true });
 }
 
 async function dockerStart(func, variables, port) {
-   const runtimeChunks = func.runtime.split("-");
-   const runtimeVersion = runtimeChunks.pop();
-   const runtimeName = runtimeChunks.join("-");
+    // Pack function files
+    const functionDir = path.join(process.cwd(), func.path);
+
+    const runtimeChunks = func.runtime.split("-");
+    const runtimeVersion = runtimeChunks.pop();
+    const runtimeName = runtimeChunks.join("-");
     const imageName = `openruntimes/${runtimeName}:${openRuntimesVersion}-${runtimeVersion}`;
 
     const tool = systemTools[runtimeName];
 
-    const functionDir = path.join(process.cwd(), func.path);
-
     const id = func.$id;
 
     const params = [ 'run' ];
@@ -168,6 +199,13 @@ async function dockerStart(func, variables, port) {
         process.stdout.write(chalk.blackBright(data));
     });
 
+    try {
+        await waitUntilPortOpen(port);
+    } catch(err) {
+        error("Failed to start function with error: " + err.message ? err.message : err.toString());
+        return;
+    }
+
     success(`Visit http://localhost:${port}/ to execute your function.`);
 }
 
@@ -186,6 +224,39 @@ async function dockerCleanup(functionId) {
     }
 }
 
+function waitUntilPortOpen(port, iteration = 0) {
+    return new Promise((resolve, reject) => {
+        const client = new net.Socket();
+
+        client.once('connect', () => {
+            client.removeAllListeners('connect');
+            client.removeAllListeners('error');
+            client.end();
+            client.destroy();
+            client.unref();
+
+            resolve();
+        });
+
+        client.once('error', async (err) => {
+            client.removeAllListeners('connect');
+            client.removeAllListeners('error');
+            client.end();
+            client.destroy();
+            client.unref();
+
+            if(iteration > 100) {
+                reject(err);
+            } else {
+                await new Promise((res) => setTimeout(res, 100));
+                waitUntilPortOpen(port, iteration + 1).then(resolve).catch(reject);
+            }
+        });
+
+        client.connect({port, host: '127.0.0.1'}, function() {});
+    }); 
+}
+
 module.exports = {
     dockerPull,
     dockerBuild,

package/lib/parser.js

@@ -90,20 +90,9 @@ const drawTable = (data) => {
             if (row[key] === null) {
                 rowValues.push("-");
             } else if (Array.isArray(row[key])) {
-                switch (row[key].length) {
-                    case 1:
-                        if (typeof row[key][0] === 'object') {
-                            rowValues.push(`array(${row[key].length})`);
-                        } else {
-                            rowValues.push(row[key][0]);
-                        }
-                        break;
-                    default:
-                        rowValues.push(`array(${row[key].length})`);
-                        break;
-                }
+                rowValues.push(JSON.stringify(row[key]));
             } else if (typeof row[key] === 'object') {
-                rowValues.push("object");
+                rowValues.push(JSON.stringify(row[key]));
             } else {
                 rowValues.push(row[key]);
             }
@@ -131,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0-rc.4';
+            const version = '6.0.0-rc.6';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 

package/lib/questions.js

@@ -247,11 +247,10 @@ const questionsPullFunctions = [
             if (functions.length === 0) {
                 throw "We couldn't find any functions in your Appwrite project";
             }
-
             return functions.map(func => {
                 return {
                     name: `${func.name} (${func.$id})`,
-                    value: func
+                    value: { ...func }
                 }
             });
         }
@@ -634,12 +633,10 @@ const questionsPushFunctions = [
         name: "functions",
         message: "Which functions would you like to push?",
         validate: (value) => validateRequired('function', value),
+        when: () => localConfig.getFunctions().length > 0,
         choices: () => {
             let functions = localConfig.getFunctions();
             checkDeployConditions(localConfig)
-            if (functions.length === 0) {
-                throw new Error("No functions found Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
-            }
             let choices = functions.map((func, idx) => {
                 return {
                     name: `${func.name} (${func.$id})`,
@@ -662,13 +659,11 @@ const questionsPushCollections = [
         name: "collections",
         message: "Which collections would you like to push?",
         validate: (value) => validateRequired('collection', value),
+        when: () => localConfig.getCollections().length > 0,
         choices: () => {
             let collections = localConfig.getCollections();
             checkDeployConditions(localConfig)
 
-            if (collections.length === 0) {
-                throw new Error("No collections found in the current directory. Use 'appwrite pull collections' to synchronize existing one, or use 'appwrite init collection' to create a new one.");
-            }
             return collections.map(collection => {
                 return {
                     name: `${collection.name} (${collection['databaseId']} - ${collection['$id']})`,
@@ -676,13 +671,16 @@ const questionsPushCollections = [
                 }
             });
         }
-    },
+    }
+];
+
+const questionPushChanges = [
     {
         type: "input",
         name: "changes",
         message: `Would you like to apply these changes? Type "YES" to confirm.`
     }
-]
+];
 
 const questionsPushBuckets = [
     {
@@ -690,12 +688,11 @@ const questionsPushBuckets = [
         name: "buckets",
         message: "Which buckets would you like to push?",
         validate: (value) => validateRequired('bucket', value),
+        when: () => localConfig.getBuckets().length > 0,
         choices: () => {
             let buckets = localConfig.getBuckets();
             checkDeployConditions(localConfig)
-            if (buckets.length === 0) {
-                throw new Error("No buckets found in the current directory. Use 'appwrite pull buckets' to synchronize existing one, or use 'appwrite init bucket' to create a new one.");
-            }
+
             return buckets.map(bucket => {
                 return {
                     name: `${bucket.name} (${bucket['$id']})`,
@@ -711,11 +708,10 @@ const questionsPushMessagingTopics = [
         type: "checkbox",
         name: "topics",
         message: "Which messaging topic would you like to push?",
+        when: () => localConfig.getMessagingTopics().length > 0,
         choices: () => {
             let topics = localConfig.getMessagingTopics();
-            if (topics.length === 0) {
-                throw new Error("No topics found in the current directory. Use 'appwrite pull topics' to synchronize existing one, or use 'appwrite init topic' to create a new one.");
-            }
+
             return topics.map(topic => {
                 return {
                     name: `${topic.name} (${topic['$id']})`,
@@ -752,12 +748,11 @@ const questionsPushTeams = [
         name: "teams",
         message: "Which teams would you like to push?",
         validate: (value) => validateRequired('team', value),
+        when: () => localConfig.getTeams().length > 0,
         choices: () => {
             let teams = localConfig.getTeams();
             checkDeployConditions(localConfig);
-            if (teams.length === 0) {
-                throw new Error("No teams found in the current directory. Use 'appwrite pull teams' to synchronize existing one, or use 'appwrite init team' to create a new one.");
-            }
+
             return teams.map(team => {
                 return {
                     name: `${team.name} (${team['$id']})`,
@@ -866,5 +861,6 @@ module.exports = {
     questionsRunFunctions,
     questionGetEndpoint,
     questionsInitResources,
-    questionsCreateTeam
+    questionsCreateTeam,
+    questionPushChanges
 };

package/lib/spinner.js

@@ -22,6 +22,7 @@ class Spinner {
             hideCursor,
             clearOnComplete,
             stopOnComplete: true,
+            linewrap: true,
             noTTYOutput: true
         });
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "appwrite-cli",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "6.0.0-rc.4",
+  "version": "6.0.0-rc.6",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {
@@ -34,7 +34,8 @@
     "tar": "^6.1.11",
     "ignore": "^5.2.0",
     "chokidar": "^3.6.0",
-    "tail": "^2.2.6"
+    "tail": "^2.2.6",
+    "dotenv": "^16.3.1"
   },
   "devDependencies": {
     "pkg": "5.8.1"

package/scoop/appwrite.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "6.0.0-rc.4",
+	"version": "6.0.0-rc.6",
 	"description": "The Appwrite CLI is a command-line application that allows you to interact with Appwrite and perform server-side tasks using your terminal.",
 	"homepage": "https://github.com/appwrite/sdk-for-cli",
 	"license": "BSD-3-Clause",
 	"architecture": {
 		"64bit": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.4/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-x64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-x64.exe",
@@ -15,7 +15,7 @@
 			]
 		},
 		"arm64": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.4/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",