retold-data-service 2.0.36 → 2.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-data-service",
-    "version": "2.0.36",
+    "version": "2.0.38",
     "description": "Serve up a whole model!",
     "main": "source/Retold-Data-Service.js",
     "bin": {
@@ -68,12 +68,12 @@
     },
     "dependencies": {
         "bibliograph": "^0.1.4",
-        "fable": "^3.1.68",
+        "fable": "^3.1.70",
         "fable-serviceproviderbase": "^3.0.19",
         "meadow": "^2.0.33",
         "meadow-connection-mysql": "^1.0.14",
         "meadow-endpoints": "^4.0.15",
-        "meadow-integration": "^1.0.28",
+        "meadow-integration": "^1.0.30",
         "meadow-migrationmanager": "^0.0.9",
         "orator": "^6.0.4",
         "orator-http-proxy": "^1.0.5",

package/source/services/data-cloner/Retold-Data-Service-DataCloner.js

@@ -84,8 +84,10 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 				ThroughputTimer: null
 			});
 
-		// Create an isolated Pict instance for remote session management
-		this._Pict = new libPict(
+		// Create an isolated Pict instance for remote session management.
+		// Forward REST client connection settings from the parent fable so
+		// the session RestClient inherits keep-alive and timeout configuration.
+		let tmpPictSettings = (
 			{
 				Product: 'DataClonerSession',
 				TraceLog: true,
@@ -96,6 +98,19 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 						}
 					]
 			});
+		if (this.fable.settings.RestClientKeepAlive)
+		{
+			tmpPictSettings.RestClientKeepAlive = this.fable.settings.RestClientKeepAlive;
+		}
+		if (this.fable.settings.RestClientRequestTimeout)
+		{
+			tmpPictSettings.RestClientRequestTimeout = this.fable.settings.RestClientRequestTimeout;
+		}
+		if (this.fable.settings.RestClientMaxRequestTimeout)
+		{
+			tmpPictSettings.RestClientMaxRequestTimeout = this.fable.settings.RestClientMaxRequestTimeout;
+		}
+		this._Pict = new libPict(tmpPictSettings);
 
 		this._Pict.serviceManager.addServiceType('SessionManager', libPictSessionManager);
 		this._Pict.serviceManager.instantiateServiceProvider('SessionManager');
@@ -1003,12 +1018,19 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 						let tmpTracker = tmpSyncEntity.operation.progressTrackers[`FullSync-${tmpTableName}`];
 						if (tmpTracker)
 						{
-							tmpProgress.Total = tmpTracker.TotalCount || 0;
+							// Clamp both to >= 0: Total can be estimated from
+							// Server.RecordCount - Local.RecordCount, which is
+							// negative when local has extra records (e.g. after
+							// server-side deletes).  A negative total in the
+							// progress report is nonsensical.
+							tmpProgress.Total = Math.max(tmpTracker.TotalCount || 0, 0);
 							tmpProgress.Synced = Math.max(tmpTracker.CurrentCount || 0, 0);
 						}
 					}
 
 					// Read per-record breakdown from the sync entity
+					let tmpEntityErrors = 0;
+					let tmpEntitySkipped = 0;
 					if (tmpSyncEntity && tmpSyncEntity.syncResults)
 					{
 						let tmpResults = tmpSyncEntity.syncResults;
@@ -1018,12 +1040,12 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 						tmpProgress.Deleted = tmpResults.Deleted || 0;
 						tmpProgress.ServerTotal = tmpResults.ServerRecordCount || 0;
 						tmpProgress.LocalCountBefore = tmpResults.LocalRecordCount || 0;
+						tmpEntityErrors = tmpResults.Errors || 0;
+						tmpEntitySkipped = tmpResults.Skipped || 0;
 					}
 
 					let tmpRESTErrors = this._cloneState.SyncRESTErrors[tmpTableName] || 0;
