feat: add service information in the responses

epoberezkin · epoberezkin · commit 482df0f145e7 · 2016-06-19T20:58:52.000+01:00
diff --git a/README.md b/README.md
@@ -83,12 +83,14 @@ the response will be a combination of two responses (both requests are processed
   "res1": {
     "statusCode": 200,
     "headers": { /* response headers for the 1st request */ },
+    "service": { "name": "service1", "basePath": "http://localhost:3001" },
     "request": { "method": "get", "path": "/resource/1" },
     "body": { /* response body 1 */ }
   },
   "res2": {
     "statusCode": 200,
     "headers": { /* response headers for the 2nd request */ },
+    "service": { "name": "service2", "basePath": "http://localhost:3002" },
     "request": { "method": "get", "path": "/resource/2" },
     "body": { /* response body 2 */ }
   }
diff --git a/index.js b/index.js
@@ -19,8 +19,8 @@ function jsonscriptProxy(options, js) {
   }
 
   js = js || new JSONScript(options.jsonscript || { strict: true });
-  for (var key in options.services)
-    js.addExecutor(key, getExecutor(options.services[key]));
+  for (var name in options.services)
+    js.addExecutor(name, getExecutor(name, options.services[name]));
   evaluator.js = js;
 
   return evaluator;
@@ -51,9 +51,13 @@ function jsonscriptProxy(options, js) {
   }
 
 
-  function getExecutor(service) {
+  function getExecutor(serviceName, service) {
     var processResponse = processResponseFunc(service.processResponse || options.processResponse);
     addExecutorMethods();
+    var serviceInfo = {
+      name: serviceName,
+      basePath: service.basePath
+    };
     return execRouter;
 
     function execRouter(args) {
@@ -66,7 +70,7 @@ function jsonscriptProxy(options, js) {
       return new (options.Promise || Promise)(function (resolve, reject) {
         request[args.method](opts, function (err, resp) {
           if (err) return reject(err);
-          try { resolve(processResponse(resp, args)); }
+          try { resolve(processResponse(resp, args, serviceInfo)); }
           catch(e) { reject(e); }
         });
       });
@@ -110,8 +114,9 @@ function bodyProcessResponse(resp) {
 }
 
 
-function defaultProcessResponse(resp, args) {
+function defaultProcessResponse(resp, args, service) {
   resp = _.pick(resp, 'statusCode', 'headers', 'body');
+  resp.service = service;
   resp.request = args;
   return resp;
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsonscript-proxy",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Proxy server for scripted processing of other services using JSONScript",
   "main": "index.js",
   "bin": {
diff --git a/spec/proxy_cli.spec.js b/spec/proxy_cli.spec.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var startService = require('./service')
+  , proxyConfig = require('./proxy_config.json')
   , request = require('request')
   , assert = require('assert')
   , spawn = require('child_process').spawn;
@@ -95,6 +96,7 @@ function send(port, api, reqBody, callback) {
 function assertGetResult(result, serviceName, name, id) {
   assert.equal(result.statusCode, 200);
   assert.equal(typeof result.headers, 'object');
+  assert.deepEqual(result.service, { name: serviceName, basePath: proxyConfig.services[serviceName].basePath });
   assert.deepEqual(result.request, { method: 'get', path: '/' + name + '/' + id })
   assert.deepEqual(result.body, {
     name: name,
diff --git a/spec/proxy_handler.spec.js b/spec/proxy_handler.spec.js
@@ -333,6 +333,7 @@ describe('jsonscript proxy handler', function() {
 function assertGetResult(result, serviceName, name, id) {
   assert.equal(result.statusCode, 200);
   assert.equal(typeof result.headers, 'object');
+  assert.deepEqual(result.service, { name: serviceName, basePath: SERVICES[serviceName].basePath });
   assert.deepEqual(result.request, { method: 'get', path: '/' + name + '/' + id })
   assert.deepEqual(result.body, {
     name: name,
@@ -346,6 +347,7 @@ function assertGetResult(result, serviceName, name, id) {
 function assertPostResult(result, serviceName, name, data) {
   assert.equal(result.statusCode, 200);
   assert.equal(typeof result.headers, 'object');
+  assert.deepEqual(result.service, { name: serviceName, basePath: SERVICES[serviceName].basePath });
   assert.deepEqual(result.request, { method: 'post', path: '/' + name, body: data })
   assert.equal(result.body.name, name);
   var id = result.body.id;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jsonscript-proxy",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "0.2.1",`
`4`	`4`	`"description": "Proxy server for scripted processing of other services using JSONScript",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"bin": {`