orator 2.0.3 → 2.0.8

package/.travis.yml

@@ -2,7 +2,11 @@ services:
   - mongodb
 language: node_js
 node_js:
-  - "6"
+  - "8"
+  - "10"
+  - "12"
+  - "14"
+  - "15"
 addons:
   code_climate:
     repo_token: 63ba2b0cf307133c314376df4b05fa8f0aa5e98919eb76488ad27a07f163cb77
@@ -12,4 +16,4 @@ after_script:
   - cat coverage/lcov.info | ./node_modules/codeclimate-test-reporter/bin/codeclimate.js
   - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 notifications:
-  slack: paviateam:C1q99hL9XXpiPpau2PUrVZPC
+  slack: paviateam:C1q99hL9XXpiPpau2PUrVZPC

package/Debug-Harness.js

@@ -0,0 +1,24 @@
+// Load the orator module with a few settings
+var libOrator = require(__dirname+'/source/Orator.js').new(
+	{
+		Product: 'MyMicroserviceHash',
+		ProductVersion: '9.8.7',
+
+		"APIServerPort": 8080
+	});
+
+// Add an API endpoint
+libOrator.webServer.get
+(
+	'/test/:hash',
+	function(pRequest, pResponse, fNext)
+	{
+		// Send back whatever was sent as "name" in the URI
+		pResponse.send(pRequest.params);
+		libOrator.fable.log.info('WTF');
+		return fNext();
+	}
+);
+
+// Start the web service
+libOrator.startWebServer();

package/README.md

@@ -2,7 +2,7 @@
 
 Orator API Server, meant to interact well with Fable, Meadow and FoxHound.
 