-					tmpProgress.Errors = tmpRESTErrors;
-
-					let tmpMissing = tmpProgress.Total - tmpProgress.Synced;
+					tmpProgress.Errors = tmpRESTErrors + tmpEntityErrors;
 
 					if (pError)
 					{
@@ -1033,25 +1055,35 @@ class RetoldDataServiceDataCloner extends libFableServiceProviderBase
 						this.logSyncEvent('TableError', `Sync [${tmpTableName}] — error: ${pError}`,
 							{ Table: tmpTableName, Total: tmpProgress.Total, Synced: tmpProgress.Synced, Error: `${pError}` });
 					}
-					else if (tmpRESTErrors > 0)
-					{
-						tmpProgress.Status = 'Error';
-						tmpProgress.ErrorMessage = `${tmpRESTErrors} REST error(s) during sync`;
-						this.fable.log.warn(`Data Cloner: Sync [${tmpTableName}] — completed with ${tmpRESTErrors} REST error(s). ${tmpProgress.Synced}/${tmpProgress.Total} records synced.`);
-						this.logSyncEvent('TableError', `Sync [${tmpTableName}] — ${tmpRESTErrors} REST error(s).`,
-							{ Table: tmpTableName, Total: tmpProgress.Total, Synced: tmpProgress.Synced, RESTErrors: tmpRESTErrors });
-					}
-					else if (tmpProgress.Total > 0 && tmpMissing > 0)
+					else if (tmpRESTErrors > 0 || tmpEntityErrors > 0)
 					{
-						tmpProgress.Status = 'Partial';
-						tmpProgress.Skipped = tmpMissing;
-						this.fable.log.warn(`Data Cloner: Sync [${tmpTableName}] — partial. ${tmpProgress.Synced}/${tmpProgress.Total} records synced, ${tmpMissing} skipped (GUID conflicts or other errors).`);
-						this.logSyncEvent('TablePartial', `Sync [${tmpTableName}] — partial. ${tmpMissing} skipped.`,
-							{ Table: tmpTableName, Total: tmpProgress.Total, Synced: tmpProgress.Synced, Skipped: tmpMissing });
+						// Only treat the sync as Partial/Error when the sync
+						// entity actually reported errors (REST fetch errors or
+						// per-record commit errors).  A count-mismatch between
+						// estimated Total and actual Synced is not itself an
+						// error — pre-count estimates can be stale (records
+						// were updated rather than added, local already has
+						// records past the server's max ID, etc.), and the
+						// sync code correctly downloads nothing in those
+						// cases.  Reporting "N skipped" for pure estimate
+						// drift is noisy and misleading.
+						let tmpPartialMessage = (tmpRESTErrors > 0 && tmpEntityErrors > 0)
+							? `${tmpRESTErrors} REST error(s) and ${tmpEntityErrors} record error(s) during sync`
+							: (tmpRESTErrors > 0)
+								? `${tmpRESTErrors} REST error(s) during sync`
+								: `${tmpEntityErrors} record error(s) during sync`;
+						tmpProgress.Status = (tmpRESTErrors > 0) ? 'Error' : 'Partial';
+						tmpProgress.ErrorMessage = tmpPartialMessage;
+						tmpProgress.Skipped = tmpEntitySkipped;
+						this.fable.log.warn(`Data Cloner: Sync [${tmpTableName}] — ${tmpPartialMessage}. ${tmpProgress.Synced}/${tmpProgress.Total} records synced.`);
+						this.logSyncEvent(tmpProgress.Status === 'Error' ? 'TableError' : 'TablePartial',
+							`Sync [${tmpTableName}] — ${tmpPartialMessage}.`,
+							{ Table: tmpTableName, Total: tmpProgress.Total, Synced: tmpProgress.Synced, RESTErrors: tmpRESTErrors, RecordErrors: tmpEntityErrors });
 					}
 					else
 					{
 						tmpProgress.Status = 'Complete';
+						tmpProgress.Skipped = tmpEntitySkipped;
 						this.fable.log.info(`Data Cloner: Sync [${tmpTableName}] — complete. ${tmpProgress.Synced}/${tmpProgress.Total} records synced.`);
 						this.logSyncEvent('TableComplete', `Sync [${tmpTableName}] — complete. ${tmpProgress.Synced}/${tmpProgress.Total} records.`,
 							{ Table: tmpTableName, Total: tmpProgress.Total, Synced: tmpProgress.Synced });