Bug 1850682 - Add a base RootBiDiModule class r=webdriver-reviewers,jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D218482

remote/webdriver-bidi/jar.mn

@@ -14,6 +14,7 @@ remote.jar:
   content/webdriver-bidi/modules/Intercept.sys.mjs (modules/Intercept.sys.mjs)
   content/webdriver-bidi/modules/ModuleRegistry.sys.mjs (modules/ModuleRegistry.sys.mjs)
   content/webdriver-bidi/modules/WindowGlobalBiDiModule.sys.mjs (modules/WindowGlobalBiDiModule.sys.mjs)
+  content/webdriver-bidi/modules/RootBiDiModule.sys.mjs (modules/RootBiDiModule.sys.mjs)
 
   # WebDriver BiDi root modules
   content/webdriver-bidi/modules/root/browser.sys.mjs (modules/root/browser.sys.mjs)

remote/webdriver-bidi/modules/RootBiDiModule.sys.mjs

@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+
+export class RootBiDiModule extends Module {
+  _hasListener(eventName, contextInfo) {
+    return this.messageHandler.eventsDispatcher.hasListener(
+      eventName,
+      contextInfo
+    );
+  }
+}

remote/webdriver-bidi/modules/root/browser.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -35,7 +35,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
  *     Array of UserContextInfo for the current user contexts.
  */
 
-class BrowserModule extends Module {
+class BrowserModule extends RootBiDiModule {
   constructor(messageHandler) {
     super(messageHandler);
   }

remote/webdriver-bidi/modules/root/browsingContext.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -156,7 +156,7 @@ const WaitCondition = {
   Complete: "complete",
 };
 
-class BrowsingContextModule extends Module {
+class BrowsingContextModule extends RootBiDiModule {
   #contextListener;
   #navigationListener;
   #promptListener;

remote/webdriver-bidi/modules/root/input.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "chrome://remote/content/shared/messagehandler/WindowGlobalMessageHandler.sys.mjs",
 });
 
-class InputModule extends Module {
+class InputModule extends RootBiDiModule {
   destroy() {}
 
   async performActions(options = {}) {

remote/webdriver-bidi/modules/root/log.sys.mjs

@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
-class LogModule extends Module {
+class LogModule extends RootBiDiModule {
   destroy() {}
 
   static get supportedEvents() {

remote/webdriver-bidi/modules/root/network.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -298,7 +298,7 @@ const SameSite = {
  */
 /* eslint-enable jsdoc/valid-types */
 
-class NetworkModule extends Module {
+class NetworkModule extends RootBiDiModule {
   #beforeStopRequestListener;
   #blockedRequests;
   #decodedBodySizeMap;
@@ -1590,10 +1590,9 @@ class NetworkModule extends Module {
 
       const protocolEventName = "network.authRequired";
 
-      const isListening = this.messageHandler.eventsDispatcher.hasListener(
+      const isListening = this._hasListener(protocolEventName, {
-        protocolEventName,
+        contextId: request.contextId,
-        { contextId: request.contextId }
+      });
-      );
       if (!isListening) {
         // If there are no listeners subscribed to this event and this context,
         // bail out.
@@ -1670,10 +1669,9 @@ class NetworkModule extends Module {
       this.#getContextInfo(browsingContext)
     );
 
-    const isListening = this.messageHandler.eventsDispatcher.hasListener(
+    const isListening = this._hasListener(protocolEventName, {
-      protocolEventName,
+      contextId: request.contextId,
-      { contextId: request.contextId }
+    });
-    );
     if (!isListening) {
       // If there are no listeners subscribed to this event and this context,
       // bail out.
@@ -1753,10 +1751,9 @@ class NetworkModule extends Module {
       this.#getContextInfo(browsingContext)
     );
 
-    const isListening = this.messageHandler.eventsDispatcher.hasListener(
+    const isListening = this._hasListener(protocolEventName, {
-      protocolEventName,
+      contextId: request.contextId,
-      { contextId: request.contextId }
+    });
-    );
     if (!isListening) {
       // If there are no listeners subscribed to this event and this context,
       // bail out.
@@ -1815,10 +1812,9 @@ class NetworkModule extends Module {
       this.#getContextInfo(browsingContext)
     );
 
-    const isListening = this.messageHandler.eventsDispatcher.hasListener(
+    const isListening = this._hasListener(protocolEventName, {
-      protocolEventName,
+      contextId: request.contextId,
-      { contextId: request.contextId }
+    });
-    );
     if (!isListening) {
       // If there are no listeners subscribed to this event and this context,
       // bail out.

remote/webdriver-bidi/modules/root/permissions.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "chrome://remote/content/shared/UserContextManager.sys.mjs",
 });
 
-class PermissionsModule extends Module {
+class PermissionsModule extends RootBiDiModule {
   constructor(messageHandler) {
     super(messageHandler);
   }

remote/webdriver-bidi/modules/root/script.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -41,7 +41,7 @@ const ScriptEvaluateResultType = {
   Success: "success",
 };
 
-class ScriptModule extends Module {
+class ScriptModule extends RootBiDiModule {
   #preloadScriptMap;
   #subscribedEvents;
 

remote/webdriver-bidi/modules/root/session.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   TabManager: "chrome://remote/content/shared/TabManager.sys.mjs",
 });
 
-class SessionModule extends Module {
+class SessionModule extends RootBiDiModule {
   #browsingContextIdEventMap;
   #globalEventSet;
 

remote/webdriver-bidi/modules/root/storage.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
+import { RootBiDiModule } from "chrome://remote/content/webdriver-bidi/modules/RootBiDiModule.sys.mjs";
 
 const lazy = {};
 
@@ -69,7 +69,7 @@ const SameSiteType = {
   [Ci.nsICookie.SAMESITE_STRICT]: "strict",
 };
 
-class StorageModule extends Module {
+class StorageModule extends RootBiDiModule {
   destroy() {}
 
   /**