-[![Code Climate](https://codeclimate.com/github/stevenvelozo/orator/badges/gpa.svg)](https://codeclimate.com/github/stevenvelozo/orator) [![Coverage Status](https://coveralls.io/repos/stevenvelozo/orator/badge.svg?branch=master)](https://coveralls.io/r/stevenvelozo/orator?branch=master) [![Build Status](https://travis-ci.org/stevenvelozo/orator.svg?branch=master)](https://travis-ci.org/stevenvelozo/orator) [![Dependency Status](https://david-dm.org/stevenvelozo/orator.svg)](https://david-dm.org/stevenvelozo/orator) [![devDependency Status](https://david-dm.org/stevenvelozo/orator/dev-status.svg)](https://david-dm.org/stevenvelozo/orator#info=devDependencies)
+[![Coverage Status](https://coveralls.io/repos/stevenvelozo/orator/badge.svg?branch=master)](https://coveralls.io/r/stevenvelozo/orator?branch=master) [![Build Status](https://travis-ci.org/stevenvelozo/orator.svg?branch=master)](https://travis-ci.org/stevenvelozo/orator) [![Dependency Status](https://david-dm.org/stevenvelozo/orator.svg)](https://david-dm.org/stevenvelozo/orator) [![devDependency Status](https://david-dm.org/stevenvelozo/orator/dev-status.svg)](https://david-dm.org/stevenvelozo/orator#info=devDependencies)
 
 This is not an attempt to reinvent the wheel.  Nor do we want to make a car with five of them.
 
@@ -29,7 +29,7 @@ var libOrator = require('orator').new(
 	});
 
 // Add an API endpoint
-pOrator.webServer.post
+libOrator.webServer.post
 (
 	'/echo/:name',
 	function(pRequest, pResponse, fNext)
@@ -61,7 +61,7 @@ var libOrator = require('orator').new(
 	});
 
 // Add an API endpoint
-pOrator.webServer.post
+libOrator.webServer.post
 (
 	'/echo/:name',
 	function(pRequest, pResponse, fNext)

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "orator",
-  "version": "2.0.3",
+  "version": "2.0.8",
   "description": "Restful web API server. Using restify 6.",
   "main": "source/Orator.js",
   "scripts": {
     "start": "node source/Orator.js",
     "coverage": "npm run coverage-normal && npm run coverage-cluster && npm run coverage-report",
-    "coverage-normal": "./node_modules/istanbul/lib/cli.js cover --dir ./coverage/normal ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
-    "coverage-cluster": "./node_modules/istanbul/lib/cli.js cover --dir ./coverage/cluster ./node_modules/mocha/bin/_mocha -- -u tdd -R spec ./test/Orator_cluster_test.js.deferred",
+    "coverage-normal": "./node_modules/istanbul/lib/cli.js cover --dir ./coverage/normal ./node_modules/mocha/bin/_mocha -- --exit -u tdd -R spec",
+    "coverage-cluster": "./node_modules/istanbul/lib/cli.js cover --dir ./coverage/cluster ./node_modules/mocha/bin/_mocha -- --exit -u tdd -R spec ./test/Orator_cluster_test.js.deferred",
     "coverage-report": "./node_modules/istanbul/lib/cli.js report",
     "test": "npm run test-normal && npm run test-cluster",
-    "test-normal": "./node_modules/mocha/bin/_mocha -u tdd -R spec",
-    "test-cluster": "./node_modules/mocha/bin/_mocha -u tdd -R spec ./test/Orator_cluster_test.js.deferred"
+    "tests": "mocha --exit -u tdd -R spec -g",
+    "test-normal": "./node_modules/mocha/bin/_mocha --exit -u tdd -R spec",
+    "test-cluster": "./node_modules/mocha/bin/_mocha --exit -u tdd -R spec ./test/Orator_cluster_test.js.deferred"
   },
   "repository": {
     "type": "git",
@@ -29,25 +30,23 @@
   },
   "homepage": "https://github.com/stevenvelozo/orator",
   "devDependencies": {
-    "async": "1.5.0",
-    "chai": "3.4.1",
-    "codeclimate-test-reporter": "0.1.1",
-    "coveralls": "2.11.4",
-    "istanbul": "0.4.1",
-    "mocha": "^5.2.0",
-    "supertest": "1.1.0"
-  },
-  "optionalDependencies": {
-    "nodegrind": "git+https://github.com/stevenvelozo/nodegrind.git"
+    "async": "2.6.1",
+    "chai": "4.1.2",
+    "codeclimate-test-reporter": "0.5.0",
+    "coveralls": "3.0.2",
+    "istanbul": "0.4.5",
+    "mocha": "5.2.0",
+    "supertest": "3.1.0"
   },
   "dependencies": {
+    "cachetrax": "^1.0.0",
     "cluster": "^0.7.7",
-    "fable": "~1.0.1",
-    "fable-uuid": "~1.0.1",
+    "fable": "~1.0.2",
+    "fable-uuid": "~1.0.2",
     "http-forward": "^0.1.3",
-    "request": "^2.69.0",
+    "request": "^2.88.2",
     "restify": "^6.4.0",
-    "restify-await-promise": "^1.0.0",
+    "restify-await-promise": "^2.2.0",
     "restify-cors-middleware": "^1.1.1"
   }
 }

package/source/Orator.js

@@ -6,6 +6,7 @@
 
 const libRestifyCORS = require('restify-cors-middleware');
 const restifyPromise = require('restify-await-promise');
+const RestifyErrors = require('restify-errors');
 
 /**
 * Orator Web API Server
@@ -25,14 +26,13 @@ var Orator = function()
 
 		// Restify for the routing and API serving
 		var libRestify = require('restify');
-		// NodeGrind for request profiling
-		var libNodegrind = false;
 		// FS for writing out profiling information
 		var libFS = require('fs');
 		// Cluster API for spawning multiple worker processes
 		var libCluster = require('cluster');
 		// HTTP Forward Proxy
 		var libHttpForward = require('http-forward');
+
 		var _ProxyRoutes = [];
 
 		// This state is used to lazily initialize the Native Restify Modules on route creation the first time
@@ -112,7 +112,7 @@ var Orator = function()
 			// This is used as the base object for instantiating the server.  You can add custom parsers and formatters safely with lambdas here.
 			RawServerParameters: {},
 
-			// Turning these on decreases speed dramatically, and generates a cachegrind file for each request.
+			// Enable request lifecycle logging if desired, for debugging
 			Profiling: (
 			{
 				// Tracelog is just log-based request timing encapsulation.
@@ -120,16 +120,7 @@ var Orator = function()
 
 				// Requestlog is to log each request ID and Session ID.
 				RequestLog: false,
-
-				// These profiling settings determine if we generate cpu or call graphs
-				Enabled: false,
-				Folder: '/tmp/',
-				// Currently supported profile types: CallGrinder or ChromeCPU
-				Type: 'CallGrinder'
 			}),
-
-			// Turning this on logs stack traces
-			LogStackTraces: true
 		});
 
 		var _Fable = require('fable').new(pSettings);
@@ -251,7 +242,7 @@ var Orator = function()
 			// Lazily initialize the Restify parsers the first time we access this object.
 			// This creates a behavior where changing the "enabledModules" property does not
 			//     do anything after routes have been created.  We may want to eventually
-			//     throw a warning (and ignroe the change) if someone accesses the property 
+			//     throw a warning (and ignore the change) if someone accesses the property
 			//     after _RestifyParsersInitialized is true.
 			if (!_RestifyParsersInitialized)
 			{
@@ -259,21 +250,6 @@ var Orator = function()
 				initializeHeaderParsers(_Fable.settings, _WebServer);
 				initializeContentParsers(_Fable.settings, _WebServer);
 				initializeLogicParsers(_Fable.settings, _WebServer);
-				_WebServer.on
-				(
-					'uncaughtException',
-					function (pRequest, pResponse, pRoute, pError)
-					{
-						if (typeof(_Fable.settings.UncaughtExceptionHook) === 'function')
-						{
-							_Fable.settings.UncaughtExceptionHook(pRequest, pResponse, pRoute, pError);
-						}
-						if (_Fable.settings.LogStackTraces)
-						{
-							_Fable.log.error('Request error', {Error:true, Stack:pError.stack});
-						}
-					}
-				);
 			}
 		};
 
@@ -299,18 +275,6 @@ var Orator = function()
 						_Fable.log.trace('Request start...',{RequestUUID: pRequest.RequestUUID});
 					}
 
-					if (_Fable.settings.Profiling.Enabled)
-					{
-						// Lazily load NodeGrind
-						if (!libNodegrind)
-						{
-							libNodegrind = require('nodegrind');
-						}
-						// If profiling is enabled, build a callgrind file
-						_Fable.log.debug('Request '+pRequest.RequestUUID+' starting with full profiling...');
-						pRequest.ProfilerName = _Fable.settings.Product+'-'+_Fable.settings.ProductVersion+'-'+pRequest.RequestUUID;
-						libNodegrind.startCPU(pRequest.RequestUUID);
-					}
 
 					return fNext();
 				}
@@ -325,34 +289,6 @@ var Orator = function()
 					{
 						_Fable.log.trace("... Request finished.",{RequestUUID: pRequest.RequestUUID, ResponseCode: pResponse.code, ResponseLength: pResponse.contentLength});
 					}
-
-					if (typeof(pRequest.ProfilerName) === 'string')
-					{
-						var tmpRequestProfile = '';
-						var tmpRequestProfilePrefix = '';
-						var tmpRequestProfilePostfix = '';
-
-						if (_Fable.settings.Profiling.Type === 'CallGrinder')
-						{
-							// Get the callgrind profile as a string
-							tmpRequestProfile = libNodegrind.stopCPU(pRequest.RequestUUID);
-							tmpRequestProfilePrefix = 'callgrind.';
-						}
-						else
-						{
-							// Alternatively, get a Chrome *.cpuprofile that you can load into the Chrome
-							// profiler (right-click on 'Profiles' in left pane in the 'Profiles' tab)
-							tmpRequestProfile = libNodegrind.stopCPU(pRequest.RequestUUID, 'cpuprofile');
-							tmpRequestProfilePostfix = '.cpuprofile';
-						}
-
-						libFS.writeFileSync(_Fable.settings.Profiling.Folder+tmpRequestProfilePrefix+pRequest.ProfilerName+tmpRequestProfilePostfix, tmpRequestProfile);
-
-						if (_Fable.settings.Profiling.TraceLog)
-						{
-							_Fable.log.trace('... Request '+pRequest.RequestUUID+' profile written to: '+_Fable.settings.Profiling.Folder+pRequest.ProfilerName);
-						}
-					}
 				}
 			);
 		};
@@ -366,16 +302,16 @@ var Orator = function()
 		*
 		* @method startWorkers
 		*/
-		 var startWorkers = function(pWorkers, fCallback)
-		 {
-		 	if (pWorkers === 0)
-		 	{
-		 		return fCallback();
-		 	}
-		 	else if (pWorkers < 0)
-		 	{
-		 		pWorkers = require('os').cpus().length;
-		 	}
+		var startWorkers = function(pWorkers, fCallback)
+		{
+			if (pWorkers === 0)
+			{
+				return fCallback();
+			}
+			else if (pWorkers < 0)
+			{
+				pWorkers = require('os').cpus().length;
+			}
 
 			for (var i=0; i<pWorkers; i++)
 			{
@@ -386,25 +322,25 @@ var Orator = function()
 
 			libCluster.on('message', function(message)
 			{
-			    _Fable.log.trace('Orator Worker ' + message.pid + ' started.');
+				_Fable.log.trace('Orator Worker ' + message.pid + ' started.');
 
-			    if (++tmpActiveWorkers === pWorkers)
-			    {
-			    	//The Master process fires the callback when all
-			    	// the workers have started. This is used by
-			    	// unit tests.
-			    	return fCallback();
-			    }
+				if (++tmpActiveWorkers === pWorkers)
+				{
+					//The Master process fires the callback when all
+					// the workers have started. This is used by
+					// unit tests.
+					return fCallback();
+				}
 			});
 			libCluster.on('exit', function(worker, code, signal)
 			{
-			    _Fable.log.trace('Orator Worker ' + worker.id + '/' + worker.process.pid + ' died');
+				_Fable.log.trace('Orator Worker ' + worker.id + '/' + worker.process.pid + ' died');
 
-			    // APIWorkerRestart flag auto-restarts a worker if it crashes
-			    if (_Fable.settings.APIWorkerRestart)
-			    {
-			    	libCluster.fork();
-			    }
+				// APIWorkerRestart flag auto-restarts a worker if it crashes
+				if (_Fable.settings.APIWorkerRestart)
+				{
+					libCluster.fork();
+				}
 			});
 		};
 
@@ -438,7 +374,7 @@ var Orator = function()
 						if (!libCluster.isMaster)
 						{
 							// notify master about the request
-    						process.send({ signal: 'notifyListening', pid: process.pid });
+							process.send({ signal: 'notifyListening', pid: process.pid });
 						}
 						return tmpNext();
 					}
@@ -501,7 +437,8 @@ var Orator = function()
 					'application/octet-stream',
 					'application/javascript',
 					'application/json'
-				]
+				],
+				handleUncaughtExceptions: true,
 			});
 			_Fable.settings.RawServerParameters = _WebServerParameters;
 		};
