appium-mac2-driver 4.5.1 → 4.6.0

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/protocol-converter.js

@@ -0,0 +1,213 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolConverter = exports.COMMAND_URLS_CONFLICTS = void 0;
+const support_1 = require("@appium/support");
+const helpers_1 = require("../basedriver/helpers");
+const constants_1 = require("../constants");
+exports.COMMAND_URLS_CONFLICTS = [
+    {
+        commandNames: ['execute', 'executeAsync'],
+        jsonwpConverter: (url) => url.replace(/\/execute.*/, url.includes('async') ? '/execute_async' : '/execute'),
+        w3cConverter: (url) => url.replace(/\/execute.*/, url.includes('async') ? '/execute/async' : '/execute/sync'),
+    },
+    {
+        commandNames: ['getElementScreenshot'],
+        jsonwpConverter: (url) => url.replace(/\/element\/([^/]+)\/screenshot$/, '/screenshot/$1'),
+        w3cConverter: (url) => url.replace(/\/screenshot\/([^/]+)/, '/element/$1/screenshot'),
+    },
+    {
+        commandNames: ['getWindowHandles', 'getWindowHandle'],
+        jsonwpConverter(url) {
+            return url.endsWith('/window')
+                ? url.replace(/\/window$/, '/window_handle')
+                : url.replace(/\/window\/handle(s?)$/, '/window_handle$1');
+        },
+        w3cConverter(url) {
+            return url.endsWith('/window_handle')
+                ? url.replace(/\/window_handle$/, '/window')
+                : url.replace(/\/window_handles$/, '/window/handles');
+        },
+    },
+    {
+        commandNames: ['getProperty'],
+        jsonwpConverter: (w3cUrl) => {
+            const w3cPropertyRegex = /\/element\/([^/]+)\/property\/([^/]+)/;
+            return w3cUrl.replace(w3cPropertyRegex, '/element/$1/attribute/$2');
+        },
+        // Don't convert JSONWP URL to W3C. W3C accepts /attribute and /property
+        w3cConverter: (jsonwpUrl) => jsonwpUrl,
+    },
+];
+const { MJSONWP, W3C } = constants_1.PROTOCOLS;
+const DEFAULT_LOG = support_1.logger.getLogger('Protocol Converter');
+class ProtocolConverter {
+    proxyFunc;
+    _downstreamProtocol = null;
+    _log;
+    /**
+     * @param proxyFunc - Function to perform the actual proxy request
+     * @param log - Logger instance, or null to use the default
+     */
+    constructor(proxyFunc, log = null) {
+        this.proxyFunc = proxyFunc;
+        this._log = log;
+    }
+    get log() {
+        return this._log ?? DEFAULT_LOG;
+    }
+    get downstreamProtocol() {
+        return this._downstreamProtocol;
+    }
+    set downstreamProtocol(value) {
+        this._downstreamProtocol = value;
+    }
+    /**
+     * Handle "crossing" endpoints for the case when upstream and downstream
+     * drivers operate different protocols.
+     */
+    async convertAndProxy(commandName, url, method, body) {
+        if (!this.downstreamProtocol) {
+            return await this.proxyFunc(url, method, body);
+        }
+        // Same url, but different arguments
+        switch (commandName) {
+            case 'timeouts':
+                return await this.proxySetTimeouts(url, method, body);
+            case 'setWindow':
+                return await this.proxySetWindow(url, method, body);
+            case 'setValue':
+                return await this.proxySetValue(url, method, body);
+            case 'performActions':
+                return await this.proxyPerformActions(url, method, body);
+            case 'releaseActions':
+                return await this.proxyReleaseActions(url, method);
+            case 'setFrame':
+                return await this.proxySetFrame(url, method, body);
+            default:
+                break;
+        }
+        // Same arguments, but different URLs
+        for (const { commandNames, jsonwpConverter, w3cConverter } of exports.COMMAND_URLS_CONFLICTS) {
+            if (!commandNames.includes(commandName)) {
+                continue;
+            }
+            const rewrittenUrl = this.downstreamProtocol === MJSONWP ? jsonwpConverter(url) : w3cConverter(url);
+            if (rewrittenUrl === url) {
+                this.log.debug(`Did not know how to rewrite the original URL '${url}' for ${this.downstreamProtocol} protocol`);
+                break;
+            }
+            this.log.info(`Rewrote the original URL '${url}' to '${rewrittenUrl}' for ${this.downstreamProtocol} protocol`);
+            return await this.proxyFunc(rewrittenUrl, method, body);
+        }
+        // No matches found. Proceed normally
+        return await this.proxyFunc(url, method, body);
+    }
+    /**
+     * W3C /timeouts can take as many as 3 timeout types at once, MJSONWP /timeouts only takes one
+     * at a time. So if we're using W3C and proxying to MJSONWP and there's more than one timeout type
+     * provided in the request, we need to do 3 proxies and combine the result.
+     */
+    getTimeoutRequestObjects(body) {
+        if (body == null) {
+            return [];
+        }
+        const bodyObj = support_1.util.safeJsonParse(body) ?? {};
+        if (this.downstreamProtocol === W3C && Object.hasOwn(bodyObj, 'ms') && Object.hasOwn(bodyObj, 'type')) {
+            const typeToW3C = (x) => (x === 'page load' ? 'pageLoad' : x);
+            return [
+                {
+                    [typeToW3C(bodyObj.type)]: bodyObj.ms,
+                },
+            ];
+        }
+        if (this.downstreamProtocol === MJSONWP && (!Object.hasOwn(bodyObj, 'ms') || !Object.hasOwn(bodyObj, 'type'))) {
+            const typeToJSONWP = (x) => (x === 'pageLoad' ? 'page load' : x);
+            return (Object.entries(bodyObj)
+                // Only transform the entry if ms value is a valid positive float number
+                .filter((pair) => /^\d+(?:[.,]\d*?)?$/.test(`${pair[1]}`))
+                .map((pair) => ({
+                type: typeToJSONWP(pair[0]),
+                ms: pair[1],
+            })));
+        }
+        return [bodyObj];
+    }
+    /**
+     * Proxy an array of timeout objects and merge the result.
+     */
+    async proxySetTimeouts(url, method, body) {
+        const timeoutRequestObjects = this.getTimeoutRequestObjects(body);
+        if (timeoutRequestObjects.length === 0) {
+            return await this.proxyFunc(url, method, body);
+        }
+        this.log.debug('Will send the following request bodies to /timeouts: %s', support_1.logger.markSensitive(JSON.stringify(timeoutRequestObjects)));
+        let response;
+        let resBody;
+        for (const timeoutObj of timeoutRequestObjects) {
+            [response, resBody] = await this.proxyFunc(url, method, timeoutObj);
+            // If we got a non-MJSONWP response, return the result, nothing left to do
+            if (this.downstreamProtocol !== MJSONWP) {
+                return [response, resBody];
+            }
+            // If we got an error, return the error right away
+            if (response.statusCode >= 400) {
+                return [response, resBody];
+            }
+            // ...Otherwise, continue to the next timeouts call
+        }
+        return [response, resBody];
+    }
+    async proxySetWindow(url, method, body) {
+        const bodyObj = support_1.util.safeJsonParse(body);
+        if (support_1.util.isPlainObject(bodyObj)) {
+            const obj = bodyObj;
+            if (this.downstreamProtocol === W3C && Object.hasOwn(bodyObj, 'name') && !Object.hasOwn(bodyObj, 'handle')) {
+                this.log.debug(`Copied 'name' value '${obj.name}' to 'handle' as per W3C spec`);
+                return await this.proxyFunc(url, method, { ...obj, handle: obj.name });
+            }
+            if (this.downstreamProtocol === MJSONWP && Object.hasOwn(bodyObj, 'handle') && !Object.hasOwn(bodyObj, 'name')) {
+                this.log.debug(`Copied 'handle' value '${obj.handle}' to 'name' as per JSONWP spec`);
+                return await this.proxyFunc(url, method, { ...obj, name: obj.handle });
+            }
+        }
+        return await this.proxyFunc(url, method, body);
+    }
+    async proxySetValue(url, method, body) {
+        const bodyObj = support_1.util.safeJsonParse(body);
+        if (support_1.util.isPlainObject(bodyObj) && (support_1.util.hasValue(bodyObj?.text) || support_1.util.hasValue(bodyObj?.value))) {
+            let { text, value } = bodyObj;
+            if (support_1.util.hasValue(text) && !support_1.util.hasValue(value)) {
+                value = typeof text === 'string' ? [...text] : Array.isArray(text) ? text : [];
+                this.log.debug(`Added 'value' property to 'setValue' request body`);
+            }
+            else if (!support_1.util.hasValue(text) && support_1.util.hasValue(value)) {
+                text = Array.isArray(value) ? value.join('') : typeof value === 'string' ? value : '';
+                this.log.debug(`Added 'text' property to 'setValue' request body`);
+            }
+            return await this.proxyFunc(url, method, { ...bodyObj, text, value });
+        }
+        return await this.proxyFunc(url, method, body);
+    }
+    async proxySetFrame(url, method, body) {
+        const bodyObj = support_1.util.safeJsonParse(body);
+        if (Object.hasOwn(bodyObj ?? {}, 'id') && support_1.util.isPlainObject(bodyObj.id)) {
+            return await this.proxyFunc(url, method, {
+                ...bodyObj,
+                id: (0, helpers_1.duplicateKeys)(bodyObj.id, constants_1.MJSONWP_ELEMENT_KEY, constants_1.W3C_ELEMENT_KEY),
+            });
+        }
+        return await this.proxyFunc(url, method, body);
+    }
+    async proxyPerformActions(url, method, body) {
+        const bodyObj = support_1.util.safeJsonParse(body);
+        if (support_1.util.isPlainObject(bodyObj)) {
+            return await this.proxyFunc(url, method, (0, helpers_1.duplicateKeys)(bodyObj, constants_1.MJSONWP_ELEMENT_KEY, constants_1.W3C_ELEMENT_KEY));
+        }
+        return await this.proxyFunc(url, method, body);
+    }
+    async proxyReleaseActions(url, method) {
+        return await this.proxyFunc(url, method);
+    }
+}
+exports.ProtocolConverter = ProtocolConverter;
+//# sourceMappingURL=protocol-converter.js.map

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/protocol-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"protocol-converter.js","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/protocol-converter.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAG7C,mDAAoD;AACpD,4CAA6E;AAIhE,QAAA,sBAAsB,GAAG;IACpC;QACE,YAAY,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;QACzC,eAAe,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC;QACnH,YAAY,EAAE,CAAC,GAAW,EAAE,EAAE,CAC5B,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC;KACzF;IACD;QACE,YAAY,EAAE,CAAC,sBAAsB,CAAC;QACtC,eAAe,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,iCAAiC,EAAE,gBAAgB,CAAC;QAClG,YAAY,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,wBAAwB,CAAC;KAC9F;IACD;QACE,YAAY,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;QACrD,eAAe,CAAC,GAAW;YACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC5B,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAC5C,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,CAAC;QAC/D,CAAC;QACD,YAAY,CAAC,GAAW;YACtB,OAAO,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBACnC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC;gBAC5C,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;QAC1D,CAAC;KACF;IACD;QACE,YAAY,EAAE,CAAC,aAAa,CAAC;QAC7B,eAAe,EAAE,CAAC,MAAc,EAAE,EAAE;YAClC,MAAM,gBAAgB,GAAG,uCAAuC,CAAC;YACjE,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;QACtE,CAAC;QACD,wEAAwE;QACxE,YAAY,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS;KAC/C;CACO,CAAC;AAEX,MAAM,EAAC,OAAO,EAAE,GAAG,EAAC,GAAG,qBAAS,CAAC;AACjC,MAAM,WAAW,GAAG,gBAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAE3D,MAAa,iBAAiB;IASnB;IARD,mBAAmB,GAA8B,IAAI,CAAC;IAC7C,IAAI,CAAsB;IAE3C;;;OAGG;IACH,YACS,SAAwB,EAC/B,MAA2B,IAAI;QADxB,cAAS,GAAT,SAAS,CAAe;QAG/B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,IAAI,kBAAkB,CAAC,KAAgC;QACrD,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe,CACnB,WAAmB,EACnB,GAAW,EACX,MAAc,EACd,IAAe;QAEf,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,oCAAoC;QACpC,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,UAAU;gBACb,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACxD,KAAK,WAAW;gBACd,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACtD,KAAK,UAAU;gBACb,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACrD,KAAK,gBAAgB;gBACnB,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC3D,KAAK,gBAAgB;gBACnB,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,KAAK,UAAU;gBACb,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACrD;gBACE,MAAM;QACV,CAAC;QAED,qCAAqC;QACrC,KAAK,MAAM,EAAC,YAAY,EAAE,eAAe,EAAE,YAAY,EAAC,IAAI,8BAAsB,EAAE,CAAC;YACnF,IAAI,CAAE,YAAkC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/D,SAAS;YACX,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACpG,IAAI,YAAY,KAAK,GAAG,EAAE,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,GAAG,SAAS,IAAI,CAAC,kBAAkB,WAAW,CAAC,CAAC;gBAChH,MAAM;YACR,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,GAAG,SAAS,YAAY,SAAS,IAAI,CAAC,kBAAkB,WAAW,CAAC,CAAC;YAChH,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1D,CAAC;QAED,qCAAqC;QACrC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACK,wBAAwB,CAAC,IAAc;QAC7C,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAAI,cAAI,CAAC,aAAa,CAAC,IAAI,CAA6B,IAAI,EAAE,CAAC;QAC5E,IAAI,IAAI,CAAC,kBAAkB,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YACtG,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,OAAO;gBACL;oBACE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAc,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;iBAChD;aACF,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,kBAAkB,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YAC9G,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,CACL,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACrB,wEAAwE;iBACvE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBACzD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACd,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC3B,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;aACZ,CAAC,CAAC,CACN,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAAC,GAAW,EAAE,MAAc,EAAE,IAAe;QACzE,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,yDAAyD,EACzD,gBAAM,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAC5D,CAAC;QAEF,IAAI,QAAwB,CAAC;QAC7B,IAAI,OAAkB,CAAC;QACvB,KAAK,MAAM,UAAU,IAAI,qBAAqB,EAAE,CAAC;YAC/C,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,UAAsB,CAAC,CAAC;YAEhF,0EAA0E;YAC1E,IAAI,IAAI,CAAC,kBAAkB,KAAK,OAAO,EAAE,CAAC;gBACxC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7B,CAAC;YACD,kDAAkD;YAClD,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC/B,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7B,CAAC;YACD,mDAAmD;QACrD,CAAC;QACD,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,MAAc,EAAE,IAAc;QACtE,MAAM,OAAO,GAAG,cAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,cAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,OAAkC,CAAC;YAC/C,IAAI,IAAI,CAAC,kBAAkB,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC3G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,GAAG,CAAC,IAAI,+BAA+B,CAAC,CAAC;gBAChF,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAC,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,IAAI,CAAC,kBAAkB,KAAK,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC/G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,gCAAgC,CAAC,CAAC;gBACrF,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAC,GAAG,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,MAAc,EAAE,IAAc;QACrE,MAAM,OAAO,GAAG,cAAI,CAAC,aAAa,CAAC,IAAI,CAAwC,CAAC;QAChF,IAAI,cAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACnG,IAAI,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,OAAO,CAAC;YAC5B,IAAI,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,KAAK,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACtE,CAAC;iBAAM,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,cAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxD,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAC,GAAG,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,MAAc,EAAE,IAAc;QACrE,MAAM,OAAO,GAAG,cAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,cAAI,CAAC,aAAa,CAAE,OAAmC,CAAC,EAAE,CAAC,EAAE,CAAC;YACtG,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE;gBACvC,GAAI,OAAkB;gBACtB,EAAE,EAAE,IAAA,uBAAa,EAAE,OAAmC,CAAC,EAAY,EAAE,+BAAmB,EAAE,2BAAe,CAAC;aAC3G,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,GAAW,EAAE,MAAc,EAAE,IAAc;QAC3E,MAAM,OAAO,GAAG,cAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,cAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAA,uBAAa,EAAC,OAAiB,EAAE,+BAAmB,EAAE,2BAAe,CAAC,CAAC,CAAC;QACnH,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,GAAW,EAAE,MAAc;QAC3D,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;CACF;AAtMD,8CAsMC"}

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy-request.d.ts

