fable 3.1.69 → 3.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.69",
+  "version": "3.1.70",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {

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

@@ -33,7 +33,7 @@ class FableServiceRestClient extends libFableServiceBase
 		let tmpKeepAlive = this.options.KeepAlive || this.fable.settings.RestClientKeepAlive;
 		if (tmpKeepAlive)
 		{
-			this.initializeKeepAliveAgent();
+			this.initializeKeepAliveAgent(this.options.KeepAliveAgentOptions);
 		}
 	}
 
@@ -41,10 +41,12 @@ class FableServiceRestClient extends libFableServiceBase
 	 * Initialize HTTP keep-alive agents and wire them into prepareRequestOptions.
 	 * Creates both an HTTP and HTTPS agent so the correct one is selected per-request
 	 * based on the URL protocol.
+	 *
+	 * @param {Object} [pAgentOptions] - Additional options passed to the Http/Https Agent constructors (e.g. timeout).
 	 */
-	initializeKeepAliveAgent()
+	initializeKeepAliveAgent(pAgentOptions)
 	{
-		let tmpAgentOptions = { keepAlive: true };
+		let tmpAgentOptions = Object.assign({ keepAlive: true }, pAgentOptions);
 
 		this.httpAgent = new libHttp.Agent(tmpAgentOptions);
 		this.httpsAgent = new libHttps.Agent(tmpAgentOptions);

package/test/RestClient_test.js

@@ -180,6 +180,27 @@ suite
 									}
 								);
 							test
+								(
+									'Pass additional agent options via KeepAliveAgentOptions.',
+									function ()
+									{
+										let testFable = new libFable();
+										let tmpRestClient = testFable.instantiateServiceProvider('RestClient',
+											{
+												KeepAlive: true,
+												KeepAliveAgentOptions: { timeout: 300000 }
+											}, 'RestClient-KeepAlive-AgentOpts');
+
+										Expect(tmpRestClient.httpAgent).to.be.an('object');
+										Expect(tmpRestClient.httpsAgent).to.be.an('object');
+										Expect(tmpRestClient.httpAgent.keepAlive).to.equal(true);
+										Expect(tmpRestClient.httpsAgent.keepAlive).to.equal(true);
+										// Verify the custom timeout was passed through
+										Expect(tmpRestClient.httpAgent.options.timeout).to.equal(300000);
+										Expect(tmpRestClient.httpsAgent.options.timeout).to.equal(300000);
+									}
+								);
+						test
 								(
 									'Do not create agents when KeepAlive is not set.',
 									function ()