single-file-cli 2.0.45 → 2.0.47

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.45";
+export const version = "2.0.47";

package/options.js

@@ -81,6 +81,7 @@ const OPTIONS_INFO = {
 	"dump-content": { description: "Dump the content of the processed page in the console ('true' when running in Docker)", type: "boolean" },
 	"emulate-media-feature": { description: "Emulate a media feature. The syntax is <name>:<value>, e.g. \"prefers-color-scheme:dark\"", type: "string[]" },
 	"error-file": { description: "Path of the file where to save the error messages", type: "string" },
+	"error-traces-disabled": { description: "Remove error stack traces in the error messages", type: "boolean", defaultValue: true },
 	"filename-template": { description: "Template used to generate the output filename (see help page of the extension for more info)", type: "string", defaultValue: "%if-empty<{page-title}|No title> ({date-locale} {time-locale}).{filename-extension}" },
 	"filename-conflict-action": { description: "Action when the filename is conflicting with existing one on the filesystem. The possible values are \"uniquify\" (default), \"overwrite\" and \"skip\"", type: "string", defaultValue: "uniquify" },
 	"filename-replacement-character": { description: "The character used for replacing invalid characters in filenames", type: "string", defaultValue: "_" },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.45",
+	"version": "2.0.47",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {

package/single-file-cli-api.js

@@ -101,7 +101,7 @@ async function initialize(options) {
 async function capture(urls, options) {
 	let newTasks;
 	const taskUrls = tasks.map(task => task.url);
-	newTasks = urls.map(url => createTask(url, options));
+	newTasks = await Promise.all(urls.map(url => createTask(url, options)));
 	newTasks = newTasks.filter(task => task && !taskUrls.includes(task.url));
 	if (newTasks.length) {
 		tasks = tasks.concat(newTasks);
@@ -161,13 +161,13 @@ async function runNextTask() {
 		if (pageData) {
 			task.filename = pageData.filename;
 			if (options.crawlLinks && testMaxDepth(task)) {
-				let newTasks = pageData.links
-					.map(urlLink => createTask(urlLink, options, task, tasks[0]))
-					.filter(task => task &&
-						testMaxDepth(task) &&
-						!tasks.find(otherTask => otherTask.url == task.url) &&
-						(!options.crawlInnerLinksOnly || task.isInnerLink) &&
-						(!options.crawlNoParent || (task.isChild || !task.isInnerLink)));
+				const urls = pageData.links;
+				let newTasks = await Promise.all(urls.map(url => createTask(url, options, task, tasks[0])));
+				newTasks = newTasks.filter(task => task &&
+					testMaxDepth(task) &&
+					!tasks.find(otherTask => otherTask.url == task.url) &&
+					(!options.crawlInnerLinksOnly || task.isInnerLink) &&
+					(!options.crawlNoParent || (task.isChild || !task.isInnerLink)));
 				tasks.splice(tasks.length, 0, ...newTasks);
 			}
 		}
@@ -182,30 +182,33 @@ function testMaxDepth(task) {
 		(options.crawlExternalLinksMaxDepth == 0 || task.externalLinkDepth < options.crawlExternalLinksMaxDepth);
 }
 
-function createTask(url, options, parentTask, rootTask) {
+async function createTask(url, options, parentTask, rootTask) {
 	url = parentTask ? rewriteURL(url, options.crawlRemoveURLFragment, options.crawlRewriteRules) : url;
-	if (!VALID_URL_TEST.test(url)) {
-		try {
-			url = url.replace(/\\/g, "/");
-			url = url.replace(/#/g, "%23");
-			url = new URL(url, import.meta.url).href;
-		} catch (error) {
-			throw new Error("Invalid URL or file path: " + url);
+	if (url) {
+		if (!VALID_URL_TEST.test(url)) {
+			try {
+				url = url.replace(/\\/g, "/");
+				url = url.replace(/#/g, "%23");
+				const baseURL = await path.toFileUrl((await Deno.cwd()) + path.SEPARATOR);
+				url = new URL(url, baseURL).href;
+			} catch (error) {
+				throw new Error("Invalid URL or file path: " + url, { cause: error });
+			}
 		}
+		const isInnerLink = rootTask && url.startsWith(getHostURL(rootTask.url));
+		const rootBaseURIMatch = rootTask && rootTask.url.match(/(.*?)[^/]*$/);
+		const isChild = isInnerLink && rootBaseURIMatch && rootBaseURIMatch[1] && url.startsWith(rootBaseURIMatch[1]);
+		return {
+			url,
+			isInnerLink,
+			isChild,
+			originalUrl: url,
+			rootBaseURI: rootBaseURIMatch && rootBaseURIMatch[1],
+			depth: parentTask ? parentTask.depth + 1 : 0,
+			externalLinkDepth: isInnerLink ? -1 : parentTask ? parentTask.externalLinkDepth + 1 : -1,
+			options
+		};
 	}
-	const isInnerLink = rootTask && url.startsWith(getHostURL(rootTask.url));
-	const rootBaseURIMatch = rootTask && rootTask.url.match(/(.*?)[^/]*$/);
-	const isChild = isInnerLink && rootBaseURIMatch && rootBaseURIMatch[1] && url.startsWith(rootBaseURIMatch[1]);
-	return {
-		url,
-		isInnerLink,
-		isChild,
-		originalUrl: url,
-		rootBaseURI: rootBaseURIMatch && rootBaseURIMatch[1],
-		depth: parentTask ? parentTask.depth + 1 : 0,
-		externalLinkDepth: isInnerLink ? -1 : parentTask ? parentTask.externalLinkDepth + 1 : -1,
-		options
-	};
 }
 
 async function saveTasks() {
@@ -268,7 +271,7 @@ async function capturePage(options) {
 		}
 		return pageData;
 	} catch (error) {
-		const message = "URL: " + options.url + "\nStack: " + error.stack + "\n";
+		const message = "URL: " + options.url + (options.errorTracesDisabled ? "" : "\nStack: " + error.stack) + "\n";
 		if (options.errorFile) {
 			await writeTextFile(options.errorFile, message, { append: true });
 		} else {