Merge pull request #2605 from kuzzleio/KZLPRD-852-catch-error-trigger-event

fix(funnel): handle errors for trigger event requests

Author: QuentinRousselet

lib/api/funnel.js

@@ -753,11 +753,31 @@ class Funnel {
    * @returns {Promise}
    */
   async executePluginRequest(request) {
-    try {
-      if (request.input.triggerEvents) {
-        const response = await this.processRequest(request);
-        return { ...response.result };
+    if (request.input.triggerEvents) {
+      let error;
+      let res;
+      try {
+        const { result } = await this.processRequest(request);
+        debug(
+          "Request %s successfully executed. Result: %a",
+          request.id,
+          result,
+        );
+        res = result;
+        return { ...result };
+      } catch (e) {
+        error = e;
+        debug("Error processing request %s: %a", request.id, error);
+      } finally {
+        global.kuzzle.pipe("request:afterExecution", {
+          error: error,
+          request: request,
+          result: res,
+          success: error === undefined ? true : false,
+        });
       }
+    }
+    try {
       return await doAction(this.getController(request), request);
     } catch (e) {
       this.handleErrorDump(e);

test/api/funnel/executePluginRequest.test.js

@@ -126,4 +126,19 @@ describe("funnel.executePluginRequest", () => {
       should(kuzzle.pipe).not.calledWith("testme:afterSucceed");
     });
   });
+
+  it("should catch an error and trigger error pipe if triggerEvent enabled", async () => {
+    const request = new Request({
+      action: "fail",
+      controller: "testme",
+      triggerEvents: true,
+    });
+
+    return funnel.executePluginRequest(request).catch((e) => {
+      should(e.message).be.eql("rejected action");
+      should(kuzzle.pipe).calledWith("testme:beforeFail");
+      should(kuzzle.pipe).calledWith("testme:errorFail");
+      should(kuzzle.pipe).not.calledWith("testme:afterFail");
+    });
+  });
 });