chore: firefox manager

puppeteer · Jun 28, 2022 · a0cec05 · a0cec05
2 parents 5bbfbe0 + a14ed2f
commit a0cec05
Show file tree

Hide file tree

Showing 11 changed files with 400 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "test": "npm run lint --silent && npm run test:unit:coverage",
     "test:unit": "npm run build:test && mocha",
     "test:unit:firefox": "cross-env PUPPETEER_PRODUCT=firefox npm run test:unit",
-    "test:unit:coverage": "c8 --check-coverage --lines 94 npm run test:unit",
+    "test:unit:coverage": "c8 --check-coverage --lines 93 npm run test:unit",
     "test:unit:chrome-headless": "cross-env HEADLESS=chrome npm run test:unit",
     "test:protocol-revision": "ts-node -s scripts/ensure-correct-devtools-protocol-package",
     "test:pinned-deps": "ts-node -s scripts/ensure-pinned-deps",

diff --git a/src/common/Browser.ts b/src/common/Browser.ts
@@ -24,7 +24,12 @@ import {Page} from './Page.js';
 import {Viewport} from './PuppeteerViewport.js';
 import {Target} from './Target.js';
 import {TaskQueue} from './TaskQueue.js';
-import {TargetManager, TargetManagerEmittedEvents} from './TargetManager.js';
+import {
+  TargetManager,
+  ChromeTargetManager,
+  TargetManagerEmittedEvents,
+} from './TargetManager.js';
+import {FirefoxTargetManager} from './FirefoxTargetManager.js';
 
 /**
  * BrowserContext options.
@@ -219,6 +224,7 @@ export class Browser extends EventEmitter {
    * @internal
    */
   static async _create(
+    product: 'firefox' | 'chrome' | undefined,
     connection: Connection,
     contextIds: string[],
     ignoreHTTPSErrors: boolean,
@@ -229,6 +235,7 @@ export class Browser extends EventEmitter {
     isPageTargetCallback?: IsPageTargetCallback
   ): Promise<Browser> {
     const browser = new Browser(
+      product,
       connection,
       contextIds,
       ignoreHTTPSErrors,
@@ -264,6 +271,7 @@ export class Browser extends EventEmitter {
    * @internal
    */
   constructor(
+    product: 'chrome' | 'firefox' | undefined,
     connection: Connection,
     contextIds: string[],
     ignoreHTTPSErrors: boolean,
@@ -274,6 +282,7 @@ export class Browser extends EventEmitter {
     isPageTargetCallback?: IsPageTargetCallback
   ) {
     super();
+    product = product || 'chrome';
     this.#ignoreHTTPSErrors = ignoreHTTPSErrors;
     this.#defaultViewport = defaultViewport;
     this.#process = process;
@@ -286,11 +295,18 @@ export class Browser extends EventEmitter {
         return true;
       });
     this.#setIsPageTargetCallback(isPageTargetCallback);
-    this.#targetManager = new TargetManager(
-      connection,
-      this.#createTarget,
-      this.#targetFilterCallback
-    );
+    this.#targetManager =
+      product === 'chrome'
+        ? new ChromeTargetManager(
+            connection,
+            this.#createTarget,
+            this.#targetFilterCallback
+          )
+        : new FirefoxTargetManager(
+            connection,
+            this.#createTarget,
+            this.#targetFilterCallback
+          );
 
     this.#defaultContext = new BrowserContext(this.#connection, this);
     this.#contexts = new Map();

diff --git a/src/common/BrowserConnector.ts b/src/common/BrowserConnector.ts
@@ -26,7 +26,7 @@ import {Connection} from './Connection.js';
 import {ConnectionTransport} from './ConnectionTransport.js';
 import {getFetch} from './fetch.js';
 import {Viewport} from './PuppeteerViewport.js';
-
+import {Product} from './Product.js';
 /**
  * Generic browser options that can be passed when launching any browser or when
  * connecting to an existing browser instance.
@@ -75,6 +75,7 @@ export async function _connectToBrowser(
     browserWSEndpoint?: string;
     browserURL?: string;
     transport?: ConnectionTransport;
+    product?: Product;
   }
 ): Promise<Browser> {
   const {
@@ -86,6 +87,7 @@ export async function _connectToBrowser(
     slowMo = 0,
     targetFilter,
     _isPageTarget: isPageTarget,
+    product,
   } = options;
 
   assert(
@@ -114,6 +116,7 @@ export async function _connectToBrowser(
     'Target.getBrowserContexts'
   );
   return Browser._create(
+    product || 'chrome',
     connection,
     browserContextIds,
     ignoreHTTPSErrors,