buninu-browser 0.2.0 → 0.2.2

package/test/user-agent.test.js

@@ -2,7 +2,16 @@ import { expect, test } from "bun:test";
 import { CdpServer } from "../lib/cdp-server.js";
 import { createBrowser } from "../lib/headless-shell.js";
 import { MOBILE_USER_AGENT } from "../lib/renderer/flags.js";
-import { CHROMIUM_VERSION, DESKTOP_USER_AGENT, desktopUserAgent } from "../lib/user-agent.js";
+import { BROWSER_PRODUCT, CHROMIUM_VERSION, DESKTOP_USER_AGENT, WEBKIT_USER_AGENT, desktopUserAgent, webkitFromArgs } from "../lib/user-agent.js";
+
+test("CLI identity defaults to WebKit, last desktop flag wins and mobile takes priority", () => {
+  for (const [args, expected] of [
+    [[], true], [["--webkit"], true], [["--chromium"], false],
+    [["--webkit", "--chromium"], false], [["--chromium", "--webkit"], true],
+    [["--mobile"], false], [["--mobile", "--webkit"], false],
+    [["--webkit", "--mobile"], false], [["--mobile", "--chromium"], false],
+  ]) expect(webkitFromArgs(args)).toBe(expected);
+});
 
 test("desktop user agent uses the same version on each platform", () => {
   for (const [platform, arch, system] of [
@@ -19,17 +28,17 @@ test("mobile uses current Chrome for Android rather than WebView", () => {
   expect(MOBILE_USER_AGENT).toBe(`Mozilla/5.0 (Linux; Android 16; ASUSAI2501C Build/BQ2A.250525.001) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36`);
 });
 
-test("CDP discovery, HTTP requests, and navigator report the same desktop user agent", async () => {
+test("Chromium opt-out reports the same identity through CDP, HTTP and navigator", async () => {
   let requestUserAgent;
   const site = Bun.serve({ port: 0, fetch(request) {
     requestUserAgent = request.headers.get("user-agent");
     return new Response("<!doctype html><title>UA test</title>", { headers: { "content-type": "text/html" } });
   } });
-  const browser = await createBrowser({ spareRenderer: false });
+  const browser = await createBrowser({ spareRenderer: false, webkit: false });
   const cdp = CdpServer.create(browser.context).listen(0, "127.0.0.1");
   try {
     const version = await fetch(`http://127.0.0.1:${cdp.port}/json/version`).then((response) => response.json());
-    expect(version.Browser).toBe(`Chrome/${CHROMIUM_VERSION}`);
+    expect(version.Browser).toBe(BROWSER_PRODUCT);
     expect(version["User-Agent"]).toBe(DESKTOP_USER_AGENT);
     await browser.context.navigate(`http://127.0.0.1:${site.port}/`);
     expect(requestUserAgent).toBe(DESKTOP_USER_AGENT);
@@ -40,3 +49,50 @@ test("CDP discovery, HTTP requests, and navigator report the same desktop user a
     site.stop(true);
   }
 });
+
+test.each([{}, { webkit: true }])("default and explicit WebKit identity is consistent across CDP, requests and navigator: %j", async (options) => {
+  let headers;
+  const site = Bun.serve({ port: 0, fetch(request) {
+    headers = request.headers;
+    return new Response("<!doctype html><title>identity</title>", { headers: { "content-type": "text/html" } });
+  } });
+  const browser = await createBrowser({ spareRenderer: false, ...options });
+  const cdp = CdpServer.create(browser.context).listen(0, "127.0.0.1");
+  try {
+    // Default and explicit WebKit profiles both resist a CDP client's Chrome UA.
+    await browser.context.setUserAgent(DESKTOP_USER_AGENT);
+    const version = await fetch(`http://127.0.0.1:${cdp.port}/json/version`).then(r => r.json());
+    expect(version.Browser).toBe(BROWSER_PRODUCT);
+    expect(version["User-Agent"]).toBe(WEBKIT_USER_AGENT);
+    await browser.context.navigate(`http://127.0.0.1:${site.port}/`);
+    expect(headers.get("user-agent")).toBe(WEBKIT_USER_AGENT);
+    expect(headers.has("sec-ch-ua")).toBe(false);
+    expect(await browser.context.evaluate(`[
+      navigator.userAgent, navigator.vendor, navigator.platform,
+      'userAgentData' in navigator, typeof NavigatorUAData, typeof window.chrome,
+    ]`)).toEqual([WEBKIT_USER_AGENT, "Apple Computer, Inc.", "MacIntel", false, "undefined", "undefined"]);
+  } finally {
+    cdp.stop(true);
+    browser.close();
+    site.stop(true);
+  }
+});
+
+test("scripts added for new documents run before the page's own scripts, in every later document", async () => {
+  const site = Bun.serve({ port: 0, fetch: () => new Response(
+    "<!doctype html><script>window.seenByPage = window.early;</script>",
+    { headers: { "content-type": "text/html" } },
+  ) });
+  const browser = await createBrowser({ spareRenderer: false });
+  try {
+    const first = browser.context.addInitScript("window.early = (window.early ?? 0) + 1;");
+    await browser.context.navigate(`http://127.0.0.1:${site.port}/`);
+    expect(await browser.context.evaluate("window.seenByPage")).toBe(1);
+    browser.context.removeInitScript(first);
+    await browser.context.navigate(`http://127.0.0.1:${site.port}/again`);
+    expect(await browser.context.evaluate("window.seenByPage")).toBe(undefined);
+  } finally {
+    browser.close();
+    site.stop(true);
+  }
+});

package/vendor/happy-dom/packages/happy-dom/src/nodes/html-image-element/HTMLImageElement.ts

@@ -19,6 +19,8 @@ const DATA_URL_REGEX = /^\s*data:([^,]+)?,(.*)/;
 export default class HTMLImageElement extends HTMLElement implements ICanvasShape {
 	public [PropertySymbol.tagName] = 'IMG';
 	public [PropertySymbol.complete] = true;
+	// Bumped whenever src changes: an image decoded for an earlier src is dropped.
+	#loadGeneration = 0;
 	public [PropertySymbol.naturalHeight] = 0;
 	public [PropertySymbol.naturalWidth] = 0;
 	public [PropertySymbol.loading] = 'auto';
@@ -357,6 +359,7 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 		super[PropertySymbol.onSetAttribute](attribute, replacedAttribute);
 
 		if (attribute[PropertySymbol.name] === 'src') {
+			const generation = ++this.#loadGeneration;
 			const url = this.#parseUrl(attribute[PropertySymbol.value]);
 
 			if (!url) {
@@ -367,13 +370,13 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 				return;
 			}
 
-			if (this.#loadDataUrl(url)) {
+			if (this.#loadDataUrl(url, generation)) {
 				return;
 			}
 
 			const settings = new WindowBrowserContext(this[PropertySymbol.window]).getSettings();
 			if (settings?.enableImageFileLoading) {
-				this.#loadUrlSource(this.src);
+				this.#loadUrlSource(this.src, generation);
 			}
 		}
 	}
@@ -385,6 +388,7 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 		super[PropertySymbol.onRemoveAttribute](removedAttribute);
 
 		if (removedAttribute[PropertySymbol.name] === 'src') {
+			this.#loadGeneration++;
 			this[PropertySymbol.complete] = true;
 			this[PropertySymbol.naturalHeight] = 0;
 			this[PropertySymbol.naturalWidth] = 0;
@@ -415,27 +419,37 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 	 * Loads the image from the given data URL.
 	 *
 	 * @param src Source.
+	 * @param generation The load this is (see #loadGeneration).
 	 * @returns True if the image was loaded, false otherwise.
 	 */
-	#loadDataUrl(src: string): boolean {
+	#loadDataUrl(src: string, generation: number): boolean {
 		const dataUrlMatch = src.match(DATA_URL_REGEX);
 
 		if (dataUrlMatch) {
 			const buffer = Buffer.from(dataUrlMatch[2], 'base64');
-			this[PropertySymbol.complete] = true;
 			this[PropertySymbol.buffer] = buffer;
 			this[PropertySymbol.complete] = false;
-			ImageSize(buffer).then((dimensions) => {
-				this[PropertySymbol.naturalHeight] = dimensions.height;
-				this[PropertySymbol.naturalWidth] = dimensions.width;
-				this[PropertySymbol.complete] = true;
-				this.dispatchEvent(new this[PropertySymbol.window].Event('load'));
-			}).catch(() => {
-				this[PropertySymbol.naturalHeight] = 0;
-				this[PropertySymbol.naturalWidth] = 0;
-				this[PropertySymbol.complete] = true;
-				this.dispatchEvent(new this[PropertySymbol.window].Event('error'));
-			});
+			// The size is read asynchronously; a src set meanwhile wins.
+			ImageSize(buffer).then(
+				(dimensions) => {
+					if (generation !== this.#loadGeneration) {
+						return;
+					}
+					this[PropertySymbol.naturalHeight] = dimensions.height;
+					this[PropertySymbol.naturalWidth] = dimensions.width;
+					this[PropertySymbol.complete] = true;
+					this.dispatchEvent(new this[PropertySymbol.window].Event('load'));
+				},
+				() => {
+					if (generation !== this.#loadGeneration) {
+						return;
+					}
+					this[PropertySymbol.naturalHeight] = 0;
+					this[PropertySymbol.naturalWidth] = 0;
+					this[PropertySymbol.complete] = true;
+					this.dispatchEvent(new this[PropertySymbol.window].Event('error'));
+				}
+			);
 			return true;
 		}
 		return false;
@@ -445,8 +459,9 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 	 * Loads the image from the given source.
 	 *
 	 * @param src Source.
+	 * @param generation The load this is (see #loadGeneration).
 	 */
-	async #loadUrlSource(src: string): Promise<void> {
+	async #loadUrlSource(src: string, generation: number): Promise<void> {
 		this[PropertySymbol.complete] = false;
 		this[PropertySymbol.naturalHeight] = 0;
 		this[PropertySymbol.naturalWidth] = 0;
@@ -460,6 +475,10 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 			error = <Error>e;
 		}
 
+		if (generation !== this.#loadGeneration) {
+			return;
+		}
+
 		if (error || !response?.ok) {
 			this[PropertySymbol.complete] = true;
 			this.dispatchEvent(new this[PropertySymbol.window].Event('error'));
@@ -478,23 +497,34 @@ export default class HTMLImageElement extends HTMLElement implements ICanvasShap
 		try {
 			buffer = await response.buffer();
 		} catch (e) {
+			if (generation !== this.#loadGeneration) {
+				return;
+			}
 			this[PropertySymbol.complete] = true;
 			this.dispatchEvent(new this[PropertySymbol.window].Event('error'));
 			return;
 		}
 
-		this[PropertySymbol.complete] = true;
+		if (generation !== this.#loadGeneration) {
+			return;
+		}
+
 		this[PropertySymbol.buffer] = buffer;
 
+		let dimensions = { width: 0, height: 0 };
 		try {
-			const dimensions = await ImageSize(buffer);
-			this[PropertySymbol.naturalHeight] = dimensions.height;
-			this[PropertySymbol.naturalWidth] = dimensions.width;
+			dimensions = await ImageSize(buffer);
 		} catch (e) {
-			this[PropertySymbol.naturalHeight] = 0;
-			this[PropertySymbol.naturalWidth] = 0;
+			// Undecodable: no natural size.
 		}
 
+		if (generation !== this.#loadGeneration) {
+			return;
+		}
+
+		this[PropertySymbol.naturalHeight] = dimensions.height;
+		this[PropertySymbol.naturalWidth] = dimensions.width;
+		this[PropertySymbol.complete] = true;
 		this.dispatchEvent(new this[PropertySymbol.window].Event('load'));
 	}
 }

package/vendor/happy-dom/packages/happy-dom/src/query-selector/SelectorParser.ts

@@ -12,10 +12,11 @@ import type { TGlobalMatchFunction } from './TGlobalMatchFunction.js';
 /**
  * Selector group RegExp.
  *
- * Group 1: Combinator (" ", ",", "+", ">", "̣~")
- * Group 2: Parentheses or brackets.
+ * Group 1: An escaped character (e.g. "\:", "\31 "), skipped.
+ * Group 2: Combinator (" ", ",", "+", ">", "̣~")
+ * Group 3: Parentheses, brackets or quotes.
  */
-const SELECTOR_GROUP_REGEXP = /(\s*[\s,+>~]\s*)|([\[\]\(\)"'])/g;
+const SELECTOR_GROUP_REGEXP = /(\\[0-9a-fA-F]{1,6}\s?|\\[\s\S])|(\s*[\s,+>~]\s*)|([\[\]\(\)"'])/g;
 
 /**
  * Selector RegExp.
@@ -45,7 +46,7 @@ const SELECTOR_GROUP_REGEXP = /(\s*[\s,+>~]\s*)|([\[\]\(\)"'])/g;
  * Group 23: Pseudo element (e.g. "::after", "::-webkit-inner-spin-button").
  */
 const SELECTOR_REGEXP =
-	/(\*)|([a-zA-Z0-9\u00A0-\uFFFF-]+)|#(([a-zA-Z0-9\u00A0-\uFFFF_-]|\\.)+)|\.(([a-zA-Z0-9\u00A0-\uFFFF_-]|\\.)+)|\[(([a-zA-Z0-9-_]|\\.)+)\]|\[(([a-zA-Z0-9-_]|\\.)+)\s*([~|^$*]{0,1})\s*=\s*("([^"]*)"|'([^']*)')\s*(s|i){0,1}\]|\[(([a-zA-Z0-9-_]|\\.)+)\s*([~|^$*]{0,1})\s*=\s*(([a-zA-Z0-9\u00A0-\uFFFF_¤£-]|\\.)+)\]|:([a-zA-Z-]+)\s*\(.+\)|:([a-zA-Z-]+)|::([a-zA-Z-]+)/g;
+	/(\*)|((?:[a-zA-Z0-9\u00A0-\uFFFF-]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)|#(([a-zA-Z0-9\u00A0-\uFFFF_-]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)|\.(([a-zA-Z0-9\u00A0-\uFFFF_-]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)|\[(([a-zA-Z0-9-_]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)\]|\[(([a-zA-Z0-9-_]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)\s*([~|^$*]{0,1})\s*=\s*("((?:[^"\\]|\\[\s\S])*)"|'((?:[^'\\]|\\[\s\S])*)')\s*(s|i){0,1}\]|\[(([a-zA-Z0-9-_]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)\s*([~|^$*]{0,1})\s*=\s*(([a-zA-Z0-9\u00A0-\uFFFF_¤£-]|\\[0-9a-fA-F]{1,6}\s?|\\.)+)\]|:([a-zA-Z-]+)\s*\(.+\)|:([a-zA-Z-]+)|::([a-zA-Z-]+)/g;
 
 /**
  * Selector pseudo RegExp.
@@ -55,11 +56,6 @@ const SELECTOR_REGEXP =
  */
 const SELECTOR_PSEUDO_REGEXP = /:([a-zA-Z-]+)|([()])/g;
 
-/**
- * Escaped Character RegExp.
- */
-const ESCAPED_CHARACTER_REGEXP = /\\/g;
-
 /**
  * CSS Escape RegExp.
  *
@@ -187,6 +183,11 @@ export default class SelectorParser {
 
 		while ((match = regExp.exec(selector))) {
 			if (match[1]) {
+				// An escaped character (CSS Syntax §4.3.7) is part of the selector it is in,
+				// never a combinator, bracket or quote.
+				continue;
+			}
+			if (match[2]) {
 				// Matches combinator (" ", ",", "+", ">", "̣~")
 				// We should ignore combinators that are inside parentheses, brackets or apostrophes
 
@@ -198,7 +199,7 @@ export default class SelectorParser {
 				) {
 					const childSelector = selector.substring(lastIndex, match.index).trim();
 
-					switch (match[1].trim()) {
+					switch (match[2].trim()) {
 						case ',':
 							selectorItem = this.getSelectorGroupItem(childSelector, combinator);
 							if (!selectorItem) {
@@ -262,7 +263,7 @@ export default class SelectorParser {
 			} else {
 				// Matches parentheses or brackets.
 
-				switch (match[2]) {
+				switch (match[3]) {
 					case '(':
 						if (depth.singleApostrophe === 0 && depth.doubleApostrophe === 0) {
 							depth.parentheses++;
@@ -365,22 +366,22 @@ export default class SelectorParser {
 			} else if (match[2]) {
 				// Matches tag name, e.g. "div"
 
-				selectorItem.tagName = match[2].toUpperCase();
+				selectorItem.tagName = SelectorParser.cssUnescape(match[2]).toUpperCase();
 			} else if (match[3]) {
 				// Matches ID, e.g. "#id"
 
-				selectorItem.id = match[3].replace(ESCAPED_CHARACTER_REGEXP, '');
+				selectorItem.id = SelectorParser.cssUnescape(match[3]);
 			} else if (match[5]) {
 				// Matches class names, e.g. ".class1"
 
 				selectorItem.classNames = selectorItem.classNames || [];
-				selectorItem.classNames.push(match[5].replace(ESCAPED_CHARACTER_REGEXP, ''));
+				selectorItem.classNames.push(SelectorParser.cssUnescape(match[5]));
 			} else if (match[7]) {
 				// Matches attributes without value, e.g. [attr]
 
 				selectorItem.attributes = selectorItem.attributes || [];
 				selectorItem.attributes.push({
-					name: match[7].replace(ESCAPED_CHARACTER_REGEXP, ''),
+					name: SelectorParser.cssUnescape(match[7]),
 					operator: null,
 					value: null,
 					modifier: null,
@@ -393,7 +394,7 @@ export default class SelectorParser {
 				const unescapedValue = SelectorParser.cssUnescape(value);
 				selectorItem.attributes = selectorItem.attributes || [];
 				selectorItem.attributes.push({
-					name: match[9].replace(ESCAPED_CHARACTER_REGEXP, ''),
+					name: SelectorParser.cssUnescape(match[9]),
 					operator: match[11] || null,
 					value: unescapedValue,
 					modifier: <'s'>match[15] || null,
@@ -409,7 +410,7 @@ export default class SelectorParser {
 				const unescapedValue = SelectorParser.cssUnescape(match[19]);
 				selectorItem.attributes = selectorItem.attributes || [];
 				selectorItem.attributes.push({
-					name: match[16].replace(ESCAPED_CHARACTER_REGEXP, ''),
+					name: SelectorParser.cssUnescape(match[16]),
 					operator: match[18] || null,
 					value: unescapedValue,
 					modifier: null,

package/vendor/ses/dist/ses.mjs

@@ -9568,7 +9568,7 @@ function buildOptimizer(constants, name) {
             ${globalObjectOptimizer}
             ${moduleLexicalOptimizer}
             return function() {
-              'use strict';
+              ${context.sloppyCode ? '' : "'use strict';"}
               return eval(arguments[0]);
             };
           }
@@ -9611,6 +9611,7 @@ const { Fail } = assert;
   moduleLexicals = {},
   globalTransforms = [],
   sloppyGlobalsMode = false,
+  sloppyCode = false,
 }) => {
   const scopeTerminator = sloppyGlobalsMode
     ? createSloppyGlobalsScopeTerminator(globalObject)
@@ -9623,6 +9624,7 @@ const { Fail } = assert;
     moduleLexicals,
     globalObject,
     scopeTerminator,
+    sloppyCode,
   });
 
   // Defer creating the actual evaluator to first use.
@@ -9715,6 +9717,14 @@ const nativeSuffix = ') { [native code] }';
 // use this top level state so that multiple calls to `tameFunctionToString` are
 // idempotent, rather than creating redundant indirections.
 let markVirtualizedNativeFunction;
+let sourceTextTransform;
+// Taken (and deleted) by the embedder, like the native-function marker.
+Object.defineProperty(globalThis, Symbol.for('ses.setFunctionSourceTextTransform'), {
+  value: transform => {
+    sourceTextTransform = transform;
+  },
+  configurable: true,
+});
 
 /**
  * Replace `Function.prototype.toString` with one that recognizes
@@ -9726,7 +9736,10 @@ let markVirtualizedNativeFunction;
 
     const tamingMethods = {
       toString() {
-        const str = functionToString(this);
+        let str = functionToString(this);
+        // The embedder may map the text of source it rewrote back to the
+        // text the page wrote (see the registered symbol below).
+        if (sourceTextTransform !== undefined) str = sourceTextTransform(str);
         if (
           stringEndsWith(str, nativeSuffix) ||
           !weaksetHas(virtualizedNativeFunctions, this)
@@ -9744,6 +9757,8 @@ let markVirtualizedNativeFunction;
     markVirtualizedNativeFunction = freeze(func =>
       weaksetAdd(virtualizedNativeFunctions, func),
     );
+    // Function.prototype.toString is itself a built-in function.
+    markVirtualizedNativeFunction(tamingMethods.toString);
   }
   return markVirtualizedNativeFunction;
 };$h͏_once.tameFunctionToString(tameFunctionToString);
@@ -12522,13 +12537,29 @@ const { quote: q } = assert;
 
 
 
-       const provideCompartmentEvaluator = (compartmentFields, options) => {
-  const { sloppyGlobalsMode = false, __moduleShimLexicals__ = undefined } =
-    options;
+       // Evaluators for sloppyGlobalsMode / __sloppyCode__, one per compartment and
+// combination: building one scans the global object and compiles a new
+// evaluator function, which made every such evaluate() call cost hundreds of
+// microseconds.
+const sloppyEvaluators = new WeakMap();
+
+const provideCompartmentEvaluator = (compartmentFields, options) => {
+  const {
+    sloppyGlobalsMode = false,
+    __moduleShimLexicals__ = undefined,
+    __sloppyCode__ = false,
+  } = options;
 
   let safeEvaluate;
 
-  if (__moduleShimLexicals__ === undefined && !sloppyGlobalsMode) {
+  const cacheKey = __moduleShimLexicals__ === undefined
+    ? `${Boolean(sloppyGlobalsMode)}:${Boolean(__sloppyCode__)}` : undefined;
+  let cached = sloppyEvaluators.get(compartmentFields);
+  if (cacheKey !== undefined && cached && cached.has(cacheKey)) {
+    return { safeEvaluate: cached.get(cacheKey) };
+  }
+
+  if (__moduleShimLexicals__ === undefined && !sloppyGlobalsMode && !__sloppyCode__) {
     ({ safeEvaluate } = compartmentFields);
   } else {
     // The scope proxy or global lexicals are different from the
@@ -12560,7 +12591,15 @@ const { quote: q } = assert;
       moduleLexicals,
       globalTransforms,
       sloppyGlobalsMode,
+      sloppyCode: __sloppyCode__,
     }));
+    if (cacheKey !== undefined) {
+      if (!cached) {
+        cached = new Map();
+        sloppyEvaluators.set(compartmentFields, cached);
+      }
+      cached.set(cacheKey, safeEvaluate);
+    }
   }
 
   return { safeEvaluate };
@@ -15138,6 +15177,13 @@ globalThis.repairIntrinsics = options => {
 
 const markVirtualizedNativeFunction = tameFunctionToString();
 
+// The embedder takes this once (and deletes it) to present its own
+// host-implemented Web APIs as built-in functions, as browsers do.
+Object.defineProperty(globalThis, Symbol.for('ses.markVirtualizedNativeFunction'), {
+  value: markVirtualizedNativeFunction,
+  configurable: true,
+});
+
 const muteReporter = chooseReporter('none');
 
 // @ts-ignore Compartment is definitely on globalThis.