From 8dc91fe24f09936f0f9efb5613855a0d1a09fdb7 Mon Sep 17 00:00:00 2001
From: Thiago Perrotta <tperrotta@chromium.org>
Date: Thu, 23 Mar 2023 13:52:45 +0100
Subject: [PATCH] make `initChannelListener` a method of ScriptEvaluator

Bug: #294
Follow-up-of: #319
---
 .../domains/script/scriptEvaluator.ts         | 104 +++++++++---------
 1 file changed, 49 insertions(+), 55 deletions(-)

diff --git a/src/bidiMapper/domains/script/scriptEvaluator.ts b/src/bidiMapper/domains/script/scriptEvaluator.ts
index c4e873a26d..33ff4fa834 100644
--- a/src/bidiMapper/domains/script/scriptEvaluator.ts
+++ b/src/bidiMapper/domains/script/scriptEvaluator.ts
@@ -21,55 +21,6 @@ import {IEventManager} from '../events/EventManager.js';
 
 import {Realm} from './realm.js';
 
-async function initChannelListener(
-  channel: Script.Channel,
-  channelHandle: string | undefined,
-  eventManager: IEventManager,
-  realm: Realm
-) {
-  const channelId = channel.value.channel;
-
-  // TODO(#294): Remove this loop after the realm is destroyed.
-  // Rely on the CDP throwing exception in such a case.
-  for (;;) {
-    const message = await realm.cdpClient.sendCommand(
-      'Runtime.callFunctionOn',
-      {
-        functionDeclaration: String(
-          async (channelHandle: {getMessage: () => Promise<unknown>}) =>
-            channelHandle.getMessage()
-        ),
-        arguments: [
-          {
-            objectId: channelHandle,
-          },
-        ],
-        awaitPromise: true,
-        executionContextId: realm.executionContextId,
-        generateWebDriverValue: true,
-      }
-    );
-
-    eventManager.registerPromiseEvent(
-      realm
-        .cdpToBidiValue(message, channel.value.ownership ?? 'none')
-        .then((data) => ({
-          method: Script.EventNames.MessageEvent,
-          params: {
-            channel: channelId,
-            data,
-            source: {
-              realm: realm.realmId,
-              context: realm.browsingContextId,
-            },
-          },
-        })),
-      realm.browsingContextId,
-      Script.EventNames.MessageEvent
-    );
-  }
-}
-
 // As `script.evaluate` wraps call into serialization script, `lineNumber`
 // should be adjusted.
 const CALL_FUNCTION_STACKTRACE_LINE_OFFSET = 1;
@@ -495,12 +446,7 @@ export class ScriptEvaluator {
         const channelHandle = createChannelHandleResult.result.objectId;
 
         // Long-poll the message queue asynchronously.
-        initChannelListener(
-          argumentValue,
-          channelHandle,
-          this.#eventManager,
-          realm
-        );
+        this.#initChannelListener(argumentValue, channelHandle, realm);
 
         const sendMessageArgResult = await realm.cdpClient.sendCommand(
           'Runtime.callFunctionOn',
@@ -571,6 +517,54 @@ export class ScriptEvaluator {
     return result;
   }
 
+  async #initChannelListener(
+    channel: Script.Channel,
+    channelHandle: string | undefined,
+    realm: Realm
+  ) {
+    const channelId = channel.value.channel;
+
+    // TODO(#294): Remove this loop after the realm is destroyed.
+    // Rely on the CDP throwing exception in such a case.
+    for (;;) {
+      const message = await realm.cdpClient.sendCommand(
+        'Runtime.callFunctionOn',
+        {
+          functionDeclaration: String(
+            async (channelHandle: {getMessage: () => Promise<unknown>}) =>
+              channelHandle.getMessage()
+          ),
+          arguments: [
+            {
+              objectId: channelHandle,
+            },
+          ],
+          awaitPromise: true,
+          executionContextId: realm.executionContextId,
+          generateWebDriverValue: true,
+        }
+      );
+
+      this.#eventManager.registerPromiseEvent(
+        realm
+          .cdpToBidiValue(message, channel.value.ownership ?? 'none')
+          .then((data) => ({
+            method: Script.EventNames.MessageEvent,
+            params: {
+              channel: channelId,
+              data,
+              source: {
+                realm: realm.realmId,
+                context: realm.browsingContextId,
+              },
+            },
+          })),
+        realm.browsingContextId,
+        Script.EventNames.MessageEvent
+      );
+    }
+  }
+
   async #serializeCdpExceptionDetails(
     cdpExceptionDetails: Protocol.Runtime.ExceptionDetails,
     lineOffset: number,