Isolate reversews CI tests

pirate · pirate · commit 844719db2e0b · 2026-05-16T12:59:07.000-07:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           case "${{ matrix.client }}" in
             js)
-              xvfb-run -a pnpm exec vitest run \
+              pnpm exec vitest run \
                 $(find js/test -name 'test.*.ts' \
                   ! -name 'test.ModCDPClient.ts' \
                   ! -name 'test.NatsUpstreamTransport.ts' \
@@ -52,7 +52,7 @@ jobs:
               ;;
             python)
               cd python
-              xvfb-run -a uv run python -m unittest \
+              uv run python -m unittest \
                 $(find tests -name 'test_*.py' \
                   ! -name 'test_ModCDPClient.py' \
                   ! -name 'test_NatsUpstreamTransport.py' \
@@ -61,7 +61,7 @@ jobs:
               ;;
             go)
               cd go
-              xvfb-run -a go test -count=1 -p 1 \
+              go test -count=1 -p 1 \
                 ./modcdp \
                 ./modcdp/injector \
                 ./modcdp/launcher \
@@ -122,15 +122,15 @@ jobs:
         run: |
           case "${{ matrix.client }}" in
             js)
-              xvfb-run -a node dist/js/examples/demo.js --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
+              node dist/js/examples/demo.js --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
               ;;
             python)
               cd python
-              xvfb-run -a uv run python examples/demo.py --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
+              uv run python examples/demo.py --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
               ;;
             go)
               cd go
-              xvfb-run -a go run ./examples/demo --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
+              go run ./examples/demo --${{ matrix.mode }} --upstream=${{ matrix.upstream }}
               ;;
             *)
               echo "unknown client: ${{ matrix.client }}" >&2
@@ -164,25 +164,41 @@ jobs:
           cache-dependency-path: go/go.sum
       - run: pnpm install --frozen-lockfile
       - run: pnpm run build
-      - name: Run JS serialized connector tests
+      - name: Run JS serialized non-reverse connector tests
         run: |
-          xvfb-run -a pnpm exec vitest run \
+          pnpm exec vitest run \
             js/test/test.ModCDPClient.ts \
             js/test/test.NatsUpstreamTransport.ts \
+            js/test/test.proxy.ts \
+            --testNamePattern "^(?!.*reversews).*" \
+            --fileParallelism=false --maxWorkers=1
+      - name: Run JS serialized reversews tests
+        run: |
+          pnpm exec vitest run \
             js/test/test.ReverseWebSocketUpstreamTransport.ts \
             js/test/test.proxy.ts \
+            --testNamePattern "reversews" \
             --fileParallelism=false --maxWorkers=1
-      - name: Run Python serialized connector tests
+      - name: Run Python serialized non-reverse connector tests
         run: |
           cd python
-          xvfb-run -a uv run python -m unittest \
+          uv run python -m unittest \
             tests.test_ModCDPClient \
-            tests.test_NatsUpstreamTransport \
+            tests.test_NatsUpstreamTransport
+      - name: Run Python serialized reversews tests
+        run: |
+          cd python
+          uv run python -m unittest \
             tests.test_ReverseWebSocketUpstreamTransport
-      - name: Run Go serialized connector tests
+      - name: Run Go serialized non-reverse connector tests
+        run: |
+          cd go
+          go test -count=1 -p 1 ./modcdp/client
+          go test -count=1 -p 1 ./modcdp/transport -run 'Test(UpstreamTransport|WebSocketUpstreamTransport|PipeUpstreamTransport|NativeMessagingUpstreamTransport|NatsUpstreamTransport)'
+      - name: Run Go serialized reversews tests
         run: |
           cd go
-          xvfb-run -a go test -count=1 -p 1 ./modcdp/client ./modcdp/transport
+          go test -count=1 -p 1 ./modcdp/transport -run 'TestReverseWebSocketUpstreamTransport'
 
   serialized-reversews-demo:
     name: serialized reversews demos
@@ -213,12 +229,12 @@ jobs:
       - name: Run reversews demos serially
         run: |
           for mode in loopback debugger; do
-            xvfb-run -a node dist/js/examples/demo.js --"$mode" --upstream=reversews
+            node dist/js/examples/demo.js --"$mode" --upstream=reversews
             cd python
-            xvfb-run -a uv run python examples/demo.py --"$mode" --upstream=reversews
+            uv run python examples/demo.py --"$mode" --upstream=reversews
             cd ..
             cd go
-            xvfb-run -a go run ./examples/demo --"$mode" --upstream=reversews
+            go run ./examples/demo --"$mode" --upstream=reversews
             cd ..
           done
 
@@ -247,4 +263,4 @@ jobs:
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm run build
-      - run: xvfb-run -a ${{ matrix.command }}
+      - run: ${{ matrix.command }}
diff --git a/extension/src/service_worker.ts b/extension/src/service_worker.ts
@@ -77,9 +77,7 @@ const configuredClient = (params: unknown, session_id?: string | null) => {
     client: configure?.client ?? {},
     server: configure?.server ?? {},
   };
