orator-conversion 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orator-conversion",
-	"version": "1.0.7",
+	"version": "1.0.9",
 	"description": "File format conversion endpoints for Orator service servers.",
 	"main": "source/Orator-File-Translation.js",
 	"scripts": {
@@ -43,13 +43,13 @@
 	"dependencies": {
 		"fable-serviceproviderbase": "^3.0.19",
 		"sharp": "^0.34.5",
-		"ultravisor-beacon": "^0.0.8",
+		"ultravisor-beacon": "^0.0.9",
 		"ws": "^8.20.0"
 	},
 	"devDependencies": {
 		"fable": "^3.1.67",
 		"orator": "^6.0.4",
-		"orator-serviceserver-restify": "^2.0.9",
+		"orator-serviceserver-restify": "^2.0.10",
 		"quackage": "^1.0.65"
 	}
 }

package/source/Conversion-Core.js

@@ -767,6 +767,116 @@ class ConversionCore
 			});
 	}
 
+	/**
+	 * Extract MULTIPLE frames from a video file in a single work item.
+	 *
+	 * This is the batch counterpart to videoExtractFrame. It exists so the
+	 * dispatcher can request all N frames the video explorer wants in one
+	 * trip — instead of triggering an entire operation graph 20 times — which
+	 * means one address resolve, one file-transfer / shared-fs check, one
+	 * probe (optional), and one ffmpeg invocation per frame all served from
+	 * the same on-disk file.
+	 *
+	 * Each frame extraction is a separate ffmpeg call internally because
+	 * ffmpeg's `-ss` before `-i` is fast (uses container index), and chaining
+	 * `select=eq(t,X)+eq(t,Y)+...` filters is brittle and produces wrong-sized
+	 * outputs for variable-bitrate streams. Sequential single-frame extracts
+	 * give us the same correctness as videoExtractFrame, just amortized.
+	 *
+	 * @param {string} pInputPath - Path to the input video file.
+	 * @param {Array}  pFrameSpecs - Frame specs:
+	 *   [
+	 *     { Timestamp: '00:00:05.000', OutputPath: '/abs/path/frame_0000.jpg' },
+	 *     { Timestamp: '00:00:10.000', OutputPath: '/abs/path/frame_0001.jpg' },
+	 *     ...
+	 *   ]
+	 * @param {object} pOptions - Shared extract options applied to every frame:
+	 *   { Width, Height }
+	 * @param {Function} fCallback - Called with (pError, pResult) where
+	 *   pResult is { Frames: [{ Index, Timestamp, OutputPath, Size, Success, Error? }, ...] }
+	 */
+	videoExtractFramesBatch(pInputPath, pFrameSpecs, pOptions, fCallback)
+	{
+		let tmpSelf = this;
+
+		if (!Array.isArray(pFrameSpecs) || pFrameSpecs.length === 0)
+		{
+			return fCallback(new Error('videoExtractFramesBatch: Frames array is required and must be non-empty.'));
+		}
+
+		// Quick existence check on the input video — fail fast rather than per-frame
+		if (!libFS.existsSync(pInputPath))
+		{
+			return fCallback(new Error(`videoExtractFramesBatch: input video not found: ${pInputPath}`));
+		}
+
+		let tmpResults = [];
+		let tmpIndex = 0;
+
+		let _extractNext = () =>
+		{
+			if (tmpIndex >= pFrameSpecs.length)
+			{
+				return fCallback(null, { Frames: tmpResults });
+			}
+
+			let tmpI = tmpIndex;
+			let tmpSpec = pFrameSpecs[tmpI];
+			tmpIndex++;
+
+			if (!tmpSpec || !tmpSpec.OutputPath || !tmpSpec.Timestamp)
+			{
+				tmpResults.push(
+					{
+						Index: tmpI,
+						Timestamp: tmpSpec ? tmpSpec.Timestamp : null,
+						OutputPath: tmpSpec ? tmpSpec.OutputPath : null,
+						Size: 0,
+						Success: false,
+						Error: 'Missing Timestamp or OutputPath'
+					});
+				return _extractNext();
+			}
+
+			tmpSelf.videoExtractFrame(pInputPath, tmpSpec.OutputPath,
+				{
+					Timestamp: tmpSpec.Timestamp,
+					Width: pOptions ? pOptions.Width : undefined,
+					Height: pOptions ? pOptions.Height : undefined
+				},
+				(pError, pResultPath) =>
+				{
+					if (pError)
+					{
+						tmpResults.push(
+							{
+								Index: tmpI,
+								Timestamp: tmpSpec.Timestamp,
+								OutputPath: tmpSpec.OutputPath,
+								Size: 0,
+								Success: false,
+								Error: pError.message
+							});
+						return _extractNext();
+					}
+
+					let tmpSize = 0;
+					try { tmpSize = libFS.statSync(pResultPath).size; } catch (pIgnore) { /* ignore */ }
+					tmpResults.push(
+						{
+							Index: tmpI,
+							Timestamp: tmpSpec.Timestamp,
+							OutputPath: pResultPath,
+							Size: tmpSize,
+							Success: true
+						});
+					return _extractNext();
+				});
+		};
+
+		_extractNext();
+	}
+
 	/**
 	 * Generate a thumbnail from a video file.
 	 *

package/source/Orator-Conversion-BeaconProvider.js

@@ -192,6 +192,18 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 					{ Name: 'Height', DataType: 'Number', Required: false, Description: 'Scale height (width auto)' }
 				]
 			},
+			'VideoExtractFrames':
+			{
+				Description: 'Extract MULTIPLE frames from a video file in a single work item. Each frame spec includes a timestamp and an output filename. All frames are written to the same OutputDir, which must be writable from this beacon (typically via shared filesystem with the dispatcher). Returns a JSON manifest with per-frame results.',
+				SettingsSchema:
+				[
+					{ Name: 'InputFile', DataType: 'String', Required: true, Description: 'Path to input video file' },
+					{ Name: 'OutputDir', DataType: 'String', Required: true, Description: 'Absolute directory where frames should be written. Must be writable from this beacon.' },
+					{ Name: 'Frames', DataType: 'String', Required: true, Description: 'JSON-encoded array of {Timestamp, Filename} pairs, e.g. [{"Timestamp":"00:00:05","Filename":"frame_0000.jpg"}, ...]' },
+					{ Name: 'Width', DataType: 'Number', Required: false, Description: 'Scale width applied to every frame' },
+					{ Name: 'Height', DataType: 'Number', Required: false, Description: 'Scale height applied to every frame' }
+				]
+			},
 			'VideoThumbnail':
 			{
 				Description: 'Generate a thumbnail from a video file.',
@@ -325,7 +337,7 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 		tmpLog.info(`[OratorConversion] Input file OK: ${tmpInputPath} (${libFS.statSync(tmpInputPath).size} bytes)`);
 
 		// File-path actions skip the buffer read — Sharp and ffmpeg handle files directly
-		let tmpFilePathActions = { 'ImageResize': true, 'ImageConvert': true, 'MediaProbe': true, 'VideoExtractFrame': true, 'VideoThumbnail': true, 'AudioExtractSegment': true, 'AudioWaveform': true };
+		let tmpFilePathActions = { 'ImageResize': true, 'ImageConvert': true, 'MediaProbe': true, 'VideoExtractFrame': true, 'VideoExtractFrames': true, 'VideoThumbnail': true, 'AudioExtractSegment': true, 'AudioWaveform': true };
 		if (tmpFilePathActions[pAction])
 		{
 			return this._executeFilePathAction(pAction, tmpSettings, tmpInputPath, tmpOutputPath, fCallback, fReportProgress);
@@ -605,6 +617,144 @@ class OratorConversionBeaconProvider extends libBeaconCapabilityProvider
 				break;
 			}
 
+			case 'VideoExtractFrames':
+			{
+				// Batch frame extraction. Reads InputFile once, extracts N frames
+				// to OutputDir, returns a JSON manifest. Used by the video explorer
+				// to avoid 20 separate work-item dispatches per video.
+				if (!this._FfmpegAvailable)
+				{
+					return fCallback(null, {
+						Outputs: { StdOut: 'ffmpeg not available on this beacon.', ExitCode: -1, Result: '' },
+						Log: ['OratorConversion: ffmpeg required for VideoExtractFrames but not found.']
+					});
+				}
+
+				let tmpOutputDir = pSettings.OutputDir;
+				if (!tmpOutputDir)
+				{
+					return fCallback(null, {
+						Outputs: { StdOut: 'No OutputDir specified.', ExitCode: -1, Result: '' },
+						Log: ['OratorConversion VideoExtractFrames: OutputDir is required.']
+					});
+				}
+
+				let tmpFrameSpecs;
+				try
+				{
+					tmpFrameSpecs = JSON.parse(pSettings.Frames || '[]');
+				}
+				catch (pParseError)
+				{
+					return fCallback(null, {
+						Outputs: { StdOut: `Invalid Frames JSON: ${pParseError.message}`, ExitCode: -1, Result: '' },
+						Log: [`OratorConversion VideoExtractFrames: failed to parse Frames JSON: ${pParseError.message}`]
+					});
+				}
+
+				if (!Array.isArray(tmpFrameSpecs) || tmpFrameSpecs.length === 0)
+				{
+					return fCallback(null, {
+						Outputs: { StdOut: 'Frames array is empty.', ExitCode: -1, Result: '' },
+						Log: ['OratorConversion VideoExtractFrames: Frames must be a non-empty array.']
+					});
+				}
+
+				// Ensure OutputDir exists. With shared-fs the dispatcher already
+				// created it; mkdir -p is a no-op in that case but needed when
+				// the dispatcher is on a different host.
+				try
+				{
+					libFS.mkdirSync(tmpOutputDir, { recursive: true });
+				}
+				catch (pMkdirError)
+				{
+					return fCallback(null, {
+						Outputs: { StdOut: `Could not create OutputDir: ${pMkdirError.message}`, ExitCode: -1, Result: '' },
+						Log: [`OratorConversion VideoExtractFrames: mkdir failed for ${tmpOutputDir}: ${pMkdirError.message}`]
+					});
+				}
+
+				// Resolve absolute output paths from { Timestamp, Filename } pairs
+				let tmpResolvedSpecs = [];
+				for (let i = 0; i < tmpFrameSpecs.length; i++)
+				{
+					let tmpEntry = tmpFrameSpecs[i];
+					if (!tmpEntry || !tmpEntry.Timestamp || !tmpEntry.Filename)
+					{
+						tmpResolvedSpecs.push(tmpEntry);
+						continue;
+					}
+					// Reject filenames with path separators or traversal — the
+					// caller is meant to give us flat names like frame_0000.jpg
+					if (tmpEntry.Filename.indexOf('/') !== -1 ||
+						tmpEntry.Filename.indexOf('\\') !== -1 ||
+						tmpEntry.Filename.indexOf('..') !== -1)
+					{
+						return fCallback(null, {
+							Outputs: { StdOut: `Invalid filename in Frames: ${tmpEntry.Filename}`, ExitCode: -1, Result: '' },
+							Log: [`OratorConversion VideoExtractFrames: refusing filename with path separators: ${tmpEntry.Filename}`]
+						});
+					}
+					tmpResolvedSpecs.push(
+						{
+							Timestamp: tmpEntry.Timestamp,
+							OutputPath: libPath.join(tmpOutputDir, tmpEntry.Filename)
+						});
+				}
+
+				if (fReportProgress) fReportProgress({ Percent: 5, Message: `Extracting ${tmpResolvedSpecs.length} frames...` });
+
+				this._Core.videoExtractFramesBatch(pInputPath, tmpResolvedSpecs,
+					{
+						Width: pSettings.Width,
+						Height: pSettings.Height
+					},
+					(pError, pBatchResult) =>
+					{
+						if (pError)
+						{
+							return fCallback(null, {
+								Outputs: { StdOut: `Batch frame extraction failed: ${pError.message}`, ExitCode: 1, Result: '' },
+								Log: [`OratorConversion VideoExtractFrames error: ${pError.message}`]
+							});
+						}
+
+						// Re-attach the original Filename field to each result so
+						// the dispatcher can correlate against its own naming.
+						let tmpFrames = pBatchResult.Frames || [];
+						for (let i = 0; i < tmpFrames.length; i++)
+						{
+							let tmpOriginal = tmpFrameSpecs[i];
+							if (tmpOriginal && tmpOriginal.Filename)
+							{
+								tmpFrames[i].Filename = tmpOriginal.Filename;
+							}
+						}
+
+						let tmpSuccessCount = tmpFrames.filter((f) => f.Success).length;
+						let tmpManifest =
+							{
+								FrameCount: tmpFrames.length,
+								SuccessCount: tmpSuccessCount,
+								OutputDir: tmpOutputDir,
+								Frames: tmpFrames
+							};
+
+						return fCallback(null, {
+							Outputs:
+							{
+								StdOut: `Extracted ${tmpSuccessCount}/${tmpFrames.length} frames from ${pSettings.InputFile} → ${tmpOutputDir}`,
+								ExitCode: tmpSuccessCount === tmpFrames.length ? 0 : 1,
+								Result: JSON.stringify(tmpManifest),
+								ContentType: 'application/json'
+							},
+							Log: [`OratorConversion VideoExtractFrames: ${tmpSuccessCount}/${tmpFrames.length} frames written to ${tmpOutputDir}`]
+						});
+					});
+				break;
+			}
+
 			case 'VideoThumbnail':
 			{
 				if (!this._FfmpegAvailable)

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(