Merge pull request #904 from appwrite/fix-cli-dev-cleanup

Fix: Dev function cleanup experience

Author: TorstenDittmann

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

@@ -86,12 +86,12 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
     log("If you wish to change your local settings, update the appwrite.json file and rerun the 'appwrite run' command.");
     hint("Permissions, events, CRON and timeouts dont apply when running locally.");
 
-    await dockerCleanup();
+    await dockerCleanup(func.$id);
 
     process.on('SIGINT', async () => {
         log('Cleaning up ...');
-        await dockerCleanup();
-        success();
+        await dockerCleanup(func.$id);
+        success("Local function successfully stopped.");
         process.exit();
     });
 

templates/cli/lib/emulation/docker.js.twig

@@ -72,7 +72,6 @@ async function dockerBuild(func, variables) {
     params.push('-e', 'APPWRITE_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_SECRET=');
-    params.push('-l', 'appwrite-env=dev');
     params.push('-e', `OPEN_RUNTIMES_ENTRYPOINT=${func.entrypoint}`);
 
     for(const k of Object.keys(variables)) {
@@ -133,7 +132,6 @@ async function dockerStart(func, variables, port) {
     params.push('--rm');
     params.push('--name', id);
     params.push('-p', `${port}:3000`);
-    params.push('-l', 'appwrite-env=dev');
     params.push('-e', 'APPWRITE_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_SECRET=');
@@ -163,50 +161,18 @@ async function dockerStart(func, variables, port) {
     success(`Visit http://localhost:${port}/ to execute your function.`);
 }
 
-async function dockerCleanup() {
-    await dockerStopActive();
+async function dockerCleanup(functionId) {
+    await dockerStop(functionId);
 
-    const functions = localConfig.getFunctions();
-    for(const func of functions) {
-        const appwritePath = path.join(process.cwd(), func.path, '.appwrite');
-        if (fs.existsSync(appwritePath)) {
-            fs.rmSync(appwritePath, { recursive: true, force: true });
-        }
-
-        const tempPath = path.join(process.cwd(), func.path, 'code.tar.gz');
-        if (fs.existsSync(tempPath)) {
-            fs.rmSync(tempPath, { force: true });
-        }
-    }
-}
-
-async function dockerStopActive() {
-    const listProcess = childProcess.spawn('docker', ['ps', '-a', '-q', '--filter', 'label=appwrite-env=dev'], {
-        stdio: 'pipe',
-    });
-
-    const ids = [];
-    function handleOutput(data) {
-        const list = data.toString().split('\n');
-        for(const id of list) {
-            if(id && !id.includes(' ')) {
-                ids.push(id);
-            }
-        }
+    const func = localConfig.getFunction(functionId);
+    const appwritePath = path.join(process.cwd(), func.path, '.appwrite');
+    if (fs.existsSync(appwritePath)) {
+        fs.rmSync(appwritePath, { recursive: true, force: true });
     }
 
-    listProcess.stdout.on('data', (data) => {
-        handleOutput(data);
-    });
-
-    listProcess.stderr.on('data', (data) => {
-        handleOutput(data);
-    });
-
-    await new Promise((res) => { listProcess.on('close', res) });
-
-    for(const id of ids) {
-        await dockerStop(id);
+    const tempPath = path.join(process.cwd(), func.path, 'code.tar.gz');
+    if (fs.existsSync(tempPath)) {
+        fs.rmSync(tempPath, { force: true });
     }
 }
 
@@ -215,6 +181,5 @@ module.exports = {
     dockerBuild,
     dockerStart,
     dockerCleanup,
-    dockerStopActive,
     dockerStop,
 }