@@ -604,7 +541,7 @@ var Orator = function()
 					_Fable.log.error('Proxy error', pError);
 				}
 
-				return fNext(true);
+				return fNext(false);
 			});
 		};
 
@@ -652,16 +589,45 @@ var Orator = function()
 			);
 		};
 
+		var userErrorTransformer;
+		var registerErrorTransformer = function(transformError)
+		{
+			if (typeof(transformError) === 'function')
+			{
+				userErrorTransformer = transformError;
+			}
+		};
+
+		var userUnhandledErrorHandler;
+		var registerUnhandledErrorHandler = function(callback)
+		{
+			if (typeof(callback) === 'function')
+			{
+				userUnhandledErrorHandler = callback;
+			}
+		};
+
 		var handleError = function(req, res, err, callback)
 		{
+			// allow application to customize this error handling
+			if (typeof userUnhandledErrorHandler == 'function' && !userUnhandledErrorHandler(req, res, err))
+			{
+				return callback();
+			}
 			//the default for a string error is 'Route not found', though it isn't accurate
 			err.message = err.message.replace('Route not found: ', '');
 			//log error
 			let sessionId = '';
 			if (req.UserSession && req.UserSession.SessionID)
+			{
 				sessionId = req.UserSession.SessionID;
-			
-			_Fable.log.error('REQUEST ERROR: ' + err.message, {SessionID: sessionId, Action: 'APIError'});
+			}
+
+			if (!err.logged)
+			{
+				_Fable.log.error('REQUEST ERROR: ' + err.message || err,
+					{ SessionID: sessionId, Action: 'APIError', RequestUUID: req.RequestUUID, Error: err.message || err, Stack: err.stack, });
+			}
 			return callback();
 		}
 
