Merge 0b944e1 into 1246e8f

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-gateway",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "homepage": "http://treegateway.org",
   "description": "The Tree Gateway API Gateway",
   "author": "Thiago da Rosa de Bustamante <trbustamante@gmail.com>",
@@ -52,32 +52,30 @@
     "instrument": true
   },
   "dependencies": {
-    "agentkeepalive": "^3.3.0",
-    "argparse": "^1.0.9",
+    "agentkeepalive": "^3.4.0",
+    "argparse": "^1.0.10",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "bson": "^2.0.0",
-    "chalk": "^2.3.0",
+    "chalk": "^2.3.2",
     "cluster": "^0.7.7",
     "compare-versions": "^3.1.0",
-    "compression": "^1.7.1",
+    "compression": "^1.7.2",
     "consul": "^0.30.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.4",
     "decache": "^4.4.0",
     "eventemitter3": "1.x.x",
-    "eventloop-latency": "^1.0.0",
     "events": "^1.1.1",
     "express": "^4.16.2",
     "express-rate-limit": "^2.9.0",
-    "express-winston": "^2.2.0",
+    "express-winston": "^2.5.0",
     "fs-extra-promise": "^0.4.1",
-    "gc-stats": "^1.1.0",
     "human-interval": "^0.1.6",
     "ioredis": "^3.1.4",
     "ip-filter": "^2.0.0",
-    "joi": "^13.0.0",
-    "jsonata": "^1.5.1",
+    "joi": "13.0.0",
+    "jsonata": "^1.5.2",
     "lodash": "^4.17.5",
     "lodash-deep": "^2.0.0",
     "minimatch": "^3.0.4",
@@ -86,14 +84,14 @@
     "os": "^0.1.1",
     "passport": "^0.3.2",
     "passport-http": "^0.3.0",
-    "passport-jwt": "^2.2.0",
+    "passport-jwt": "^3.0.1",
     "passport-local": "^1.0.0",
     "path-to-regexp": "^1.6.0",
     "raw-body": "^2.3.0",
     "request": "^2.83.0",
     "requires-port": "1.x.x",
     "stream-buffers": "^3.0.1",
-    "swagger-client": "^3.4.8",
+    "swagger-client": "^3.5.0",
     "typescript-ioc": "^1.1.0",
     "typescript-rest": "^1.2.2",
     "typescript-rest-swagger": "0.0.12",
@@ -108,7 +106,7 @@
     "@types/argparse": "^1.0.33",
     "@types/bcryptjs": "^2.4.1",
     "@types/body-parser": "^1.16.7",
-    "@types/bson": "^1.0.4",
+    "@types/bson": "^1.0.7",
     "@types/chai": "^3.5.1",
     "@types/chalk": "^2.2.0",
     "@types/compression": "0.0.33",
@@ -128,7 +126,7 @@
     "@types/mustache": "^0.8.30",
     "@types/on-headers": "^2.1.29",
     "@types/passport": "^0.2.33",
-    "@types/passport-http": "^0.3.4",
+    "@types/passport-http": "^0.3.5",
     "@types/passport-jwt": "^2.0.22",
     "@types/passport-local": "^1.0.29",
     "@types/request": "0.0.31",

src/admin/api/admin-api.ts

@@ -1,11 +1,10 @@
 'use strict';
 
-import { StatsRest } from './stats';
 import { MiddlewareRest } from './middleware';
 import { APIRest } from './api';
 import { ConfigPackageRest } from './config-package';
 import { HealthCheck } from './health-check';
 import { UsersRest } from './users';
 import { GatewayRest } from './gateway';
 
-export default [StatsRest, MiddlewareRest, APIRest, ConfigPackageRest, HealthCheck, UsersRest, GatewayRest];
+export default [MiddlewareRest, APIRest, ConfigPackageRest, HealthCheck, UsersRest, GatewayRest];

src/admin/api/middleware.ts

@@ -97,9 +97,9 @@ export class MiddlewareRest {
     }
 
     @GET
-    @Path('stats/request/mapper')
-    statsRequestMapper( @QueryParam('name') name?: string): Promise<Array<string>> {
-        return this.service.list('stats/request/mapper', name);
+    @Path('request/logger')
+    requestLogger( @QueryParam('name') name?: string): Promise<Array<string>> {
+        return this.service.list('request/logger', name);
     }
 
     @DELETE
@@ -187,9 +187,9 @@ export class MiddlewareRest {
     }
 
     @DELETE
-    @Path('stats/request/mapper/:name')
-    removeStatsRequestMapper( @PathParam('name') name: string): Promise<void> {
-        return this.service.remove('stats/request/mapper', name);
+    @Path('request/logger/:name')
+    removeRequestLogger( @PathParam('name') name: string): Promise<void> {
+        return this.service.remove('request/logger', name);
     }
 
     @PUT
@@ -277,9 +277,9 @@ export class MiddlewareRest {
     }
 
     @PUT
-    @Path('stats/request/mapper/:name')
-    updateStatsRequestMapper( @PathParam('name') name: string, @FileParam('file') file: Express.Multer.File): Promise<void> {
-        return this.service.save('stats/request/mapper', name, file.buffer);
+    @Path('request/logger/:name')
+    updateRequestLogger( @PathParam('name') name: string, @FileParam('file') file: Express.Multer.File): Promise<void> {
+        return this.service.save('request/logger', name, file.buffer);
     }
 
     @GET
@@ -480,10 +480,10 @@ export class MiddlewareRest {
     }
 
     @GET
-    @Path('stats/request/mapper/:name')
-    getStatsRequestMapperMiddleware( @PathParam('name') name: string): Promise<Return.DownloadBinaryData> {
+    @Path('request/logger/:name')
+    getRequestLoggerMiddleware( @PathParam('name') name: string): Promise<Return.DownloadBinaryData> {
         return new Promise<Return.DownloadBinaryData>((resolve, reject) => {
-            this.service.read('stats/request/mapper', name)
+            this.service.read('request/logger', name)
                 .then(value => {
                     resolve(new Return.DownloadBinaryData(value, 'application/javascript', name + '.js'));
                 })
@@ -704,13 +704,13 @@ export class MiddlewareRest {
     }
 
     @POST
-    @Path('stats/request/mapper')
-    addStatsRequestMapper( @FileParam('file') file: Express.Multer.File,
+    @Path('request/logger')
+    addRequestLogger( @FileParam('file') file: Express.Multer.File,
         @FormParam('name') name: string) {
         return new Promise<Return.NewResource<void>>((resolve, reject) => {
-            this.service.add('stats/request/mapper', name, file.buffer)
+            this.service.add('request/logger', name, file.buffer)
                 .then(value => {
-                    resolve(new Return.NewResource<void>(path.join('stats/request/mapper', name)));
+                    resolve(new Return.NewResource<void>(path.join('request/logger', name)));
                 })
                 .catch(err => {
                     reject(new Errors.InternalServerError('Error saving handler.'));

src/admin/config/cli-args.ts

@@ -795,41 +795,41 @@ errorHandler.addArgument(
     }
 );
 
-const statsRequestMapper = middlewareCommands.addParser('statsRequestMapper', {
+const requestLogger = middlewareCommands.addParser('requestLogger', {
     addHelp: true,
-    help: 'Stats Request Mapper configurations'
+    help: 'Request Logger configurations'
 });
 
-statsRequestMapper.addArgument(
+requestLogger.addArgument(
     ['-l', '--list'], {
-        help: 'Inform the search params for Stats Request Mapper listing. Ex: --list name:test',
+        help: 'Inform the search params for Request Logger listing. Ex: --list name:test',
         nargs: '*'
     }
 );
 
-statsRequestMapper.addArgument(
+requestLogger.addArgument(
     ['-r', '--remove'], {
-        help: 'Inform the Stats Request Mapper name to be removed',
+        help: 'Inform the Request Logger name to be removed',
     }
 );
 
-statsRequestMapper.addArgument(
+requestLogger.addArgument(
     ['-u', '--update'], {
-        help: 'Inform the name and path to the Stats Request Mapper file (JS format) to be updated. Ex: -u handler1 ./stats/request/mapper/handler1.js',
+        help: 'Inform the name and path to the Request Logger file (JS format) to be updated. Ex: -u handler1 ./request/logger/handler1.js',
         nargs: 2
     }
 );
 
-statsRequestMapper.addArgument(
+requestLogger.addArgument(
     ['-a', '--add'], {
-        help: 'Inform the name and path to the Stats Request Mapper file (JS format) to be added. Ex: -a handler1 ./stats/request/mapper/handler1.js',
+        help: 'Inform the name and path to the Request Logger file (JS format) to be added. Ex: -a handler1 ./request/logger/handler1.js',
         nargs: 2
     }
 );
 
-statsRequestMapper.addArgument(
+requestLogger.addArgument(
     ['-g', '--get'], {
-        help: 'Inform the name of the Stats Request Mapper to be retrieved',
+        help: 'Inform the name of the Request Logger to be retrieved',
     }
 );
 export let configArgs = parser.parseArgs();