single-file-cli 2.0.61 → 2.0.63

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.61";
+export const version = "2.0.63";

package/options.js

@@ -133,8 +133,9 @@ 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" },
 	"embedded-image": { description: "Path to a PNG image to embed in the compressed file.", type: "string" },
-	"embed-pdf": { description: "Embed a PDF file in the self-extracting HTML file. When enabled, the resulting file can be read as a HTML, a ZIP file or a PDF file.", type: "boolean" },
+	"embed-pdf": { description: "Embed a PDF file in the ZIP or self-extracting file. When enabled, the resulting file can be read as a ZIP file or a PDF file.", type: "boolean" },
 	"embed-pdf-options": { description: "Options passed to the CDP method `Page.printToPDF()` given as a JSON string (e.g. { \"pageRanges\": \"1-1\", \"paperWidth\": 11, \"paperHeight\": 8.5 })", type: "string" },
+	"embedded-pdf": { description: "Path to a PDF file to embed in the compressed file.", 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" },
 	"output-json": { description: "Output the result as a JSON string containing the page and network info", type: "boolean" },

package/package.json

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

package/single-file-cli-api.js

@@ -247,7 +247,6 @@ async function capturePage(options) {
 		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) {
@@ -263,7 +262,6 @@ async function capturePage(options) {
 			pageData.doctype = undefined;
 			pageData.viewport = undefined;
 			pageData.comment = undefined;
-			filename += filename.endsWith(".json") ? "" : ".json";
 			content = JSON.stringify(pageData, null, 2);
 		}
 		if (options.output) {
@@ -275,9 +273,12 @@ async function capturePage(options) {
 				console.log(content || ""); // eslint-disable-line no-console
 			}
 		} else {
-			filename = await getFilename(filename, options);
+			filename = await getFilename(pageData.filename, options);
 		}
-		if (filename && !options.dumpContent) {
+		if (filename) {
+			if (options.outputJson) {
+				filename += filename.endsWith(".json") ? "" : ".json";
+			}
 			const directoryName = await path.dirname(filename);
 			if (directoryName !== ".") {
 				await mkdir(directoryName, { recursive: true });

package/single-file-launcher.js

@@ -95,6 +95,9 @@ async function run() {
 		if (options.embeddedImage) {
 			options.embeddedImage = Array.from(await readFile(options.embeddedImage));
 		}
+		if (options.embeddedPdf) {
+			options.embeddedPdf = Array.from(await readFile(options.embeddedPdf));
+		}
 		options.retrieveLinks = true;
 		const singlefile = await initialize(options);
 		await singlefile.capture(urls);