orator-conversion 1.0.2 → 1.0.4

package/debug/Harness.js

@@ -1,10 +1,48 @@
 const libFable = require('fable');
+const libPath = require('path');
+
+// Parse command-line flags before creating Fable so LogStreams can be set
+let tmpUltravisorURL = null;
+let tmpLogFilePath = null;
+for (let i = 2; i < process.argv.length; i++)
+{
+	if ((process.argv[i] === '--ultravisor' || process.argv[i] === '-u'))
+	{
+		if (process.argv[i + 1] && !process.argv[i + 1].startsWith('-'))
+		{
+			tmpUltravisorURL = process.argv[++i];
+		}
+		else
+		{
+			tmpUltravisorURL = 'http://localhost:54321';
+		}
+	}
+	if (process.argv[i] === '--logfile' || process.argv[i] === '-l')
+	{
+		if (process.argv[i + 1] && !process.argv[i + 1].startsWith('-'))
+		{
+			tmpLogFilePath = libPath.resolve(process.argv[++i]);
+		}
+		else
+		{
+			tmpLogFilePath = libPath.resolve(`orator-conversion-${new Date().toISOString().replace(/[:.]/g, '-')}.log`);
+		}
+	}
+}
+
+let tmpLogStreams = [{ level: 'trace', streamtype: 'process.stdout' }];
+if (tmpLogFilePath)
+{
+	tmpLogStreams.push({ loggertype: 'simpleflatfile', level: 'trace', path: tmpLogFilePath });
+	console.log(`[Orator-Conversion] Logging to file: ${tmpLogFilePath}`);
+}
 
 const defaultFableSettings = (
 	{
 		Product: 'Orator-FileTranslation',
 		ProductVersion: '1.0.0',
-		APIServerPort: 8765
+		APIServerPort: 8765,
+		LogStreams: tmpLogStreams
 	});
 
 let _Fable = new libFable(defaultFableSettings);
@@ -32,6 +70,30 @@ tmpAnticipate.anticipate(
 
 tmpAnticipate.anticipate(_Orator.startService.bind(_Orator));
 
+// If an Ultravisor URL was provided, connect as a beacon
+if (tmpUltravisorURL)
+{
+	tmpAnticipate.anticipate(
+		(fNext) =>
+		{
+			_Fable.OratorFileTranslation.connectBeacon(
+				{
+					ServerURL: tmpUltravisorURL,
+					Name: 'orator-conversion',
+					BindAddresses: [{ IP: '127.0.0.1', Port: 8765, Protocol: 'http' }]
+				},
+				(pError) =>
+				{
+					if (pError)
+					{
+						_Fable.log.warn(`Beacon connection failed (server may not be running): ${pError.message}`);
+						_Fable.log.warn('HTTP endpoints are still available. Beacon will not be active.');
+					}
+					return fNext();
+				});
+		});
+}
+
 tmpAnticipate.wait(
 	(pError) =>
 	{
@@ -45,4 +107,27 @@ tmpAnticipate.wait(
 		_Fable.log.info('  POST http://127.0.0.1:8765/conversion/1.0/image/png-to-jpg');
 		_Fable.log.info('  POST http://127.0.0.1:8765/conversion/1.0/pdf-to-page-png/:Page');
 		_Fable.log.info('  POST http://127.0.0.1:8765/conversion/1.0/pdf-to-page-jpg/:Page');
+
+		if (tmpUltravisorURL)
+		{
+			_Fable.log.info('');
+			_Fable.log.info(`Beacon: connected to Ultravisor at ${tmpUltravisorURL}`);
+		}
 	});
+
+// Graceful shutdown
+process.on('SIGINT', () =>
+{
+	console.log('\n[Orator-Conversion] Shutting down...');
+	if (_Fable.OratorFileTranslation._BeaconService)
+	{
+		_Fable.OratorFileTranslation.disconnectBeacon(() =>
+		{
+			process.exit(0);
+		});
+	}
+	else
+	{
+		process.exit(0);
+	}
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orator-conversion",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "File format conversion endpoints for Orator service servers.",
 	"main": "source/Orator-File-Translation.js",
 	"scripts": {
@@ -42,12 +42,14 @@
 	"homepage": "https://github.com/stevenvelozo/orator-conversion#readme",
 	"dependencies": {
 		"fable-serviceproviderbase": "^3.0.19",
-		"sharp": "^0.34.5"
+		"sharp": "^0.34.5",
+		"ultravisor-beacon": "^0.0.3",
+		"ws": "^8.20.0"
 	},
 	"devDependencies": {
-		"fable": "^3.1.55",
-		"orator": "^6.0.1",
-		"orator-serviceserver-restify": "^2.0.7",
-		"quackage": "^1.0.58"
+		"fable": "^3.1.67",
+		"orator": "^6.0.4",
+		"orator-serviceserver-restify": "^2.0.9",
+		"quackage": "^1.0.65"
 	}
 }