Update npm packages

Author: qboot

.babelrc

@@ -1,4 +1,4 @@
 {
-    "presets": ["env", "stage-2"],
-    "plugins": ["transform-runtime"]
+    "presets": ["@babel/preset-env"],
+    "plugins": ["@babel/plugin-transform-runtime", "@babel/plugin-proposal-class-properties"]
 }

.eslintrc.json

@@ -39,6 +39,8 @@
         "object-curly-spacing": [
             "error",
             "always"
-        ]
+        ],
+        "no-prototype-builtins": "off",
+        "require-atomic-updates": "off"
     }
 }

package.json

@@ -34,18 +34,20 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "babel-runtime": "^6.26.0"
+    "@babel/runtime": "^7.4.5"
   },
   "devDependencies": {
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
     "@redirectionio/proxy": "file:./.",
-    "babel-cli": "^6.26.0",
-    "babel-eslint": "^8.2.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "eslint": "^4.14.0",
-    "express": "^4.16.2",
-    "jest": "^22.0.4",
-    "pm2": "^2.9.3"
+    "babel-eslint": "^10.0.2",
+    "eslint": "^6.0.1",
+    "esm": "^3.2.25",
+    "express": "^4.17.1",
+    "jest": "^24.8.0",
+    "pm2": "^3.5.1"
   }
 }

src/Client.js

@@ -130,11 +130,7 @@ export default class Client {
 
         let socket = null
 
-        try {
-            socket = await this.getConnection()
-        } catch (error) {
-            throw error
-        }
+        socket = await this.getConnection()
 
         let response = null
 

src/RedirectionIO.js

@@ -72,11 +72,7 @@ export default class RedirectionIO {
 
         let response = null
 
-        try {
-            response = await client.findRedirect(request)
-        } catch (error) {
-            throw error
-        }
+        response = await client.findRedirect(request)
 
         return response
     }
@@ -93,11 +89,7 @@ export default class RedirectionIO {
             const response = req.rio.response || new Response(res.statusCode)
             const client = new Client(this.connections, 10, false)
 
-            try {
-                await client.log(request, response)
-            } catch (error) {
-                throw error
-            }
+            await client.log(request, response)
         })
     }
 }

tests/Client.test.js

@@ -3,29 +3,32 @@ import { spawn } from 'child_process'
 import AgentNotFoundError from '../src/Error/AgentNotFoundError'
 import BadConfigurationError from '../src/Error/BadConfigurationError'
 import Client from '../src/Client'
-import RedirectResponse from '../src/HttpMessage/RedirectResponse'
 import Request from '../src/HttpMessage/Request'
 import Response from '../src/HttpMessage/Response'
 
 let agent = null
 let client = null
 
 beforeAll(done => {
-    agent = spawn('./node_modules/.bin/babel-node', [__dirname + '/../src/Resources/fake_agent.js'], { detached: true })
+    agent = spawn('node', ['-r', 'esm', __dirname + '/../src/Resources/fake_agent.js'], { detached: true })
     agent.stdout.on('data', () => done())
 
     client = new Client({ 'fake_agent': 'tcp://localhost:3100' })
 })
 
 afterAll(() => {
-    process.kill(-agent.pid)
+    try {
+        process.kill(-agent.pid)
+    } catch (error) {
+        // Fake agent already stopped
+    }
 })
 
 it('find redirect when rule exist', async () => {
     const request = createRequest({ path: '/foo' })
     const response = await client.findRedirect(request)
 
-    expect(response).toBeInstanceOf(RedirectResponse)
+    expect(response).toBeInstanceOf(Response)
     expect(response.statusCode).toBe(301)
     expect(response.location).toBe('/bar')
 })
@@ -42,13 +45,13 @@ it('find twice redirect when rule exist', async () => {
     const request = createRequest({ path: '/foo' })
     let response = await client.findRedirect(request)
 
-    expect(response).toBeInstanceOf(RedirectResponse)
+    expect(response).toBeInstanceOf(Response)
     expect(response.statusCode).toBe(301)
     expect(response.location).toBe('/bar')
 
     response = await client.findRedirect(request)
 
-    expect(response).toBeInstanceOf(RedirectResponse)
+    expect(response).toBeInstanceOf(Response)
     expect(response.statusCode).toBe(301)
     expect(response.location).toBe('/bar')
 })
@@ -107,7 +110,7 @@ it('find redirect in multiple hosts array', async () => {
     const request = createRequest({ path: '/foo' })
     const response = await customClient.findRedirect(request)
 
-    expect(response).toBeInstanceOf(RedirectResponse)
+    expect(response).toBeInstanceOf(Response)
     expect(response.statusCode).toBe(301)
     expect(response.location).toBe('/bar')
 })
@@ -119,7 +122,7 @@ it('find nothing when agent goes down', async () => {
         return new Promise(resolve => {
             const env = Object.create(process.env)
             env.RIO_PORT = 3101
-            customAgent = spawn('./node_modules/.bin/babel-node', [__dirname + '/../src/Resources/fake_agent.js'], { env: env, detached: true })
+            customAgent = spawn('node', ['-r', 'esm', __dirname + '/../src/Resources/fake_agent.js'], { env: env, detached: true })
             customAgent.stdout.on('data', () => resolve())
             customAgent.stderr.on('data', data => console.log(data.toString()))
         })
@@ -134,11 +137,15 @@ it('find nothing when agent goes down', async () => {
     const request = createRequest({ path: '/foo' })
     let response = await customClient.findRedirect(request)
 
-    expect(response).toBeInstanceOf(RedirectResponse)
+    expect(response).toBeInstanceOf(Response)
     expect(response.statusCode).toBe(301)
     expect(response.location).toBe('/bar')
 
-    process.kill(-customAgent.pid)
+    try {
+        process.kill(-customAgent.pid)
+    } catch (error) {
+        // Fake agent already stopped
+    }
 
     await expect(customClient.findRedirect(request)).resolves.toBeFalsy()
 })

tests/RedirectionIO.test.js

@@ -9,11 +9,17 @@ const config = { 'fake_agent': 'tcp://127.0.0.1:3200' }
 beforeAll(done => {
     const env = Object.create(process.env)
     env.RIO_PORT = 3200
-    agent = spawn('./node_modules/.bin/babel-node', [__dirname + '/../src/Resources/fake_agent.js'], { env: env, detached: true })
+    agent = spawn('node', ['-r', 'esm', __dirname + '/../src/Resources/fake_agent.js'], { env: env, detached: true })
     agent.stdout.on('data', () => done())
 })
 
-afterAll(() => process.kill(-agent.pid))
+afterAll(() => {
+    try {
+        process.kill(-agent.pid)
+    } catch (error) {
+        // Fake agent already stopped
+    }
+})
 
 it('find redirect in express server when rule exist', done => {
     // Mocks all needed functions/objects
@@ -135,7 +141,7 @@ it('find nothing in express server when agent is down', done => {
     try {
         process.kill(-agent.pid)
     } catch (error) {
-        // do nothing
+        // Fake agent already stopped
     }
 
     // Mocks all needed functions/objects