Fix blocking CLI queue for rebuilds

Author: Meldiron

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

@@ -150,14 +150,6 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
 
     await dockerPull(func);
 
-    log('Building function using Docker ...');
-    await dockerBuild(func, variables);
-
-    log('Starting function using Docker ...');
-    hint('Function automatically restarts when you edit your code.');
-
-    await dockerStart(func, variables, port);
-
     new Tail(logsPath).on("line", function(data) {
         process.stdout.write(chalk.white(`${data}\n`));
     });
@@ -183,8 +175,14 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
 
             const dependencyFile = files.find((filePath) => tool.dependencyFiles.includes(filePath));
             if(tool.isCompiled || dependencyFile) {
-                log(`Rebuilding the function ...`);
+                log(`Rebuilding the function due to file changes ...`);
                 await dockerBuild(func, variables);
+
+                if(!Queue.isEmpty()) {
+                    Queue.unlock();
+                    return;
+                }
+
                 await dockerStart(func, variables, port);
             } else {
                 log('Hot-swapping function.. Files with change are ' + files.join(', '));
@@ -249,6 +247,22 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
             Queue.unlock();
         }
     });
+
+    Queue.lock();
+
+    log('Building function using Docker ...');
+    await dockerBuild(func, variables);
+
+    if(!Queue.isEmpty()) {
+        Queue.unlock();
+        return;
+    }
+
+    log('Starting function using Docker ...');
+    hint('Function automatically restarts when you edit your code.');
+    await dockerStart(func, variables, port);
+
+    Queue.unlock();
 }
 
 const run = new Command("run")

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

@@ -4,7 +4,7 @@ const { localConfig } = require("../config");
 const path = require('path');
 const fs = require('fs');
 const { log, success, hint } = require("../parser");
-const { openRuntimesVersion, systemTools } = require("./utils");
+const { openRuntimesVersion, systemTools, Queue } = require("./utils");
 
 async function dockerStop(id) {
     const stopProcess = childProcess.spawn('docker', ['rm', '--force', id], {
@@ -94,8 +94,25 @@ async function dockerBuild(func, variables) {
         process.stderr.write(chalk.blackBright(`${data}\n`));
     });
 
+    const killInterval = setInterval(() => {
+        if(!Queue.isEmpty()) {
+            log('Cancelling build ...');
+            buildProcess.stdout.destroy();
+            buildProcess.stdin.destroy();
+            buildProcess.stderr.destroy();
+            buildProcess.kill("SIGKILL");
+            clearInterval(killInterval);
+        }
+    }, 100);
+
     await new Promise((res) => { buildProcess.on('close', res) });
 
+    clearInterval(interval);
+
+    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)) {

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

@@ -157,6 +157,9 @@ const Queue = {
         this.files = [];
         this.locked = true;
     },
+    isEmpty() {
+        return this.files.length == 0
+    },
     unlock() {
         this.locked = false;
         if(this.files.length > 0) {