@@ -0,0 +1,12 @@
+import axios from 'axios';
+export declare class ProxyRequest {
+    private readonly _requestConfig;
+    private _resultPromise;
+    private _abortController;
+    private _cancelled;
+    constructor(requestConfig: axios.RawAxiosRequestConfig<any>);
+    execute(): Promise<axios.AxiosResponse>;
+    cancel(): void;
+    private _makeRequest;
+}
+//# sourceMappingURL=proxy-request.d.ts.map

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-request.d.ts","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/proxy-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8B;IAC7D,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,UAAU,CAAU;gBAEhB,aAAa,EAAE,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC;IAOrD,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;IAiB7C,MAAM,IAAI,IAAI;YAKA,YAAY;CAc3B"}

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy-request.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyRequest = void 0;
+const axios_1 = __importDefault(require("axios"));
+class ProxyRequest {
+    _requestConfig;
+    _resultPromise;
+    _abortController;
+    _cancelled;
+    constructor(requestConfig) {
+        this._requestConfig = requestConfig;
+        this._resultPromise = null;
+        this._abortController = null;
+        this._cancelled = false;
+    }
+    async execute() {
+        if (this._resultPromise) {
+            return await this._resultPromise;
+        }
+        const abortController = new AbortController();
+        this._abortController = abortController;
+        this._cancelled = false;
+        try {
+            this._resultPromise = this._makeRequest(abortController.signal);
+            return await this._resultPromise;
+        }
+        finally {
+            this._abortController = null;
+        }
+    }
+    cancel() {
+        this._cancelled = true;
+        this._abortController?.abort();
+    }
+    async _makeRequest(signal) {
+        try {
+            return await (0, axios_1.default)({
+                ...this._requestConfig,
+                signal,
+            });
+        }
+        catch (err) {
+            if (this._cancelled && axios_1.default.isCancel(err)) {
+                // The request was cancelled; do not propagate the error to callers.
+                return await new Promise(() => { });
+            }
+            throw err;
+        }
+    }
+}
+exports.ProxyRequest = ProxyRequest;
+//# sourceMappingURL=proxy-request.js.map

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-request.js","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/proxy-request.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,YAAY;IACN,cAAc,CAA8B;IACrD,cAAc,CAAsC;IACpD,gBAAgB,CAAyB;IACzC,UAAU,CAAU;IAE5B,YAAY,aAA+C;QACzD,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC;QACnC,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAExB,IAAI,CAAC;YACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAChE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC;QACnC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAmB;QAC5C,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,eAAK,EAAC;gBACjB,GAAG,IAAI,CAAC,cAAc;gBACtB,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,IAAI,CAAC,UAAU,IAAI,eAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3C,oEAAoE;gBACpE,OAAO,MAAM,IAAI,OAAO,CAAsB,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;CACF;AAjDD,oCAiDC"}

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy.d.ts

