single-file-cli 2.0.4 → 2.0.5

package/Dockerfile

@@ -9,5 +9,4 @@ ENTRYPOINT [ \
     "./single-file", \
     "--browser-executable-path", "/usr/bin/chromium-browser", \
     "--output-directory", "./../../out/", \
-    "--browser-args", "[\"--no-sandbox\"]", \
     "--dump-content" ]

package/build-lib.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-deno vendor "npm:single-file-core"
+deno vendor "npm:single-file-core@1.3.28"
 
 echo "
 import { build } from 'npm:esbuild';

package/deno.json

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

package/{back-ends/chromium-browser.js → lib/browser.js}

@@ -21,11 +21,12 @@
  *   Source.
  */
 
-import { BROWSER_PATHS, BROWSER_ARGS } from "./chromium-constants.js";
-import { build, makeTempDir, Command, errors, remove } from "../deno-polyfill.js";
+import { BROWSER_PATHS, BROWSER_ARGS } from "./constants.js";
+import { Deno } from "./deno-polyfill.js";
 
 const PIPED_STD_CONFIG = "piped";
 
+const { build, makeTempDir, Command, errors, remove } = Deno;
 let child, profilePath;
 export { launchBrowser, closeBrowser };
 
@@ -56,10 +57,10 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	if (options.httpProxyServer) {
 		args.push("--proxy-server=" + options.httpProxyServer);
 	}
+	args.push(`--user-data-dir=${profilePath}`);
 	if (options.args) {
 		args.push(...options.args);
 	}
-	args.push(`--user-data-dir=${profilePath}`);
 	const command = new Command(path, { args, stdout: PIPED_STD_CONFIG, stderr: PIPED_STD_CONFIG });
 	try {
 		child = await command.spawn();

package/{back-ends/chromium-back-end.js → lib/cdp-client.js}

@@ -23,7 +23,7 @@
 
 /* global setTimeout, clearTimeout */
 
-import { launchBrowser, closeBrowser } from "./chromium-browser.js";
+import { launchBrowser, closeBrowser } from "./browser.js";
 import { getScriptSource, getHookScriptSource } from "./single-file-script.js";
 import { CDP } from "simple-cdp";
 
@@ -119,16 +119,14 @@ async function getPageData(options) {
 			worldName: SINGLE_FILE_WORLD_NAME
 		});
 		await Runtime.enable();
