meadow 2.0.44 → 2.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -87,7 +87,7 @@
   "devDependencies": {
     "alasql": "^4.17.0",
     "dgraph-js-http": "^21.3.0",
-    "fable": "^3.1.76",
+    "fable": "^3.1.77",
     "gulp-util": "^3.0.8",
     "meadow-connection-dgraph": "^1.0.3",
     "meadow-connection-mongodb": "^1.0.3",

package/source/providers/Meadow-Provider-MeadowEndpoints.js

@@ -56,7 +56,14 @@ var MeadowProvider = function()
 		var buildURL = function(pAddress)
 		{
 			let tmpEndpointSettings = getEndpointSettings();
-			return `${tmpEndpointSettings.ServerProtocol}://${tmpEndpointSettings.ServerAddress}:${tmpEndpointSettings.ServerPort}/${tmpEndpointSettings.ServerEndpointPrefix}${pAddress}`;
+			let tmpURL = `${tmpEndpointSettings.ServerProtocol}://${tmpEndpointSettings.ServerAddress}:${tmpEndpointSettings.ServerPort}/${tmpEndpointSettings.ServerEndpointPrefix}${pAddress}`;
+			// e.g. 'skipDecoration=true' — lets machine-to-machine connections
+			// opt out of per-row presentation decoration the remote applies.
+			if (typeof(tmpEndpointSettings.AdditionalQueryString) === 'string' && tmpEndpointSettings.AdditionalQueryString.length > 0)
+			{
+				tmpURL += (tmpURL.indexOf('?') >= 0) ? `&${tmpEndpointSettings.AdditionalQueryString}` : `?${tmpEndpointSettings.AdditionalQueryString}`;
+			}
+			return tmpURL;
 		};
 
 		var buildRequestOptions = function(pQuery)
@@ -75,10 +82,19 @@ var MeadowProvider = function()
 			let tmpCookies = (tmpInstance && Array.isArray(tmpInstance.cookies))
 				? tmpInstance.cookies : [];
 
+			// Explicit timeout: Node 20+ installs a ~5s socket timeout on
+			// http.globalAgent; an explicit request timeout takes that default
+			// out of play (same workaround as fable's RestClient). Configurable
+			// per connection (settings.RequestTimeout) for slow decorated reads.
+			let tmpEndpointSettings = getEndpointSettings();
+			let tmpRequestTimeout = (typeof(tmpEndpointSettings.RequestTimeout) === 'number')
+				? tmpEndpointSettings.RequestTimeout : 60000;
+
 			let tmpRequestOptions = (
 			{
 				url: tmpURL,
-				headers: _Fable.Utility.extend({cookie: ''}, tmpHeaders)
+				headers: _Fable.Utility.extend({cookie: ''}, tmpHeaders),
+				timeout: tmpRequestTimeout
 			});
 
 			tmpRequestOptions.headers.cookie = tmpCookies.join(';');

package/test/Meadow-Provider-MeadowEndpoints-Session_tests.js

@@ -121,3 +121,78 @@ suite('MeadowEndpoints provider instance-driven configuration', function ()
 		Expect(Array.isArray(tmpOutcome.Records)).to.equal(true);
 	});
 });
+
+suite('MeadowEndpoints provider request timeout', function ()
+{
+	suiteSetup(async function () { await startStubAPI(); });
+	suiteTeardown(function () { if (_Server) { _Server.close(); } });
+
+	test('an explicit request timeout is always set (Node 20+ globalAgent ~5s default workaround)', function (fDone)
+	{
+		// Intercept the socket-level options by reading from a slow-but-fine
+		// stub: the request must carry a timeout >= the configured value, so
+		// the platform default never applies.
+		const libHTTP = require('http');
+		const tmpOriginalRequest = libHTTP.request;
+		let tmpCapturedOptions = null;
+		libHTTP.request = function (pOptions, fResponseHandler)
+		{
+			tmpCapturedOptions = pOptions;
+			return tmpOriginalRequest.call(libHTTP, pOptions, fResponseHandler);
+		};
+		const tmpDAL = buildDAL(null, serverSettings());
+		readAnimals(tmpDAL).then((pOutcome) =>
+		{
+			libHTTP.request = tmpOriginalRequest;
+			Expect(tmpCapturedOptions).to.be.an('object');
+			Expect(tmpCapturedOptions.timeout).to.equal(60000, 'default 60s');
+			fDone();
+		}).catch((pError) => { libHTTP.request = tmpOriginalRequest; fDone(pError); });
+	});
+
+	test('the connection settings RequestTimeout overrides the default', function (fDone)
+	{
+		const libHTTP = require('http');
+		const tmpOriginalRequest = libHTTP.request;
+		let tmpCapturedOptions = null;
+		libHTTP.request = function (pOptions, fResponseHandler)
+		{
+			tmpCapturedOptions = pOptions;
+			return tmpOriginalRequest.call(libHTTP, pOptions, fResponseHandler);
+		};
+		const tmpSettings = Object.assign(serverSettings(), { RequestTimeout: 120000 });
+		const tmpDAL = buildDAL(null, tmpSettings);
+		readAnimals(tmpDAL).then(() =>
+		{
+			libHTTP.request = tmpOriginalRequest;
+			Expect(tmpCapturedOptions.timeout).to.equal(120000);
+			fDone();
+		}).catch((pError) => { libHTTP.request = tmpOriginalRequest; fDone(pError); });
+	});
+});
+
+suite('MeadowEndpoints provider additional query string', function ()
+{
+	suiteSetup(async function () { await startStubAPI(); });
+	suiteTeardown(function () { if (_Server) { _Server.close(); } });
+
+	test('AdditionalQueryString is appended to read URLs (e.g. skipDecoration=true)', function (fDone)
+	{
+		const libHTTP = require('http');
+		const tmpOriginalRequest = libHTTP.request;
+		let tmpCapturedPath = null;
+		libHTTP.request = function (pOptions, fResponseHandler)
+		{
+			tmpCapturedPath = pOptions.path;
+			return tmpOriginalRequest.call(libHTTP, pOptions, fResponseHandler);
+		};
+		const tmpSettings = Object.assign(serverSettings(), { AdditionalQueryString: 'skipDecoration=true' });
+		const tmpDAL = buildDAL(null, tmpSettings);
+		readAnimals(tmpDAL).then(() =>
+		{
+			libHTTP.request = tmpOriginalRequest;
+			Expect(tmpCapturedPath).to.contain('?skipDecoration=true');
+			fDone();
+		}).catch((pError) => { libHTTP.request = tmpOriginalRequest; fDone(pError); });
+	});
+});