fix (invoke-handler) coderunner doesn't wait for async handlers completion in CLOUD mode

Author: vengrov

lib/server-code/runners/tasks/invoke-handler.js

@@ -64,7 +64,7 @@ module.exports = function(task, runnerOpts, model) {
       }
     });
 
-    function sendResult(result) {
+    function buildResponse(result) {
       if (result !== undefined) {
         req.context.prematureResult = res.result = result;
       }
@@ -75,7 +75,7 @@ module.exports = function(task, runnerOpts, model) {
           : req[name];
       });
 
-      resolve(encodeTaskArguments(taskArgs));
+      return encodeTaskArguments(taskArgs);
     }
 
     function invoke() {
@@ -85,14 +85,10 @@ module.exports = function(task, runnerOpts, model) {
         throw new Error(`${event.name}(${task.target}) event handler does not exist`);
       }
 
-      const result = handler.invoke.apply(null, handlerArgs);
-
-      if (task.async) {
-        resolve(); //empty invocation result for async events
-      } else {
-        promise.timeout(task.timeout, Promise.resolve(result), TIMED_OUT_ERR)
-          .then(sendResult, reject);
-      }
+      const invocationPromise = Promise.resolve(handler.invoke.apply(null, handlerArgs));
+      promise.timeout(task.timeout, invocationPromise, TIMED_OUT_ERR).then(result => {
+        resolve(task.async ? undefined : buildResponse(result));
+      }, reject);
     }
 
     const d = domain.create();

test/invoke-handler-task.js

@@ -62,7 +62,7 @@ describe('[invoke-handler] task executor', function() {
       req.item.should.be.eql({ name: 'John' });
     }
 
-    return invokeAndParse(task, modelStub(handler)).should.be.fulfilled();
+    return invokeAndParse(task, modelStub(handler));
   });
 
   describe('should perform class mapping', function() {
@@ -310,18 +310,29 @@ describe('[invoke-handler] task executor', function() {
 
   describe('for async events', function() {
     const task = createTask(AFTER_CREATE, [], true);
+    task.timeout = 3;
+
+    it('should wait for handler`s promise', function() {
+      let handlerFinished = false;
 
-    it('should not wait for handler`s promise', function() {
       function handler() {
-        return new Promise(() => {
+        return new Promise(resolve => {
+          setTimeout(() => {
+            handlerFinished = true;
+            resolve();
+          }, 2);
         });
       }
 
-      return invokeAndParse(task, modelStub(handler)).should.be.fulfilled();
+      return invokeAndParse(task, modelStub(handler))
+        .then(() => {
+          handlerFinished.should.be.true();
+        });
     });
 
     it('should not return any result', function() {
       function handler() {
+        return {};
       }
 
       return invokeAndParse(task, modelStub(handler)).should.be.fulfilledWith(undefined);