-		let topFrameId;
+		const topFrameId = targetInfo.id;
 		const executionContextIdPromise = new Promise(resolve => {
 			const CONTEXT_CREATED_EVENT = "executionContextCreated";
 			Runtime.addEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
 
 			async function executionContextCreated({ params }) {
 				const { context } = params;
-				if (context.auxData && context.auxData.isDefault && topFrameId === undefined) {
-					topFrameId = context.auxData.frameId;
-				} else if (context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
+				if (context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
 					Runtime.removeEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
 					await Runtime.disable();
 					resolve(context.id);
@@ -145,20 +143,19 @@ async function getPageData(options) {
 
 			async function onLifecycleEvent({ params }) {
 				const { name, frameId } = params;
-				if (topFrameId === undefined && frameId !== undefined) {
-					topFrameId = frameId;
-				}
-				if (name === "DOMContentLoaded" && topFrameId !== undefined && frameId === topFrameId) {
-					contentLoaded = true;
-				}
-				if (contentLoaded && name === (options.browserWaitUntil || NETWORK_IDLE_STATE) && frameId === topFrameId) {
-					if (options.browserWaitDelay) {
-						setTimeout(() => resolve, options.browserWaitDelay);
-					} else {
-						Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
-						await Page.setLifecycleEventsEnabled({ enabled: false });
-						await Page.disable();
-						resolve();
+				if (frameId === topFrameId) {
+					if (name === "DOMContentLoaded") {
+						contentLoaded = true;
+					}
+					if (contentLoaded && name === (options.browserWaitUntil || NETWORK_IDLE_STATE)) {
+						if (options.browserWaitDelay) {
+							setTimeout(() => resolve, options.browserWaitDelay);
+						} else {
+							Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+							await Page.setLifecycleEventsEnabled({ enabled: false });
+							await Page.disable();
+							resolve();
+						}
 					}
 				}
 			}
@@ -209,7 +206,7 @@ async function getPageData(options) {
 
 function getBrowserOptions(options) {
 	const browserOptions = {};
-	browserOptions.args = options.browserArgs ? JSON.parse(options.browserArgs) : [];
+	browserOptions.args = options.browserArgs;
 	browserOptions.headless = options.browserHeadless && !options.browserDebug;
 	browserOptions.executablePath = options.browserExecutablePath;
 	browserOptions.browserDebug = options.browserDebug;

package/{deno-polyfill.js → lib/deno-polyfill.js}

@@ -39,23 +39,7 @@ const NODE_MODULES = {
 	"url": "node:url"
 };
 
-export {
-	initGlobalThisProperties,
-	args,
-	readTextFile,
-	writeTextFile,
-	mkdir,
-	makeTempDir,
-	stat,
-	remove,
-	stdout,
-	exit,
-	build,
-	errors,
-	Command,
-	toFileUrl,
-	dirname
-};
+export { DenoAPI as Deno, pathAPI as path, initGlobalThisProperties };
 
 const args = DENO_RUNTIME_DETECTED ? Deno.args : process.argv.slice(2);
 
@@ -76,6 +60,65 @@ const errors = {
 	}
 };
 
+const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
+	constructor(path, options = {}) {
+		this.path = path;
+		this.options = options;
+	}
+	async spawn() {
+		const childProcess = await import(NODE_MODULES["child_process"]);
+		const child = childProcess.spawn(this.path, this.options.args);
+
+		await new Promise((resolve, reject) => {
+			child.on("spawn", () => resolve());
+			child.on("error", error => {
+				if (error.code == "ENOENT") {
+					reject(new errors.NotFound(error.message));
+				} else {
+					reject(error);
+				}
+			});
+		});
+		return {
+			status: new Promise((resolve, reject) => {
+				child.on("exit", code => {
+					if (code === 0 || code === 143) {
+						resolve();
+					} else {
+						reject(new Error(`Process exited with code ${code}`));
+					}
+				});
+			}),
+			kill() {
+				child.kill();
+			},
+			ref() {
+				// Do nothing
+			}
+		};
+	}
+};
+
+const DenoAPI = {
+	args,
+	readTextFile,
+	writeTextFile,
+	mkdir,
+	makeTempDir,
+	stat,
+	remove,
+	stdout,
+	exit,
+	build,
+	errors,
+	Command
+};
+
+const pathAPI = {
+	toFileUrl,
+	dirname
+};
+
 async function initGlobalThisProperties() {
 	if (!DENO_RUNTIME_DETECTED) {
 		const { WebSocket } = await import(getNPMModule("ws"));
@@ -152,45 +195,6 @@ function exit(code) {
 	}
 }
 
-const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
-	constructor(path, options = {}) {
-		this.path = path;
-		this.options = options;
-	}
-	async spawn() {
-		const childProcess = await import(NODE_MODULES["child_process"]);
-		const child = childProcess.spawn(this.path, this.options.args);
-
-		await new Promise((resolve, reject) => {
-			child.on("spawn", () => resolve());
-			child.on("error", error => {
-				if (error.code == "ENOENT") {
-					reject(new errors.NotFound(error.message));
-				} else {
-					reject(error);
-				}
-			});
-		});
-		return {
-			status: new Promise((resolve, reject) => {
-				child.on("exit", code => {
-					if (code === 0 || code === 143) {
-						resolve();
-					} else {
-						reject(new Error(`Process exited with code ${code}`));
-					}
-				});
-			}),
-			kill() {
-				child.kill();
-			},
-			ref() {
-				// Do nothing
-			}
-		};
-	}
-};
-
 async function toFileUrl(filePath) {
 	if (DENO_RUNTIME_DETECTED) {
 		return path.toFileUrl(filePath);
@@ -201,11 +205,7 @@ async function toFileUrl(filePath) {
 }
 
 async function dirname(filePath) {
-	if (DENO_RUNTIME_DETECTED) {
-		return path.dirname(filePath);
-	} else {
-		return path.dirname(filePath);
-	}
+	return path.dirname(filePath);
 }
 
 function getNPMModule(module) {