single-file-cli 2.1.0 → 2.1.2

package/options.js

@@ -203,76 +203,155 @@ const OPTIONS_INFO = [{
 }];
 
 const { args, exit } = Deno;
-const options = getOptions();
-export { options, parseArgs };
+export { getOptions, parseArgs, applySettings, parseUrlsFile };
 
-function getOptions() {
-	const { positionals, options } = parseArgs(Array.from(args));
-	const unknownOptions = [];
-	positionals.forEach(positional => {
-		if (positional.startsWith("--")) {
-			unknownOptions.push(positional);
-			positionals.splice(positionals.indexOf(positional), 1);
-		}
-	});
-	if ((!positionals.length || positionals.length > 2 || options.help || unknownOptions.length) && (!options.version && !options.urlsFile)) {
-		console.log(USAGE_TEXT + "\n"); // eslint-disable-line no-console
-		console.log("Options:"); // eslint-disable-line no-console
-		OPTIONS_INFO.forEach(category => {
-			const categoryName = CATEGORIES[OPTIONS_INFO.indexOf(category)];
-			console.log(`  * ${categoryName}:`); // eslint-disable-line no-console
-			Object.keys(category).forEach(optionName => {
-				const optionInfo = getOptionInfo(optionName);
-				let optionType = optionInfo.type;
-				if (isArray(optionType)) {
-					optionType = optionType.replace("[]", "*");
-				}
-				const optionDescription = optionInfo.description;
-				const optionDefaultValue = optionInfo.defaultValue === undefined ? "" : `(default: ${JSON.stringify(optionInfo.defaultValue)})`;
-				console.log(`    --${optionName}: ${optionDescription} <${optionType}> ${optionDefaultValue}`); // eslint-disable-line no-console
-			});
-			console.log(""); // eslint-disable-line no-console
+function parseUrlsFile(content) {
+	return content.split("\n")
+		.map(line => line.trim())
+		.filter(line => line)
+		.map(line => {
+			let optionPosition = line.indexOf(" --");
+			if (optionPosition < 0) {
+				optionPosition = line.indexOf("\t--");
+			}
+			if (optionPosition > 0) {
+				const url = line.substring(0, optionPosition).trim();
+				const { options, positionals, invalidOptions } = parseArgs(tokenizeArgs(line.substring(optionPosition + 1).trim()), false);
+				positionals.filter(positional => positional.startsWith("--")).forEach(option =>
+					console.warn(`Warning: Unknown option ${option} (${url})`)); // eslint-disable-line no-console
+				invalidOptions.forEach(({ name, value }) => console.warn(value === undefined ? // eslint-disable-line no-console
+					`Warning: Missing value for --${name} (${url})` :
+					`Warning: Invalid value for --${name}: ${JSON.stringify(value)} (${url})`));
+				return [url, options];
+			} else {
+				return line;
+			}
 		});
-		if (unknownOptions.length) {
-			console.log(`Error: Unknown option${unknownOptions.length > 1 ? "s" : ""} ${unknownOptions.join(", ")}`); // eslint-disable-line no-console
-			console.log(""); // eslint-disable-line no-console
+}
+
+function tokenizeArgs(argsString) {
+	const args = [];
+	let previousCharacter, previousPreviousCharacter, lastQuoteCharacter;
+	let lastCharIndex = 0;
+	for (let currentCharIndex = 0; currentCharIndex < argsString.length; currentCharIndex++) {
+		const character = argsString[currentCharIndex];
+		if (character == lastQuoteCharacter && (previousCharacter != "\\" || previousPreviousCharacter == "\\")) {
+			args.push(argsString.substring(lastCharIndex, currentCharIndex));
+			lastQuoteCharacter = null;
+			lastCharIndex = currentCharIndex + 1;
+		} else if (!lastQuoteCharacter) {
+			if (character == "'" || character == "\"") {
+				lastQuoteCharacter = character;
+				lastCharIndex = currentCharIndex + 1;
+			} else if (character == " " || character == "\t" || character == "=") {
+				if (lastCharIndex < currentCharIndex) {
+					args.push(argsString.substring(lastCharIndex, currentCharIndex));
+				}
+				lastCharIndex = currentCharIndex + 1;
+			}
 		}
+		previousPreviousCharacter = previousCharacter;
+		previousCharacter = character;
+	}
+	if (lastCharIndex < argsString.length) {
+		args.push(argsString.substring(lastCharIndex).trim());
+	}
+	return args;
+}
+
+function applySettings(options, settings, explicitOptions = parseArgs(Array.from(args), false).options) {
+	const profiles = settings.profiles || {};
+	let profileName = options.settingsFileProfile;
+	if (profileName == "default" || profileName === undefined) {
+		profileName = "__Default_Settings__";
+	} else if (!profiles[profileName]) {
+		const profileNames = Object.keys(profiles).filter(name => name != "__Default_Settings__");
+		throw new Error(`Unknown profile ${JSON.stringify(profileName)}, available profiles: ${profileNames.join(", ")}`);
+	}
+	Object.assign(options, profiles[profileName], explicitOptions);
+	delete options.settingsFile;
+}
+
+function getOptions() {
+	const { positionals, options, invalidOptions } = parseArgs(Array.from(args));
+	const unknownOptions = positionals.filter(positional => positional.startsWith("--"));
+	const urls = positionals.filter(positional => !positional.startsWith("--"));
+	if (options.help) {
+		printUsage();
 		exit(0);
 	}
 	if (options.version) {
 		console.log(version); // eslint-disable-line no-console
 		exit(0);
 	}
-	return { ...options, url: positionals[0], output: positionals[1] };
+	const errorMessages = [];
+	unknownOptions.forEach(option => errorMessages.push(`Unknown option ${option}`));
+	invalidOptions.forEach(({ name, value }) => errorMessages.push(value === undefined ?
+		`Missing value for --${name}` :
+		`Invalid value for --${name}: ${JSON.stringify(value)}`));
+	if (!urls.length && !options.urlsFile) {
+		errorMessages.push("The URL or path of the page to save is required");
+	}
+	if (urls.length > 2) {
+		errorMessages.push(`Unexpected arguments: ${urls.slice(2).join(", ")}`);
+	}
+	if (errorMessages.length) {
+		printUsage();
+		errorMessages.forEach(message => console.error(`Error: ${message}`)); // eslint-disable-line no-console
+		exit(1);
+	}
+	return { ...options, url: urls[0], output: urls[1] };
+}
+
+function printUsage() {
+	console.log(USAGE_TEXT + "\n"); // eslint-disable-line no-console
+	console.log("Options:"); // eslint-disable-line no-console
+	OPTIONS_INFO.forEach(category => {
+		const categoryName = CATEGORIES[OPTIONS_INFO.indexOf(category)];
+		console.log(`  * ${categoryName}:`); // eslint-disable-line no-console
+		Object.keys(category).forEach(optionName => {
+			const optionInfo = category[optionName];
+			let optionType = optionInfo.type;
+			if (isArray(optionType)) {
+				optionType = optionType.replace("[]", "*");
+			}
+			const optionDescription = optionInfo.description;
+			const optionDefaultValue = optionInfo.defaultValue === undefined ? "" : `(default: ${JSON.stringify(optionInfo.defaultValue)})`;
+			console.log(`    --${optionName}: ${optionDescription} <${optionType}> ${optionDefaultValue}`); // eslint-disable-line no-console
+		});
+		console.log(""); // eslint-disable-line no-console
+	});
 }
 
 function parseArgs(args, setDefaultValues = true) {
 	const positionals = [];
 	const options = {};
-	const result = { positionals, options: {} };
+	const invalidOptions = [];
+	const result = { positionals, options: {}, invalidOptions };
 	let argIndex = 0;
 	while (argIndex < args.length) {
 		const arg = args[argIndex];
-		const { argName, argValue, optionInfo } = parseArg(arg);
-		if (optionInfo) {
-			if (options[argName] === undefined) {
-				options[argName] = [];
+		const { argValue, option } = parseArg(arg);
+		if (option) {
+			const optionName = option.name;
+			if (options[optionName] === undefined) {
+				options[optionName] = [];
 			}
-			let nextArgName;
 			if (argValue === undefined) {
-				if (
-					argIndex + 1 < args.length &&
-					({ argName: nextArgName } = parseArg(args[argIndex + 1])) &&
-					(nextArgName === undefined || !getOptionInfo(nextArgName)) &&
-					isValid(optionInfo.type, args[argIndex + 1]) &&
-					(isArray(optionInfo.type) || !options[argName].length)) {
-					options[argName].push(args[argIndex + 1]);
-					argIndex++;
+				if (argIndex + 1 < args.length && !parseArg(args[argIndex + 1]).option) {
+					const nextArg = args[argIndex + 1];
+					if (isValid(option.info.type, nextArg)) {
+						options[optionName].push(nextArg);
+						argIndex++;
+					} else if (option.info.type.startsWith("number")) {
+						invalidOptions.push({ name: optionName, value: nextArg });
+						argIndex++;
+					}
 				}
-			} else if (isValid(optionInfo.type, argValue) && (isArray(optionInfo.type) || !options[argName].length)) {
-				options[argName].push(argValue);
+			} else if (isValid(option.info.type, argValue)) {
+				options[optionName].push(argValue);
 			} else {
-				positionals.push(arg);
+				invalidOptions.push({ name: optionName, value: argValue });
 			}
 		} else {
 			positionals.push(arg);
@@ -280,34 +359,38 @@ function parseArgs(args, setDefaultValues = true) {
 		argIndex++;
 	}
 	Object.keys(options).forEach(optionName => {
-		const optionInfo = getOptionInfo(optionName);
+		const optionInfo = getOptionInfo(optionName).info;
 		const optionKey = getOptionKey(optionName, optionInfo);
 		let optionValue = options[optionName];
 		const isArrayType = isArray(optionInfo.type);
+		if (!optionInfo.type.startsWith("boolean") && !optionValue.length &&
+			!invalidOptions.some(invalidOption => invalidOption.name == optionName)) {
+			invalidOptions.push({ name: optionName });
+		}
 		if (optionInfo.type.startsWith("boolean")) {
 			optionValue = optionValue.map(value => value == "true");
 			optionValue = isArrayType ?
 				optionValue.length ? optionValue : true :
-				optionValue.length ? optionValue[0] : true;
+				optionValue.length ? optionValue[optionValue.length - 1] : true;
 		} else if (optionInfo.type.startsWith("number")) {
 			optionValue = optionValue.map(value => Number(value));
 			optionValue = isArrayType ?
 				optionValue.length ? optionValue : optionInfo.defaultValue || 0 :
-				optionValue.length ? optionValue[0] : optionInfo.defaultValue || 0;
+				optionValue.length ? optionValue[optionValue.length - 1] : optionInfo.defaultValue || 0;
 		} else {
 			optionValue = isArrayType ?
 				optionValue.length ? optionValue : optionInfo.defaultValue || "" :
-				optionValue.length ? optionValue[0] : optionInfo.defaultValue || "";
+				optionValue.length ? optionValue[optionValue.length - 1] : optionInfo.defaultValue || "";
 		}
 		result.options[optionKey] = optionValue;
 	});
 	if (setDefaultValues) {
 		OPTIONS_INFO.forEach(categoryOptions => {
 			Object.keys(categoryOptions).forEach(optionName => {
-				const optionInfo = getOptionInfo(optionName);
+				const optionInfo = categoryOptions[optionName];
 				const optionKey = getOptionKey(optionName, optionInfo);
 				if (result.options[optionKey] === undefined && optionInfo.defaultValue !== undefined) {
-					result.options[optionKey] = categoryOptions[optionName].defaultValue;
+					result.options[optionKey] = optionInfo.defaultValue;
 				}
 			});
 		});
@@ -332,7 +415,11 @@ function parseArgs(args, setDefaultValues = true) {
 	}
 	if (result.options.browserArgs) {
 		const browserArguments = result.options.browserArguments || [];
-		browserArguments.push(...JSON.parse(result.options.browserArgs));
+		try {
+			browserArguments.push(...JSON.parse(result.options.browserArgs));
+		} catch {
+			invalidOptions.push({ name: "browser-args", value: result.options.browserArgs });
+		}
 		result.options.browserArgs = browserArguments;
 		delete result.options.browserArguments;
 	}
@@ -340,46 +427,14 @@ function parseArgs(args, setDefaultValues = true) {
 		result.options.browserArgs = result.options.browserArguments;
 		delete result.options.browserArguments;
 	}
-	if (result.options.errorFile) {
+	if (result.options.errorFile !== undefined) {
 		result.options.errorsFile = result.options.errorFile;
 		delete result.options.errorFile;
 	}
-	if (result.options.errorTracesDisabled) {
+	if (result.options.errorTracesDisabled !== undefined) {
 		result.options.errorsTracesDisabled = result.options.errorTracesDisabled;
 		delete result.options.errorTracesDisabled;
 	}
-	if (result.options.crawlReplaceUrls) {
-		result.options.crawlReplaceURLs = result.options.crawlReplaceUrls;
-		delete result.options.crawlReplaceUrls;
-	}
-	if (result.options.saveOriginalUrls) {
-		result.options.saveOriginalURLs = result.options.saveOriginalUrls;
-		delete result.options.saveOriginalUrls;
-	}
-	if (result.options.browserRemoteDebuggingUrl) {
-		result.options.browserRemoteDebuggingURL = result.options.browserRemoteDebuggingUrl;
-		delete result.options.browserRemoteDebuggingUrl;
-	}
-	if (result.options.crawlRemoveUrlFragment) {
-		result.options.crawlRemoveURLFragment = result.options.crawlRemoveUrlFragment;
-		delete result.options.crawlRemoveUrlFragment;
-	}
-	if (result.options.compressCss) {
-		result.options.compressCSS = result.options.compressCss;
-		delete result.options.compressCss;
-	}
-	if (result.options.compressHtml) {
-		result.options.compressHTML = result.options.compressHtml;
-		delete result.options.compressHtml;
-	}
-	if (result.options.insertMetaCsp) {
-		result.options.insertMetaCSP = result.options.insertMetaCsp;
-		delete result.options.insertMetaCsp;
-	}
-	if (result.options.blockedUrlPatterns) {
-		result.options.blockedURLPatterns = result.options.blockedUrlPatterns;
-		delete result.options.blockedUrlPatterns;
-	}
 	if (result.options.filenameReplacedCharacters) {
 		const filenameReplacedCharacters = result.options.filenameReplacedCharacters;
 		result.options.filenameReplacedCharacters = [];
@@ -404,6 +459,49 @@ function parseArgs(args, setDefaultValues = true) {
 			}
 		});
 	}
+	if (result.options.httpHeaders) {
+		const headers = {};
+		result.options.httpHeaders.forEach(header => {
+			const separatorIndex = header.indexOf("=");
+			if (separatorIndex <= 0) {
+				invalidOptions.push({ name: "http-header", value: header });
+			} else {
+				headers[header.substring(0, separatorIndex).trim()] = header.substring(separatorIndex + 1).trim();
+			}
+		});
+		result.options.httpHeaders = headers;
+	}
+	if (result.options.emulateMediaFeatures) {
+		result.options.emulateMediaFeatures = result.options.emulateMediaFeatures
+			.map(feature => {
+				const separatorIndex = feature.indexOf(":");
+				if (separatorIndex <= 0) {
+					invalidOptions.push({ name: "emulate-media-feature", value: feature });
+				} else {
+					return {
+						name: feature.substring(0, separatorIndex),
+						value: feature.substring(separatorIndex + 1)
+					};
+				}
+			})
+			.filter(feature => feature);
+	}
+	if (result.options.browserCookies) {
+		result.options.browserCookies = result.options.browserCookies.map(cookie => {
+			const [name, value, domain, path, expires, httpOnly, secure, sameSite, url] = cookie.split(",");
+			return {
+				name,
+				value,
+				url,
+				domain,
+				path,
+				secure: secure === "true",
+				httpOnly: httpOnly === "true",
+				sameSite,
+				expires: expires && !isNaN(Number(expires)) ? Number(expires) : undefined
+			};
+		});
+	}
 	return result;
 }
 
@@ -423,13 +521,13 @@ function parseArg(arg) {
 	const parsedArg = arg.match(ARGS_REGEX);
 	if (parsedArg && parsedArg.length) {
 		let [_, argName, argValue] = parsedArg; // eslint-disable-line no-unused-vars
-		const optionInfo = getOptionInfo(argName);
+		const option = getOptionInfo(argName);
 		if (argValue !== undefined &&
 			((argValue.startsWith("\"") && argValue.endsWith("\"")) ||
 				(argValue.startsWith("'") && argValue.endsWith("'")))) {
 			argValue = argValue.substring(1, argValue.length - 1);
 		}
-		return { argName, argValue, optionInfo };
+		return { argName, argValue, option };
 	} else {
 		return {};
 	}
@@ -440,7 +538,7 @@ function getOptionInfo(optionName) {
 	OPTIONS_INFO.forEach(categoryOptions => {
 		Object.keys(categoryOptions).forEach(keyName => {
 			if (keyName.toLowerCase() == optionName.toLowerCase() || categoryOptions[keyName].alias == optionName.toLowerCase()) {
-				result = categoryOptions[keyName];
+				result = { name: keyName, info: categoryOptions[keyName] };
 			}
 		});
 	});
@@ -455,7 +553,7 @@ function isValid(type, value) {
 	if (type.startsWith("boolean")) {
 		return value == "true" || value == "false";
 	} else if (type.startsWith("number")) {
-		return !isNaN(value);
+		return value.trim() != "" && !isNaN(value);
 	} else {
 		return true;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {
@@ -10,18 +10,18 @@
 	},
 	"type": "module",
 	"scripts": {
-		"test": "node --test \"test/**/*.test.js\"",
+		"test": "node --test --test-concurrency=2 \"test/**/*.test.js\"",
 		"lint": "eslint ."
 	},
 	"bin": {
 		"single-file": "single-file-node.js"
 	},
 	"dependencies": {
-		"simple-cdp": "^1.10.0"
+		"simple-cdp": "^1.10.1"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.39.1",
-		"esbuild": "^0.27.4",
+		"@eslint/js": "^9.39.5",
+		"esbuild": "^0.27.7",
 		"eslint": "^10.8.1"
 	}
 }

package/single-file-cli-api.js

@@ -23,6 +23,7 @@
 
 /* global URL */
 
+import { Buffer } from "node:buffer";
 import * as backend from "./lib/cdp-client.js";
 import { getZipScriptSource } from "./lib/single-file-script.js";
 import { Deno, path } from "./lib/deno-polyfill.js";
@@ -105,7 +106,6 @@ async function initialize(options) {
 
 async function capture(urls, options) {
 	let newTasks;
-	const taskUrls = tasks.map(task => task.url);
 	newTasks = await Promise.all(urls.map(value => {
 		let url, taskOptions;
 		if (Array.isArray(value)) {
@@ -117,7 +117,7 @@ async function capture(urls, options) {
 		}
 		return createTask(url, taskOptions);
 	}));
-	newTasks = newTasks.filter(task => task && !taskUrls.includes(task.url));
+	newTasks = newTasks.filter((task, taskIndex) => task && !mergeDuplicateTask(task, tasks.concat(newTasks.slice(0, taskIndex))));
 	if (newTasks.length) {
 		tasks = tasks.concat(newTasks);
 		await saveTasks();
@@ -292,44 +292,34 @@ async function capturePage(options) {
 		if (options.outputJson) {
 			if (content instanceof Uint8Array) {
 				pageData.content = undefined;
-				pageData.binaryContent = content.toBase64();
+				pageData.binaryContent = Buffer.from(content).toString("base64");
 			}
 			pageData.doctype = undefined;
 			pageData.viewport = undefined;
 			pageData.comment = undefined;
 			content = JSON.stringify(pageData, null, 2);
 		}
-		if (options.output) {
-			filename = await getFilename(options.output, options);
-		} else if (options.dumpContent) {
+		if (options.dumpContent && !options.output) {
 			if (options.compressContent) {
 				await stdout.write(content);
 			} else {
 				console.log(content || ""); // eslint-disable-line no-console
 			}
 		} else {
-			filename = await getFilename(pageData.filename, options);
+			let outputFilename = options.output || pageData.filename;
+			if (options.outputJson && !outputFilename.endsWith(".json")) {
+				outputFilename += ".json";
+			}
+			filename = await writeOutputFile(outputFilename, content, options);
 		}
 		if (filename) {
-			if (options.outputJson) {
-				filename += filename.endsWith(".json") ? "" : ".json";
-			}
-			const directoryName = path.dirname(filename);
-			if (directoryName !== ".") {
-				await mkdir(directoryName, { recursive: true });
-			}
-			if (content instanceof Uint8Array) {
-				await writeFile(filename, content);
-			} else {
-				await writeTextFile(filename, content);
-			}
 			const outputDirectory = getOutputDirectory(options);
 			pageData.filename = filename.startsWith(outputDirectory) ? filename.substring(outputDirectory.length) : filename;
 		}
 		return pageData;
 	} catch (error) {
 		const date = new Date();
-		let message = `[${date.toISOString()}] URL: ${options.url}`;
+		let message = `[${date.toISOString()}] URL: ${options.url} Error: ${error.message || error}`;
 		if (!options.errorsTracesDisabled) {
 			message += "\nStack: " + error.stack;
 		}
@@ -365,6 +355,37 @@ function getOutputDirectory(options) {
 	return outputDirectory;
 }
 
+async function writeOutputFile(outputFilename, content, options) {
+	while (true) {
+		const filename = await getFilename(outputFilename, options);
+		if (!filename) {
+			return;
+		}
+		const directoryName = path.dirname(filename);
+		if (directoryName !== ".") {
+			await mkdir(directoryName, { recursive: true });
+		}
+		// exclusive creation prevents parallel tasks writing the same filename
+		// from silently overwriting each other
+		const writeOptions = { createNew: options.filenameConflictAction != "overwrite" };
+		try {
+			if (content instanceof Uint8Array) {
+				await writeFile(filename, content, writeOptions);
+			} else {
+				await writeTextFile(filename, content, writeOptions);
+			}
+			return filename;
+		} catch (error) {
+			if (!(error instanceof errors.AlreadyExists)) {
+				throw error;
+			}
+			if (options.filenameConflictAction == "skip") {
+				return;
+			}
+		}
+	}
+}
+
 async function getFilename(filename, options, index = 1) {
 	let newFilename = getOutputDirectory(options) + filename;
 	if (options.filenameConflictAction == "overwrite") {

package/single-file-launcher.js

@@ -24,7 +24,7 @@
 import { initialize } from "./single-file-cli-api.js";
 import { closeBrowser } from "./lib/browser.js";
 import { Deno } from "./lib/deno-polyfill.js";
-import { options, parseArgs } from "./options.js";
+import { getOptions, applySettings, parseUrlsFile } from "./options.js";
 
 const { readTextFile, readFile, exit, addSignalListener } = Deno;
 
@@ -43,39 +43,17 @@ export { run };
 
 async function run() {
 	try {
+		const options = getOptions();
 		let urls;
 		if (options.settingsFile) {
-			const settings = JSON.parse(await Deno.readTextFile(options.settingsFile));
-			let profileName = options.settingsProfile || "default";
-			if (profileName == "default" || !settings.profiles[profileName]) {
-				profileName = "__Default_Settings__";
-			}
-			Object.assign(options, settings.profiles[profileName]);
-			delete options.settingsFile;
+			const settings = JSON.parse(await readTextFile(options.settingsFile));
+			applySettings(options, settings);
 		}
 		if (options.urlsFile) {
 			urls = await getUrlsFile(options.urlsFile);
 		} else {
 			urls = [options.url];
 		}
-		if (options.browserCookies) {
-			const cookies = [];
-			for (const cookie of options.browserCookies) {
-				const [name, value, domain, path, expires, httpOnly, secure, sameSite, url] = cookie.split(",");
-				cookies.push({
-					name,
-					value,
-					url,
-					domain,
-					path,
-					secure: secure === "true",
-					httpOnly: httpOnly === "true",
-					sameSite,
-					expires: isNaN(Number(expires)) ? undefined : Number(expires)
-				});
-			}
-			options.browserCookies = cookies;
-		}
 		if (options.browserCookiesFile) {
 			const cookiesContent = await readTextFile(options.browserCookiesFile);
 			try {
@@ -84,23 +62,6 @@ async function run() {
 				options.browserCookies = parseCookies(cookiesContent);
 			}
 		}
-		if (options.emulateMediaFeatures) {
-			options.emulateMediaFeatures = options.emulateMediaFeatures.map(feature => {
-				const colonIndex = feature.indexOf(":");
-				return {
-					name: feature.substring(0, colonIndex),
-					value: feature.substring(colonIndex + 1)
-				};
-			});
-		}
-		if (options.httpHeaders) {
-			const headers = {};
-			for (const header of options.httpHeaders) {
-				const [name, value] = header.split("=");
-				headers[name] = value.trim();
-			}
-			options.httpHeaders = headers;
-		}
 		if (options.embeddedImage) {
 			options.embeddedImage = Array.from(await readFile(options.embeddedImage));
 		}
@@ -148,54 +109,5 @@ async function closeBrowserAndExit(code) {
 }
 
 async function getUrlsFile(urlsFile) {
-	let urls = (await readTextFile(urlsFile)).split("\n");
-	urls = urls.map(value => {
-		value = value.trim();
-		let optionPosition = value.indexOf(" --");
-		if (optionPosition < 0) {
-			optionPosition = value.indexOf("\t--");
-		}
-		if (optionPosition > 0) {
-			const url = value.substring(0, optionPosition).trim();
-			const argsString = value.substring(optionPosition + 1).trim();
-			const args = [];
-			let previousCharacter, previousPreviousCharacter, lastQuoteCharacter;
-			let lastCharIndex = 0;
-			for (let currentCharIndex = 0; currentCharIndex < argsString.length; currentCharIndex++) {
-				const character = argsString[currentCharIndex];
-				if (character == lastQuoteCharacter && (previousCharacter != "\\" || previousPreviousCharacter == "\\")) {
-					args.push(argsString.substring(lastCharIndex, currentCharIndex));
-					lastQuoteCharacter = null;
-					lastCharIndex = currentCharIndex + 1;
-				} else if (!lastQuoteCharacter) {
-					if (character == "'" || character == "\"") {
-						lastQuoteCharacter = argsString[currentCharIndex];
-						lastCharIndex = currentCharIndex + 1;
-					} else {
-						const isSpaceCharacter = character == " " || character == "\t";
-						if (isSpaceCharacter || character == "=") {
-							if (isSpaceCharacter && (currentCharIndex == lastCharIndex + 1)) {
-								lastCharIndex++;
-							} else if (lastCharIndex < currentCharIndex) {
-								args.push(argsString.substring(lastCharIndex, currentCharIndex));
-								lastCharIndex = currentCharIndex + 1;
-							} else {
-								lastCharIndex = currentCharIndex + 1;
-							}
-						}
-					}
-				}
-				previousPreviousCharacter = previousCharacter;
-				previousCharacter = character;
-			}
-			if (lastCharIndex < argsString.length) {
-				args.push(argsString.substring(lastCharIndex).trim());
-			}
-			const { options } = parseArgs(args, false);
-			return [url, options];
-		} else {
-			return value;
-		}
-	});
-	return urls;
+	return parseUrlsFile(await readTextFile(urlsFile));
 }