fable 3.1.66 → 3.1.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.66",
+  "version": "3.1.68",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {
@@ -51,7 +51,7 @@
   },
   "homepage": "https://github.com/stevenvelozo/fable",
   "devDependencies": {
-    "quackage": "^1.0.65"
+    "quackage": "^1.0.68"
   },
   "dependencies": {
     "async.eachlimit": "^0.5.2",

package/source/services/Fable-Service-ExpressionParser.js

@@ -42,7 +42,8 @@ class FableServiceExpressionParser extends libFableServiceBase
 		this.log;
 
 		// The configuration for tokens that the solver recognizes, with precedence and friendly names.
-		this.tokenMap = require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-TokenMap.json');
+		// Clone the JSON so each instance gets its own tokenMap (require() caches and returns the same object reference).
+		this.tokenMap = JSON.parse(JSON.stringify(require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-TokenMap.json')));
 
 		// Keep track of maximum token precedence
 		this.tokenMaxPrecedence = 4;
@@ -86,7 +87,8 @@ class FableServiceExpressionParser extends libFableServiceBase
 		}
 
 		// The configuration for which functions are available to the solver.
-		this.functionMap = require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json');
+		// Clone the JSON so each instance gets its own functionMap (require() caches and returns the same object reference).
+		this.functionMap = JSON.parse(JSON.stringify(require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json')));
 
 		this.serviceType = 'ExpressionParser';
 

package/source/services/Fable-Service-RestClient.js

@@ -232,7 +232,17 @@ class FableServiceRestClient extends libFableServiceBase
 							let tmpCompletionTime = this.fable.log.getTimeStamp();
 							this.fable.log.debug(`==> JSON ${tmpOptions.method} completed - received in ${this.dataFormat.formatTimeDelta(tmpOptions.RequestStartTime, tmpCompletionTime)}ms`);
 						}
-						return fCallback(pError, pResponse, JSON.parse(tmpJSONData));
+						let tmpParsedJSON;
+						try
+						{
+							tmpParsedJSON = JSON.parse(tmpJSONData);
+						}
+						catch (pParseError)
+						{
+							let tmpStatusCode = pResponse ? pResponse.statusCode : 'unknown';
+							return fCallback(new Error(`JSON parse failed (HTTP ${tmpStatusCode}): ${tmpJSONData.substring(0, 200)}`), pResponse, null);
+						}
+						return fCallback(pError, pResponse, tmpParsedJSON);
 					});
 			});
 	}

package/test/RestClient_test.js

@@ -7,6 +7,7 @@
 */
 
 var libFable = require('../source/Fable.js');
+var libHTTP = require('http');
 
 var Chai = require("chai");
 var Expect = Chai.expect;
@@ -144,5 +145,44 @@ suite
 							);
 					}
 				);
+
+				suite
+					(
+						'Error Handling',
+						function ()
+						{
+							test
+								(
+									'Handle a non-JSON response without crashing.',
+									function (fTestComplete)
+									{
+										// Spin up a tiny HTTP server that returns plain text with a 414 status
+										var tmpServer = libHTTP.createServer(function (pReq, pRes)
+										{
+											pRes.writeHead(414, { 'Content-Type': 'text/plain' });
+											pRes.end('URI too long\n');
+										});
+
+										tmpServer.listen(0, function ()
+										{
+											var tmpPort = tmpServer.address().port;
+											var testFable = new libFable();
+											var tmpRestClient = testFable.instantiateServiceProvider('RestClient', {}, 'RestClient-ErrorTest');
+
+											tmpRestClient.getJSON('http://localhost:' + tmpPort + '/anything',
+												function (pError, pResponse, pBody)
+												{
+													Expect(pError).to.be.an.instanceof(Error);
+													Expect(pError.message).to.contain('414');
+													Expect(pError.message).to.contain('URI too long');
+													Expect(pBody).to.equal(null);
+													tmpServer.close();
+													fTestComplete();
+												});
+										});
+									}
+								);
+						}
+					);
 		}
 	);