add websockets web-platform test suite

Author: anonrig

build/wpt_test.bzl

@@ -295,6 +295,8 @@ const unitTests :Workerd.Config = (
           (name = "SIDECAR_HOSTNAME", fromEnvironment = "SIDECAR_HOSTNAME"),
           (name = "HTTP_PORT", fromEnvironment = "HTTP_PORT"),
           (name = "HTTPS_PORT", fromEnvironment = "HTTPS_PORT"),
+          (name = "WS_PORT", fromEnvironment = "WS_PORT"),
+          (name = "WSS_PORT", fromEnvironment = "WSS_PORT"),
           (name = "GEN_TEST_CONFIG", fromEnvironment = "GEN_TEST_CONFIG"),
           (name = "GEN_TEST_REPORT", fromEnvironment = "GEN_TEST_REPORT"),
           (name = "GEN_TEST_STATS", fromEnvironment = "GEN_TEST_STATS"),

justfile

@@ -77,7 +77,7 @@ new-wpt-test test_name:
   echo 'wpt_test(name = "{{test_name}}", config = "{{test_name}}-test.ts", wpt_directory = "@wpt//:{{test_name}}@module")' >> src/wpt/BUILD.bazel
 
   ./tools/cross/format.py
-  bazel test //src/wpt:{{test_name}} --test_env=GEN_TEST_CONFIG=1 --test_output=streamed
+  bazel test //src/wpt:{{test_name}}@ --test_env=GEN_TEST_CONFIG=1 --test_output=streamed
 
 # Specify the full Bazel target name for the test to be created.
 # e.g. just new-test //src/workerd/api/tests:v8-temporal-test

src/wpt/BUILD.bazel

@@ -129,3 +129,17 @@ wpt_test(
     config = "performance-timeline-test.ts",
     wpt_directory = "@wpt//:performance-timeline@module",
 )
+
+wpt_test(
+    name = "websockets",
+    size = "large",
+    config = "websockets-test.ts",
+    start_server = True,
+    target_compatible_with = select({
+        # TODO(later): Provide a Windows version of the sidecar script we wrote to invoke wptserve.
+        # Currently we only have a Unix shell script.
+        "@platforms//os:windows": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
+    wpt_directory = "@wpt//:websockets@module",
+)

src/wpt/harness/assertions.ts

@@ -103,6 +103,24 @@ declare global {
     description?: string
   ): void;
 
+  function assert_greater_than_equal(
+    actual: number,
+    expected: number,
+    description?: string
+  ): void;
+
+  function assert_less_than(
+    actual: number,
+    expected: number,
+    description?: string
+  ): void;
+
+  function assert_less_than_equal(
+    actual: number,
+    expected: number,
+    description?: string
+  ): void;
+
   function promise_rejects_exactly(
     test: Test,
     exception: typeof Error,
@@ -481,6 +499,43 @@ globalThis.assert_greater_than = (actual, expected, description): void => {
   ok(actual > expected, description);
 };
 
+/**
+ * Assert that ``actual`` is a number greater than or equal to ``expected``.
+ *
+ * @param actual - Test value.
+ * @param expected - Number that ``actual`` must be greater than or equal to.
+ * @param [description] - Description of the condition being tested.
+ */
+globalThis.assert_greater_than_equal = (
+  actual,
+  expected,
+  description
+): void => {
+  ok(actual >= expected, description);
+};
+
+/**
+ * Assert that ``actual`` is a number less than ``expected``.
+ *
+ * @param actual - Test value.
+ * @param expected - Number that ``actual`` must be less than.
+ * @param [description] - Description of the condition being tested.
+ */
+globalThis.assert_less_than = (actual, expected, description): void => {
+  ok(actual < expected, description);
+};
+
+/**
+ * Assert that ``actual`` is a number less than or equal to ``expected``.
+ *
+ * @param actual - Test value.
+ * @param expected - Number that ``actual`` must be less than or equal to.
+ * @param [description] - Description of the condition being tested.
+ */
+globalThis.assert_less_than_equal = (actual, expected, description): void => {
+  ok(actual <= expected, description);
+};
+
 /**
  * Assert that a Promise is rejected with the provided value.
  *

src/wpt/harness/common.ts

@@ -142,6 +142,8 @@ export type HostInfo = {
   HTTPS_REMOTE_ORIGIN: string;
   HTTP_PORT: string;
   HTTPS_PORT: string;
+  WS_PORT: string;
+  WSS_PORT: string;
 };
 
 export function getHostInfo(): HostInfo {
@@ -163,6 +165,8 @@ export function getHostInfo(): HostInfo {
     HTTPS_REMOTE_ORIGIN: httpsUrl.origin,
     HTTP_PORT: httpUrl.port,
     HTTPS_PORT: httpsUrl.port,
+    WS_PORT: (globalThis.state.env.WS_PORT as string) ?? '',
+    WSS_PORT: (globalThis.state.env.WSS_PORT as string) ?? '',
   };
 }
 

src/wpt/harness/harness.ts

@@ -302,10 +302,14 @@ function replaceInterpolation(code: string): string {
   const hostInfo = getHostInfo();
 
   return code
-    .replace('{{host}}', hostInfo.REMOTE_HOST)
-    .replace('{{ports[http][0]}}', hostInfo.HTTP_PORT)
-    .replace('{{ports[http][1]}}', hostInfo.HTTP_PORT)
-    .replace('{{ports[https][0]}}', hostInfo.HTTPS_PORT);
+    .replace(/\{\{host\}\}/g, hostInfo.REMOTE_HOST)
+    .replace(/\{\{hosts\[alt\]\[www\]\}\}/g, hostInfo.REMOTE_HOST)
+    .replace(/\{\{ports\[http\]\[0\]\}\}/g, hostInfo.HTTP_PORT)
+    .replace(/\{\{ports\[http\]\[1\]\}\}/g, hostInfo.HTTP_PORT)
+    .replace(/\{\{ports\[https\]\[0\]\}\}/g, hostInfo.HTTPS_PORT)
+    .replace(/\{\{ports\[ws\]\[0\]\}\}/g, hostInfo.WS_PORT)
+    .replace(/\{\{ports\[wss\]\[0\]\}\}/g, hostInfo.WSS_PORT)
+    .replace(/\{\{ports\[h2\]\[0\]\}\}/g, hostInfo.HTTPS_PORT);
 }
 
 function getCodeAtPath(

src/wpt/harness/test.ts

@@ -36,7 +36,11 @@ declare global {
     name?: string,
     properties?: unknown
   ): void;
-  function async_test(func: TestFn, name?: string, properties?: unknown): void;
+  function async_test(
+    func: TestFn | string,
+    name?: string,
+    properties?: unknown
+  ): Test;
   function test(func: TestFn, name?: string, properties?: unknown): void;
 }
 
@@ -293,15 +297,38 @@ class AsyncTest extends Test {
   }
 }
 
-globalThis.async_test = (func, name, properties): void => {
-  if (maybeAddSkippedTest(name ?? '')) {
-    return;
+globalThis.async_test = (func, name, properties): Test => {
+  // async_test can be called in two ways:
+  // 1. async_test(func, name, properties) - func is a TestFn
+  // 2. async_test(name, properties) - just creates a test with the given name
+  let testName: string;
+  let testFunc: TestFn | undefined;
+
+  if (typeof func === 'string') {
+    // async_test(name, properties) signature
+    testName = func;
+    testFunc = undefined;
+    // name parameter is actually properties in this case
+    properties = name;
+  } else {
+    // async_test(func, name, properties) signature
+    testName = name ?? '';
+    testFunc = func;
   }
 
-  const testCase = new AsyncTest(name ?? '', properties);
+  if (maybeAddSkippedTest(testName)) {
+    // Return a dummy test object for skipped tests
+    return new SkippedTest(testName, 'DISABLED');
+  }
+
+  const testCase = new AsyncTest(testName, properties);
   globalThis.state.subtests.push(testCase);
 
-  testCase.step(func, testCase, testCase);
+  if (testFunc) {
+    testCase.step(testFunc, testCase, testCase);
+  }
+
+  return testCase;
 };
 
 /**