single-file-cli 2.0.22 → 2.0.24

package/README.MD

@@ -69,7 +69,7 @@ Make sure Chrome or a Chromium-based browser is installed in the default folder.
   
     ```sh
     npm install "single-file-cli"
-    cd single-file-cli-master
+    cd node_modules/single-file-cli
     ```
 
     You can also install SingleFile globally with `-g` when running `npm install`.

package/deno.json

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

package/lib/cdp-client.js

@@ -28,29 +28,30 @@ import { getScriptSource, getHookScriptSource } from "./single-file-script.js";
 import { CDP } from "simple-cdp";
 
 const LOAD_TIMEOUT_ERROR = "ERR_LOAD_TIMEOUT";
-const INTERACTIVE_TIME_STATE = "InteractiveTime";
+const DEFAULT_NETWORK_STATE = "networkIdle";
 const NETWORK_STATES = ["InteractiveTime", "networkIdle", "networkAlmostIdle", "load", "DOMContentLoaded"];
 const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
 const EMPTY_PAGE_URL = "about:blank";
 
-export { initialize, getPageData, closeBrowser };
+export { initialize, getPageData, hasTargets, closeBrowser };
 
 async function initialize(options) {
-	if (!options.browserRemoteDebuggingURL) {
-		await launchBrowser(getBrowserOptions(options));
-	} else {
+	if (options.browserRemoteDebuggingURL) {
 		CDP.remoteDebuggingUrl = options.browserRemoteDebuggingURL;
+	} else {
+		await launchBrowser(getBrowserOptions(options));
 	}
 }
 
 async function getPageData(options) {
+	let Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, Target;
 	let targetInfo;
 	try {
 		targetInfo = await CDP.createTarget(EMPTY_PAGE_URL);
-		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger } = new CDP(targetInfo);
+		({ Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, Target } = new CDP(targetInfo));
 		if (options.browserStartMinimized) {
-			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.targetId });
+			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.id });
 			if (bounds.windowState !== MINIMIZED_WINDOW_STATE) {
 				await Browser.setWindowBounds({ windowId, bounds: { windowState: MINIMIZED_WINDOW_STATE } });
 			}
@@ -130,12 +131,17 @@ async function getPageData(options) {
 		}
 		throw error;
 	} finally {
-		if (targetInfo && !options.browserDebug) {
+		if (targetInfo) {
 			await CDP.closeTarget(targetInfo.id);
 		}
 	}
 }
 
+async function hasTargets() {
+	const targets = await CDP.getTargets();
+	return targets.filter(target => target.type === "page").length > 0;
+}
+
 async function loadPage({ Page, Runtime }, options) {
 	await Runtime.enable();
 	await Page.enable();
@@ -194,12 +200,14 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 							contextId = contextIds[contextIdIndex];
 						}
 						contextIdIndex++;
-					} while (contextId === undefined && contextIdIndex < contextIds.length);
+					} while (contextId === undefined && contextIdIndex < contextIds.length && !navigationSignal.aborted);
 				}
-				if (contextId === undefined) {
-					reject(new Error("Execution context not found"));
-				} else {
-					resolve(contextId);
+				if (!navigationSignal.aborted) {
+					if (contextId === undefined) {
+						reject(new Error("Execution context not found"));
+					} else {
+						resolve(contextId);
+					}
 				}
 			}
 		}
@@ -262,11 +270,9 @@ async function waitForPageReady({ Page }, topFrameId, options, navigationSignal)
 
 			function onLifecycleEvent({ params }) {
 				const { name, frameId } = params;
-				if (frameId === topFrameId) {
-					if (name === options.browserWaitUntil || name === INTERACTIVE_TIME_STATE || navigationSignal.aborted) {
-						Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
-						resolve();
-					}
+				if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE || navigationSignal.aborted)) {
+					Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+					resolve();
 				}
 			}
 		});

package/lib/deno-polyfill.js

@@ -114,7 +114,6 @@ const DenoAPI = {
 };
 
 const pathAPI = {
-	toFileUrl,
 	dirname
 };
 
@@ -208,15 +207,6 @@ function exit(code) {
 	}
 }
 
