Inline _getCdpConnection

puppeteer · Nov 28, 2023 · 39594ce · 39594ce
1 parent bb648e9
commit 39594ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/packages/puppeteer-core/src/bidi/BrowserConnector.ts b/packages/puppeteer-core/src/bidi/BrowserConnector.ts
@@ -15,7 +15,7 @@
  */
 
 import type {BrowserCloseCallback} from '../api/Browser.js';
-import {_getCdpConnection} from '../cdp/BrowserConnector.js';
+import {Connection} from '../cdp/Connection.js';
 import type {ConnectionTransport} from '../common/ConnectionTransport.js';
 import type {
   BrowserConnectOptions,
@@ -105,7 +105,12 @@ async function getBiDiConnection(
   pureBidiConnection.unbind();
 
   // Fall back to CDP over BiDi reusing the WS connection.
-  const cdpConnection = await _getCdpConnection(url, connectionTransport, options);
+  const cdpConnection = new Connection(
+    url,
+    connectionTransport,
+    slowMo,
+    protocolTimeout
+  );
 
   const version = await cdpConnection.send('Browser.getVersion');
   if (version.product.toLowerCase().includes('firefox')) {

diff --git a/packages/puppeteer-core/src/cdp/BrowserConnector.ts b/packages/puppeteer-core/src/cdp/BrowserConnector.ts
@@ -42,9 +42,16 @@ export async function _connectToCdpBrowser(
     defaultViewport = DEFAULT_VIEWPORT,
     targetFilter,
     _isPageTarget: isPageTarget,
+    slowMo = 0,
+    protocolTimeout,
   } = options;
 
-  const connection = await _getCdpConnection(url, connectionTransport, options);
+  const connection = new Connection(
+    url,
+    connectionTransport,
+    slowMo,
+    protocolTimeout
+  );
 
   const version = await connection.send('Browser.getVersion');
   const product = version.product.toLowerCase().includes('firefox')
@@ -69,13 +76,3 @@ export async function _connectToCdpBrowser(
   );
   return browser;
 }
-
-export function _getCdpConnection(
-  url: string,
-  connectionTransport: ConnectionTransport,
-  options: BrowserConnectOptions & ConnectOptions
-): Connection {
-  const {slowMo = 0, protocolTimeout} = options;
-
-  return new Connection(url, connectionTransport, slowMo, protocolTimeout);
-}
diff --git a/packages/puppeteer-core/src/common/BrowserConnector.ts b/packages/puppeteer-core/src/common/BrowserConnector.ts
@@ -45,10 +45,18 @@ export async function _connectToBrowser(
   const {connectionTransport, url} = await getConnectionTransport(options);
 
   if (options.protocol === 'webDriverBiDi') {
-    const bidiBrowser = await _connectToBiDiBrowser(connectionTransport, url, options);
+    const bidiBrowser = await _connectToBiDiBrowser(
+      connectionTransport,
+      url,
+      options
+    );
     return bidiBrowser;
   } else {
-    const cdpBrowser = await _connectToCdpBrowser(connectionTransport, url, options);
+    const cdpBrowser = await _connectToCdpBrowser(
+      connectionTransport,
+      url,
+      options
+    );
     return cdpBrowser;
   }
 }