orator 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orator",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Unopinionated restful web API server container",
   "main": "source/Orator.js",
   "scripts": {
@@ -58,12 +58,13 @@
     "mocha": "10.2.0",
     "nyc": "^15.1.0",
     "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0"
+    "vinyl-source-stream": "^2.0.0",
+    "orator-serviceserver-restify": "^1.0.1"
   },
   "dependencies": {
     "async": "^3.2.4",
-    "fable": "~3.0.3",
+    "fable": "^3.0.7",
     "find-my-way": "^7.5.0",
-    "orator-serviceserver": "^1.0.1"
+    "orator-serviceserver": "^1.0.2"
   }
 }

package/source/Orator-ServiceServer-IPC.js

@@ -28,6 +28,28 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 		this.postBehaviorFunctions = [];
 	}
 
+	use(fHandlerFunction)
+	{
+		if (!super.use(fHandlerFunction))
+		{
+			this.log.error(`IPC provider failed to map USE handler function!`);
+			return false;
+		}
+
+		this.preBehaviorFunctions.push(fHandlerFunction);
+	}
+
+	addPostBehaviorFunction(fHandlerFunction)
+	{
+		if (!super.use(fHandlerFunction))
+		{
+			this.log.error(`IPC provider failed to map USE handler function!`);
+			return false;
+		}
+
+		this.preBehaviorFunctions.push(fHandlerFunction);
+	}
+
 	executePreBehaviorFunctions(pRequest, pResponse, fNext)
 	{
 		libAsyncEachOfSeries(this.preBehaviorFunctions,
@@ -45,6 +67,17 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 			});
 	}
 
+	addPostBehaviorFunction(fHandlerFunction)
+	{
+		if (!super.use(fHandlerFunction))
+		{
+			this.log.error(`IPC provider failed to map USE handler function!`);
+			return false;
+		}
+
+		this.preBehaviorFunctions.push(fHandlerFunction);
+	}
+
 	executePostBehaviorFunctions(pRequest, pResponse, fNext)
 	{
 		libAsyncEachOfSeries(this.postBehaviorFunctions,
@@ -181,7 +214,7 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 	invoke(pMethod, pRoute, pData, fCallback)
 	{
 		// If the data is skipped and a callback is parameter 3, do the right thing
-		let tmpCallback = (typeof(fCallback) == 'function') ? fCallback : 
+		let tmpCallback = (typeof(fCallback) == 'function') ? fCallback :
 							(typeof(pData) == 'function') ? pData :
 							// This is here in case the developer passed no callback and just wants to fire and forget the IPC call which might not be async safe
 							()=>{};
@@ -207,7 +240,7 @@ class OratorServiceServerIPC extends libOratorServiceServerBase
 					this.log.error(`IPC Request Error Request GUID [${tmpRequest.guid}] handling route [${pRoute}]: ${pError}`, {Error: pError, Route: pRoute, Data: pData});
 				}
 
-				// by default, send data back through 
+				// by default, send data back through
 				return tmpCallback(pError, tmpSynthesizedResponseData.responseData, tmpSynthesizedResponseData, pResults);
 			});
 	}

package/source/Orator.js

@@ -88,6 +88,8 @@ class Orator
 		{
 			this.log.warn(`Orator attempting to initialize a service server after initialization has already completed.`)
 		}
+
+		return tmpNext()
 	}
 
 	_startServiceListener(fNext)

package/test/Orator_basic_tests.js

@@ -13,6 +13,8 @@ const Expect = Chai.expect;
 const Assert = Chai.assert;
 
 //const libSuperTest = require('supertest');
+const libFable = require('fable');
+const _Fable = new libFable({Product:'Orator-BasicTests-Backplane'});
 
 const _MockSettings = (
 {
@@ -53,7 +55,9 @@ suite
 						// Start the service server
 						tmpOrator.initializeServiceServer();
 						// Start the service
+						Expect(tmpOrator.serviceServer.Active).to.equal(false);
 						tmpOrator.startService(fDone);
+						Expect(tmpOrator.serviceServer.Active).to.equal(true);
 					}
 				);
 
@@ -75,7 +79,7 @@ suite
 							{
 								// Send back the request parameters
 								pResponse.send(pRequest.params);
-								tmpOrator.fable.log.info(`sent ${pRequest.params}`);
+								tmpOrator.fable.log.info(`Endpoint sent parameters object:`,pRequest.params);
 								return fNext();
 							}
 						);
