single-file-cli 2.0.9 → 2.0.11

package/deno.json

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

package/lib/browser.js

@@ -31,7 +31,7 @@ let child, profilePath;
 export { launchBrowser, closeBrowser };
 
 async function launchBrowser(options = {}, indexPath = 0) {
-	let path = BROWSER_PATHS[build.os][indexPath];
+	const executablePath = options.executablePath || BROWSER_PATHS[build.os][indexPath];
 	const args = Array.from(BROWSER_ARGS);
 	profilePath = await makeTempDir();
 	if (options.headless) {
@@ -39,9 +39,6 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	} else {
 		args.push("--start-maximized");
 	}
-	if (options.executablePath) {
-		path = options.executablePath;
-	}
 	if (options.debug) {
 		args.push("--auto-open-devtools-for-tabs");
 	}
@@ -57,11 +54,11 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	if (options.httpProxyServer) {
 		args.push("--proxy-server=" + options.httpProxyServer);
 	}
-	args.push(`--user-data-dir=${profilePath}`);
+	args.push("--user-data-dir=" + profilePath);
 	if (options.args) {
 		args.push(...options.args);
 	}
-	const command = new Command(path, { args, stdout: PIPED_STD_CONFIG, stderr: PIPED_STD_CONFIG });
+	const command = new Command(executablePath, { args, stdout: PIPED_STD_CONFIG, stderr: PIPED_STD_CONFIG });
 	try {
 		child = await command.spawn();
 	} catch (error) {
@@ -69,8 +66,10 @@ async function launchBrowser(options = {}, indexPath = 0) {
 			if (indexPath + 1 < BROWSER_PATHS[build.os].length) {
 				await launchBrowser(options, indexPath + 1);
 			} else {
-				throw error;
+				throw "Chromium executable not found. Set the path using the --executable-path option.";
 			}
+		} else {
+			throw error;
 		}
 	}
 	child.ref();

package/lib/deno-polyfill.js

@@ -39,8 +39,6 @@ const NODE_MODULES = {
 	"url": "node:url"
 };
 
-export { DenoAPI as Deno, pathAPI as path, initGlobalThisProperties };
-
 const args = DENO_RUNTIME_DETECTED ? Deno.args : process.argv.slice(2);
 
 const stdout = {
@@ -119,6 +117,10 @@ const pathAPI = {
 	dirname
 };
 
+await initGlobalThisProperties();
+
+export { DenoAPI as Deno, pathAPI as path };
+
 async function initGlobalThisProperties() {
 	if (!DENO_RUNTIME_DETECTED) {
 		const { WebSocket } = await import(getNPMModule("ws"));

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.9";
+export const version = "2.0.11";

package/options.js

@@ -154,7 +154,7 @@ async function getOptions() {
 	Object.keys(OPTIONS_INFO).forEach(optionName => {
 		const optionInfo = getOptionInfo(optionName);
 		const optionKey = getOptionKey(optionName, optionInfo);
-		if (optionInfo.defaultValue !== undefined) {
+		if (options[optionKey] === undefined && optionInfo.defaultValue !== undefined) {
 			options[optionKey] = OPTIONS_INFO[optionName].defaultValue;
 		}
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.9",
+	"version": "2.0.11",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {
@@ -9,7 +9,9 @@
 		"node": ">=20"
 	},
 	"type": "module",
-	"bin": "./single-file",
+	"bin": {
+		"single-file": "./single-file-node.js"
+	},
 	"dependencies": {
 		"simple-cdp": "^1.8.2",
 		"ws": "^8.16.0"

package/single-file

@@ -1,108 +1,5 @@
 #!/usr/bin/env -S deno run --allow-read --allow-write --allow-net --allow-env --allow-run
 
-/*
- * Copyright 2010-2024 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- *
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or
- *   modify it under the terms of the GNU Affero General Public License
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- *
- *   The code in this file is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU
- *   AGPL normally required by section 4, provided you include this license
- *   notice and a URL through which recipients can access the Corresponding
- *   Source.
- */
+import { run } from "./single-file-launcher.js";
 
-import { VALID_URL_TEST, initialize } from "./single-file-cli-api.js";
-import { initGlobalThisProperties, Deno, path } from "./lib/deno-polyfill.js";
-import options from "./options.js";
-
-const { readTextFile } = Deno;
-const { toFileUrl } = path;
-await initGlobalThisProperties();
-await run(options);
-
-async function run(options = {}) {
-	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
-			});
-		}
-		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.retrieveLinks = true;
-	const singlefile = await initialize(options);
-	await singlefile.capture(urls);
-	await singlefile.finish();
-}
-
-function parseCookies(textValue) {
-	const httpOnlyRegExp = /^#HttpOnly_(.*)/;
-	return textValue.split(/\r\n|\n/)
-		.filter(line => line.trim() && (!/^#/.test(line) || httpOnlyRegExp.test(line)))
-		.map(line => {
-			const httpOnly = httpOnlyRegExp.test(line);
-			if (httpOnly) {
-				line = line.replace(httpOnlyRegExp, "$1");
-			}
-			const values = line.split(/\t/);
-			if (values.length == 7) {
-				return {
-					domain: values[0],
-					path: values[2],
-					secure: values[3] == "TRUE",
-					expires: (values[4] && Number(values[4])) || undefined,
-					name: values[5],
-					value: values[6],
-					httpOnly
-				};
-			}
-		})
-		.filter(cookieData => cookieData);
-}
+await run();

package/single-file-launcher.js

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010-2024 Gildas Lormeau
+ * contact : gildas.lormeau <at> gmail.com
+ *
+ * This file is part of SingleFile.
+ *
+ *   The code in this file is free software: you can redistribute it and/or
+ *   modify it under the terms of the GNU Affero General Public License
+ *   (GNU AGPL) as published by the Free Software Foundation, either version 3
+ *   of the License, or (at your option) any later version.
+ *
+ *   The code in this file is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+ *   General Public License for more details.
+ *
+ *   As additional permission under GNU AGPL version 3 section 7, you may
+ *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU
+ *   AGPL normally required by section 4, provided you include this license
+ *   notice and a URL through which recipients can access the Corresponding
+ *   Source.
+ */
+
+/* global URL */
+
+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 { 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
+			});
+		}
+		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.retrieveLinks = true;
+	const singlefile = await initialize(options);
+	await singlefile.capture(urls);
+	await singlefile.finish();
+}
+
+function parseCookies(textValue) {
+	const httpOnlyRegExp = /^#HttpOnly_(.*)/;
+	return textValue.split(/\r\n|\n/)
+		.filter(line => line.trim() && (!/^#/.test(line) || httpOnlyRegExp.test(line)))
+		.map(line => {
+			const httpOnly = httpOnlyRegExp.test(line);
+			if (httpOnly) {
+				line = line.replace(httpOnlyRegExp, "$1");
+			}
+			const values = line.split(/\t/);
+			if (values.length == 7) {
+				return {
+					domain: values[0],
+					path: values[2],
+					secure: values[3] == "TRUE",
+					expires: (values[4] && Number(values[4])) || undefined,
+					name: values[5],
+					value: values[6],
+					httpOnly
+				};
+			}
+		})
+		.filter(cookieData => cookieData);
+}

package/single-file-node.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { run } from "./single-file-launcher.js";
+
+await run();