fixed an issue with the queue when using custom commands

Author: beatfactor

lib/core/asynctree.js

@@ -129,6 +129,10 @@ class AsyncTree {
       if (!node.childNodes[i].started) {
         return node.childNodes[i];
       }
+
+      if (node.childNodes[i].childNodes.length > 0) {
+        return AsyncTree.getNextChild(node.childNodes[i]);
+      }
     }
 
     return false;

lib/core/queue.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('events');
 const AsyncTree = require('./asynctree.js');
+const Utils = require('../util/utils.js');
 const Node = require('./treenode.js');
 
 class CommandQueue extends EventEmitter {
@@ -39,13 +40,7 @@ class CommandQueue extends EventEmitter {
       clearTimeout(this.scheduleTimeoutId);
     }
 
-    this.scheduleTimeoutId = setTimeout(() => {
-      this.tree
-        .traverse()
-        .catch(err => {
-          return err;
-        });
-    }, 0);
+    this.scheduleTimeoutId = setTimeout(() => this.traverse(), 0);
   }
 
   clearScheduled() {
@@ -66,21 +61,33 @@ class CommandQueue extends EventEmitter {
     return this;
   }
 
-  run() {
-    if (this.tree.started) {
-      return this;
-    }
-
-    return this.tree
+  traverse() {
+    this.tree
       .traverse()
       .catch(err => {
         return err;
       })
       .then(err => {
-        this.emit('queue:finished', err);
-
-        return err;
+        this.done(err);
       });
+
+    return this;
+  }
+
+  done(err) {
+    this.emit('queue:finished', err);
+    this.deferred.resolve(err);
+  }
+
+  run() {
+    if (this.tree.started) {
+      return this;
+    }
+
+    this.deferred = Utils.createPromise();
+    this.traverse();
+
+    return this.deferred.promise;
   }
 }