@@ -0,0 +1,83 @@
+import http from 'node:http';
+import https from 'node:https';
+import type { AppiumLogger, HTTPBody, HTTPHeaders, HTTPMethod, ProxyOptions, ProxyResponse } from '@appium/types';
+import type { Request, Response } from 'express';
+import { PROTOCOLS } from '../constants';
+import { ProtocolConverter } from './protocol-converter';
+type Protocol = (typeof PROTOCOLS)[keyof typeof PROTOCOLS];
+export declare class JWProxy {
+    readonly scheme: string;
+    readonly server: string;
+    readonly port: number;
+    readonly base: string;
+    readonly reqBasePath: string;
+    sessionId: string | null;
+    timeout: number;
+    readonly headers: HTTPHeaders | undefined;
+    readonly httpAgent: http.Agent;
+    readonly httpsAgent: https.Agent;
+    readonly protocolConverter: ProtocolConverter;
+    private _downstreamProtocol;
+    private _activeRequests;
+    private readonly _log;
+    constructor(opts?: ProxyOptions);
+    get log(): AppiumLogger;
+    /**
+     * Gets the protocol used by the downstream server (W3C or MJSONWP).
+     */
+    get downstreamProtocol(): Protocol | null | undefined;
+    /**
+     * Sets the protocol used by the downstream server (W3C or MJSONWP).
+     */
+    set downstreamProtocol(value: Protocol | null | undefined);
+    /**
+     * Returns the number of active downstream HTTP requests.
+     */
+    getActiveRequestsCount(): number;
+    /**
+     * Cancels all currently active downstream HTTP requests.
+     */
+    cancelActiveRequests(): void;
+    /**
+     * Builds a full downstream URL (including base path and session) for a given upstream URL.
+     */
+    getUrlForProxy(url: string, method?: HTTPMethod): string;
+    /**
+     * Proxies a raw WebDriver command to the downstream server.
+     */
+    proxy(url: string, method: string, body?: HTTPBody): Promise<[ProxyResponse, HTTPBody]>;
+    /**
+     * Detects the downstream protocol from a response body.
+     */
+    getProtocolFromResBody(resObj: Record<string, unknown>): Protocol | undefined;
+    /**
+     * Proxies a command identified by its HTTP method and URL to the downstream server.
+     */
+    proxyCommand(url: string, method: HTTPMethod, body?: HTTPBody): Promise<[ProxyResponse, HTTPBody]>;
+    /**
+     * Executes a WebDriver command and returns the unwrapped `value` field (or throws).
+     */
+    command(url: string, method: HTTPMethod, body?: HTTPBody): Promise<HTTPBody>;
+    /**
+     * Extracts a session id from a WebDriver-style URL.
+     */
+    getSessionIdFromUrl(url: string): string | null;
+    /**
+     * Proxies an Express `Request`/`Response` pair to the downstream server,
+     * converting any downstream errors into a proper W3C HTTP response.
+     *
+     * This method must not throw; it always writes a response.
+     */
+    proxyReqRes(req: Request, res: Response): Promise<void>;
+    /**
+     * Performs requests to the downstream server
+     *
+     * @private - Do not call this method directly,
+     * it uses client-specific arguments and responses!
+     */
+    private request;
+    private _parseUrl;
+    private _toNormalizedPathname;
+}
+export {};
+//# sourceMappingURL=proxy.d.ts.map

