appium-mac2-driver 4.5.0 → 4.6.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [4.6.0](https://github.com/appium/appium-mac2-driver/compare/v4.5.1...v4.6.0) (2026-11-06)
+
+### Features
+
+* add Chromium web view contexts via appium-chromedriver ([#437](https://github.com/appium/appium-mac2-driver/issues/437)) ([8c3a3d3](https://github.com/appium/appium-mac2-driver/commit/8c3a3d3530244c1c60cc57f3d082cb31683fb5ab))
+
+## [4.5.1](https://github.com/appium/appium-mac2-driver/compare/v4.5.0...v4.5.1) (2026-10-27)
+
+### Bug Fixes
+
+* **wda:** check opts.reqBasePath instead of caps.reqBasePath in startSession ([#434](https://github.com/appium/appium-mac2-driver/issues/434)) ([8d0d827](https://github.com/appium/appium-mac2-driver/commit/8d0d827325f544c9a7093878fdf704e00ebb5a4f))
+
+### Code Refactoring
+
+* use AsyncLock from asyncbox instead of async-lock ([#430](https://github.com/appium/appium-mac2-driver/issues/430)) ([a795822](https://github.com/appium/appium-mac2-driver/commit/a795822013578cfbe2390a58d4967779ed50cf0e))
+
 ## [4.5.0](https://github.com/appium/appium-mac2-driver/compare/v4.4.0...v4.5.0) (2026-10-19)
 
 ### Features

package/build/lib/commands/clipboard.js

@@ -6,7 +6,7 @@
  * Only `plaintext`, 'image and 'url' are supported.
  */
 export async function macosSetClipboard(content, contentType = 'plaintext') {
-    await this.proxyCommand('/wda/setPasteboard', 'POST', {
+    await this.wda.proxy.command('/wda/setPasteboard', 'POST', {
         content,
         contentType,
     });
@@ -20,7 +20,7 @@ export async function macosSetClipboard(content, contentType = 'plaintext') {
  * An empty string is returned if the clipboard contains no data for the given content type.
  */
 export async function macosGetClipboard(contentType = 'plaintext') {
-    return /** @type {string} */ await this.proxyCommand('/wda/getPasteboard', 'POST', {
+    return /** @type {string} */ await this.wda.proxy.command('/wda/getPasteboard', 'POST', {
         contentType,
     });
 }

package/build/lib/commands/clipboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../lib/commands/clipboard.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAErC,OAAe,EACf,cAAsB,WAAW;IAEjC,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE;QACpD,OAAO;QACP,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAmB,cAAsB,WAAW;IACzF,OAAO,qBAAqB,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE;QACjF,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../lib/commands/clipboard.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAErC,OAAe,EACf,cAAsB,WAAW;IAEjC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,EAAE;QACzD,OAAO;QACP,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAmB,cAAsB,WAAW;IACzF,OAAO,qBAAqB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,EAAE;QACtF,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}

package/build/lib/commands/context.d.ts

@@ -0,0 +1,66 @@
+import { Chromedriver } from 'appium-chromedriver';
+import type { ChromedriverOpts } from 'appium-chromedriver';
+import type { Mac2Driver } from '../driver.js';
+import type { WebViewDetails } from '../types.js';
+export declare const NATIVE_APP = "NATIVE_APP";
+export declare const WEBVIEW_PREFIX = "WEBVIEW_";
+export declare const DEBUGGING_PORT_FLAG = "--remote-debugging-port";
+/**
+ * @returns The name of the current context: `NATIVE_APP` or `WEBVIEW_<id>`.
+ */
+export declare function getCurrentContext(this: Mac2Driver): Promise<string>;
+/**
+ * @returns `NATIVE_APP` followed by one `WEBVIEW_<id>` entry per page found via CDP.
+ */
+export declare function getContexts(this: Mac2Driver): Promise<string[]>;
+/**
+ * Switches the context. `NATIVE_APP` (or an empty name) goes back to WebDriverAgentMac,
+ * `WEBVIEW_<id>` starts a Chromedriver attached to the given CDP page and proxies to it.
+ *
+ * @param name - The context name
+ */
+export declare function setContext(this: Mac2Driver, name?: string | null): Promise<void>;
+/**
+ * Chromedriver attaches to the browser, so the requested page must be selected explicitly.
+ *
+ * @param cd - Started Chromedriver
+ * @param pageId - The CDP target id of the page
+ */
+export declare function switchToPage(cd: Pick<Chromedriver, 'jwproxy'>, pageId: string): Promise<void>;
+/**
+ * @param details - The web view details
+ * @returns Chromedriver options. The download is only enabled by the `chromedriver_autodownload` feature.
+ */
+export declare function getChromedriverOpts(this: Mac2Driver, details: WebViewDetails): ChromedriverOpts;
+/**
+ * @returns Browser info and the list of pages reported by the CDP endpoint of the app.
+ * Unreachable endpoint yields no pages.
+ */
+export declare function getWebViewDetails(this: Mac2Driver): Promise<WebViewDetails>;
+/**
+ * Same as `getContexts`, but returns the details of each web view.
+ *
+ * @param waitForWebviewMs - How long to wait for at least one web view to appear
+ */
+export declare function macosGetContexts(this: Mac2Driver, waitForWebviewMs?: number): Promise<{
+    id: string;
+    [key: string]: unknown;
+}[]>;
+/**
+ * Picks the debugging port and makes sure the app is launched with it. The driver owns the flag,
+ * so one passed in the app arguments is replaced.
+ *
+ * @param caps - The session capabilities
+ * @returns The capabilities to start the WDA session with and the port, if web views are enabled
+ */
+export declare function prepareWebviewLaunch<T extends {
+    arguments?: unknown;
+}>(caps: T & {
+    webviewEnabled?: boolean;
+    webviewDevtoolsPort?: number;
+    noReset?: boolean;
+}): Promise<{
+    caps: T;
+    port: number | null;
+}>;
+//# sourceMappingURL=context.d.ts.map

package/build/lib/commands/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAK1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAA0B,cAAc,EAAC,MAAM,aAAa,CAAC;AAGzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,cAAc,aAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAQ7D;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzE;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMrE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDtF;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOnG;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,GAAG,gBAAgB,CAU/F;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAejF;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,UAAU,EAChB,gBAAgB,GAAE,MAAU,GAC3B,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAC,EAAE,CAAC,CASjD;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,SAAS;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAC,EACxE,IAAI,EAAE,CAAC,GAAG;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAC,GACpF,OAAO,CAAC;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAC,CAAC,CAkBzC"}

package/build/lib/commands/context.js

@@ -0,0 +1,206 @@
+import path from 'node:path';
+import { Chromedriver } from 'appium-chromedriver';
+import { errors } from 'appium/driver.js';
+import axios from 'axios';
+import { findAPortNotInUse } from 'portscanner';
+import log from '../logger.js';
+import { getModuleRoot } from '../utils.js';
+export const NATIVE_APP = 'NATIVE_APP';
+export const WEBVIEW_PREFIX = 'WEBVIEW_';
+export const DEBUGGING_PORT_FLAG = '--remote-debugging-port';
+const CHROMEDRIVER_AUTODOWNLOAD_FEATURE = 'chromedriver_autodownload';
+const CDP_HOST = '127.0.0.1';
+const CDP_REQUEST_TIMEOUT_MS = 10000;
+const PORT_RANGE_START = 10900;
+const PORT_RANGE_END = 11000;
+const WEBVIEW_POLL_INTERVAL_MS = 500;
+/**
+ * @returns The name of the current context: `NATIVE_APP` or `WEBVIEW_<id>`.
+ */
+export async function getCurrentContext() {
+    return this._currentContext ?? NATIVE_APP;
+}
+/**
+ * @returns `NATIVE_APP` followed by one `WEBVIEW_<id>` entry per page found via CDP.
+ */
+export async function getContexts() {
+    if (!this.isWebviewEnabled()) {
+        return [NATIVE_APP];
+    }
+    const { pages } = await this.getWebViewDetails();
+    return [NATIVE_APP, ...pages.map((page) => `${WEBVIEW_PREFIX}${page.id}`)];
+}
+/**
+ * Switches the context. `NATIVE_APP` (or an empty name) goes back to WebDriverAgentMac,
+ * `WEBVIEW_<id>` starts a Chromedriver attached to the given CDP page and proxies to it.
+ *
+ * @param name - The context name
+ */
+export async function setContext(name) {
+    if (!name || name === NATIVE_APP) {
+        await this.stopChromedriver();
+        return;
+    }
+    this.assertWebviewEnabled();
+    const pageId = name.startsWith(WEBVIEW_PREFIX) ? name.slice(WEBVIEW_PREFIX.length) : name;
+    const details = await this.getWebViewDetails();
+    const page = details.pages.find((p) => p.id === pageId);
+    if (!page) {
+        throw new errors.InvalidArgumentError(`Web view not found: ${name}`);
+    }
+    if (/\bEdg\//.test(details.info?.Browser ?? '')) {
+        throw new errors.InvalidArgumentError('Microsoft Edge web views are not supported');
+    }
+    const debuggerAddress = (page.webSocketDebuggerUrl ?? '').replace(/^wss?:\/\//, '').split('/')[0];
+    if (!debuggerAddress) {
+        throw new errors.InvalidArgumentError(`Web view '${name}' does not expose a debugger address`);
+    }
+    // Only one Chromedriver may be alive at a time, so a webview-to-webview switch replaces it
+    await this.stopChromedriver();
+    const cd = new Chromedriver(getChromedriverOpts.call(this, details));
+    cd.on(Chromedriver.EVENT_CHANGED, (msg) => {
+        // An unexpected exit must not leave the proxy pointing at a dead process
+        if (msg.state === Chromedriver.STATE_STOPPED && this.chromedriver === cd) {
+            this.log.warn('Chromedriver has stopped unexpectedly. Switching back to the native context');
+            this.resetWebviewState();
+        }
+    });
+    try {
+        await cd.start({ 'goog:chromeOptions': { debuggerAddress } });
+        await switchToPage(cd, page.id);
+        // Timeouts belong to the session, but a new Chromedriver session starts with its defaults
+        const timeouts = {
+            ...(this.implicitWaitMs ? { implicit: this.implicitWaitMs } : {}),
+            ...(this._pageLoadTimeoutMs !== null ? { pageLoad: this._pageLoadTimeoutMs } : {}),
+            ...(this._scriptTimeoutMs !== null ? { script: this._scriptTimeoutMs } : {}),
+        };
+        if (Object.keys(timeouts).length) {
+            await cd.jwproxy.command('/timeouts', 'POST', timeouts);
+        }
+    }
+    catch (e) {
+        try {
+            await cd.stop();
+        }
+        catch { }
+        throw e;
+    }
+    this.chromedriver = cd;
+    this._currentContext = `${WEBVIEW_PREFIX}${page.id}`;
+}
+/**
+ * Chromedriver attaches to the browser, so the requested page must be selected explicitly.
+ *
+ * @param cd - Started Chromedriver
+ * @param pageId - The CDP target id of the page
+ */
+export async function switchToPage(cd, pageId) {
+    const handles = await cd.jwproxy.command('/window/handles', 'GET');
+    const handle = handles.find((h) => h === pageId || h === `CDwindow-${pageId}`);
+    if (!handle) {
+        throw new errors.NoSuchWindowError(`Chromedriver does not see the web view '${pageId}'`);
+    }
+    await cd.jwproxy.command('/window', 'POST', { handle });
+}
+/**
+ * @param details - The web view details
+ * @returns Chromedriver options. The download is only enabled by the `chromedriver_autodownload` feature.
+ */
+export function getChromedriverOpts(details) {
+    const { chromedriverExecutable, chromedriverExecutableDir } = this.opts;
+    return {
+        details: details.info ? { info: { Browser: details.info.Browser } } : undefined,
+        ...(chromedriverExecutable ? { executable: chromedriverExecutable } : {}),
+        // Any explicit dir makes Chromedriver select a version matching the app instead of a fixed default
+        executableDir: chromedriverExecutableDir ?? path.join(getModuleRoot(), 'chromedriver'),
+        isAutodownloadEnabled: this.isFeatureEnabled(CHROMEDRIVER_AUTODOWNLOAD_FEATURE),
+        ...(this.basePath ? { reqBasePath: this.basePath } : {}),
+    };
+}
+/**
+ * @returns Browser info and the list of pages reported by the CDP endpoint of the app.
+ * Unreachable endpoint yields no pages.
+ */
+export async function getWebViewDetails() {
+    this.assertWebviewEnabled();
+    const port = this._webviewDevtoolsPort;
+    if (!port) {
+        throw new errors.InvalidArgumentError('The web view debugging port is not known');
+    }
+    const [info, pages] = await Promise.all([
+        cdpRequest(this, port, '/json/version'),
+        cdpRequest(this, port, '/json/list'),
+    ]);
+    return {
+        port,
+        info: info ?? undefined,
+        pages: (pages ?? []).filter((page) => page.type === 'page'),
+    };
+}
+/**
+ * Same as `getContexts`, but returns the details of each web view.
+ *
+ * @param waitForWebviewMs - How long to wait for at least one web view to appear
+ */
+export async function macosGetContexts(waitForWebviewMs = 0) {
+    this.assertWebviewEnabled();
+    const deadline = Date.now() + waitForWebviewMs;
+    let details = await this.getWebViewDetails();
+    while (!details.pages.length && Date.now() < deadline) {
+        await new Promise((resolve) => setTimeout(resolve, WEBVIEW_POLL_INTERVAL_MS));
+        details = await this.getWebViewDetails();
+    }
+    return [{ id: NATIVE_APP }, ...details.pages.map((page) => ({ ...page, id: `${WEBVIEW_PREFIX}${page.id}` }))];
+}
+/**
+ * Picks the debugging port and makes sure the app is launched with it. The driver owns the flag,
+ * so one passed in the app arguments is replaced.
+ *
+ * @param caps - The session capabilities
+ * @returns The capabilities to start the WDA session with and the port, if web views are enabled
+ */
+export async function prepareWebviewLaunch(caps) {
+    if (!caps.webviewEnabled) {
+        return { caps, port: null };
+    }
+    // The arguments are ignored if the already running app is just activated
+    if (caps.noReset && !caps.webviewDevtoolsPort) {
+        throw new errors.InvalidArgumentError(`'webviewDevtoolsPort' capability must be set along with 'noReset', since the app arguments ` +
+            `might be ignored and the debugging port cannot be chosen by the driver`);
+    }
+    const port = caps.webviewDevtoolsPort ?? (await findAPortNotInUse(PORT_RANGE_START, PORT_RANGE_END, CDP_HOST));
+    const args = Array.isArray(caps.arguments) ? caps.arguments.map(String) : [];
+    const userArgs = removeDebuggingPortArgs(args);
+    if (userArgs.length !== args.length) {
+        log.warn(`Ignoring '${DEBUGGING_PORT_FLAG}' in the app arguments. Use 'webviewDevtoolsPort' capability instead`);
+    }
+    return { caps: { ...caps, arguments: [...userArgs, `${DEBUGGING_PORT_FLAG}=${port}`] }, port };
+}
+// Handles both the `--flag=value` and the `--flag value` forms
+function removeDebuggingPortArgs(args) {
+    const result = [];
+    for (let i = 0; i < args.length; i++) {
+        if (args[i] === DEBUGGING_PORT_FLAG) {
+            if (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                i++;
+            }
+        }
+        else if (!args[i].startsWith(`${DEBUGGING_PORT_FLAG}=`)) {
+            result.push(args[i]);
+        }
+    }
+    return result;
+}
+async function cdpRequest(driver, port, endpoint) {
+    try {
+        const { data } = await axios.get(`http://${CDP_HOST}:${port}${endpoint}`, {
+            timeout: CDP_REQUEST_TIMEOUT_MS,
+        });
+        return data;
+    }
+    catch (e) {
+        driver.log.debug(`CDP request to ${CDP_HOST}:${port}${endpoint} failed: ${e.message}`);
+        return null;
+    }
+}
+//# sourceMappingURL=context.js.map

package/build/lib/commands/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.ts"],"names":[],"mappings":"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"}

package/build/lib/commands/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAI7C;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,EAAE,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAOlH"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAI7C;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,EAAE,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAWlH"}

package/build/lib/commands/execute.js

@@ -5,6 +5,10 @@ const EXECUTE_SCRIPT_PREFIX = 'macos:';
  * @param args - Arguments to pass to the script
  */
 export async function execute(script, args) {
+    // Non-macos scripts belong to the web page when a web view is active
+    if (this.chromedriver && !/^\s*macos:/.test(String(script))) {
+        return await this.chromedriver.jwproxy.command('/execute/sync', 'POST', { script, args: args ?? [] });
+    }
     this.log.info(`Executing extension command '${script}'`);
     const formattedScript = String(script)
         .trim()

package/build/lib/commands/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"AAIA,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAmB,MAAc,EAAE,IAAoC;IAClG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,MAAM,GAAG,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;SACnC,IAAI,EAAE;SACN,OAAO,CAAC,YAAY,EAAE,GAAG,qBAAqB,GAAG,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;GAKG;AACH,SAAS,2BAA2B,CAAC,IAAoC;IACvE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AACtD,CAAC"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"AAIA,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAmB,MAAc,EAAE,IAAoC;IAClG,qEAAqE;IACrE,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAC,CAAC,CAAC;IACtG,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,MAAM,GAAG,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;SACnC,IAAI,EAAE;SACN,OAAO,CAAC,YAAY,EAAE,GAAG,qBAAqB,GAAG,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;GAKG;AACH,SAAS,2BAA2B,CAAC,IAAoC;IACvE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AACtD,CAAC"}

package/build/lib/commands/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAed"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAoBd"}

package/build/lib/commands/find.js

@@ -10,6 +10,10 @@ import { util } from 'appium/support.js';
 export async function findElOrEls(strategy, selector, mult, context) {
     const contextId = context ? util.unwrapElement(context) : context;
     const endpoint = `/element${contextId ? `/${contextId}/element` : ''}${mult ? 's' : ''}`;
+    // Web view elements are located by Chromedriver using the standard W3C strategies
+    if (this.chromedriver) {
+        return await this.chromedriver.jwproxy.command(endpoint, 'POST', { using: strategy, value: selector });
+    }
     let normalizedStrategy = strategy;
     if (strategy === '-ios predicate string') {
         normalizedStrategy = 'predicate string';

package/build/lib/commands/find.js.map

@@ -1 +1 @@
-{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAIvC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAE/B,QAAgB,EAChB,QAAgB,EAChB,IAAa,EACb,OAAgB;IAEhB,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,MAAM,QAAQ,GAAG,WAAW,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEzF,IAAI,kBAAkB,GAAG,QAAQ,CAAC;IAClC,IAAI,QAAQ,KAAK,uBAAuB,EAAE,CAAC;QACzC,kBAAkB,GAAG,kBAAkB,CAAC;IAC1C,CAAC;SAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QAC3C,kBAAkB,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;QACpD,KAAK,EAAE,kBAAkB;QACzB,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAIvC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAE/B,QAAgB,EAChB,QAAgB,EAChB,IAAa,EACb,OAAgB;IAEhB,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,MAAM,QAAQ,GAAG,WAAW,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEzF,kFAAkF;IAClF,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;IACvG,CAAC;IAED,IAAI,kBAAkB,GAAG,QAAQ,CAAC;IAClC,IAAI,QAAQ,KAAK,uBAAuB,EAAE,CAAC;QACzC,kBAAkB,GAAG,kBAAkB,CAAC;IAC1C,CAAC;SAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QAC3C,kBAAkB,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;QACpD,KAAK,EAAE,kBAAkB;QACzB,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;AACL,CAAC"}

package/build/lib/constraints.d.ts

@@ -50,6 +50,18 @@ declare const MAC2_CONSTRAINTS: {
     readonly initialDeeplinkUrl: {
         readonly isString: true;
     };
+    readonly webviewEnabled: {
+        readonly isBoolean: true;
+    };
+    readonly webviewDevtoolsPort: {
+        readonly isNumber: true;
+    };
+    readonly chromedriverExecutable: {
+        readonly isString: true;
+    };
+    readonly chromedriverExecutableDir: {
+        readonly isString: true;
+    };
 };
 export default MAC2_CONSTRAINTS;
 export type Mac2Constraints = typeof MAC2_CONSTRAINTS;

package/build/lib/constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDU,CAAC;AAEjC,eAAe,gBAAgB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,OAAO,gBAAgB,CAAC"}
+{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEU,CAAC;AAEjC,eAAe,gBAAgB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,OAAO,gBAAgB,CAAC"}

package/build/lib/constraints.js

@@ -50,6 +50,18 @@ const MAC2_CONSTRAINTS = {
     initialDeeplinkUrl: {
         isString: true,
     },
+    webviewEnabled: {
+        isBoolean: true,
+    },
+    webviewDevtoolsPort: {
+        isNumber: true,
+    },
+    chromedriverExecutable: {
+        isString: true,
+    },
+    chromedriverExecutableDir: {
+        isString: true,
+    },
 };
 export default MAC2_CONSTRAINTS;
 //# sourceMappingURL=constraints.js.map

package/build/lib/constraints.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG;IACvB,UAAU,EAAE;QACV,QAAQ,EAAE,IAAI;KACf;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,IAAI;KACf;IACD,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,IAAI;KACf;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,IAAI;KACf;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,SAAS,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QACX,SAAS,EAAE,IAAI;KAChB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,IAAI;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,IAAI;KACf;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI;KACf;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,IAAI;KACf;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,IAAI;KACf;CAC6B,CAAC;AAEjC,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG;IACvB,UAAU,EAAE;QACV,QAAQ,EAAE,IAAI;KACf;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,IAAI;KACf;IACD,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,IAAI;KACf;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,IAAI;KACf;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,SAAS,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QACX,SAAS,EAAE,IAAI;KAChB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,IAAI;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,IAAI;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,IAAI;KACf;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI;KACf;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,IAAI;KACf;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,IAAI;KACf;IACD,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,mBAAmB,EAAE;QACnB,QAAQ,EAAE,IAAI;KACf;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,IAAI;KACf;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,IAAI;KACf;CAC6B,CAAC;AAEjC,eAAe,gBAAgB,CAAC"}

package/build/lib/driver.d.ts

@@ -1,9 +1,11 @@
 import type { RouteMatcher, HTTPMethod, HTTPBody, DefaultCreateSessionResult, DriverData, InitialOpts, StringRecord, ExternalDriver, W3CDriverCaps } from '@appium/types';
+import type { Chromedriver } from 'appium-chromedriver';
 import { BaseDriver } from 'appium/driver.js';
 import * as appManagemenetCommands from './commands/app-management.js';
 import * as appleScriptCommands from './commands/applescript.js';
 import * as auditCommands from './commands/audit.js';
 import * as clipboardCommands from './commands/clipboard.js';
+import * as contextCommands from './commands/context.js';
 import * as executeCommands from './commands/execute.js';
 import * as findCommands from './commands/find.js';
 import * as gesturesCommands from './commands/gestures.js';
@@ -36,6 +38,12 @@ export declare class Mac2Driver extends BaseDriver<Mac2Constraints, StringRecord
         };
     };
     static executeMethodMap: {
+        readonly 'macos: getContexts': {
+            readonly command: "macosGetContexts";
+            readonly params: {
+                readonly optional: readonly ["waitForWebviewMs"];
+            };
+        };
         readonly 'macos: click': {
             readonly command: "macosClick";
             readonly params: {
@@ -243,6 +251,11 @@ export declare class Mac2Driver extends BaseDriver<Mac2Constraints, StringRecord
     macosQueryAppState: typeof appManagemenetCommands.macosQueryAppState;
     macosExecAppleScript: typeof appleScriptCommands.macosExecAppleScript;
     execute: typeof executeCommands.execute;
+    getCurrentContext: typeof contextCommands.getCurrentContext;
+    getContexts: typeof contextCommands.getContexts;
+    setContext: typeof contextCommands.setContext;
+    getWebViewDetails: typeof contextCommands.getWebViewDetails;
+    macosGetContexts: typeof contextCommands.macosGetContexts;
     findElOrEls: typeof findCommands.findElOrEls;
     macosSetValue: typeof gesturesCommands.macosSetValue;
     macosClick: typeof gesturesCommands.macosClick;
@@ -278,6 +291,11 @@ export declare class Mac2Driver extends BaseDriver<Mac2Constraints, StringRecord
     _videoChunksBroadcaster: nativeScreenRecordingCommands.NativeVideoChunksBroadcaster;
     _screenRecorder: recordScreenCommands.ScreenRecorder | null;
     proxyReqRes: (...args: any) => any;
+    chromedriver: Chromedriver | null;
+    _currentContext: string | null;
+    _pageLoadTimeoutMs: number | null;
+    _scriptTimeoutMs: number | null;
+    _webviewDevtoolsPort: number | null;
     private isProxyActive;
     private _wda;
     private _wdaSessionId;
@@ -289,6 +307,14 @@ export declare class Mac2Driver extends BaseDriver<Mac2Constraints, StringRecord
     getProxyAvoidList(sessionId: string): RouteMatcher[];
     canProxy(): boolean;
     proxyCommand(url: string, method: HTTPMethod, body?: HTTPBody): Promise<any>;
+    implicitWaitW3C(ms: number): Promise<void>;
+    pageLoadTimeoutW3C(ms: number): Promise<void>;
+    scriptTimeoutW3C(ms: number): Promise<void>;
+    isWebviewEnabled(): boolean;
+    assertWebviewEnabled(): void;
+    /** Stops Chromedriver, if any, and routes the commands back to WebDriverAgentMac */
+    stopChromedriver(): Promise<void>;
+    resetWebviewState(): void;
     getStatus(): Promise<any>;
     getWindowRect(): Promise<any>;
     createSession(w3cCaps1: W3CMac2DriverCaps, w3cCaps2?: W3CMac2DriverCaps, w3cCaps3?: W3CMac2DriverCaps, driverData?: DriverData[]): Promise<DefaultCreateSessionResult<Mac2Constraints>>;

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}