retold-remote 0.0.23 → 0.0.26

package/source/server/RetoldRemote-ToolDetector.js

@@ -40,6 +40,7 @@ class ToolDetector
 			p7zip: this._detectCommand('7z --help'),
 			audiowaveform: this._detectCommand('audiowaveform --version'),
 			ebook_convert: this._detectCommand('ebook-convert --version'),
+			libreoffice: this._detectLibreOffice(),
 			exiftool: this._detectCommand('exiftool -ver'),
 			dcraw: this._detectCommandExists('dcraw'),
 			dcrawJs: this._detectModule('dcraw'),
@@ -151,6 +152,55 @@ class ToolDetector
 		return this._detectCommand('vlc --version');
 	}
 
+	/**
+	 * Detect LibreOffice for headless document conversion.
+	 * macOS: check for the .app bundle (soffice in the bundle).
+	 * Linux: check the soffice command.
+	 * Windows: check default install paths.
+	 *
+	 * @returns {boolean}
+	 */
+	_detectLibreOffice()
+	{
+		const libFS = require('fs');
+
+		// macOS: check for LibreOffice.app
+		try
+		{
+			if (libFS.existsSync('/Applications/LibreOffice.app/Contents/MacOS/soffice'))
+			{
+				return true;
+			}
+		}
+		catch (pError)
+		{
+			// ignore
+		}
+
+		// Windows: check default install paths
+		if (process.platform === 'win32')
+		{
+			try
+			{
+				if (libFS.existsSync('C:\\Program Files\\LibreOffice\\program\\soffice.exe'))
+				{
+					return true;
+				}
+				if (libFS.existsSync('C:\\Program Files (x86)\\LibreOffice\\program\\soffice.exe'))
+				{
+					return true;
+				}
+			}
+			catch (pError)
+			{
+				// ignore
+			}
+		}
+
+		// Linux / other: check soffice on PATH
+		return this._detectCommandExists('soffice');
+	}
+
 	/**
 	 * Check if a command-line tool exists on the PATH using 'which'.
 	 * Useful for tools that exit non-zero when invoked with no arguments (e.g. dcraw).

package/source/server/RetoldRemote-UltravisorBeacon.js

@@ -44,6 +44,8 @@ class RetoldRemoteUltravisorBeacon extends libFableServiceProviderBase
 	 *   - ContentPath {string} Absolute path to content directory
 	 *   - ContentBaseURL {string} URL prefix for content access (e.g. 'http://localhost:7500/content/')
 	 *   - CacheRoot {string} Absolute path to cache directory
+	 *   - HostID {string} Override for the host identity (default: os.hostname())
+	 *   - SharedMounts {Array<{MountID, Root}>} Shared filesystem mounts to advertise
 	 * @param {Function} fCallback Called with (pError, pBeaconInfo)
 	 */
 	connectBeacon(pBeaconConfig, fCallback)
@@ -62,8 +64,10 @@ class RetoldRemoteUltravisorBeacon extends libFableServiceProviderBase
 		// Register the beacon service type with fable if not already present
 		this.fable.addServiceTypeIfNotExists('UltravisorBeacon', libBeaconService);
 
-		// Instantiate the beacon service with the provided config
-		this._BeaconService = this.fable.instantiateServiceProviderWithoutRegistration('UltravisorBeacon',
+		// Build the beacon options. SharedMounts is forwarded as-is — the caller
+		// (Server-Setup) computes the MountID hash so that both retold-remote and
+		// orator-conversion advertise the SAME id for the same on-disk mount.
+		let tmpBeaconOptions =
 			{
 				ServerURL: pBeaconConfig.ServerURL,
 				Name: pBeaconConfig.Name || 'retold-remote',
@@ -72,7 +76,18 @@ class RetoldRemoteUltravisorBeacon extends libFableServiceProviderBase
 				StagingPath: pBeaconConfig.StagingPath || process.cwd(),
 				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);
 
 		// Register the File context (content root — the user's media folder)
 		if (pBeaconConfig.ContentPath)