@@ -84,11 +88,117 @@ suite
 						tmpOrator.invoke('GET', tmpURI, null, 
 							(pError, pResponseData) =>
 							{
-								tmpOrator.log.info(`Response to [${tmpURI}] came back from IPC resulting in [${pResponseData}]!`)
+								let tmpResponseObject = JSON.parse(pResponseData);
+								Expect(tmpResponseObject).to.have.a.property('hash');
+								Expect(tmpResponseObject.hash).to.equal('SomeHash');
+								tmpOrator.log.info(`Response to [${tmpURI}] came back from IPC resulting in [${pResponseData}] which is type ${typeof(pResponseData)}!`);
 								return fDone();
 							});
 					}
 				);
+
+				test
+				(
+					'ipc should be able to process any number of handler additions with the use function',
+					(fDone) =>
+					{
+						let tmpOrator = new libOrator();
+						// Initialize the service server
+						tmpOrator.initializeServiceServer();
+						// Start the service
+						tmpOrator.startService();
+
+						tmpOrator.serviceServer.get
+						(
+							'/MagicEndpoint/:MagicWords',
+							(pRequest, pResponse, fNext) =>
+							{
+								let tmpResponseObject = (
+									{
+										MagicWords: pRequest.params.MagicWords,
+										MagicIngredients: pRequest.MagicIngredients
+									});
+								pResponse.send(tmpResponseObject);
+								return fNext();
+							}
+						);
+
+						_Fable.Utility.waterfall([
+								(fStageComplete) =>
+								{
+									let tmpURI = `/MagicEndpoint/BippityBoppityBoo`;
+									tmpOrator.invoke('GET', tmpURI, null, 
+										(pError, pResponseData) =>
+										{
+											let tmpResponseObject = JSON.parse(pResponseData);
+											Expect(tmpResponseObject).to.have.a.property('MagicWords');
+											Expect(tmpResponseObject.MagicWords).to.equal('BippityBoppityBoo');
+											Expect(tmpResponseObject).to.not.have.a.property('MagicIngredients');
+											//Expect(tmpResponseObject.MagicIngredients).to.be('undefined');
+											tmpOrator.log.info(`Response to [${tmpURI}] came back from IPC resulting in [${pResponseData}] which is type ${typeof(pResponseData)}!`);
+											return fStageComplete();
+										});
+								},
+								(fStageComplete) =>
+								{
+									// Add a use parameter that decorates the ingredients
+									tmpOrator.serviceServer.use(
+										(pRequest, pResponse, fNext) =>
+										{
+											pRequest.MagicIngredients = [];
+											return fNext();
+										});
+									return fStageComplete();
+								},
+								(fStageComplete) =>
+								{
+									let tmpURI = `/MagicEndpoint/BippityBoppityBoo`;
+									tmpOrator.invoke('GET', tmpURI, null, 
+										(pError, pResponseData) =>
+										{
+											let tmpResponseObject = JSON.parse(pResponseData);
+											Expect(tmpResponseObject).to.have.a.property('MagicWords');
+											Expect(tmpResponseObject.MagicWords).to.equal('BippityBoppityBoo');
+											Expect(tmpResponseObject).to.have.a.property('MagicIngredients');
+											Expect(tmpResponseObject.MagicIngredients).to.be.an('array');
+											tmpOrator.log.info(`Response to [${tmpURI}] came back from IPC resulting in [${pResponseData}] which is type ${typeof(pResponseData)}!`);
+											return fStageComplete();
+										});
+								},
+								(fStageComplete) =>
+								{
+									// Add a use parameter that decorates the ingredients
+									tmpOrator.serviceServer.use(
+										(pRequest, pResponse, fNext) =>
+										{
+											pRequest.MagicIngredients.push('Magic Outcomes');
+											return fNext();
+										});
+									return fStageComplete();
+								},
+								(fStageComplete) =>
+								{
+									let tmpURI = `/MagicEndpoint/BippityBoppityBoo`;
+									tmpOrator.invoke('GET', tmpURI, null,
+										(pError, pResponseData) =>
+										{
+											let tmpResponseObject = JSON.parse(pResponseData);
+											Expect(tmpResponseObject).to.have.a.property('MagicWords');
+											Expect(tmpResponseObject.MagicWords).to.equal('BippityBoppityBoo');
+											Expect(tmpResponseObject).to.have.a.property('MagicIngredients');
+											Expect(tmpResponseObject.MagicIngredients).to.be.an('array');
+											Expect(tmpResponseObject.MagicIngredients[0]).to.equal('Magic Outcomes');
+											tmpOrator.log.info(`Response to [${tmpURI}] came back from IPC resulting in [${pResponseData}] which is type ${typeof(pResponseData)}!`);
+											return fStageComplete();
+										});
+								}
+							],
+							(pError) =>
+							{
+								return fDone();
+							})
+					}
+				);
 			}
 		);
 	}