single-file-cli 2.0.38 → 2.0.41

package/build.sh

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

package/deno.json

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

package/lib/browser.js

@@ -117,7 +117,11 @@ async function closeBrowser() {
 		child = undefined;
 	}
 	if (profilePath !== undefined) {
-		await remove(profilePath, { recursive: true });
-		profilePath = undefined;
+		try {
+			await remove(profilePath, { recursive: true });
+			profilePath = undefined;
+		} catch (error) {
+			console.log("Warning: failed to remove profile directory: " + error.message); // eslint-disable-line no-console
+		}
 	}
 }

package/lib/cdp-client.js

@@ -39,8 +39,8 @@ const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
 export { initialize, getPageData, closeBrowser };
 
 async function initialize(singleFileOptions) {
-	if (options.browserRemoteDebuggingURL) {
-		options.apiUrl = singleFileOptions.browserRemoteDebuggingURL;
+	if (singleFileOptions.browserServer) {
+		options.apiUrl = singleFileOptions.browserServer;
 	} else {
 		options.apiUrl = "http://localhost:" + (await launchBrowser(getBrowserOptions(singleFileOptions)));
 	}
@@ -63,8 +63,46 @@ async function getPageData(options) {
 		if (options.browserByPassCSP === undefined || options.browserByPassCSP) {
 			await Page.setBypassCSP({ enabled: true });
 		}
-		if (options.browserMobileEmulation) {
-			await Emulation.setDeviceMetricsOverride({ mobile: true });
+		if (options.browserMobileEmulation || options.browserDeviceWidth || options.browserDeviceHeight || options.browserDeviceScaleFactor || options.platform || options.acceptLanguage) {
+			if (options.browserMobileEmulation || options.browserDeviceWidth || options.browserDeviceHeight || options.browserDeviceScaleFactor) {
+				let browserDeviceWidth;
+				if (!options.browserDeviceWidth) {
+					const { result } = await Runtime.evaluate({ expression: "window.innerWidth" });
+					browserDeviceWidth = result.value;
+				}
+				let browserDeviceHeight;
+				if (!options.browserDeviceHeight) {
+					const { result } = await Runtime.evaluate({ expression: "window.innerHeight" });
+					browserDeviceHeight = result.value;
+				}
+				let browserDeviceScaleFactor;
+				if (!options.browserDeviceScaleFactor) {
+					const { result } = await Runtime.evaluate({ expression: "window.devicePixelRatio" });
+					browserDeviceScaleFactor = result.value;
+				}
+				await Emulation.setDeviceMetricsOverride({
+					mobile: Boolean(options.browserMobileEmulation),
+					width: options.browserDeviceWidth || (options.browserMobileEmulation ? 360 : options.width || browserDeviceWidth),
+					height: options.browserDeviceHeight || (options.browserMobileEmulation ? 800 : options.height || browserDeviceHeight),
+					deviceScaleFactor: options.browserDeviceScaleFactor || (options.browserMobileEmulation ? 2 : browserDeviceScaleFactor)
+				});
+			}
+			if (options.browserMobileEmulation || options.platform || options.acceptLanguage) {
+				let browserUserAgent;
+				if (!options.userAgent) {
+					({ browserUserAgent } = await Browser.getVersion());
+				}
+				const agentOptions = {
+					userAgent: options.userAgent || (options.browserMobileEmulation ? "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome Mobile Safari/537.36" : browserUserAgent)
+				};
+				if (options.acceptLanguage) {
+					agentOptions.acceptLanguage = options.acceptLanguage;
+				}
+				if (options.platform || options.browserMobileEmulation) {
+					agentOptions.platform = options.platform || "Android";
+				}
+				await Emulation.setUserAgentOverride(agentOptions);
+			}
 		}
 		if (options.httpProxyUsername) {
 			await Fetch.enable({ handleAuthRequests: true });
@@ -359,4 +397,4 @@ function getBrowserOptions(options) {
 	browserOptions.userAgent = options.userAgent;
 	browserOptions.httpProxyServer = options.httpProxyServer;
 	return browserOptions;
-}
+}