perf(browser): improve browser parallelisation

packages/browser/src/client/channel.ts

@@ -1,40 +1,58 @@
 import type { CancelReason } from '@vitest/runner'
 import { getBrowserState } from './utils'
 
-export interface IframeDoneEvent {
-  type: 'done'
-  filenames: string[]
-  id: string
+export interface IframeViewportEvent {
+  event: 'viewport'
+  width: number
+  height: number
+  iframeId: string
 }
 
-export interface IframeErrorEvent {
-  type: 'error'
-  error: any
-  errorType: string
-  files: string[]
-  id: string
+export interface IframeViewportFailEvent {
+  event: 'viewport:fail'
+  iframeId: string
+  error: string
 }
 
-export interface IframeViewportEvent {
-  type: 'viewport'
-  width: number
-  height: number
-  id: string
+export interface IframeViewportDoneEvent {
+  event: 'viewport:done'
+  iframeId: string
 }
 
 export interface GlobalChannelTestRunCanceledEvent {
   type: 'cancel'
   reason: CancelReason
 }
 
+export interface IframeExecuteEvent {
+  event: 'execute'
+  method: 'run' | 'collect'
+  files: string[]
+  iframeId: string
+  context: string
+}
+
+export interface IframeCleanupEvent {
+  event: 'cleanup'
+  iframeId: string
+}
+
+export interface IframePrepareEvent {
+  event: 'prepare'
+  iframeId: string
+}
+
 export type GlobalChannelIncomingEvent = GlobalChannelTestRunCanceledEvent
 
 export type IframeChannelIncomingEvent =
   | IframeViewportEvent
-  | IframeErrorEvent
-  | IframeDoneEvent
 
-export type IframeChannelOutgoingEvent = never
+export type IframeChannelOutgoingEvent =
+  | IframeExecuteEvent
+  | IframeCleanupEvent
+  | IframePrepareEvent
+  | IframeViewportFailEvent
+  | IframeViewportDoneEvent
 
 export type IframeChannelEvent =
   | IframeChannelIncomingEvent
@@ -44,17 +62,3 @@ export const channel: BroadcastChannel = new BroadcastChannel(
   `vitest:${getBrowserState().sessionId}`,
 )
 export const globalChannel: BroadcastChannel = new BroadcastChannel('vitest:global')
-
-export function waitForChannel(event: IframeChannelOutgoingEvent['type']): Promise<void> {
-  return new Promise<void>((resolve) => {
-    channel.addEventListener(
-      'message',
-      (e) => {
-        if (e.data?.type === event) {
-          resolve()
-        }
-      },
-      { once: true },
-    )
-  })
-}

packages/browser/src/client/client.ts

@@ -53,11 +53,19 @@ function createClient() {
   ctx.rpc = createBirpc<WebSocketBrowserHandlers, WebSocketBrowserEvents>(
     {
       onCancel: setCancel,
-      async createTesters(files: string[]) {
-        if (PAGE_TYPE !== 'orchestrator') {
-          return
+      async createTesters(options) {
+        const orchestrator = getBrowserState().orchestrator
+        if (!orchestrator) {
+          throw new TypeError('Only orchestrator can create testers.')
+        }
+        return orchestrator.createTesters(options)
+      },
+      async cleanupTesters() {
+        const orchestrator = getBrowserState().orchestrator
+        if (!orchestrator) {
+          throw new TypeError('Only orchestrator can cleanup testers.')
         }
-        getBrowserState().createTesters?.(files)
+        return orchestrator.cleanupTesters()
       },
       cdpEvent(event: string, payload: unknown) {
         const cdp = getBrowserState().cdp
@@ -85,6 +93,7 @@ function createClient() {
     {
       post: msg => ctx.ws.send(msg),
       on: fn => (onMessage = fn),
+      timeout: -1, // createTesters can take a while
       serialize: e =>
         stringify(e, (_, v) => {
           if (v instanceof Error) {