package/node_modules/@appium/base-driver/build/lib/jsonwp-proxy/proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAI/B,OAAO,KAAK,EAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEhH,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAG/C,OAAO,EAAyC,SAAS,EAAC,MAAM,cAAc,CAAC;AAY/E,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AASvD,KAAK,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAe3D,qBAAa,OAAO;IAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAE9C,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA2B;gBAEpC,IAAI,GAAE,YAAiB;IAgDnC,IAAI,GAAG,IAAI,YAAY,CAEtB;IAED;;OAEG;IACH,IAAI,kBAAkB,IAAI,QAAQ,GAAG,IAAI,GAAG,SAAS,CAEpD;IAED;;OAEG;IACH,IAAI,kBAAkB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,EAGxD;IAED;;OAEG;IACH,sBAAsB,IAAI,MAAM;IAIhC;;OAEG;IACH,oBAAoB,IAAI,IAAI;IAO5B;;OAEG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM;IAmBxD;;OAEG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,QAAe,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAmHnG;;OAEG;IACH,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,GAAG,SAAS;IAS7E;;OAEG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAE,QAAe,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAY9G;;OAEG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAE,QAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;IAmDxF;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK/C;;;;;OAKG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC7D;;;;;OAKG;YACW,OAAO;IAarB,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,qBAAqB;CAyB9B"}