fix: emit 'error' event causes an exception to be raised

examples/events/broker.js

@@ -8,4 +8,4 @@ broker.events.on('lost-channel', (channel) => console.log('lost-channel', channe
 broker.events.on('schedule', (request) => console.log('schedule', request))
 broker.events.on('execute', (request) => console.log('execute', request))
 broker.events.on('executed', (request) => console.log('executed', request))
-broker.events.on('error', (request) => console.log('error', request))
+broker.events.on('failed', (request) => console.log('failed', request))

examples/events/client.js

@@ -4,7 +4,7 @@ const client = ya.client(ya.transports.tcp(8005, 'localhost'))
 
 client.events.on('execute', (request) => console.log('execute', request))
 client.events.on('executed', (request) => console.log('executed', request))
-client.events.on('error', (request) => console.log('error', request))
+client.events.on('failed', (request) => console.log('failed', request))
 
 for (let i = 0; i < 50; i++) {
   client.remote.replyWithDelay(i, 1000).then(console.log)

examples/events/server.js

@@ -6,4 +6,4 @@ const server = ya.server(ya.transports.tcp(8005, 'localhost'), modulePath)
 server.events.on('schedule', (request) => console.log('schedule', request))
 server.events.on('execute', (request) => console.log('execute', request))
 server.events.on('executed', (request) => console.log('executed', request))
-server.events.on('error', (request) => console.log('executed', request))
+server.events.on('failed', (request) => console.log('failed', request))

lib/brokers/rpc.js

@@ -268,7 +268,7 @@ function create () {
           if (d.result !== undefined) {
             events.emit('executed', request)
           } else {
-            events.emit('error', request)
+            events.emit('failed', request)
           }
         }
         const reqChannel = channels.get(request.channelId)

lib/clients/rpc-client.js

@@ -44,7 +44,7 @@ function addRpcClientRole (channel, events) {
       } else if (resp.progress && request.onProgress) {
         request.onProgress(d.progress)
       } else if (resp.error) {
-        events.emit('error', request.request)
+        events.emit('failed', request.request)
         request.onResult(new Error(d.error), undefined)
         requests.remove(d.id)
       } else if (resp.status && request.onStatus) {

lib/clients/rpc-server.js

@@ -84,11 +84,18 @@ function create (channel, modulePath, options = {}) {
       load = 0
     })
     worker.on('message', data => {
-      if (data.result !== undefined || data.error !== undefined) {
+      if (data.result !== undefined) {
+        delete data.request
+        load--
         events.emit(
-          data.result !== undefined ? 'executed' : 'error',
-          { ...data.request, pid: worker.pid, result: data.result, error: data.error })
+          'executed',
+          { ...data.request, pid: worker.pid, result: data.result })
+      } else if (data.error !== undefined) {
+        delete data.request
         load--
+        events.emit(
+          'failed',
+          { ...data.request, pid: worker.pid, error: data.error })
       }
       processQueue()
       channel.write({ c: COMMANDS.RPC_EXECUTE, ...data })