@@ -682,6 +648,9 @@ var Orator = function()
 			serveStatic: libRestify.plugins.serveStatic,
 			getHeader: getHeader,
 
+			registerErrorTransformer: registerErrorTransformer,
+			registerUnhandledErrorHandler: registerUnhandledErrorHandler,
+
 			new: createNew
 		});
 
@@ -691,7 +660,7 @@ var Orator = function()
 		 * @property webServer
 		 * @type Object
 		 */
-		var getWebServer = function() 
+		var getWebServer = function()
 					{
 						// Lazily load the webserver the first time it is accessed
 						if (typeof(_WebServer) === 'undefined')
@@ -701,7 +670,35 @@ var Orator = function()
 							_WebServerParameters.version = _Fable.settings.ProductVersion;
 							_WebServer = libRestify.createServer(_WebServerParameters);
 							//enable support for Promise endpoint methods
-							restifyPromise.install(_WebServer);
+							restifyPromise.install(_WebServer,
+							{
+								/*
+								 * We provide an error transformer here to handle uncaught exceptions, as the
+								 * old code path is broken by this plugin. This at least allows us to send back
+								 * some kind of error to the caller. Without this, you get a 500 with a body of {}
+								 */
+								errorTransformer:
+								{
+									transform: (originalError) =>
+									{
+										let error = originalError;
+										if (typeof userErrorTransformer == 'function')
+										{
+											error = userErrorTransformer(error);
+										}
+										// duck typing for error objects; means an exception was thrown; but status code means it was handled upstream
+										if (error && error.message && error.stack && !error.statusCode)
+										{
+											_Fable.log.fatal('Unhandled request error', { Error: error.message || error, Stack: error.stack, });
+
+											const wrappedError = new RestifyErrors.InternalError(error, error.message || 'Unhandled error');
+											wrappedError.logged = true; // dumb, but prevents double logging in handleError
+											return wrappedError;
+										}
+										return error || new Error('fail request'); // returning no error here is bad news; request can get stuck, so at least return something
+									},
+								},
+							});
 							//handle errors - DOES NOT HANDLE uncaught exceptions! (DOES work with Promises however)
 							_WebServer.on('restifyError', handleError);
 							initializeInstrumentation();

package/test/Orator-proxy_tests.js

@@ -16,12 +16,12 @@ var _MockSettings = (
 {
 	Product: 'MockOratorAlternate',
 	ProductVersion: '0.0.0',
-	APIServerPort: 8181
+	APIServerPort: 8181,
 });
 
 suite
 (
-	'Orator',
+	'Orator Proxy',
 	function()
 	{
 		var _Orator;
@@ -34,6 +34,14 @@ suite
 			}
 		);
 
+		suiteTeardown
+		(
+			function()
+			{
+				_Orator.stopWebServer();
+			}
+		);
+
 		suite
 		(
 			'Object Sanity',
@@ -99,7 +107,7 @@ suite
 								fNext();
 							}
 						);
-						
+
 						// Create a route to proxy HTTP requests to google, dropping the prefix for the remote request
 						_Orator.addProxyRoute('google/', 'https://www.google.com/');
 
@@ -112,7 +120,7 @@ suite
 						_Orator.addStaticRoute(__dirname+'/../', 'LICENSE', /\/content\/(.*)/, '/content/');
 						// You should be able to host files just with a path
 						_Orator.addStaticRoute(__dirname+'/');
-						
+
 						_Orator.startWebServer(fDone);
 					}
 				);
