orator 3.0.8 → 3.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orator",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "Unopinionated restful web API server container",
   "main": "source/Orator.js",
   "scripts": {

package/source/Orator-ServiceServer-Base.js

@@ -6,6 +6,8 @@ class OratorServiceServerBase
 
 		this.log = pOrator.log;
 
+		this.ServiceServerType = 'Base';
+
 		this.Name = this.orator.settings.Product;
 		this.URL = 'BASE_SERVICE_SERVER';
 		this.Port = this.orator.settings.ServicePort;
@@ -34,17 +36,19 @@ class OratorServiceServerBase
 	 * End of Service Lifecycle Functions
 	 */
 
-	use(fHandlerFunction)
+	/*
+	 * Content parsing functions
+	 *************************************************************************/
+	bodyParser(pOptions)
 	{
-		if (typeof(fHandlerFunction) != 'function')
-		{
-			this.log.error(`Orator USE global handler mapping failed -- parameter was expected to be a function with prototype function(Request, Response, Next) but type was ${typeof(fHandlerFunction)} instead of a string.`)
-			return false;
-		}
-
-		return true;
+		return (pRequest, pResponse, fNext) => 
+			{
+				fNext();
+			};
 	}
-
+	/*************************************************************************
+	 * End of Service Lifecycle Functions
+	 */
 
 	/*
 	 * Service Route Creation Functions
@@ -68,6 +72,21 @@ class OratorServiceServerBase
 
 	 * This pattern and calling super is totally optional, obviously.
 	 *************************************************************************/
+	use(fHandlerFunction)
+	{
+		if (typeof(fHandlerFunction) != 'function')
+		{
+			this.log.error(`Orator USE global handler mapping failed -- parameter was expected to be a function with prototype function(Request, Response, Next) but type was ${typeof(fHandlerFunction)} instead of a string.`)
+			return false;
+		}
+
+		return true;
+	}
+
+	doGet(pRoute, ...fRouteProcessingFunctions)
+	{
+		return true;
+	}
 	get(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -75,10 +94,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator GET Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doGet(pRoute, ...fRouteProcessingFunctions);
+	}
+	getWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.get(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doPut(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	put(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -86,10 +112,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator PUT Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doPut(pRoute, ...fRouteProcessingFunctions);
+	}
+	putWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.put(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doPost(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	post(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -97,10 +130,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator POST Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doPost(pRoute, ...fRouteProcessingFunctions);
+	}
+	postWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.post(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doDel(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	del(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -108,10 +148,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator DEL Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doDel(pRoute, ...fRouteProcessingFunctions);
+	}
+	delWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.del(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doPatch(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	patch(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -119,10 +166,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator PATCH Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doPatch(pRoute, ...fRouteProcessingFunctions);
+	}
+	patchWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.patch(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doOpts(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	opts(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -130,10 +184,17 @@ class OratorServiceServerBase
 			this.log.error(`Orator OPTS Route mapping failed -- route parameter was ${typeof(pRoute)} instead of a string.`)
 			return false;
 		}
+		return this.doOpts(pRoute, ...fRouteProcessingFunctions);
+	}
+	optsWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.opts(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 
+	doHead(pRoute, ...fRouteProcessingFunctions)
+	{
 		return true;
 	}
-
 	head(pRoute, ...fRouteProcessingFunctions)
 	{
 		if (typeof(pRoute) != 'string')
@@ -144,6 +205,10 @@ class OratorServiceServerBase
 
 		return true;
 	}
+	headWithBodyParser(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.head(pRoute, this.bodyParser(), ...fRouteProcessingFunctions);
+	}
 	/*************************************************************************
 	 * End of Service Route Creation Functions
 	 */

package/source/Orator-ServiceServer-IPC.js

@@ -21,6 +21,8 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 		this.router = libFindMyWay(this.routerOptions);
 		this.router.addConstraintStrategy(libOratorServiceServerIPCCustomConstrainer);
 
+		this.ServiceServerType = 'IPC';
+
 		this.URL = 'IPC';
 
 		this.preBehaviorFunctions = [];
@@ -163,48 +165,48 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 		return true;
 	}
 
-	get(pRoute, ...fRouteProcessingFunctions)
+	// This is the virtualized "body parser"
+	bodyParser()
 	{
-		if (!super.get(pRoute, ...fRouteProcessingFunctions))
+		return (pRequest, pResponse, fNext) =>
 		{
-			this.log.error(`IPC provider failed to map GET route [${pRoute}]!`);
-			return false;
-		}
+			return fNext();
+		};
+	}
 
+	doGet(pRoute, ...fRouteProcessingFunctions)
+	{
 		return this.addRouteProcessor('GET', pRoute, Array.from(fRouteProcessingFunctions));
 	}
 
-	put(pRoute, ...fRouteProcessingFunctions)
+	doPut(pRoute, ...fRouteProcessingFunctions)
 	{
-		if (!super.get(pRoute, ...fRouteProcessingFunctions))
-		{
-			this.log.error(`IPC provider failed to map PUT route [${pRoute}]!`);
-			return false;
-		}
+		return this.addRouteProcessor('PUT', pRoute, Array.from(fRouteProcessingFunctions));
+	}
 
-		return true;
+	doPost(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.addRouteProcessor('POST', pRoute, Array.from(fRouteProcessingFunctions));
 	}
 
-	post(pRoute, ...fRouteProcessingFunctions)
+	doDel(pRoute, ...fRouteProcessingFunctions)
 	{
-		if (!super.get(pRoute, ...fRouteProcessingFunctions))
-		{
-			this.log.error(`IPC provider failed to map POST route [${pRoute}]!`);
-			return false;
-		}
+		return this.addRouteProcessor('DEL', pRoute, Array.from(fRouteProcessingFunctions));
+	}
 
-		return true;
+	doPatch(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.addRouteProcessor('PATCH', pRoute, Array.from(fRouteProcessingFunctions));
 	}
 
-	del(pRoute, ...fRouteProcessingFunctions)
+	doOpts(pRoute, ...fRouteProcessingFunctions)
 	{
-		if (!super.get(pRoute, ...fRouteProcessingFunctions))
-		{
-			this.log.error(`IPC provider failed to map DEL route [${pRoute}]!`);
-			return false;
-		}
+		return this.addRouteProcessor('OPTS', pRoute, Array.from(fRouteProcessingFunctions));
+	}
 
-		return true;
+	doHead(pRoute, ...fRouteProcessingFunctions)
+	{
+		return this.addRouteProcessor('HEAD', pRoute, Array.from(fRouteProcessingFunctions));
 	}
 	/*************************************************************************
 	 * End of Service Route Creation Functions

package/test/Orator_basic_tests.js

@@ -40,7 +40,12 @@ suite
 						Expect(tmpOrator).to.be.an('object', 'Orator should initialize as an object directly from the require statement.');
 						Expect(tmpOrator.startService).to.be.an('function');
 						Expect(tmpOrator.settings).to.be.an('object');
-						fDone();
+						tmpOrator.initializeServiceServer(
+							(pError)=>
+							{
+								Expect(tmpOrator.serviceServer.ServiceServerType).to.equal('IPC', 'The default service server provider should be IPC.');
+								fDone();
+							});
 					}
 				);