Hotfix event error handler (#264)

* refactoring

* feat(core): Added error handler for events

* fix(core): Added error handler for events

* fix: Added support for Node 18

Author: kevinries

.github/workflows/ci.yml

@@ -25,8 +25,7 @@ jobs:
           - 4222:4222
     strategy:
       matrix:
-        node-version: [12.x, 13.x, 14.x, 15.x, 16.x]
-
+        node-version: [12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Setup Node.js

.idea/workspace.xml

@@ -10,7 +10,7 @@ module.exports = (runtime) => {
   const wrapErrorHandlerMiddleware = function (handler) {
     return function errorHandlerMiddleware (context, serviceInjections) {
       return handler(context, serviceInjections)
-        .catch(error => {
+        .catch((error) => {
           if (!(error instanceof Error)) {
             error = new WeaveError(error, 500);
           }
@@ -19,17 +19,49 @@ module.exports = (runtime) => {
             runtime.transport.removePendingRequestsById(context.id);
           }
 
-          runtime.log.debug(`The action ${context.action.name} is rejected`, { requestId: context.id }, error);
+          Object.defineProperty(error, 'context', {
+            value: context,
+            writable: true,
+            enumerable: false
+          });
+
+          runtime.log.debug(`The action "${context.action.name}" was rejected`, { requestId: context.requestId }, error);
+          return runtime.handleError(error);
+        });
+    };
+  };
+
+  const wrapEventErrorHandlerMiddleware = function (handler) {
+    return function errorHandlerMiddleware (context, serviceInjections) {
+      return handler(context, serviceInjections)
+        .catch((error) => {
+          if (!(error instanceof Error)) {
+            error = new WeaveError(error, 500);
+          }
+
+          if (runtime.nodeId !== context.nodeId) {
+            runtime.transport.removePendingRequestsById(context.id);
+          }
+
+          Object.defineProperty(error, 'context', {
+            value: context,
+            writable: true,
+            enumerable: false
+          });
+
+          runtime.log.debug(`The event "${context.eventName}" was rejected`, { requestId: context.requestId }, error);
           return runtime.handleError(error);
+        })
+        .catch((error) => {
+          // we just log the error because we don't want to crash the event loop
+          runtime.log.error(error);
         });
-      // .catch(error => {
-      //   runtime.log.error(error)
-      // })
     };
   };
 
   return {
     localAction: wrapErrorHandlerMiddleware,
-    remoteAction: wrapErrorHandlerMiddleware
+    remoteAction: wrapErrorHandlerMiddleware,
+    localEvent: wrapEventErrorHandlerMiddleware
   };
 };

packages/core/core/lib/middlewares/error-handler/index.js

@@ -52,6 +52,10 @@ const OtherService = {
   events: {
     'other.thing' () {
       flow.push(`${this.broker.nodeId}-${this.name}-other.thing`);
+    },
+    'failed-event' () {
+      flow.push(`${this.broker.nodeId}-${this.name}-failed-event`);
+      throw new Error('This is a failed event');
     }
   }
 };
@@ -406,3 +410,19 @@ describe('Event acknowledgement', () => {
     node1.emit('user-created', null, { ack: true });
   });
 });
+
+describe('Event error handling', () => {
+  const nodes = createNodes(['test-event-error-handling']);
+
+  beforeAll(() => Promise.all(nodes.map(node => node.start())));
+  afterAll(() => Promise.all(nodes.map(node => node.stop())));
+
+  it('should throw an error', async () => {
+    const node = nodes[0];
+    try {
+      await node.emit('failed-event');
+    } catch (error) {
+      expect(error.message).toBe('This is a failed event');
+    }
+  });
+});

packages/core/core/test/integration/events.test.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const cliUI = require('../utils/cli-ui');
 const convertArgs = require('../utils/convert-args');
 const { safeCopy, isStream, isObject, timespanFromUnixTimes } = require('@weave-js/utils');
-
 const util = require('util');
 
 function handleResult (result, args, startTime) {

packages/core/repl/lib/helper/invoke-action.js

@@ -5,12 +5,12 @@ exports.getIpList = function getIpList (skipInternal = true) {
   return Object.keys(interfaces)
     .map(name => {
       let IPs = interfaces[name]
-        .filter(int => int.family === 'IPv4');
+        .filter((networkInterface) => networkInterface.family === 'IPv4' || networkInterface.family === 4);
 
       if (skipInternal) {
-        IPs = IPs.filter(int => !int.internal);
+        IPs = IPs.filter((networkInterface) => !networkInterface.internal);
       }
 
-      return IPs.map(int => int.address);
-    }).reduce((a, b) => a.concat(b), []);
+      return IPs.map((networkInterface) => networkInterface.address);
+    }).flat();
 };

packages/core/utils/lib/get-IP-list.js

@@ -1,9 +1,10 @@
 const utils = require('../lib');
 
 describe('IP List function', () => {
-  it('should flatten an array a single level deep (1)', () => {
+  it('should return an IP List', () => {
     const regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/;
     const result = utils.getIpList();
+
     expect(regex.test(result[0])).toBe(true);
   });
 });