appium-android-driver 12.1.2 → 12.2.0

package/lib/commands/context/helpers.js

@@ -68,6 +68,290 @@ const DEVTOOLS_PORT_ALLOCATION_GUARD = util.getLockFileGuard(
   {timeout: 7, tryRecovery: true},
 );
 
+// #region Exported Functions
+
+/**
+ *
+ * @param {string} browser
+ * @returns {CHROME_BROWSER_PACKAGE_ACTIVITY[keyof CHROME_BROWSER_PACKAGE_ACTIVITY]}
+ */
+export function getChromePkg(browser) {
+  return (
+    CHROME_BROWSER_PACKAGE_ACTIVITY[browser.toLowerCase()] ||
+    CHROME_BROWSER_PACKAGE_ACTIVITY.default
+  );
+}
+
+/**
+ * Parse webview names for getContexts
+ *
+ * @this {AndroidDriver}
+ * @param {import('../types').WebviewsMapping[]} webviewsMapping
+ * @param {import('../types').GetWebviewsOpts} options
+ * @returns {string[]}
+ */
+export function parseWebviewNames(
+  webviewsMapping,
+  {ensureWebviewsHavePages = true, isChromeSession = false} = {},
+) {
+  if (isChromeSession) {
+    return [CHROMIUM_WIN];
+  }
+
+  /** @type {string[]} */
+  const result = [];
+  for (const {webview, pages, proc, webviewName} of webviewsMapping) {
+    if (ensureWebviewsHavePages && !pages?.length) {
+      this.log.info(
+        `Skipping the webview '${webview}' at '${proc}' ` +
+          `since it has reported having zero pages`,
+      );
+      continue;
+    }
+    if (webviewName) {
+      result.push(webviewName);
+    }
+  }
+  this.log.debug(
+    `Found ${util.pluralize('webview', result.length, true)}: ${JSON.stringify(result)}`,
+  );
+  return result;
+}
+
+/**
+ * Get a list of available webviews mapping by introspecting processes with adb,
+ * where webviews are listed. It's possible to pass in a 'deviceSocket' arg, which
+ * limits the webview possibilities to the one running on the Chromium devtools
+ * socket we're interested in (see note on webviewsFromProcs). We can also
+ * direct this method to verify whether a particular webview process actually
+ * has any pages (if a process exists but no pages are found, Chromedriver will
+ * not actually be able to connect to it, so this serves as a guard for that
+ * strange failure mode). The strategy for checking whether any pages are
+ * active involves sending a request to the remote debug server on the device,
+ * hence it is also possible to specify the port on the host machine which
+ * should be used for this communication.
+ *
+ * @this {AndroidDriver}
+ * @param {import('../types').GetWebviewsOpts} [opts={}]
+ * @returns {Promise<import('../types').WebviewsMapping[]>}
+ */
+export async function getWebViewsMapping({
+  androidDeviceSocket = null,
+  ensureWebviewsHavePages = true,
+  webviewDevtoolsPort = null,
+  enableWebviewDetailsCollection = true,
+  waitForWebviewMs = 0,
+} = {}) {
+  this.log.debug(`Getting a list of available webviews`);
+
+  if (!_.isNumber(waitForWebviewMs)) {
+    waitForWebviewMs = parseInt(`${waitForWebviewMs}`, 10) || 0;
+  }
+
+  /** @type {import('../types').WebviewsMapping[]} */
+  let webviewsMapping;
+  const timer = new timing.Timer().start();
+  do {
+    webviewsMapping = await webviewsFromProcs.bind(this)(androidDeviceSocket);
+
+    if (webviewsMapping.length > 0) {
+      break;
+    }
+
+    this.log.debug(`No webviews found in ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
+    await sleep(WEBVIEW_WAIT_INTERVAL_MS);
+  } while (timer.getDuration().asMilliSeconds < waitForWebviewMs);
+
+  await collectWebviewsDetails.bind(this)(webviewsMapping, {
+    ensureWebviewsHavePages,
+    enableWebviewDetailsCollection,
+    webviewDevtoolsPort,
+  });
+
+  for (const webviewMapping of webviewsMapping) {
+    const {webview, info} = webviewMapping;
+    webviewMapping.webviewName = null;
+
+    let wvName = webview;
+    /** @type {{name: string; id: string | null} | undefined} */
+    let process;
+    if (!androidDeviceSocket) {
+      const pkgMatch = WEBVIEW_PKG_PATTERN.exec(webview);
+      try {
+        // web view name could either be suffixed with PID or the package name
+        // package names could not start with a digit
+        const pkg = pkgMatch ? pkgMatch[1] : await procFromWebview.bind(this)(webview);
+        wvName = `${WEBVIEW_BASE}${pkg}`;
+        const pidMatch = WEBVIEW_PID_PATTERN.exec(webview);
+        process = {
+          name: pkg,
+          id: pidMatch ? pidMatch[1] : null,
+        };
+      } catch (e) {
+        this.log.debug(e.stack);
+        this.log.warn(e.message);
+        continue;
+      }
+    }
+
+    webviewMapping.webviewName = wvName;
+    const key = toDetailsCacheKey(this.adb, wvName);
+    if (info || process) {
+      WEBVIEWS_DETAILS_CACHE.set(key, {info, process});
+    } else if (WEBVIEWS_DETAILS_CACHE.has(key)) {
+      WEBVIEWS_DETAILS_CACHE.delete(key);
+    }
+  }
+  return webviewsMapping;
+}
+
+/**
+ * @this {AndroidDriver}
+ * @param {import('../../driver').AndroidDriverOpts} opts
+ * @param {string} curDeviceId
+ * @param {string} [context]
+ * @returns {Promise<Chromedriver>}
+ */
+export async function setupNewChromedriver(opts, curDeviceId, context) {
+  // @ts-ignore TODO: Remove the legacy
+  if (opts.chromeDriverPort) {
+    this.log.warn(
+      `The 'chromeDriverPort' capability is deprecated. Please use 'chromedriverPort' instead`,
+    );
+    // @ts-ignore TODO: Remove the legacy
+    opts.chromedriverPort = opts.chromeDriverPort;
+  }
+
+  if (opts.chromedriverPort) {
+    this.log.debug(`Using user-specified port ${opts.chromedriverPort} for chromedriver`);
+  } else {
+    // if a single port wasn't given, we'll look for a free one
+    opts.chromedriverPort = await getChromedriverPort.bind(this)(opts.chromedriverPorts);
+  }
+
+  const details = context ? getWebviewDetails(this.adb, context) : undefined;
+  if (!_.isEmpty(details)) {
+    this.log.debug(
+      'Passing web view details to the Chromedriver constructor: ' +
+        JSON.stringify(details, null, 2),
+    );
+  }
+
+  /** @type {import('appium-chromedriver').ChromedriverOpts} */
+  const chromedriverOpts = {
+    port: _.isNil(opts.chromedriverPort) ? undefined : String(opts.chromedriverPort),
+    executable: opts.chromedriverExecutable,
+    adb: this.adb,
+    cmdArgs: /** @type {string[] | undefined} */ (opts.chromedriverArgs),
+    verbose: !!opts.showChromedriverLog,
+    executableDir: opts.chromedriverExecutableDir,
+    mappingPath: opts.chromedriverChromeMappingFile,
+    // @ts-ignore this property exists
+    bundleId: opts.chromeBundleId,
+    useSystemExecutable: opts.chromedriverUseSystemExecutable,
+    disableBuildCheck: opts.chromedriverDisableBuildCheck,
+    // @ts-ignore this is ok
+    details,
+    isAutodownloadEnabled: isChromedriverAutodownloadEnabled.bind(this)(),
+  };
+  if (this.basePath) {
+    chromedriverOpts.reqBasePath = this.basePath;
+  }
+  const chromedriver = new Chromedriver(chromedriverOpts);
+  // make sure there are chromeOptions
+  opts.chromeOptions = opts.chromeOptions || {};
+  // try out any prefixed chromeOptions,
+  // and strip the prefix
+  for (const opt of _.keys(opts)) {
+    if (opt.endsWith(':chromeOptions')) {
+      this?.log?.warn(`Merging '${opt}' into 'chromeOptions'. This may cause unexpected behavior`);
+      _.merge(opts.chromeOptions, opts[opt]);
+    }
+  }
+
+  // Ensure there are logging preferences
+  opts.chromeLoggingPrefs = opts.chromeLoggingPrefs ?? {};
+
+  // Strip the prefix and store it
+  for (const opt of _.keys(opts)) {
+    if (opt.endsWith(':loggingPrefs')) {
+      this.log.warn(`Merging '${opt}' into 'chromeLoggingPrefs'. This may cause unexpected behavior`);
+      _.merge(opts.chromeLoggingPrefs, opts[opt]);
+    }
+  }
+
+  const caps = /** @type {any} */ (createChromedriverCaps.bind(this)(opts, curDeviceId, details));
+  this.log.debug(
+    `Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`,
+  );
+  const sessionCaps = await chromedriver.start(caps);
+  cacheChromedriverCaps.bind(this)(sessionCaps, context);
+  return chromedriver;
+}
+
+/**
+ * @this {AndroidDriver}
+ * @template {Chromedriver} T
+ * @param {T} chromedriver
+ * @param {string} context
+ * @returns {Promise<T>}
+ */
+export async function setupExistingChromedriver(chromedriver, context) {
+  // check the status by sending a simple window-based command to ChromeDriver
+  // if there is an error, we want to recreate the ChromeDriver session
+  if (await chromedriver.hasWorkingWebview()) {
+    const cachedCaps = this._chromedriverCapsCache.get(context);
+    if (cachedCaps) {
+      cacheChromedriverCaps.bind(this)(cachedCaps, context);
+    }
+  } else {
+    this.log.debug('ChromeDriver is not associated with a window. Re-initializing the session.');
+    const sessionCaps = await chromedriver.restart();
+    cacheChromedriverCaps.bind(this)(sessionCaps, context);
+  }
+  return chromedriver;
+}
+
+/**
+ * @this {AndroidDriver}
+ * @returns {boolean}
+ */
+export function shouldDismissChromeWelcome() {
+  return (
+    !!this.opts.chromeOptions &&
+    _.isArray(this.opts.chromeOptions.args) &&
+    this.opts.chromeOptions.args.includes('--no-first-run')
+  );
+}
+
+/**
+ * @this {AndroidDriver}
+ * @returns {Promise<void>}
+ */
+export async function dismissChromeWelcome() {
+  this.log.info('Trying to dismiss Chrome welcome');
+  let activity = await this.getCurrentActivity();
+  if (activity !== 'org.chromium.chrome.browser.firstrun.FirstRunActivity') {
+    this.log.info('Chrome welcome dialog never showed up! Continuing');
+    return;
+  }
+  let el = await this.findElOrEls('id', 'com.android.chrome:id/terms_accept', false);
+  await this.click(/** @type {string} */ (el.ELEMENT));
+  try {
+    let el = await this.findElOrEls('id', 'com.android.chrome:id/negative_button', false);
+    await this.click(/** @type {string} */ (el.ELEMENT));
+  } catch (e) {
+    // DO NOTHING, THIS DEVICE DIDNT LAUNCH THE SIGNIN DIALOG
+    // IT MUST BE A NON GMS DEVICE
+    this.log.warn(
+      `This device did not show Chrome SignIn dialog, ${/** @type {Error} */ (e).message}`,
+    );
+  }
+}
+
+// #endregion
+// #region Internal Helper Functions
+
 /**
  * @returns {Promise<number>}
  */
@@ -130,23 +414,11 @@ async function cdpInfo(host, port) {
   return cdpGetRequest(host, port, '/json/version');
 }
 
-/**
- *
- * @param {string} browser
- * @returns {CHROME_BROWSER_PACKAGE_ACTIVITY[keyof CHROME_BROWSER_PACKAGE_ACTIVITY]}
- */
-export function getChromePkg(browser) {
-  return (
-    CHROME_BROWSER_PACKAGE_ACTIVITY[browser.toLowerCase()] ||
-    CHROME_BROWSER_PACKAGE_ACTIVITY.default
-  );
-}
-
 /**
  * Create Chromedriver capabilities based on the provided
  * Appium capabilities
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {any} opts
  * @param {string} deviceId
  * @param {import('../types').WebViewDetails | null} [webViewDetails]
@@ -228,70 +500,34 @@ function createChromedriverCaps(opts, deviceId, webViewDetails) {
 
   this.log.debug(
     'Precalculated Chromedriver capabilities: ' + JSON.stringify(caps.chromeOptions, null, 2),
-  );
-
-  /** @type {string[]} */
-  const protectedCapNames = [];
-  for (const [opt, val] of _.toPairs(opts.chromeOptions)) {
-    if (_.isUndefined(caps.chromeOptions[opt])) {
-      caps.chromeOptions[opt] = val;
-    } else {
-      protectedCapNames.push(opt);
-    }
-  }
-  if (!_.isEmpty(protectedCapNames)) {
-    this.log.info(
-      'The following Chromedriver capabilities cannot be overridden ' +
-        'by the provided chromeOptions:',
-    );
-    for (const optName of protectedCapNames) {
-      this.log.info(`  ${optName} (${JSON.stringify(opts.chromeOptions[optName])})`);
-    }
-  }
-
-  return caps;
-}
-
-/**
- * Parse webview names for getContexts
- *
- * @this {import('../../driver').AndroidDriver}
- * @param {import('../types').WebviewsMapping[]} webviewsMapping
- * @param {import('../types').GetWebviewsOpts} options
- * @returns {string[]}
- */
-export function parseWebviewNames(
-  webviewsMapping,
-  {ensureWebviewsHavePages = true, isChromeSession = false} = {},
-) {
-  if (isChromeSession) {
-    return [CHROMIUM_WIN];
-  }
+  );
 
   /** @type {string[]} */
-  const result = [];
-  for (const {webview, pages, proc, webviewName} of webviewsMapping) {
-    if (ensureWebviewsHavePages && !pages?.length) {
-      this.log.info(
-        `Skipping the webview '${webview}' at '${proc}' ` +
-          `since it has reported having zero pages`,
-      );
-      continue;
+  const protectedCapNames = [];
+  for (const [opt, val] of _.toPairs(opts.chromeOptions)) {
+    if (_.isUndefined(caps.chromeOptions[opt])) {
+      caps.chromeOptions[opt] = val;
+    } else {
+      protectedCapNames.push(opt);
     }
-    if (webviewName) {
-      result.push(webviewName);
+  }
+  if (!_.isEmpty(protectedCapNames)) {
+    this.log.info(
+      'The following Chromedriver capabilities cannot be overridden ' +
+        'by the provided chromeOptions:',
+    );
+    for (const optName of protectedCapNames) {
+      this.log.info(`  ${optName} (${JSON.stringify(opts.chromeOptions[optName])})`);
     }
   }
-  this.log.debug(
-    `Found ${util.pluralize('webview', result.length, true)}: ${JSON.stringify(result)}`,
-  );
-  return result;
+
+  return caps;
 }
 
 /**
  * Allocates a local port for devtools communication
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {string} socketName - The remote Unix socket name
  * @param {number?} [webviewDevtoolsPort=null] - The local port number or null to apply
  * autodetection
@@ -339,7 +575,7 @@ async function allocateDevtoolsChannel(socketName, webviewDevtoolsPort = null) {
  * No error is thrown if CDP request fails - in such case no data will be
  * recorded into the corresponding `webviewsMapping` item.
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {import('../types').WebviewProps[]} webviewsMapping The current webviews mapping
  * !!! Each item of this array gets mutated (`info`/`pages` properties get added
  * based on the provided `opts`) if the requested details have been
@@ -419,100 +655,13 @@ async function collectWebviewsDetails(webviewsMapping, opts = {}) {
   this.log.debug(`CDP data collection completed`);
 }
 
-/**
- * Get a list of available webviews mapping by introspecting processes with adb,
- * where webviews are listed. It's possible to pass in a 'deviceSocket' arg, which
- * limits the webview possibilities to the one running on the Chromium devtools
- * socket we're interested in (see note on webviewsFromProcs). We can also
- * direct this method to verify whether a particular webview process actually
- * has any pages (if a process exists but no pages are found, Chromedriver will
- * not actually be able to connect to it, so this serves as a guard for that
- * strange failure mode). The strategy for checking whether any pages are
- * active involves sending a request to the remote debug server on the device,
- * hence it is also possible to specify the port on the host machine which
- * should be used for this communication.
- *
- * @this {import('../../driver').AndroidDriver}
- * @param {import('../types').GetWebviewsOpts} [opts={}]
- * @returns {Promise<import('../types').WebviewsMapping[]>}
- */
-export async function getWebViewsMapping({
-  androidDeviceSocket = null,
-  ensureWebviewsHavePages = true,
-  webviewDevtoolsPort = null,
-  enableWebviewDetailsCollection = true,
-  waitForWebviewMs = 0,
-} = {}) {
-  this.log.debug(`Getting a list of available webviews`);
-
-  if (!_.isNumber(waitForWebviewMs)) {
-    waitForWebviewMs = parseInt(`${waitForWebviewMs}`, 10) || 0;
-  }
-
-  /** @type {import('../types').WebviewsMapping[]} */
-  let webviewsMapping;
-  const timer = new timing.Timer().start();
-  do {
-    webviewsMapping = await webviewsFromProcs.bind(this)(androidDeviceSocket);
-
-    if (webviewsMapping.length > 0) {
-      break;
-    }
-
-    this.log.debug(`No webviews found in ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
-    await sleep(WEBVIEW_WAIT_INTERVAL_MS);
-  } while (timer.getDuration().asMilliSeconds < waitForWebviewMs);
-
-  await collectWebviewsDetails.bind(this)(webviewsMapping, {
-    ensureWebviewsHavePages,
-    enableWebviewDetailsCollection,
-    webviewDevtoolsPort,
-  });
-
-  for (const webviewMapping of webviewsMapping) {
-    const {webview, info} = webviewMapping;
-    webviewMapping.webviewName = null;
-
-    let wvName = webview;
-    /** @type {{name: string; id: string | null} | undefined} */
-    let process;
-    if (!androidDeviceSocket) {
-      const pkgMatch = WEBVIEW_PKG_PATTERN.exec(webview);
-      try {
-        // web view name could either be suffixed with PID or the package name
-        // package names could not start with a digit
-        const pkg = pkgMatch ? pkgMatch[1] : await procFromWebview.bind(this)(webview);
-        wvName = `${WEBVIEW_BASE}${pkg}`;
-        const pidMatch = WEBVIEW_PID_PATTERN.exec(webview);
-        process = {
-          name: pkg,
-          id: pidMatch ? pidMatch[1] : null,
-        };
-      } catch (e) {
-        this.log.debug(e.stack);
-        this.log.warn(e.message);
-        continue;
-      }
-    }
-
-    webviewMapping.webviewName = wvName;
-    const key = toDetailsCacheKey(this.adb, wvName);
-    if (info || process) {
-      WEBVIEWS_DETAILS_CACHE.set(key, {info, process});
-    } else if (WEBVIEWS_DETAILS_CACHE.has(key)) {
-      WEBVIEWS_DETAILS_CACHE.delete(key);
-    }
-  }
-  return webviewsMapping;
-}
-
 /**
  * Take a webview name like WEBVIEW_4296 and use 'adb shell ps' to figure out
  * which app package is associated with that webview. One of the reasons we
  * want to do this is to make sure we're listing webviews for the actual AUT,
  * not some other running app
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {string} webview
  * @returns {Promise<string>}
  */
@@ -536,7 +685,7 @@ async function procFromWebview(webview) {
  * See https://cs.chromium.org/chromium/src/chrome/browser/devtools/device/android_device_info_query.cc
  * for more details
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @returns {Promise<string[]>} a list of matching webview socket names (including the leading '@')
  */
 async function getPotentialWebviewProcs() {
@@ -585,7 +734,7 @@ async function getPotentialWebviewProcs() {
  * that socket name (this is for apps which embed Chromium, which isn't the
  * same as chrome-backed webviews).
  *
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {string?} [deviceSocket=null] - the explictly-named device socket to use
  * @returns {Promise<import('../types').WebviewProc[]>}
  */
@@ -626,7 +775,7 @@ async function webviewsFromProcs(deviceSocket = null) {
 }
 
 /**
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {import('../types').PortSpec} [portSpec]
  * @returns {Promise<number>}
  */
@@ -674,7 +823,7 @@ async function getChromedriverPort(portSpec) {
 }
 
 /**
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @returns {boolean}
  */
 function isChromedriverAutodownloadEnabled() {
@@ -689,167 +838,25 @@ function isChromedriverAutodownloadEnabled() {
 }
 
 /**
- * @this {import('../../driver').AndroidDriver}
- * @param {import('../../driver').AndroidDriverOpts} opts
- * @param {string} curDeviceId
- * @param {string} [context]
- * @returns {Promise<Chromedriver>}
- */
-export async function setupNewChromedriver(opts, curDeviceId, context) {
-  // @ts-ignore TODO: Remove the legacy
-  if (opts.chromeDriverPort) {
-    this.log.warn(
-      `The 'chromeDriverPort' capability is deprecated. Please use 'chromedriverPort' instead`,
-    );
-    // @ts-ignore TODO: Remove the legacy
-    opts.chromedriverPort = opts.chromeDriverPort;
-  }
-
-  if (opts.chromedriverPort) {
-    this.log.debug(`Using user-specified port ${opts.chromedriverPort} for chromedriver`);
-  } else {
-    // if a single port wasn't given, we'll look for a free one
-    opts.chromedriverPort = await getChromedriverPort.bind(this)(opts.chromedriverPorts);
-  }
-
-  const details = context ? getWebviewDetails(this.adb, context) : undefined;
-  if (!_.isEmpty(details)) {
-    this.log.debug(
-      'Passing web view details to the Chromedriver constructor: ' +
-        JSON.stringify(details, null, 2),
-    );
-  }
-
-  /** @type {import('appium-chromedriver').ChromedriverOpts} */
-  const chromedriverOpts = {
-    port: _.isNil(opts.chromedriverPort) ? undefined : String(opts.chromedriverPort),
-    executable: opts.chromedriverExecutable,
-    adb: this.adb,
-    cmdArgs: /** @type {string[] | undefined} */ (opts.chromedriverArgs),
-    verbose: !!opts.showChromedriverLog,
-    executableDir: opts.chromedriverExecutableDir,
-    mappingPath: opts.chromedriverChromeMappingFile,
-    // @ts-ignore this property exists
-    bundleId: opts.chromeBundleId,
-    useSystemExecutable: opts.chromedriverUseSystemExecutable,
-    disableBuildCheck: opts.chromedriverDisableBuildCheck,
-    // @ts-ignore this is ok
-    details,
-    isAutodownloadEnabled: isChromedriverAutodownloadEnabled.bind(this)(),
-  };
-  if (this.basePath) {
-    chromedriverOpts.reqBasePath = this.basePath;
-  }
-  const chromedriver = new Chromedriver(chromedriverOpts);
-  // make sure there are chromeOptions
-  opts.chromeOptions = opts.chromeOptions || {};
-  // try out any prefixed chromeOptions,
-  // and strip the prefix
-  for (const opt of _.keys(opts)) {
-    if (opt.endsWith(':chromeOptions')) {
-      this?.log?.warn(`Merging '${opt}' into 'chromeOptions'. This may cause unexpected behavior`);
-      _.merge(opts.chromeOptions, opts[opt]);
-    }
-  }
-
-  // Ensure there are logging preferences
-  opts.chromeLoggingPrefs = opts.chromeLoggingPrefs ?? {};
-
-  // Strip the prefix and store it
-  for (const opt of _.keys(opts)) {
-    if (opt.endsWith(':loggingPrefs')) {
-      this.log.warn(`Merging '${opt}' into 'chromeLoggingPrefs'. This may cause unexpected behavior`);
-      _.merge(opts.chromeLoggingPrefs, opts[opt]);
-    }
-  }
-
-  const caps = /** @type {any} */ (createChromedriverCaps.bind(this)(opts, curDeviceId, details));
-  this.log.debug(
-    `Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`,
-  );
-  const sessionCaps = await chromedriver.start(caps);
-  updateBidiProxyUrl.bind(this)(sessionCaps, context);
-  return chromedriver;
-}
-
-/**
- * @this {import('../../driver').AndroidDriver}
- * @template {Chromedriver} T
- * @param {T} chromedriver
- * @param {string} context
- * @returns {Promise<T>}
- */
-export async function setupExistingChromedriver(chromedriver, context) {
-  // check the status by sending a simple window-based command to ChromeDriver
-  // if there is an error, we want to recreate the ChromeDriver session
-  if (await chromedriver.hasWorkingWebview()) {
-    const cachedBidiProxyUrl = this._bidiProxyUrlCache.get(context);
-    if (cachedBidiProxyUrl) {
-      updateBidiProxyUrl.bind(this)({webSocketUrl: cachedBidiProxyUrl}, context);
-    }
-  } else {
-    this.log.debug('ChromeDriver is not associated with a window. Re-initializing the session.');
-    const sessionCaps = await chromedriver.restart();
-    updateBidiProxyUrl.bind(this)(sessionCaps, context);
-  }
-  return chromedriver;
-}
-
-/**
- * @this {import('../../driver').AndroidDriver}
+ * @this {AndroidDriver}
  * @param {Record<string, any>} sessionCaps
  * @param {string} context
  * @returns {void}
  */
-function updateBidiProxyUrl(sessionCaps, context) {
-  if (!this.opts?.chromedriverForwardBiDi || !sessionCaps?.webSocketUrl) {
-    return;
-  }
-
-  this._bidiProxyUrlCache.set(context, sessionCaps.webSocketUrl);
-  if (this._bidiProxyUrl !== sessionCaps.webSocketUrl) {
+function cacheChromedriverCaps(sessionCaps, context) {
+  // Store full session capabilities in cache
+  this._chromedriverCapsCache.set(context, sessionCaps);
+
+  if (
+    this.opts?.chromedriverForwardBiDi
+    && sessionCaps?.webSocketUrl
+    && this._bidiProxyUrl !== sessionCaps.webSocketUrl
+  ) {
     this._bidiProxyUrl = sessionCaps.webSocketUrl;
     this.log.debug(`Updated Bidi Proxy URL to ${this._bidiProxyUrl}`);
   }
 }
 
-/**
- * @this {import('../../driver').AndroidDriver}
- * @returns {boolean}
- */
-export function shouldDismissChromeWelcome() {
-  return (
-    !!this.opts.chromeOptions &&
-    _.isArray(this.opts.chromeOptions.args) &&
-    this.opts.chromeOptions.args.includes('--no-first-run')
-  );
-}
-
-/**
- * @this {import('../../driver').AndroidDriver}
- * @returns {Promise<void>}
- */
-export async function dismissChromeWelcome() {
-  this.log.info('Trying to dismiss Chrome welcome');
-  let activity = await this.getCurrentActivity();
-  if (activity !== 'org.chromium.chrome.browser.firstrun.FirstRunActivity') {
-    this.log.info('Chrome welcome dialog never showed up! Continuing');
-    return;
-  }
-  let el = await this.findElOrEls('id', 'com.android.chrome:id/terms_accept', false);
-  await this.click(/** @type {string} */ (el.ELEMENT));
-  try {
-    let el = await this.findElOrEls('id', 'com.android.chrome:id/negative_button', false);
-    await this.click(/** @type {string} */ (el.ELEMENT));
-  } catch (e) {
-    // DO NOTHING, THIS DEVICE DIDNT LAUNCH THE SIGNIN DIALOG
-    // IT MUST BE A NON GMS DEVICE
-    this.log.warn(
-      `This device did not show Chrome SignIn dialog, ${/** @type {Error} */ (e).message}`,
-    );
-  }
-}
-
 /**
  * https://github.com/puppeteer/puppeteer/issues/2242#issuecomment-544219536
  *
@@ -862,6 +869,9 @@ function isCompatibleCdpHost (host) {
     || Boolean(net.isIP(host));
 }
 
+// #endregion
+
 /**
  * @typedef {import('appium-adb').ADB} ADB
+ * @typedef {import('../../driver').AndroidDriver} AndroidDriver
  */