Build 2.20: Added onRequest to MicroService Routing

robtweed · Sep 4, 2017 · b5601e1 · b5601e1
1 parent 79a576e
commit b5601e1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/docker/package.json b/docker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "qewd-appliance",
-  "version": "2.1.0",
+  "version": "2.19.0",
   "description": "QEWD Docker appliance",
   "author": "Rob Tweed <rtweed@mgateway.com>",
   "main": "qewd.js",
   "scripts": {
-    "start": "node qewd.js"
+    "start": "NODE_PATH=/opt/qewd/mapped node qewd.js"
   },
   "dependencies": {
     "qewd": "",

diff --git a/lib/microServices.js b/lib/microServices.js
@@ -24,7 +24,7 @@
  |  limitations under the License.                                          |
  ----------------------------------------------------------------------------
 
-  17 August 2017
+  4 September 2017
 
   Run during master process startup (see master.js)
   Sets up MicroService connections and control data structues 
@@ -121,6 +121,13 @@ module.exports = function(services_config) {
         onResponse: service.onResponse,
         route: new router.routeParser(service.path)
       };
+
+      if (service.onRequest) {
+        route.onRequest = service.onRequest;
+        delete route.destination; // onRequest function will determine the destination
+        delete route.onResponse;  // onRequest's responsibility is to route to a destination which may have an onResponse
+      }
+
       q.u_services.restRoutes.push(route);
 
       // make qewd-router accessible to ewd-qoper8-express which will handle the run-time routing

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 
 {
   "name": "qewd",
-  "version": "2.19.0",
+  "version": "2.20.0",
   "config": {
-    "date": "1 September 2017"
+    "date": "4 September 2017"
   },
   "description": "Quick and Easy Web Development",
   "main": "index.js",

diff --git a/rpi-docker/package.json b/rpi-docker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "qewd-rpi-appliance",
-  "version": "2.2.0",
+  "version": "2.19.0",
   "description": "QEWD Docker Appliance for Raspberry Pi",
   "author": "Rob Tweed <rtweed@mgateway.com>",
   "main": "qewd.js",
   "scripts": {
-    "start": "node qewd.js"
+    "start": "NODE_PATH=/opt/qewd/mapped node qewd.js"
   },
   "dependencies": {
     "qewd": "",