meadow-integration 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meadow-integration",
-    "version": "1.0.27",
+    "version": "1.0.29",
     "description": "Meadow Data Integration",
     "bin": {
         "mdwint": "source/cli/Meadow-Integration-CLI-Run.js"
@@ -40,7 +40,7 @@
         ]
     },
     "dependencies": {
-        "fable": "^3.1.67",
+        "fable": "^3.1.70",
         "fable-serviceproviderbase": "^3.0.19",
         "fast-xml-parser": "^4.4.1",
         "meadow": "^2.0.33",

package/source/services/clone/Meadow-Service-RestClient.js

@@ -1,6 +1,4 @@
 const libFableServiceProviderBase = require('fable-serviceproviderbase');
-const Http = require('http');
-const Https = require('https');
 
 const defaultRestClientOptions = (
 	{
@@ -41,30 +39,22 @@ class MeadowCloneRestClient extends libFableServiceProviderBase
 			this._SessionToken = this.options.SessionToken;
 		}
 
-		this.restClient = this.fable.serviceManager.instantiateServiceProvider('RestClient', {}, 'MeadowCloneRestClient-RestClient');
-		this.cache = {};
-
-		this.requestTimeout = this.options.RequestTimeout;
-		this.maxRequestTimeout = this.options.MaxRequestTimeout;
+		// Fable settings override instance options for timeouts
+		this.requestTimeout = this.fable.settings.RestClientRequestTimeout || this.options.RequestTimeout;
+		this.maxRequestTimeout = this.fable.settings.RestClientMaxRequestTimeout || this.options.MaxRequestTimeout;
 
-		// Use the longer of the two timeouts for the agent's socket timeout
-		// so that MAX queries don't get killed at the socket level.
-		const agentOptions = { keepAlive: true, timeout: Math.max(this.requestTimeout, this.maxRequestTimeout) };
-
-		if (this.serverURL && this.serverURL.startsWith('http:'))
-		{
-			this.agent = new Http.Agent(agentOptions);
-		}
-		else
-		{
-			this.agent = new Https.Agent(agentOptions);
-		}
-
-		this.restClient.prepareRequestOptions = (pOptions) =>
-		{
-			pOptions.agent = this.agent;
-			return pOptions;
-		};
+		// When keep-alive is enabled via fable settings (RestClientKeepAlive), use a
+		// socket timeout based on the longer of the two request timeouts so that
+		// slow MAX queries don't get killed at the socket level.
+		let tmpRestClientOptions = (
+			{
+				KeepAliveAgentOptions:
+					{
+						timeout: Math.max(this.requestTimeout, this.maxRequestTimeout)
+					}
+			});
+		this.restClient = this.fable.serviceManager.instantiateServiceProvider('RestClient', tmpRestClientOptions, 'MeadowCloneRestClient-RestClient');
+		this.cache = {};
 	}
 
 	prepareRequestOptions(pOptions)

package/source/services/clone/Meadow-Service-Sync-Entity-Ongoing.js

@@ -715,7 +715,7 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 										const tmpRecordID = pEntityRecord[this.DefaultIdentifier];
 										if (!tmpRecordID || tmpRecordID < 1)
 										{
-											return fRecordComplete();
+											return setImmediate(fRecordComplete);
 										}
 
 										// Read local record with delete tracking disabled so we can see all records
@@ -745,7 +745,7 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 															{
 																this.log.error(`Error creating deleted record ${this.EntitySchema.TableName} ID ${tmpRecordID}: ${pCreateError}`);
 															}
-															return fRecordComplete();
+															return setImmediate(fRecordComplete);
 														});
 													return;
 												}
@@ -753,7 +753,7 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 												if (pRecord.Deleted == 1)
 												{
 													// Already marked deleted locally
-													return fRecordComplete();
+													return setImmediate(fRecordComplete);
 												}
 
 												// Record exists locally but is not deleted -- update it
@@ -772,7 +772,7 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 														{
 															this.log.error(`Error marking record as deleted ${this.EntitySchema.TableName} ID ${tmpRecordID}: ${pUpdateError}`);
 														}
-														return fRecordComplete();
+														return setImmediate(fRecordComplete);
 													});
 											});
 									},

package/source/services/clone/Meadow-Service-Sync-Entity-OngoingEventualConsistency.js

@@ -208,7 +208,7 @@ class MeadowSyncEntityOngoingEventualConsistency extends libMeadowSyncEntityOngo
 										const tmpRecordID = pEntityRecord[this.DefaultIdentifier];
 										if (!tmpRecordID || tmpRecordID < 1)
 										{
-											return fRecordComplete();
+											return setImmediate(fRecordComplete);
 										}
 
 										const tmpQuery = this.Meadow.query;
@@ -237,7 +237,7 @@ class MeadowSyncEntityOngoingEventualConsistency extends libMeadowSyncEntityOngo
 																this.log.error(`Error creating deleted record ${this.EntitySchema.TableName} ID ${tmpRecordID}: ${pCreateError}`);
 															}
 															tmpProcessed++;
-															return fRecordComplete();
+															return setImmediate(fRecordComplete);
 														});
 													return;
 												}
@@ -245,7 +245,7 @@ class MeadowSyncEntityOngoingEventualConsistency extends libMeadowSyncEntityOngo
 												if (pRecord.Deleted == 1)
 												{
 													tmpProcessed++;
-													return fRecordComplete();
+													return setImmediate(fRecordComplete);
 												}
 
 												const tmpRecordToCommit = this.marshalRecord(pEntityRecord);
@@ -264,7 +264,7 @@ class MeadowSyncEntityOngoingEventualConsistency extends libMeadowSyncEntityOngo
 															this.log.error(`Error marking record as deleted ${this.EntitySchema.TableName} ID ${tmpRecordID}: ${pUpdateError}`);
 														}
 														tmpProcessed++;
-														return fRecordComplete();
+														return setImmediate(fRecordComplete);
 													});
 											});
 									},