single-file-cli 2.0.12 → 2.0.14

package/deno.json

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

package/lib/browser.js

@@ -66,7 +66,13 @@ async function launchBrowser(options = {}, indexPath = 0) {
 			if (indexPath + 1 < BROWSER_PATHS[build.os].length) {
 				await launchBrowser(options, indexPath + 1);
 			} else {
-				throw "Chromium executable not found. Set the path using the --browser-executable-path option.";
+				let message = "Chromium executable not found. ";
+				if (options.executablePath) {
+					message += "Make sure --browser-executable-path is correct.";
+				} else {
+					message += "Set the path using the --browser-executable-path option.";
+				}
+				throw new Error(message);
 			}
 		} else {
 			throw error;

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.12";
+export const version = "2.0.14";

package/package.json

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

package/single-file-launcher.js

@@ -27,59 +27,64 @@ import { VALID_URL_TEST, initialize } from "./single-file-cli-api.js";
 import { Deno, path } from "./lib/deno-polyfill.js";
 import options from "./options.js";
 
-const { readTextFile } = Deno;
+const { readTextFile, exit } = Deno;
 const { toFileUrl } = path;
 
 export { run };
 
 async function run() {
-	let urls;
-	if (options.url && !VALID_URL_TEST.test(options.url)) {
-		options.url = (await toFileUrl(new URL(options.url, import.meta.url).pathname)).href;
-	}
-	if (options.urlsFile) {
-		urls = (await readTextFile(options.urlsFile)).split("\n");
-	} 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,
-				httpOnly,
-				sameSite,
-				expires
-			});
+	try {
+		let urls;
+		if (options.url && !VALID_URL_TEST.test(options.url)) {
+			options.url = (await toFileUrl(new URL(options.url, import.meta.url).pathname)).href;
 		}
-		options.browserCookies = cookies;
-	}
-	if (options.browserCookiesFile) {
-		const cookiesContent = await readTextFile(options.browserCookiesFile);
-		try {
-			options.browserCookies = JSON.parse(cookiesContent);
-		} catch (error) {
-			options.browserCookies = parseCookies(cookiesContent);
+		if (options.urlsFile) {
+			urls = (await readTextFile(options.urlsFile)).split("\n");
+		} else {
+			urls = [options.url];
 		}
-	}
-	if (options.httpHeaders) {
-		const headers = {};
-		for (const header of options.httpHeaders) {
-			const [name, value] = header.split("=");
-			headers[name] = value.trim();
+		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,
+					httpOnly,
+					sameSite,
+					expires
+				});
+			}
+			options.browserCookies = cookies;
+		}
+		if (options.browserCookiesFile) {
+			const cookiesContent = await readTextFile(options.browserCookiesFile);
+			try {
+				options.browserCookies = JSON.parse(cookiesContent);
+			} catch (error) {
+				options.browserCookies = parseCookies(cookiesContent);
+			}
+		}
+		if (options.httpHeaders) {
+			const headers = {};
+			for (const header of options.httpHeaders) {
+				const [name, value] = header.split("=");
+				headers[name] = value.trim();
+			}
+			options.httpHeaders = headers;
 		}
-		options.httpHeaders = headers;
+		options.retrieveLinks = true;
+		const singlefile = await initialize(options);
+		await singlefile.capture(urls);
+		await singlefile.finish();
+	} catch (error) {
+		console.error(error.message || error); // eslint-disable-line no-console
+		exit(-1);
 	}
-	options.retrieveLinks = true;
-	const singlefile = await initialize(options);
-	await singlefile.capture(urls);
-	await singlefile.finish();
 }
 
 function parseCookies(textValue) {