orator-conversion 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orator-conversion",
-	"version": "1.0.6",
+	"version": "1.0.8",
 	"description": "File format conversion endpoints for Orator service servers.",
 	"main": "source/Orator-File-Translation.js",
 	"scripts": {
@@ -43,7 +43,7 @@
 	"dependencies": {
 		"fable-serviceproviderbase": "^3.0.19",
 		"sharp": "^0.34.5",
-		"ultravisor-beacon": "^0.0.7",
+		"ultravisor-beacon": "^0.0.8",
 		"ws": "^8.20.0"
 	},
 	"devDependencies": {

package/source/Orator-Conversion-BeaconProvider.js

@@ -46,6 +46,13 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 		this.Name = 'OratorConversion';
 		this.Capability = 'MediaConversion';
 
+		this.log = (this._ProviderConfig && this._ProviderConfig.Log) || {
+			trace: (...pArgs) => { console.log(...pArgs); },
+			info: (...pArgs) => { console.log(...pArgs); },
+			warn: (...pArgs) => { console.warn(...pArgs); },
+			error: (...pArgs) => { console.error(...pArgs); }
+		};
+
 		this._Core = new libConversionCore({
 			PdftkPath: this._ProviderConfig.PdftkPath || 'pdftk',
 			PdftoppmPath: this._ProviderConfig.PdftoppmPath || 'pdftoppm',
@@ -233,27 +240,27 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 				return fCallback(new Error(`OratorConversion provider requires Sharp: ${pSharpError.message}`));
 			}
 			this._SharpAvailable = true;
-			console.log(`  [OratorConversion] Sharp: available`);
+			this.log.info(`  [OratorConversion] Sharp: available`);
 
 			this._Core.checkPdftoppm((pPdftoppmError, pPdftoppmAvailable) =>
 			{
 				this._PdftoppmAvailable = !pPdftoppmError;
-				console.log(`  [OratorConversion] pdftoppm: ${this._PdftoppmAvailable ? 'available' : 'not found (PDF actions disabled)'}`);
+				this.log.info(`  [OratorConversion] pdftoppm: ${this._PdftoppmAvailable ? 'available' : 'not found (PDF actions disabled)'}`);
 
 				this._Core.checkPdftk((pPdftkError, pPdftkAvailable) =>
 				{
 					this._PdftkAvailable = !pPdftkError;
-					console.log(`  [OratorConversion] pdftk: ${this._PdftkAvailable ? 'available' : 'not found (PDF extraction disabled)'}`);
+					this.log.info(`  [OratorConversion] pdftk: ${this._PdftkAvailable ? 'available' : 'not found (PDF extraction disabled)'}`);
 
 					this._Core.checkFfmpeg((pFfmpegError, pFfmpegAvailable) =>
 					{
 						this._FfmpegAvailable = !pFfmpegError;
-						console.log(`  [OratorConversion] ffmpeg: ${this._FfmpegAvailable ? 'available' : 'not found (video/audio actions disabled)'}`);
+						this.log.info(`  [OratorConversion] ffmpeg: ${this._FfmpegAvailable ? 'available' : 'not found (video/audio actions disabled)'}`);
 
 						this._Core.checkFfprobe((pFfprobeError, pFfprobeAvailable) =>
 						{
 							this._FfprobeAvailable = !pFfprobeError;
-							console.log(`  [OratorConversion] ffprobe: ${this._FfprobeAvailable ? 'available' : 'not found (media probe disabled)'}`);
+							this.log.info(`  [OratorConversion] ffprobe: ${this._FfprobeAvailable ? 'available' : 'not found (media probe disabled)'}`);
 
 							return fCallback(null);
 						});
@@ -268,7 +275,7 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 	 */
 	execute(pAction, pWorkItem, pContext, fCallback, fReportProgress)
 	{
-		let tmpLog = pContext && pContext.log ? pContext.log : { info: console.log, warn: console.warn, error: console.error };
+		let tmpLog = pContext && pContext.log ? pContext.log : this.log;
 		tmpLog.info(`[OratorConversion] execute: action="${pAction}" workItem=${pWorkItem.WorkItemHash || '?'} settings=${JSON.stringify(pWorkItem.Settings || {}).substring(0, 200)}`);
 		let tmpSettings = pWorkItem.Settings || {};
 		let tmpStagingPath = pContext.StagingPath || process.cwd();

package/source/Orator-File-Translation.js

@@ -529,6 +529,10 @@ class OratorFileTranslation extends libFableServiceProviderBase
 	 *   - MaxConcurrent {number} Max concurrent work items (default: 2)
 	 *   - StagingPath {string} Local staging directory (default: cwd)
 	 *   - Tags {object} Beacon tags (default: {})
+	 *   - HostID {string} Override for the host identity (default: os.hostname())
+	 *   - SharedMounts {Array<{MountID, Root}>} Shared filesystem mounts to advertise
+	 *     so the reachability matrix can detect zero-copy paths between this
+	 *     beacon and other beacons on the same host
 	 * @param {Function} fCallback Called with (pError, pBeaconInfo)
 	 */
 	connectBeacon(pBeaconConfig, fCallback)
@@ -560,8 +564,10 @@ class OratorFileTranslation extends libFableServiceProviderBase
 			// Already exists — fine
 		}
 
-		// Instantiate the beacon service with the provided config
-		this._BeaconService = this.fable.instantiateServiceProviderWithoutRegistration('UltravisorBeacon',
+		// Build the beacon service options. SharedMounts is forwarded as-is so
+		// the caller controls which mounts get advertised — and matches the
+		// MountID computation done by other beacons on the same host.
+		let tmpBeaconOptions =
 			{
 				ServerURL: pBeaconConfig.ServerURL,
 				Name: pBeaconConfig.Name || 'orator-conversion',
@@ -570,7 +576,18 @@ class OratorFileTranslation extends libFableServiceProviderBase
 				StagingPath: tmpStagingPath,
 				Tags: pBeaconConfig.Tags || {},
 				BindAddresses: pBeaconConfig.BindAddresses || []
-			});
+			};
+		if (pBeaconConfig.HostID)
+		{
+			tmpBeaconOptions.HostID = pBeaconConfig.HostID;
+		}
+		if (Array.isArray(pBeaconConfig.SharedMounts) && pBeaconConfig.SharedMounts.length > 0)
+		{
+			tmpBeaconOptions.SharedMounts = pBeaconConfig.SharedMounts;
+		}
+
+		// Instantiate the beacon service with the provided config
+		this._BeaconService = this.fable.instantiateServiceProviderWithoutRegistration('UltravisorBeacon', tmpBeaconOptions);
 
 		// Create the MediaConversion capability provider and register it
 		let tmpProvider = new libOratorConversionBeaconProvider(