-async function toFileUrl(filePath) {
-	if (DENO_RUNTIME_DETECTED) {
-		return path.toFileUrl(filePath);
-	} else {
-		const url = await import(NODE_MODULES["url"]);
-		return new URL(url.pathToFileURL(filePath));
-	}
-}
-
 async function dirname(filePath) {
 	return path.dirname(filePath);
 }

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.22";
+export const version = "2.0.24";

package/package.json

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

package/single-file-cli-api.js

@@ -79,7 +79,7 @@ const STATE_PROCESSED = "processed";
 const { readTextFile, writeTextFile, writeFile, stdout, mkdir, stat, errors } = Deno;
 let tasks = [], maxParallelWorkers, sessionFilename;
 
-export { DEFAULT_OPTIONS, VALID_URL_TEST, initialize };
+export { initialize };
 
 async function initialize(options) {
 	options = Object.assign({}, DEFAULT_OPTIONS, options);
@@ -151,7 +151,7 @@ async function finish(options) {
 			}
 		}
 	}
-	if (!options.browserDebug) {
+	if (!options.browserDebug && !options.browserRemoteDebuggingURL && !(await backend.hasTargets())) {
 		return backend.closeBrowser();
 	}
 }
@@ -203,21 +203,28 @@ function testMaxDepth(task) {
 
 function createTask(url, options, parentTask, rootTask) {
 	url = parentTask ? rewriteURL(url, options.crawlRemoveURLFragment, options.crawlRewriteRules) : url;
-	if (VALID_URL_TEST.test(url)) {
-		const isInnerLink = rootTask && url.startsWith(getHostURL(rootTask.url));
-		const rootBaseURIMatch = rootTask && rootTask.url.match(/(.*?)[^/]*$/);
-		const isChild = isInnerLink && rootBaseURIMatch && rootBaseURIMatch[1] && url.startsWith(rootBaseURIMatch[1]);
-		return {
-			url,
-			isInnerLink,
-			isChild,
-			originalUrl: url,
-			rootBaseURI: rootBaseURIMatch && rootBaseURIMatch[1],
-			depth: parentTask ? parentTask.depth + 1 : 0,
-			externalLinkDepth: isInnerLink ? -1 : parentTask ? parentTask.externalLinkDepth + 1 : -1,
-			options
-		};
+	if (!VALID_URL_TEST.test(url)) {
+		try {
+			url = url.replace(/\\/g, "/");
+			url = url.replace(/#/g, "%23");
+			url = new URL(url, import.meta.url).href;
+		} catch (error) {
+			throw new Error("Invalid URL or file path: " + url);
+		}
 	}
+	const isInnerLink = rootTask && url.startsWith(getHostURL(rootTask.url));
+	const rootBaseURIMatch = rootTask && rootTask.url.match(/(.*?)[^/]*$/);
+	const isChild = isInnerLink && rootBaseURIMatch && rootBaseURIMatch[1] && url.startsWith(rootBaseURIMatch[1]);
+	return {
+		url,
+		isInnerLink,
+		isChild,
+		originalUrl: url,
+		rootBaseURI: rootBaseURIMatch && rootBaseURIMatch[1],
+		depth: parentTask ? parentTask.depth + 1 : 0,
+		externalLinkDepth: isInnerLink ? -1 : parentTask ? parentTask.externalLinkDepth + 1 : -1,
+		options
+	};
 }
 
 async function saveTasks() {

package/single-file-launcher.js

@@ -21,23 +21,17 @@
  *   Source.
  */
 
-/* global URL */
-
-import { VALID_URL_TEST, initialize } from "./single-file-cli-api.js";
-import { Deno, path } from "./lib/deno-polyfill.js";
+import { initialize } from "./single-file-cli-api.js";
+import { Deno } from "./lib/deno-polyfill.js";
 import options from "./options.js";
 
 const { readTextFile, exit } = Deno;
-const { toFileUrl } = path;
 
 export { run };
 
 async function run() {
 	try {
 		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 {

package/single-file.bat

@@ -1,2 +1,2 @@
 @echo off
-node "%~dp0\single-file" %*
+deno run --allow-read --allow-write --allow-net --allow-env --allow-run "%~dp0\single-file" %*