-  if (client.downstream_transport === "reversews") {
-    bridge.stopNativeBridge?.("reverse downstream connected");
-  } else if (bridge.reverseBridgeActive?.() !== true) {
+  if (client.downstream_transport !== "reversews") {
     bridge.stopReverseBridge?.("non-reverse downstream connected");
   }
   return client;
@@ -180,7 +178,6 @@ if (bridge) {
     ["startReverseBridge", "reverse"],
     ["stopReverseBridge", "reverse"],
     ["startNativeBridge", "native"],
-    ["stopNativeBridge", "native"],
     ["startNatsBridge", "nats"],
   ]) {
     const start = bridge[method]?.bind(bridge);
diff --git a/go/modcdp/injector/extension.zip b/go/modcdp/injector/extension.zip
diff --git a/js/src/server/ModCDPServer.ts b/js/src/server/ModCDPServer.ts
@@ -466,28 +466,6 @@ export function installModCDPServer(
     return { upstream_reversews_url, stopped: true, reason };
   }
 
-  function reverseBridgeActive() {
-    return (
-      reverseBridgeSocket?.readyState === WebSocket.OPEN ||
-      reverseBridgeSocket?.readyState === WebSocket.CONNECTING
-    );
-  }
-
-  function stopNativeBridge(reason = "stopped") {
-    const upstream_nativemessaging_host_name = nativeBridgeHostName;
-    nativeBridgeHostName = null;
-    if (nativeBridgeReconnectTimer) {
-      clearTimeout(nativeBridgeReconnectTimer);
-      nativeBridgeReconnectTimer = null;
-    }
-    const port = nativeBridgePort;
-    nativeBridgePort = null;
-    ModCDPServer.native_bridge_connected = false;
-    ModCDPServer.native_bridge_last_error = reason;
-    port?.disconnect?.();
-    return { upstream_nativemessaging_host_name, stopped: true, reason };
-  }
-
   function scheduleNativeBridgeReconnect(delayMs: number) {
     if (!nativeBridgeHostName) return;
     if (nativeBridgeReconnectTimer) return;
@@ -639,7 +617,6 @@ export function installModCDPServer(
     const ws = new WebSocket(endpoint);
     reverseBridgeSocket = ws;
     ws.addEventListener("open", () => {
-      stopNativeBridge("reverse bridge connected");
       startOffscreenKeepAlive();
       ws.send(
         JSON.stringify({
@@ -656,12 +633,10 @@ export function installModCDPServer(
     ws.addEventListener("error", () => {
       if (reverseBridgeSocket === ws) reverseBridgeSocket = null;
       scheduleReverseBridgeReconnect(reverseBridgeReconnectIntervalMs);
-      if (nativeBridgeHostName) connectNativeBridge(nativeBridgeHostName);
     });
     ws.addEventListener("close", () => {
       if (reverseBridgeSocket === ws) reverseBridgeSocket = null;
       scheduleReverseBridgeReconnect(reverseBridgeReconnectIntervalMs);
-      if (nativeBridgeHostName) connectNativeBridge(nativeBridgeHostName);
     });
     return { upstream_reversews_url: endpoint, connected: false };
   }
@@ -676,17 +651,6 @@ export function installModCDPServer(
         reason: "native_messaging_unavailable",
       };
     }
-    if (
-      reverseBridgeUrl &&
-      (reverseBridgeSocket?.readyState === WebSocket.OPEN ||
-        reverseBridgeSocket?.readyState === WebSocket.CONNECTING)
-    ) {
-      return {
-        upstream_nativemessaging_host_name: hostName,
-        connected: false,
-        reason: "reverse_bridge_active",
-      };
-    }
     if (nativeBridgePort)
       return { upstream_nativemessaging_host_name: hostName, connected: true };
     try {
@@ -1246,8 +1210,6 @@ export function installModCDPServer(
       };
     },
     stopReverseBridge,
-    reverseBridgeActive,
-    stopNativeBridge,
     startNativeBridge(
       hostName = DEFAULT_NATIVE_BRIDGE_HOST_NAME,
       {
diff --git a/python/modcdp/extension.zip b/python/modcdp/extension.zip
diff --git a/python/tests/test_ReverseWebSocketUpstreamTransport.py b/python/tests/test_ReverseWebSocketUpstreamTransport.py
@@ -147,7 +147,6 @@ def test_accepts_real_extension_reverse_connection_and_routes_cdp_through_chrome
                 "launcher_mode": "local",
                 "launcher_options": {
                     "headless": sys.platform.startswith("linux") and not os.environ.get("DISPLAY"),
-                    "sandbox": not sys.platform.startswith("linux"),
                     # Reversews is browser -> client only. After explicit CHROME_PATH and
                     # CI /usr/bin/chromium, these tests use Chrome for Testing because
                     # Canary rejects --load-extension in this local test path.
