onjs 2.1.0 → 2.2.0

package/.github/workflows/github-actions.yml

@@ -0,0 +1,63 @@
+name: GitHub Actions
+run-name: ${{ github.actor }} is testing and building changes
+on: 
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+  pull-requests: read
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  test-and-build:
+    runs-on: ubuntu-latest
+    container: node:16-bullseye
+    services:
+      redis:
+        image: redis:alpine
+        ports:
+          - 19379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      rabbitmq:
+        image: rabbitmq:alpine
+        ports:
+          - 5672:5672
+        env:
+          RABBITMQ_ERLANG_COOKIE: SWQOKODSQALRPCLNMEQG
+          RABBITMQ_DEFAULT_USER: rabbitmq
+          RABBITMQ_DEFAULT_PASS: rabbitmq
+          RABBITMQ_DEFAULT_VHOST: /
+
+    steps:
+      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: echo "The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "The workflow is now ready to test your code on the runner."
+      - name: Installing dependencies
+        run: npm install
+
+      - name: Testing
+        run: npm test
+      - run: echo "Job's status is ${{ job.status }}."
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Publishing to NPM
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/README.md

@@ -142,7 +142,7 @@ var options = {
 
 var mqOptions = {
 	exchange_name: 'onjs_test',
-	url: 'amqp://rabbitmq:rabbitmq@localhost:35672/'
+	url: 'amqp://rabbitmq:rabbitmq@localhost:5672/'
 }
 
 var mq = new MQ(mqOptions)

package/bin/prepare-test-environment

@@ -1,16 +1,19 @@
 #!/bin/bash
 
 RABBIT_CONTAINER_NAME=onjs_rabbit_test
-RABBIT_CONTAINER_PORT1=34369
-RABBIT_CONTAINER_PORT2=35671
-RABBIT_CONTAINER_PORT3=35672
-RABBIT_CONTAINER_PORT4=46872
+RABBIT_CONTAINER_PORT=5672
+
 
 REDIS_CONTAINER_NAME=onjs_redis_test
 REDIS_CONTAINER_PORT=19379
 
 function createRabbitContainer() {
-	id=$(docker run -d --name ${RABBIT_CONTAINER_NAME} -p ${RABBIT_CONTAINER_PORT1}:4369 -p ${RABBIT_CONTAINER_PORT2}:5671 -p ${RABBIT_CONTAINER_PORT3}:5672 -p ${RABBIT_CONTAINER_PORT4}:25672 -e RABBITMQ_ERLANG_COOKIE=SWQOKODSQALRPCLNMEQG -e RABBITMQ_DEFAULT_USER=rabbitmq -e RABBITMQ_DEFAULT_PASS=rabbitmq -e RABBITMQ_DEFAULT_VHOST=/ --hostname rabbitmq rabbitmq:alpine)
+	id=$(docker run -d --name ${RABBIT_CONTAINER_NAME} \
+  -p ${RABBIT_CONTAINER_PORT}:5672 \
+  -e RABBITMQ_ERLANG_COOKIE=SWQOKODSQALRPCLNMEQG \
+  -e RABBITMQ_DEFAULT_USER=rabbitmq \
+  -e RABBITMQ_DEFAULT_PASS=rabbitmq \
+  -e RABBITMQ_DEFAULT_VHOST=/ rabbitmq:alpine)
 	echo $id
 }
 

package/lib/on.js

@@ -1,6 +1,5 @@
 var RedisQueue = require('bull');
 var _ = require('lodash')
-var Q = require('q')
 var EventEmitter = require('events')
 var utils = require('./utils')
 var hasProperties = utils.hasProperties
@@ -223,14 +222,12 @@ class On extends EventEmitter {
       this.queueInstance.on('queueEventReceived', async (data) => {
         try {
           let taskName = data.name
-          this._eventLog('info', taskName, `Received task on queue ${taskName}`)
-          this._eventLog('info', taskName, data.data)
+          this._eventLog('info', taskName, `Received task on queue ${taskName}`, data.data)
 
           let task = this._getEventByName(taskName)
 
           if (hasProperties(task) && !this._validationIsSuccess(task.eventName, data.data)) {
-            this._log('error', `Validation failed for task ${task.eventName} due to missing properties, received data`)
-            this._log('error', data.data)
+            this._log('error', `Validation failed for task ${task.eventName} due to missing properties, received data`, data.data)
             var error = new Error(`Validation failed for task ${task.eventName}`)
             error.event = task
 
@@ -263,12 +260,11 @@ class On extends EventEmitter {
   _onTaskReceived (task, data) {
     this._eventLog('info', task.eventName, 'Executing task callback for task')
 
-    return Q.allSettled(task.actions.map((action) => {
+    return Promise.allSettled(task.actions.map((action) => {
       return action.call(task, data)
     }))
       .then((results) => {
-        this._eventLog('info', task.eventName, 'Results of all executions for task ' + task.eventName)
-        this._eventLog('info', task.eventName, results)
+        this._eventLog('info', task.eventName, 'Results of all executions for task ' + task.eventName, results)
       })
       .catch(err => {
         this._eventLog('error', task.eventName, err)
@@ -523,19 +519,17 @@ class On extends EventEmitter {
         this._eventLog('info', event.eventName, `Processing redis event ${event.eventName} and executing callback`)
         this._eventLog('info', event.eventName, `Calling event callback`)
 
-        return Q.allSettled(event.actions.map((action) => {
+        return Promise.allSettled(event.actions.map((action) => {
           return action.call(event, data, next)
         }))
           .then((results) => {
-            this._eventLog('info', event.eventName, 'Results of all executions')
-            this._eventLog('info', event.eventName, results)
+            this._eventLog('info', event.eventName, 'Results of all executions', results)
             jobDone()
           })
       })
 
       event.redisQueue.on('error', err => {
-        this._eventLog('error', event.eventName, 'Error on redis queue')
-        this._eventLog('error', event.eventName, err)
+        this._eventLog('error', event.eventName, 'Error on redis queue', err)
       })
 
       event.redisQueue.add(processName, data, {
@@ -557,16 +551,16 @@ class On extends EventEmitter {
     }
   }
 
-  _eventLog (type, eventName, message) {
+  _eventLog (type, eventName, message, metadata) {
     if (this.debugEnabled) {
-      return this.logger[type](message)
+      return this.logger[type](message, metadata)
     }
 
     var eventIndex = this._getEventIndex(eventName)
     if (eventIndex >= 0) {
       var event = this.events[eventIndex]
       if (event.isLogged) {
-        return this.logger[type](message)
+        return this.logger[type](message, metadata)
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onjs",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "On.js is an event library based on RabbitMQ that helps you control events on a microservices arquitecture",
   "main": "index.js",
   "scripts": {
@@ -28,10 +28,8 @@
     "should": "^13.1.3"
   },
   "dependencies": {
-    "amqplib": "^0.5.2",
-    "bull": "^3.0.0-rc.4",
-    "mocha": "^5.2.0",
-    "q": "^1.5.0",
-    "uuid": "^3.1.0"
+    "amqplib": "^0.10.3",
+    "bull": "^3.29.3",
+    "mocha": "^5.2.0"
   }
 }

package/tests/tests/queues.js

@@ -14,11 +14,11 @@ describe('Queue', function () {
   var config = {
     mq: {
       exchange_name: 'onjs_test',
-      url: 'amqp://rabbitmq:rabbitmq@localhost:35672/',
+      url: 'amqp://rabbitmq:rabbitmq@rabbitmq:5672/',
     },
     redis: {
       port: REDIS_PORT,
-      host: '127.0.0.1'
+      host: 'redis'
     }
   }
 

package/tests/tests/rpcs.js

@@ -13,11 +13,11 @@ describe('RPC', function () {
   var config = {
     mq: {
       exchange_name: 'onjs_test',
-      url: 'amqp://rabbitmq:rabbitmq@localhost:35672/',
+      url: 'amqp://rabbitmq:rabbitmq@rabbitmq:5672/',
     },
     redis: {
       port: REDIS_PORT,
-      host: '127.0.0.1'
+      host: 'redis'
     }
   }
 

package/tests/tests/test.js

@@ -17,11 +17,11 @@ describe('On.js', function () {
   var config = {
     mq: {
       exchange_name: 'onjs_test',
-      url: 'amqp://rabbitmq:rabbitmq@localhost:35672/',
+      url: 'amqp://rabbitmq:rabbitmq@rabbitmq:5672/',
     },
     redis: {
       port: REDIS_PORT,
-      host: '127.0.0.1'
+      host: 'redis'
     }
   }
 

package/tests/tests/topics.js

@@ -12,11 +12,11 @@ describe('Topics', function () {
   var config = {
     mq: {
       exchange_name: 'onjs_test',
-      url: 'amqp://rabbitmq:rabbitmq@localhost:35672/',
+      url: 'amqp://rabbitmq:rabbitmq@rabbitmq:5672/',
     },
     redis: {
       port: REDIS_PORT,
-      host: '127.0.0.1'
+      host: 'redis'
     }
   }