@@ -184,7 +192,7 @@ suite
 								//check for not found
 								Expect(pResponse.statusCode)
 									.to.equal(404);
-									
+
 								return fDone();
 							}
 						);
@@ -196,6 +204,7 @@ suite
 					'Shutdown Orator web server',
 					function()
 					{
+						//TODO: this test assumes the order of test execution; is that safe?
 						_Orator.stopWebServer();
 					}
 				);

package/test/Orator_basic_tests.js

@@ -16,21 +16,47 @@ var _MockSettings = (
 {
 	Product: 'MockOratorAlternate',
 	ProductVersion: '0.0.0',
-	APIServerPort: 8080
+	APIServerPort: 8999,
 });
 
 suite
 (
-	'Orator',
+	'Orator basic',
 	function()
 	{
 		var _Orator;
+		let capturedOriginalErr = null;
+		let capturedReq = null;
+		let capturedRes = null;
+		let capturedErr = null;
 
 		setup
 		(
 			function()
 			{
 				_Orator = require('../source/Orator.js').new(_MockSettings);
+				_Orator.registerUnhandledErrorHandler((req, res, err) =>
+				{
+					capturedReq = req;
+					capturedRes = res;
+					capturedErr = err;
+					return err.statusCode > 0;
+				});
+				_Orator.registerErrorTransformer((err) =>
+				{
+					capturedOriginalErr = err;
+					return err;
+				});
+			}
+		);
+
+		teardown(() => { capturedReq = undefined; capturedRes = undefined; capturedErr = undefined; capturedOriginalErr = undefined; });
+
+		suiteTeardown
+		(
+			function()
+			{
+				_Orator.stopWebServer();
 			}
 		);
 
@@ -95,8 +121,8 @@ suite
 							'/ThirdAPI',
 							function (pRequest, pResponse, fNext)
 							{
-								pResponse.send('RAWR');
-								return fNext('The server should give a nice stack trace');
+								throw new Error('The server should give a nice stack trace');
+								fNext();
 							}
 						);
 						_Orator.webServer.get (
@@ -113,29 +139,48 @@ suite
 								return Promise.reject('error promise response');
 							}
 						);
+						_Orator.webServer.get (
+							'/SyncBug',
+							function (pRequest, pResponse, fNext)
+							{
+								const cat = null;
+								cat.dog();
+							}
+						);
+						_Orator.webServer.get (
+							'/AsyncBug',
+							async function (pRequest, pResponse)
+							{
+								await new Promise((resolve) => setTimeout(() => resolve()), 1);
+								const cat = null;
+								cat.dog();
+							}
+						);
 						// Expect this to fail
 						_Orator.addStaticRoute();
 						// And you can specify a path for bonus
