single-file-cli 2.0.44 → 2.0.46

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.44",
+  "version": "2.0.46",
   "description": "SingleFile CLI",
   "nodeModulesDir": true,
   "exports": {

package/lib/deno-polyfill.js

@@ -36,7 +36,8 @@ const NODE_MODULES = {
 	"fs": "node:fs/promises",
 	"os": "node:os",
 	"child_process": "node:child_process",
-	"url": "node:url"
+	"url": "node:url",
+	"process": "node:process"
 };
 
 const args = DENO_RUNTIME_DETECTED ? Deno.args : process.argv.slice(2);
@@ -80,7 +81,7 @@ const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
 		return {
 			status: new Promise((resolve, reject) => {
 				child.on("exit", code => {
-					if (code === 0 || code === 143 || code === 130) {
+					if (code === 0 || code === 143 || code === 130 || code === null) {
 						resolve();
 					} else {
 						reject(new Error(`Process exited with code ${code}`));
@@ -111,11 +112,14 @@ const DenoAPI = {
 	addSignalListener,
 	build,
 	errors,
-	Command
+	Command,
+	cwd
 };
 
 const pathAPI = {
-	dirname
+	dirname,
+	toFileUrl,
+	SEPARATOR: DENO_RUNTIME_DETECTED ? path.SEPARATOR : path.sep
 };
 
 await initGlobalThisProperties();
@@ -204,6 +208,11 @@ function exit(code) {
 	if (DENO_RUNTIME_DETECTED) {
 		Deno.exit(code);
 	} else {
+		if (code == "SIGINT") {
+			code = 130;
+		} else if (code == "SIGTERM") {
+			code = 143;
+		}
 		process.exit(code);
 	}
 }
@@ -216,10 +225,28 @@ function addSignalListener(signal, listener) {
 	}
 }
 
+async function cwd() {
+	if (DENO_RUNTIME_DETECTED) {
+		return Deno.cwd();
+	} else {
+		const process = await import(NODE_MODULES["process"]);
+		return process.cwd();
+	}
+}
+
 async function dirname(filePath) {
 	return path.dirname(filePath);
 }
 
+async function toFileUrl(filePath) {
+	if (DENO_RUNTIME_DETECTED) {
+		return path.toFileUrl(filePath);
+	} else {
+		const url = await import(NODE_MODULES["url"]);
+		return url.pathToFileURL(filePath).href;
+	}
+}
+
 function getNPMModule(module) {
 	return NPM_MODULES[module];
 }

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.44";
+export const version = "2.0.46";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.44",
+	"version": "2.0.46",
 	"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,15 +182,16 @@ 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;
+			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);
+			throw new Error("Invalid URL or file path: " + url, { cause: error });
 		}
 	}
 	const isInnerLink = rootTask && url.startsWith(getHostURL(rootTask.url));