single-file-cli 2.0.5 → 2.0.7

package/README.MD

@@ -6,7 +6,11 @@ SingleFile can be launched from the command line by running it into a (headless)
 
 It runs through Deno as a standalone script injected into the web page via the Chrome DevTools Protocol instead of being embedded into a WebExtension.
 
+## Installation
 
+SingleFile can be run without installing it, just download the executable file and save it in the directory of your choice here: https://github.com/gildas-lormeau/single-file-cli/releases
+
+Make sure Chrome or a Chromium-based browser is installed in the default folder. Otherwise you might need to set the `--browser-executable-path` option to help SingleFile locating the path of the executable file.
 
 ## Installation with Docker
 
@@ -57,11 +61,18 @@ It runs through Deno as a standalone script injected into the web page via the C
 
 ## Manual installation
 
-- Make sure Chrome or a Chromium-based browser is installed. Otherwise you might need to set the `--browser-executable-path` option to help SingleFile locating the path of the executable file.
-
 - Install [Deno](https://deno.com/)
 
-- There are 2 ways to download the code of SingleFile, choose the one you prefer:
+- There are 3 ways to download the code of SingleFile, choose the one you prefer:
+  
+  - Download and install with `npm` (`npm` is installed with Node.js)
+  
+    ```sh
+    npm install "single-file-cli"
+    cd single-file-cli-master
+    ```
+
+    You can also install SingleFile globally with `-g` when running `npm install`.
 
   - Download and unzip manually the
     [master archive](https://github.com/gildas-lormeau/single-file-cli/archive/master.zip)

package/build-lib.sh

@@ -80,4 +80,5 @@ await Promise.all(SCRIPTS.map(script => Deno.remove(script)));
 await Deno.remove('lib/single-file-hooks-frames.js');
 " |  deno run --allow-read --allow-write --allow-net --allow-run --allow-env --lock=node_modules/deno.lock.tmp -
 
-rm -rf node_modules
+rm -rf node_modules
+rm -rf vendor

package/deno.json

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

package/lib/browser.js

@@ -42,14 +42,14 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	if (options.executablePath) {
 		path = options.executablePath;
 	}
-	if (options.browserDebug) {
+	if (options.debug) {
 		args.push("--auto-open-devtools-for-tabs");
 	}
-	if (options.browserDisableWebSecurity) {
+	if (options.disableWebSecurity) {
 		args.push("--disable-web-security");
 	}
-	if (options.browserWidth && options.browserHeight) {
-		args.push("--window-size=" + options.browserWidth + "," + options.browserHeight);
+	if (options.width && options.height) {
+		args.push("--window-size=" + options.width + "," + options.height);
 	}
 	if (options.userAgent) {
 		args.push("--user-agent=" + options.userAgent);

package/lib/cdp-client.js

@@ -209,10 +209,10 @@ function getBrowserOptions(options) {
 	browserOptions.args = options.browserArgs;
 	browserOptions.headless = options.browserHeadless && !options.browserDebug;
 	browserOptions.executablePath = options.browserExecutablePath;
-	browserOptions.browserDebug = options.browserDebug;
-	browserOptions.browserDisableWebSecurity = options.browserDisableWebSecurity === undefined || options.browserDisableWebSecurity;
-	browserOptions.browserWidth = options.browserWidth;
-	browserOptions.browserHeight = options.browserHeight;
+	browserOptions.debug = options.browserDebug;
+	browserOptions.disableWebSecurity = options.browserDisableWebSecurity === undefined || options.browserDisableWebSecurity;
+	browserOptions.width = options.browserWidth;
+	browserOptions.height = options.browserHeight;
 	browserOptions.userAgent = options.userAgent;
 	browserOptions.httpProxyServer = options.httpProxyServer;
 	return browserOptions;

package/options.js

@@ -120,14 +120,15 @@ const OPTIONS_INFO = {
 	"create-root-directory": { description: "Create a root directory based on the timestamp", type: "boolean" },
 	"extract-data-from-page": { description: "Extract compressed data from the page instead of fetching the page in order to create universal self-extracting HTML files", type: "boolean", defaultValue: true },
 	"prevent-appended-data": { description: "Prevent appending data after the compressed data when creating self-extracting HTML files", type: "boolean" },
-	"output-directory": { description: "Path to where to save files, this path must exist.", type: "string" }
+	"output-directory": { description: "Path to where to save files, this path must exist.", type: "string" },
+	"version": { description: "Print the version number and exit.", type: "boolean" }
 };
 
 const { args, exit } = Deno;
-const options = getOptions();
+const options = await getOptions();
 export default options;
 
-function getOptions() {
+async function getOptions() {
 	const { positionals, options } = parseArgs(Array.from(args));
 	if ((!positionals.length && !Object.keys(options).length) || positionals.length > 2 || options.help) {
 		console.log(USAGE_TEXT + "\n"); // eslint-disable-line no-console
@@ -145,6 +146,11 @@ function getOptions() {
 		console.log(""); // eslint-disable-line no-console
 		exit(0);
 	}
+	if (options.version) {
+		const version = JSON.parse(await Deno.readTextFile("./deno.json")).version;
+		console.log(version); // eslint-disable-line no-console
+		exit(0);
+	}
 	Object.keys(OPTIONS_INFO).forEach(optionName => {
 		const optionInfo = getOptionInfo(optionName);
 		const optionKey = getOptionKey(optionName, optionInfo);
@@ -165,6 +171,10 @@ function getOptions() {
 		options.browserArgs = browserArguments;
 		delete options.browserArguments;
 	}
+	if (options.browserArguments) {
+		options.browserArgs = options.browserArguments;
+		delete options.browserArguments;
+	}
 	delete options.acceptHeaderFont;
 	delete options.acceptHeaderImage;
 	delete options.acceptHeaderStylesheet;
@@ -279,4 +289,4 @@ function isValid(type, value) {
 
 function isArray(type) {
 	return type.endsWith("[]");
-}
+}

package/package.json

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