-						_Orator.addStaticRoute(__dirname+'/../', 'LICENSE', /\/content\/(.*)/, '/content/');
+						var libPath = require('path');
+						var tmpPath = libPath.normalize(__dirname+'/');
+						_Orator.addStaticRoute(tmpPath, 'Test.html', /\/content\/(.*)/, '/content/');
 						// You should be able to host files just with a path
 						_Orator.addStaticRoute(__dirname+'/');
 						_Orator.startWebServer
 						(
 							function ()
 							{
-								libSuperTest('http://localhost:8080/')
+								libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 								.get('PIN')
 								.end(
 									function (pError, pResponse)
 									{
 										Expect(pResponse.text)
 											.to.contain('PON');
-										libSuperTest('http://localhost:8080/')
+										libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 										.get('ThirdAPI')
 										.end(
 											function (pError, pResponse)
 											{
-												libSuperTest('http://localhost:8080/')
+												libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 												.get('Test.css')
 												.end(
 													function (pError, pResponse)
@@ -143,13 +188,13 @@ suite
 														_Orator.settings.Profiling.TraceLog = true;
 														Expect(pResponse.text)
 															.to.contain('50000px');
-														libSuperTest('http://localhost:8080/')
+														libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 														.get('content/')
 														.end(
 															function (pError, pResponse)
 															{
 																Expect(pResponse.text)
-																	.to.contain('MIT');
+																	.to.contain('Um');
 																fDone();
 															}
 														);
@@ -168,7 +213,7 @@ suite
 					'promise routes should work',
 					function(fDone)
 					{
-						libSuperTest('http://localhost:8080/')
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 						.get('PromiseAPI')
 						.end(
 							function (pError, pResponse)
@@ -186,14 +231,69 @@ suite
 					'promise routes error handling',
 					function(fDone)
 					{
-						libSuperTest('http://localhost:8080/')
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 						.get('PromiseAPIError')
 						.end(
 							function (pError, pResponse)
 							{
+								Expect(capturedErr).to.exist;
+								Expect(capturedReq).to.exist;
+								Expect(capturedRes).to.exist;
 								Expect(pResponse.text)
 									.to.contain('error promise response');
 
+								return fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'unhandled error interception',
+					function(fDone)
+					{
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
+						.get('SyncBug')
+						.end(
+							function (pError, pResponse)
+							{
+								Expect(pError).to.not.exist;
+								Expect(capturedOriginalErr).to.exist;
+								Expect(capturedErr).to.exist;
+								Expect(capturedOriginalErr.statusCode).to.not.exist; // raw error
+								Expect(capturedErr.statusCode).to.equal(500); // wrapped to give reasonable http response
+								Expect(capturedReq).to.exist; // shows we called the custom error handler
+								Expect(capturedReq.RequestUUID).to.be.a('string'); // so we can log this from the handler
+								Expect(capturedRes).to.exist; // shows we called the custom error handler
+								Expect(capturedErr.message).to.contain('Cannot read property \'dog\'');
+								Expect(pResponse.text).to.contain('Cannot read property \'dog\'');
+
+								return fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'unhandled error interception async',
+					function(fDone)
+					{
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
+						.get('AsyncBug')
+						.end(
+							function (pError, pResponse)
+							{
+								Expect(pError).to.not.exist;
+								Expect(capturedOriginalErr).to.exist;
+								Expect(capturedErr).to.exist;
+								Expect(capturedOriginalErr.statusCode).to.not.exist; // raw error
+								Expect(capturedErr.statusCode).to.equal(500); // wrapped to give reasonable http response
+								Expect(capturedReq).to.exist; // shows we called the custom error handler
+								Expect(capturedReq.RequestUUID).to.be.a('string'); // so we can log this from the handler
+								Expect(capturedRes).to.exist; // shows we called the custom error handler
+								Expect(capturedErr.message).to.contain('Cannot read property \'dog\'');
+								Expect(pResponse.text).to.contain('Cannot read property \'dog\'');
+
 								return fDone();
 							}
 						);
@@ -215,7 +315,7 @@ suite
 							{
 								Product: 'MockOratorInverted',
 								ProductVersion: '0.0.0',
-								APIServerPort: 8089,
+								APIServerPort: _MockSettings.APIServerPort - 10,
 								LogStackTraces: false
 							});
 						var _OratorInverted = require('../source/Orator.js').new(_MockSettingsInvertedParameters);
@@ -249,11 +349,12 @@ suite
 							}
 						);
 						_OratorInverted.startWebServer();
-						libSuperTest('http://localhost:8089/')
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort - 10}/`)
 						.get('PINGU')
 						.end(
 							function (pError, pResponse)
 							{
+								_OratorInverted.stopWebServer();
 								if (pError)
 								{
 									console.log('Error on Inverted Results: '+JSON.stringify(pError));
@@ -280,4 +381,4 @@ suite
 			}
 		);
 	}
-);
+);

package/test/Orator_cluster_test.js.deferred

@@ -17,7 +17,7 @@ var _MockSettings = (
 {
 	Product: 'MockOratorAlternate',
 	ProductVersion: '0.0.0',
-	APIServerPort: 8080,
+	APIServerPort: 8099,
 	APIWorkers: 3,
 	APIWorkerRestart: false
 });
@@ -99,7 +99,9 @@ suite
 						// Expect this to fail
 						_Orator.addStaticRoute();
 						// And you can specify a path for bonus
-						_Orator.addStaticRoute(__dirname+'/../', 'LICENSE', /\/content\/(.*)/, '/content/');
+						var libPath = require('path');
+						var tmpPath = libPath.normalize(__dirname+'/');
+						_Orator.addStaticRoute(tmpPath, 'Test.html', /\/content\/(.*)/, '/content/');
 						// You should be able to host files just with a path
 						_Orator.addStaticRoute(__dirname+'/');
 				
@@ -133,19 +135,19 @@ suite
 						function(fDone)
 						{
 							
-							libSuperTest('http://localhost:8080/')
+							libSuperTest('http://localhost:8099/')
 							.get('PIN')
 							.end(
 								function (pError, pResponse)
 								{
 									Expect(pResponse.text)
 										.to.contain('PON');
-									libSuperTest('http://localhost:8080/')
+									libSuperTest('http://localhost:8099/')
 									.get('ThirdAPI')
 									.end(
 										function (pError, pResponse)
 										{
-											libSuperTest('http://localhost:8080/')
+											libSuperTest('http://localhost:8099/')
 											.get('Test.css')
 											.end(
 												function (pError, pResponse)
@@ -153,13 +155,13 @@ suite
 													_Orator.settings.Profiling.TraceLog = true;
 													Expect(pResponse.text)
 														.to.contain('50000px');
-													libSuperTest('http://localhost:8080/')
+													libSuperTest('http://localhost:8099/')
 													.get('content/')
 													.end(
 														function (pError, pResponse)
 														{
 															Expect(pResponse.text)
-																.to.contain('MIT');
+																.to.contain('Um');
 															
 															return fDone();
 														}
@@ -189,7 +191,7 @@ suite
 
 							for(var i=0; i<DISTRIBUTION_LOAD_COUNT; i++)
 							{
-								libSuperTest('http://localhost:8080/')
+								libSuperTest('http://localhost:8099/')
 									.get('GetPID')
 									.end(
 										function (pError, pResponse)
@@ -228,4 +230,4 @@ suite
 			);
 		}
 	}
-);
+);

package/test/Orator_logging_tests.js

@@ -15,7 +15,7 @@ var libSuperTest = require('supertest');
 var _MockSettings = (
 {
 	Product: 'MockOratorRequestLogging',
-	APIServerPort: 8085,
+	APIServerPort: 8985,
 	Profiling: (
 		{
 			// Tracelog is just log-based request timing encapsulation.
@@ -40,6 +40,14 @@ suite
 			}
 		);
 
+		suiteTeardown
+		(
+			function()
+			{
+				_Orator.stopWebServer();
+			}
+		);
+
 		suite
 		(
 			'Request Logging Server Start',
@@ -51,24 +59,31 @@ suite
 					function(fDone)
 					{
 						_Orator.webServer.get (
-							'/PINGOLo', 
-							function (pRequest, pResponse, fNext) 
+							'/PINGOLo',
+							function (pRequest, pResponse, fNext)
 							{
 								pResponse.send('Loggo');
 								fNext();
 							}
 						);
 						_Orator.webServer.get (
-							'/PINataGOLo', 
-							function (pRequest, pResponse, fNext) 
+							'/PINataGOLo',
+							function (pRequest, pResponse, fNext)
 							{
 								throw new Error("Something absolutely dire has occurred.");
 								pResponse.send('Loggso');
 								fNext();
 							}
 						);
+						_Orator.webServer.get (
+							'/PINataGOLo_promise',
+							async function (pRequest, pResponse)
+							{
+								return Promise.reject("Something absolutely dire has occurred.");
+							}
+						);
 						_Orator.startWebServer();
-						libSuperTest('http://localhost:8085/')
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 						.get('PINGOLo')
 						.end(
 							function (pError, pResponse)
@@ -83,7 +98,7 @@ suite
 									Expect(pResponse.text)
 										.to.contain('Loggo');
 								}
-								libSuperTest('http://localhost:8085/')
+								libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 								.get('PINataGOLo')
 								.end(
 									function (pError, pResponse)
@@ -95,6 +110,8 @@ suite
 										}
 										else
 										{
+											Expect(pResponse.statusCode)
+												.to.equal(500);
 											Expect(pResponse.text)
 												.to.contain('dire');
 										}
@@ -112,8 +129,35 @@ suite
 					'uncaught exceptions should throw properly.',
 					function(fDone)
 					{
-						libSuperTest('http://localhost:8085/')
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
 						.get('PINataGOLo')
+						.end(
+							function (pError, pResponse)
+							{
+								if (pError)
+								{
+									console.log('Error on Logfile Results: '+JSON.stringify(pError));
+									Expect('Logged Request Error').to.equal('Nothing');
+								}
+								else
+								{
+									Expect(pResponse.statusCode)
+										.to.equal(500);
+									Expect(pResponse.text)
+										.to.contain('dire');
+								}
+								fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'rejected promises should throw properly.',
+					function(fDone)
+					{
+						libSuperTest(`http://localhost:${_MockSettings.APIServerPort}/`)
+						.get('PINataGOLo_promise')
 						.end(
 							function (pError, pResponse)
 							{
@@ -135,4 +179,4 @@ suite
 			}
 		);
 	}
-);
+);

package/test/Test.html

@@ -0,0 +1 @@
+<html><head></head><body>Um</body></html>

package/.vscode/launch.json

@@ -1,24 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Mocha Tests",
-            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-            "args": [
-                "-u",
-                "tdd",
-                "--bail",
-                "--timeout",
-                "999999",
-                "--colors",
-                "${workspaceFolder}/test/Orator_basic_tests.js"
-            ],
-            "internalConsoleOptions": "openOnSessionStart"
-        }
-    ]
-}

package/test/Orator_cachegrinder_tests.js

@@ -1,100 +0,0 @@
-/**
-* Unit tests for the Orator Server
-*
-* @license     MIT
-*
-* @author      Steven Velozo <steven@velozo.com>
-*/
-
-var Chai = require("chai");
-var Expect = Chai.expect;
-var Assert = Chai.assert;
-
-var libSuperTest = require('supertest');
-
-var _MockSettings = (
-{
-	Product: 'MockOratorGRINDER',
-	ProductVersion: '0.0.0',
-	APIServerPort: 8082,
-	Profiling: (
-		{
-			// Tracelog is just log-based request timing encapsulation.
-			TraceLog: true,
-
-			// These profiling settings determine if we generate cpu or call graphs
-			Enabled: true,
-			Folder: '/tmp/',
-			// Currently supported profile types: CallGrinder or ChromeCPU
-			Type: 'CallGrinder'
-		})
-
-});
-
-suite
-(
-	'Orator',
-	function()
-	{
-		var _Orator;
-
-		setup
-		(
-			function()
-			{
-				_Orator = require('../source/Orator.js').new(_MockSettings);
-			}
-		);
-
-		suite
-		(
-			'Alternate (cachegrinder) Server Start',
-			function()
-			{
-				test
-				(
-					'simple routes should work',
-					function(fDone)
-					{
-						_Orator.webServer.get (
-							'/PING', 
-							function (pRequest, pResponse, fNext) 
-							{
-								pResponse.send('PONG');
-								fNext();
-							}
-						);
-						_Orator.startWebServer(
-							function()
-							{
-								libSuperTest('http://localhost:8082/')
-								.get('PING')
-								.end(
-									function (pError, pResponse)
-									{
-										if (pError)
-										{
-											console.log('Error on Inverted Results: '+JSON.stringify(pError));
-											Expect('CacheGrinder Request Error').to.equal('Nothing');
-										}
-										else
-										{
-											Expect(pResponse.text)
-												.to.contain('PONG');
-										}
-										// This is just to exercise the lazy loaded cachegrinder module
-										libSuperTest('http://localhost:8082/')
-										.get('PING')
-										.end(function (pError, pResponse) {fDone();});
-									}
-								);
-							}
-						);
-						Expect(_Orator)
-							.to.be.an('object', 'Orator should initialize as an object directly from the require statement.');
-					}
-				);
-			}
-		);
-	}
-);

package/test/Orator_chromecpu_notrace_tests.js

@@ -1,90 +0,0 @@
-/**
-* Unit tests for the Orator Server
-*
-* @license     MIT
-*
-* @author      Steven Velozo <steven@velozo.com>
-*/
-
-var Chai = require("chai");
-var Expect = Chai.expect;
-var Assert = Chai.assert;
-
-var libSuperTest = require('supertest');
-
-var _MockSettings = (
-{
-	Product: 'MockOratorCHROMENOTRACE',
-	APIServerPort: 8083,
-	Profiling: (
-		{
-			// Tracelog is just log-based request timing encapsulation.
-			TraceLog: false,
-
-			// These profiling settings determine if we generate cpu or call graphs
-			Enabled: true,
-			Folder: '/tmp/',
-			// Currently supported profile types: CallGrinder or ChromeCPU
-			Type: 'ChromeCPU'
-		})
-
-});
-
-suite
-(
-	'Orator',
-	function()
-	{
-		var _Orator;
-
-		setup
-		(
-			function()
-			{
-				_Orator = require('../source/Orator.js').new(_MockSettings);
-			}
-		);
-
-		suite
-		(
-			'Alternate (chromecpu) without Trace Server Start',
-			function()
-			{
-				test
-				(
-					'simple routes should work',
-					function(fDone)
-					{
-						_Orator.webServer.get (
-							'/PI', 
-							function (pRequest, pResponse, fNext) 
-							{
-								pResponse.send('PO');
-								fNext();
-							}
-						);
-						_Orator.startWebServer();
-						libSuperTest('http://localhost:8083/')
-						.get('PI')
-						.end(
-							function (pError, pResponse)
-							{
-								if (pError)
-								{
-									console.log('Error on Inverted Results: '+JSON.stringify(pError));
-									Expect('No Trace Request Error').to.equal('Nothing');
-								}
-								else
-								{
-									Expect(pResponse.text)
-										.to.contain('PO');
-								}
-								fDone();
-							}
-						);
-					}
-				);
-			}
-		);
-	}
-);

package/test/Orator_chromecpu_tests.js

@@ -1,90 +0,0 @@
-/**
-* Unit tests for the Orator Server
-*
-* @license     MIT
-*
-* @author      Steven Velozo <steven@velozo.com>
-*/
-
-var Chai = require("chai");
-var Expect = Chai.expect;
-var Assert = Chai.assert;
-
-var libSuperTest = require('supertest');
-
-var _MockSettings = (
-{
-	Product: 'MockOratorCHROME',
-	APIServerPort: 8081,
-	Profiling: (
-		{
-			// Tracelog is just log-based request timing encapsulation.
-			TraceLog: true,
-
-			// These profiling settings determine if we generate cpu or call graphs
-			Enabled: true,
-			Folder: '/tmp/',
-			// Currently supported profile types: CallGrinder or ChromeCPU
-			Type: 'ChromeCPU'
-		})
-
-});
-
-suite
-(
-	'Orator',
-	function()
-	{
-		var _Orator;
-
-		setup
-		(
-			function()
-			{
-				_Orator = require('../source/Orator.js').new(_MockSettings);
-			}
-		);
-
-		suite
-		(
-			'Alternate (chromecpu) Server Start',
-			function()
-			{
-				test
-				(
-					'simple routes should work',
-					function(fDone)
-					{
-						_Orator.webServer.get (
-							'/PINGO', 
-							function (pRequest, pResponse, fNext) 
-							{
-								pResponse.send('PONGO');
-								fNext();
-							}
-						);
-						_Orator.startWebServer();
-						libSuperTest('http://localhost:8081/')
-						.get('PINGO')
-						.end(
-							function (pError, pResponse)
-							{
-								if (pError)
-								{
-									console.log('Error on Inverted Results: '+JSON.stringify(pError));
-									Expect('Chrome Trace Request Error').to.equal('Nothing');
-								}
-								else
-								{
-									Expect(pResponse.text)
-										.to.contain('PONGO');
-								}
-								fDone();
-							}
-						);
-					}
-				);
-			}
-		);
-	}
-);