refactor: use awaitable post to pass messages (#388)

Author: ojeytonwilliams

packages/dom-evaluator/src/dom-test-evaluator.ts

@@ -196,17 +196,18 @@ ${rawTest}`);
   async handleMessage(
     e: CodeEvent | TestEvent | InitEvent<InitTestFrameOptions>,
   ): Promise<void> {
+    const respond = (msg: unknown) => e.ports[0].postMessage(msg);
     if (e.data.type === "test") {
       const result = await this.#runTest!(e.data.value);
       const msg = { type: "result" as const, value: result };
-      postCloneableMessage((msg) => e.ports[0].postMessage(msg), msg);
+      postCloneableMessage(respond, msg);
     } else if (e.data.type === "init") {
       await this.init(e.data.value);
-      self.parent.postMessage(READY_MESSAGE, "*");
+      respond(READY_MESSAGE);
     } else if (e.data.type === "code") {
       // This is used to run arbitrary non-test code, such as the afterAll hook.
       await this.runCode(e.data.value);
-      e.ports[0].postMessage({ type: "code" });
+      respond({ type: "code" });
     }
   }
 }

packages/javascript-evaluator/src/javascript-test-evaluator.ts

@@ -121,17 +121,18 @@ ${test};`);
   async handleMessage(
     e: TestEvent | InitEvent<InitWorkerOptions> | CodeEvent,
   ): Promise<void> {
+    const respond = (msg: unknown) => e.ports[0].postMessage(msg);
     if (e.data.type === "test") {
       const result = await this.#runTest!(e.data.value);
       const msg = { type: "result" as const, value: result };
-      postCloneableMessage((msg) => e.ports[0].postMessage(msg), msg);
+      postCloneableMessage(respond, msg);
     } else if (e.data.type === "init") {
       this.init(e.data.value);
-      postMessage(READY_MESSAGE);
+      respond(READY_MESSAGE);
     } else if (e.data.type === "code") {
       // This is used to run arbitrary non-test code, such as the afterAll hook.
       await this.runCode(e.data.value);
-      e.ports[0].postMessage({ type: "code" });
+      respond({ type: "code" });
     }
   }
 }

packages/main/src/test-runner.ts

@@ -1,4 +1,3 @@
-import type { ReadyEvent } from "../../shared/src/interfaces/test-runner";
 import type {
   InitEvent,
   TestEvent,
@@ -123,28 +122,15 @@ ${opts.source}`;
     document.body.appendChild(this.#testEvaluator);
     await isReady;
 
-    const isInitialized = new Promise((resolve) => {
-      const listener = (event: ReadyEvent) => {
-        if (
-          event.origin === "null" &&
-          event.source === this.#testEvaluator.contentWindow &&
-          event.data.type === "ready"
-        ) {
-          window.removeEventListener("message", listener);
-          resolve(true);
-        }
-      };
-
-      window.addEventListener("message", listener);
-    });
-
     const msg: InitEvent<InitTestFrameOptions>["data"] = {
       type: "init",
       value: opts,
     };
-    this.#testEvaluator.contentWindow?.postMessage(msg, "*");
 
-    await isInitialized;
+    await post({
+      messenger: this.#testEvaluator.contentWindow!,
+      message: msg,
+    });
   }
 
   runTest(test: string) {
@@ -208,23 +194,14 @@ export class WorkerTestRunner implements Runner {
 
   async init(opts: InitWorkerOptions) {
     this.#opts = opts;
-    const isInitialized = new Promise((resolve) => {
-      const listener = (event: ReadyEvent) => {
-        if (event.data.type === "ready") {
-          this.#testEvaluator.removeEventListener("message", listener);
-          resolve(true);
-        }
-      };
-
-      this.#testEvaluator.addEventListener("message", listener);
-    });
-
     const msg: InitEvent<InitWorkerOptions>["data"] = {
       type: "init",
       value: opts,
     };
-    this.#testEvaluator.postMessage(msg);
-    await isInitialized;
+    await post({
+      messenger: this.#testEvaluator,
+      message: msg,
+    });
   }
 
   async #recreateRunner() {

packages/python-evaluator/src/python-test-evaluator.ts

@@ -230,17 +230,18 @@ class PythonTestEvaluator implements TestEvaluator {
   async handleMessage(
     e: TestEvent | InitEvent<InitWorkerOptions> | CodeEvent,
   ): Promise<void> {
+    const respond = (msg: unknown) => e.ports[0].postMessage(msg);
     if (e.data.type === "test") {
       const result = await this.#runTest!(e.data.value);
       const msg = { type: "result" as const, value: result };
-      postCloneableMessage((msg) => e.ports[0].postMessage(msg), msg);
+      postCloneableMessage(respond, msg);
     } else if (e.data.type === "init") {
       await this.init(e.data.value);
-      postMessage(READY_MESSAGE);
+      respond(READY_MESSAGE);
     } else if (e.data.type === "code") {
       // This is used to run arbitrary non-test code, such as the afterAll hook.
       await this.runCode(e.data.value);
-      e.ports[0].postMessage({ type: "code" });
+      respond({ type: "code" });
     }
   }
 }