single-file-cli 2.0.48 → 2.0.50

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.48";
+export const version = "2.0.50";

package/options.js

@@ -97,6 +97,8 @@ const OPTIONS_INFO = {
 	"http-proxy-password": { description: "HTTP password", type: "string" },
 	"include-BOM": { description: "Include the UTF-8 BOM into the HTML page", type: "boolean" },
 	"include-infobar": { description: "Include the infobar", type: "boolean" },
+	"infobar-template": { description: "Template used to generate the infobar content (see help page of the extension for more info)", type: "string" },
+	"open-infobar": { description: "Keep the infobar open when using --include-infobar", type: "boolean" },
 	"insert-meta-CSP": { description: "Include a <meta> tag with a CSP to avoid potential requests to internet when viewing a page", type: "boolean", defaultValue: true },
 	"load-deferred-images": { description: "Load deferred (a.k.a. lazy-loaded) images", type: "boolean", defaultValue: true },
 	"load-deferred-images-dispatch-scroll-event": { description: "Dispatch 'scroll' event when loading deferred images", type: "boolean" },
@@ -131,7 +133,8 @@ const OPTIONS_INFO = {
 	"prevent-appended-data": { description: "Prevent appending data after the compressed data when creating self-extracting HTML files", type: "boolean" },
 	"embed-screenshot": { description: "Embed a screenshot of the page as a PNG file in the compressed file (self-extracting HTML or ZIP file). When enabled, the resulting file can be read as a ZIP file or a PNG image.", type: "boolean" },
 	"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" }
+	"version": { description: "Print the version number and exit.", type: "boolean" },
+	"output-json": { description: "Output the result as a JSON string containing the page and network info", type: "boolean" },
 };
 
 const { args, exit } = Deno;

package/package.json

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

package/single-file-cli-api.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-/* global URL */
+/* global URL, Blob, FileReader */
 
 import * as backend from "./lib/cdp-client.js";
 import { getZipScriptSource } from "./lib/single-file-script.js";
@@ -244,29 +244,48 @@ function getHostURL(url) {
 
 async function capturePage(options) {
 	try {
-		let filename;
+		let filename, content;
 		options.zipScript = getZipScriptSource();
 		const pageData = await backend.getPageData(options);
+		filename = pageData.filename;
+		content = pageData.content;
+		if (options.outputJson) {
+			if (content instanceof Uint8Array) {
+				const fileReader = new FileReader();
+				fileReader.readAsDataURL(new Blob([content]));
+				content = await new Promise(resolve => {
+					fileReader.onload = () => resolve(fileReader.result);
+				});
+				content = content.replace(/^data:.*?;base64,/, "");
+				pageData.content = undefined;
+				pageData.binaryContent = content;
+			}
+			pageData.doctype = undefined;
+			pageData.viewport = undefined;
+			pageData.comment = undefined;
+			filename += filename.endsWith(".json") ? "" : ".json";
+			content = JSON.stringify(pageData, null, 2);
+		}
 		if (options.output) {
 			filename = await getFilename(options.output, options);
 		} else if (options.dumpContent) {
 			if (options.compressContent) {
-				await stdout.write(pageData.content);
+				await stdout.write(content);
 			} else {
-				console.log(pageData.content || ""); // eslint-disable-line no-console
+				console.log(content || ""); // eslint-disable-line no-console
 			}
 		} else {
-			filename = await getFilename(pageData.filename, options);
+			filename = await getFilename(filename, options);
 		}
-		if (filename) {
+		if (filename && !options.dumpContent) {
 			const directoryName = await path.dirname(filename);
 			if (directoryName !== ".") {
 				await mkdir(directoryName, { recursive: true });
 			}
-			if (pageData.content instanceof Uint8Array) {
-				await writeFile(filename, pageData.content);
+			if (content instanceof Uint8Array) {
+				await writeFile(filename, content);
 			} else {
-				await writeTextFile(filename, pageData.content);
+				await writeTextFile(filename, content);
 			}
 		}
 		return pageData;