fix (invoke-handler) impossible to return result from custom event handler

Author: vengrov

lib/server-code/api/index.js

@@ -146,7 +146,7 @@ ServerCode.addTimer = contextGuarded(function(timer) {
  * @param {Boolean} async
  */
 ServerCode.customEvent = contextGuarded((eventName, handler, async) => {
-  addHandler(CUSTOM.events.handleEvent.id, eventName, async, handler);
+  addHandler(CUSTOM.events.execute.id, eventName, async, handler);
 });
 
 /**

lib/server-code/events.js

@@ -1,8 +1,8 @@
 'use strict';
 
 class EventType {
-  constructor(id, name, provider, args) {
-    Object.assign(this, { id, name, provider, args });
+  constructor(id, name, provider, args, rawResult) {
+    Object.assign(this, { id, name, provider, args, rawResult });
   }
 }
 
@@ -28,8 +28,8 @@ const PERSISTENCE = new EventProvider('persistence', true),
       GEO       = new EventProvider('geo', true),
       CUSTOM    = new EventProvider('custom', true);
 
-function addEvent(id, name, provider, args) {
-  events[id] = provider.events[name] = new EventType(id, name, provider, args);
+function addEvent(id, name, provider, args, rawResult) {
+  events[id] = provider.events[name] = new EventType(id, name, provider, args, rawResult);
 }
 
 //Data (Persistence Service) Events
@@ -135,7 +135,7 @@ addEvent(609, 'afterMoveFileOrDirectory', FILE, ['source', 'target', 'result']);
 addEvent(800, 'execute', TIMER, []);
 
 //Custom Events
-addEvent(900, 'handleEvent', CUSTOM, ['args']);
+addEvent(900, 'execute', CUSTOM, ['args', 'result'], true);
 
 module.exports = {
   /**

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

@@ -68,7 +68,7 @@ module.exports = function(task, runnerOpts, model) {
 
       event.args.forEach((name, index) => {
         taskArgs[index + 1] = (name === 'result')
-          ? resultWrapper.executionResult(res.error, res.result)
+          ? event.rawResult ? res.result : resultWrapper.executionResult(res.error, res.result)
           : req[name];
       });
 

test/invoke-handler-task.js

@@ -8,7 +8,8 @@ const should          = require('should'),
       executionResult = require('../lib/server-code/runners/tasks/util/result-wrapper').executionResult,
       PERSISTENCE     = events.providers.PERSISTENCE,
       BEFORE_CREATE   = PERSISTENCE.events.beforeCreate,
-      AFTER_CREATE    = PERSISTENCE.events.afterCreate;
+      AFTER_CREATE    = PERSISTENCE.events.afterCreate,
+      CUSTOM_EVENT    = events.providers.CUSTOM.events.execute;
 
 require('mocha');
 
@@ -325,4 +326,20 @@ describe('[invoke-handler] task executor', function() {
       return invokeAndParse(task, modelStub(handler)).should.be.fulfilledWith(undefined);
     });
   });
+
+  describe('for custom events', function() {
+    it('should return raw, unwrapped result to the server', function() {
+      const task = createTask(CUSTOM_EVENT, []);
+      const result = { a: 'b' };
+
+      function handler() {
+        return result;
+      }
+
+      return invokeAndParse(task, modelStub(handler)).then( res => {
+        should.exists(res.arguments[2]);
+        res.arguments[2].should.be.eql(result);
+      });
+    });
+  });
 });