v1.0.5

Author: ahmedragab

index.js

@@ -85,6 +85,7 @@ module.exports = {
     server: function (paths, options) {
 
         if (server) return server;
+        app.disable("x-powered-by");
         if (options.proxy) app.set('trust proxy', options.proxy);
         app.use(logger('dev'));
         app.use(limiter);
@@ -100,8 +101,9 @@ module.exports = {
             for (var i = 0; i < keys.length; i++) {
 
                 var routeOptions = routes[keys[i]];
-                var route = typeof options.path === 'string' && typeof routeOptions.path === 'string' ?
-                    join(options.path, routeOptions.path) : routeOptions.path || options.path;
+                var prefix = routeOptions.prefix || options.path;
+                var route = typeof prefix === 'string' && typeof routeOptions.path === 'string' ?
+                    join(prefix, routeOptions.path) : routeOptions.path || prefix;
                 if (route) route = new Route(route);
                 var method = typeof routeOptions.method === 'string' &&
                     typeof app[routeOptions.method.toLowerCase()] === 'function' &&
@@ -149,10 +151,7 @@ module.exports = {
         app.use(function (err, req, res, next) {
 
             debug(err);
-            if (res.headersSent) {
-
-                return next(err);
-            }
+            if (res.headersSent) return next(err);
             respond(res.status(HttpStatus.getStatus(err.code) || 500), {
 
                 behaviour: err.name,

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "backend-js",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "Backend-js is a layer built above expressjs to enable behaviours framework for nodejs applications.",
     "main": "index.js",
     "scripts": {
@@ -25,6 +25,7 @@
         "morgan": "latest",
         "parseparams": "latest",
         "route-parser": "latest",
+        "vhost": "latest",
         "snyk": "^1.530.0"
     },
     "repository": {
@@ -48,4 +49,4 @@
     },
     "homepage": "https://github.com/quaNode/backend-js#readme",
     "snyk": true
-}
+}

package.json

@@ -5,8 +5,9 @@
 var express = require('express');
 var paginate = require('express-paginate');
 var Route = require('route-parser');
-var define = require('define-js');
 var unless = require('express-unless');
+var vhost = require('vhost');
+var define = require('define-js');
 var parse = require('parseparams');
 var { BusinessBehaviourType, BusinessBehaviour } = require('behaviours-js');
 var businessController = require('./controller.js').businessController;
@@ -49,6 +50,8 @@ var behaviours = {
 
 var BEHAVIOURS = {};
 
+var defaultRemotes = {};
+
 var FetchBehaviours = {};
 
 var LogBehaviours = {};
@@ -77,8 +80,6 @@ var types = {
 
 var defaultPrefix = '/';
 
-var defaultRemotes = {};
-
 backend.behaviour = function (path, config) {
 
     if (typeof app !== 'function' || typeof app.use !== 'function') {
@@ -164,8 +165,14 @@ backend.behaviour = function (path, config) {
                 if (typeof plugin === 'function' && parse(plugin)[0] === 'out') return plugin;
                 return res_plugin;
             }, undefined);
-            var prefix = typeof path === 'string' && path.length > 0 ?
-                join(defaultPrefix, path) : defaultPrefix !== '/' ? defaultPrefix : null;
+            var prefix;
+            var overwritePath;
+            if (typeof config === 'object') overwritePath = config.overwritePath;
+            if (typeof path === 'string' && path.length > 0) {
+
+                if (overwritePath) prefix = path;
+                else prefix = join(defaultPrefix, path);
+            } else if (defaultPrefix !== '/' && !overwritePath) prefix = defaultPrefix;
             var behaviour_runner = function (req, res, next, inputObjects, er) {
 
                 var signature = getSignature(req);
@@ -210,7 +217,7 @@ backend.behaviour = function (path, config) {
                         request.next(error || er || new Error('Error while executing ' +
                             options.name + ' behaviour, version ' + options.version + '!'));
                     } else if (!res_plugin ||
-                        res_plugin(behaviourResponse, request.req, request.res, request.next)) {
+                        !res_plugin(behaviourResponse, request.req, request.res, request.next)) {
 
                         response.response = options.paginate ? behaviourResponse.modelObjects ||
                             behaviourResponse : behaviourResponse;
@@ -311,6 +318,11 @@ backend.behaviour = function (path, config) {
                     }
                 });
             }
+            if (typeof options.host === 'string' && options.host.length > 0) {
+
+                req_handler = vhost(options.host, req_handler);
+                if (req_plugin) req_plugin = vhost(options.host, req_plugin);
+            }
             if (isRoute) {
 
                 var keys = Object.keys(behaviours);
@@ -351,6 +363,7 @@ backend.behaviour = function (path, config) {
                     version: options.version,
                     method: options.method,
                     path: options.path,
+                    prefix: prefix,
                     origins: options.origins,
                     credentials: options.credentials,
                     maxAge: options.maxAge,
@@ -387,4 +400,4 @@ backend.behaviours = function (path, parser, remotes) {
     return behaviours;
 };
 
-backend.routes = behaviours;
+backend.routes = behaviours;

src/behaviour.js

@@ -47,9 +47,9 @@ module.exports.getLogBehaviour =
                 };
             }
         };
-        return define(getLBConstructor).extend(getRemoteBehaviour(options, config,
-            types, BEHAVIOURS, defaultRemotes, FetchBehaviours)).defaults({
+        return define(getLBConstructor).extend(getRemoteBehaviour(options, config, types, BEHAVIOURS,
+            defaultRemotes, FetchBehaviours)).defaults({
 
                 type: types[options.type]
             });
-    };
+    };