Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(wpt): serve script load and error fixtures

ldm03028654817a9
diff --git a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py b/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
index 8a927f169..f65733178 100644
--- a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
+++ b/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
@@ -744,9 +744,24 @@ def _supported_wptserve_handler_references(
"html/semantics/scripting-1/the-script-element/module/"
):
supported += SUPPORTED_MODULE_DELAY_WPTSERVE_HANDLER_PATTERNS
+ if rel is not None:
+ supported += _script_load_error_handler_reference_patterns(posixpath.dirname(rel) or ".")
return supported
+@lru_cache(maxsize=None)
+def _script_load_error_handler_reference_patterns(directory: str) -> tuple[re.Pattern[str], ...]:
+ resource = "html/semantics/scripting-1/the-script-element/resources/load-error-events.py"
+ relative = posixpath.relpath(resource, directory)
+ return tuple(
+ re.compile(
+ rf"(?<![A-Za-z0-9_./-]){re.escape(reference)}"
+ rf"{WPTSERVE_HANDLER_TRAILING_BOUNDARY}"
+ )
+ for reference in ("/" + resource, relative, "./" + relative)
+ )
+
+
def _has_unsupported_server_feature(
text: str,
*,
diff --git a/moli-benchmark/moli_benchmark/wpt_cross/server.py b/moli-benchmark/moli_benchmark/wpt_cross/server.py
index e30f2f152..19e2f4d4c 100644
--- a/moli-benchmark/moli_benchmark/wpt_cross/server.py
+++ b/moli-benchmark/moli_benchmark/wpt_cross/server.py
@@ -1864,6 +1864,12 @@ def _make_handler(
):
self._serve_delayed_module_script(parsed.query, emit_body=emit_body)
return
+ if path == (
+ "/html/semantics/scripting-1/the-script-element/"
+ "resources/load-error-events.py"
+ ):
+ self._serve_script_load_error_events(parsed.query, emit_body=emit_body)
+ return
if path in {"/wasm/webapi/status.py", "/wasm/webapi/webapi/status.py"}:
status_code = _wasm_webapi_status_code(parsed.query)
if status_code is None:
@@ -2460,6 +2466,26 @@ def _make_handler(
except (BrokenPipeError, ConnectionResetError, OSError):
return
+ def _serve_script_load_error_events(self, query: str, *, emit_body: bool) -> None:
+ params = parse_qs(query, keep_blank_values=True)
+ test = params.get("test", [""])[0]
+ if re.fullmatch(r"[a-zA-Z0-9_]+", test) is None:
+ self.send_error(400)
+ return
+ if "_load" in test:
+ status = 200
+ body = f'"use strict"; {test}.executed = true;'
+ else:
+ status = 404
+ body = (
+ f'"use strict"; {test}.test.step(function() {{ '
+ 'assert_unreached("404 script should not be executed"); });'
+ )
+ self._send_bytes(
+ "text/javascript", body.encode("ascii"),
+ emit_body=emit_body, status_code=status,
+ )
+
def _serve_fetch_status(self, query: str, *, emit_body: bool) -> None:
try:
status, text, content_type, body = _fetch_status_response(query)
diff --git a/moli-benchmark/tests/test_wpt_script_load_error_server.py b/moli-benchmark/tests/test_wpt_script_load_error_server.py
new file mode 100644
index 000000000..8c635d32d
--- /dev/null
+++ b/moli-benchmark/tests/test_wpt_script_load_error_server.py
@@ -0,0 +1,103 @@
+from __future__ import annotations
+
+import tempfile
+import unittest
+from contextlib import ExitStack
+from http.client import HTTPConnection
+from pathlib import Path
+from unittest.mock import patch
+
+from moli_benchmark.wpt_cross.case_set import enumerate_cases
+from moli_benchmark.wpt_cross.server import WptFixtureServer
+
+
+SCRIPT_DIRECTORY = "html/semantics/scripting-1/the-script-element"
+RESOURCE = "/" + SCRIPT_DIRECTORY + "/resources/load-error-events.py"
+
+
+class ScriptLoadErrorFixtureTests(unittest.TestCase):
+ def setUp(self) -> None:
+ self.stack = ExitStack()
+ self.addCleanup(self.stack.close)
+ self.root = Path(self.stack.enter_context(tempfile.TemporaryDirectory()))
+ (self.root / "resources").mkdir()
+ for name in ("testharness.js", "testharnessreport.js"):
+ (self.root / "resources" / name).write_text("// test harness")
+ self.directory = self.root / SCRIPT_DIRECTORY
+ (self.directory / "resources").mkdir(parents=True)
+ (self.directory / "resources/load-error-events.py").write_text(
+ "# Python source must not be served as JavaScript"
+ )
+ self.stack.enter_context(patch(
+ "moli_benchmark.wpt_cross.server._global_ipv6_address", return_value=None
+ ))
+
+ def request(
+ self, server: WptFixtureServer, query: str, *, method: str = "GET",
+ ) -> tuple[int, dict[str, str], bytes]:
+ connection = HTTPConnection("127.0.0.1", server.port, timeout=2)
+ try:
+ connection.request(method, RESOURCE + "?" + query)
+ response = connection.getresponse()
+ return (
+ response.status,
+ {name.lower(): value for name, value in response.getheaders()},
+ response.read(),
+ )
+ finally:
+ connection.close()
+
+ def test_load_and_error_responses_match_script_fixture(self) -> None:
+ server = self.stack.enter_context(WptFixtureServer(self.root))
+ cases = (
+ ("test=test1_load", 200, b'"use strict"; test1_load.executed = true;'),
+ (
+ "test=test1_error&test=ignored_load", 404,
+ b'"use strict"; test1_error.test.step(function() { '
+ b'assert_unreached("404 script should not be executed"); });',
+ ),
+ ("test=test%32_load", 200, b'"use strict"; test2_load.executed = true;'),
+ )
+ for query, expected_status, expected_body in cases:
+ for method in ("GET", "HEAD"):
+ with self.subTest(query=query, method=method):
+ status, headers, body = self.request(server, query, method=method)
+ self.assertEqual(status, expected_status)
+ self.assertEqual(headers["content-type"], "text/javascript")
+ self.assertEqual(headers["content-length"], str(len(expected_body)))
+ self.assertEqual(body, b"" if method == "HEAD" else expected_body)
+
+ def test_missing_or_invalid_test_names_return_bad_request(self) -> None:
+ server = self.stack.enter_context(WptFixtureServer(self.root))
+ for query in ("", "test=", "test=a.b_load", "test=a%0A_load", "test=%C3%A9_load"):
+ with self.subTest(query=query):
+ status, _, _ = self.request(server, query)
+ self.assertEqual(status, 400)
+
+ def test_discovery_only_accepts_references_to_the_supported_handler(self) -> None:
+ cases = {
+ "load-relative.html": ("resources/load-error-events.py", True),
+ "load-absolute.html": (RESOURCE, True),
+ "module/load-relative.html": ("../resources/load-error-events.py", True),
+ "module/load-dot-relative.html": ("./../resources/load-error-events.py", True),
+ "module/load-own-resource.html": ("resources/load-error-events.py", False),
+ "module/load-suffix.html": ("../resources/load-error-events.py.extra", False),
+ "load-other.html": ("/unrelated/resources/load-error-events.py", False),
+ }
+ for name, (reference, _) in cases.items():
+ path = self.directory / name
+ path.parent.mkdir(parents=True, exist_ok=True)
+ path.write_text(
+ '<!doctype html><script src="/resources/testharness.js"></script>'
+ '<script src="/resources/testharnessreport.js"></script>'
+ f'<script src="{reference}?test=test1_load"></script>'
+ )
+ discovered = enumerate_cases(self.root, dir_prefixes=(SCRIPT_DIRECTORY,))
+ self.assertEqual(
+ sorted(case.case_path for case in discovered),
+ sorted(SCRIPT_DIRECTORY + "/" + name for name, (_, allowed) in cases.items() if allowed),
+ )
+
+
+if __name__ == "__main__":
+ unittest.main()