webdriverio 9.0.0-alpha.114 → 9.0.0-alpha.321

package/build/utils/interception/index.d.ts

@@ -2,7 +2,7 @@
 import { type JsonCompatible } from '@wdio/types';
 import { type local } from 'webdriver';
 import { URLPattern } from 'urlpattern-polyfill';
-import type { MockOptions, RespondWithOptions } from './types.js';
+import type { MockFilterOptions, RequestWithOptions, RespondWithOptions } from './types.js';
 import type { WaitForOptions } from '../../types.js';
 type RespondBody = string | JsonCompatible | Buffer;
 /**
@@ -14,11 +14,7 @@ type RespondBody = string | JsonCompatible | Buffer;
 export default class WebDriverInterception {
     #private;
     private constructor();
-    static initiate(url: string, 
-    /**
-     * ToDo(Christian): incorporate filterOptions
-     */
-    filterOptions: MockOptions, browser: WebdriverIO.Browser): Promise<WebDriverInterception>;
+    static initiate(url: string, filterOptions: MockFilterOptions, browser: WebdriverIO.Browser): Promise<WebDriverInterception>;
     /**
      * allows access to all requests made with given pattern
      */
@@ -38,11 +34,23 @@ export default class WebDriverInterception {
      * Restored mock does not emit events and could not mock responses
      */
     restore(): Promise<this>;
+    /**
+     * Always use request modification for the next request done by the browser.
+     * @param payload  payload to overwrite the request
+     * @param once     apply overwrite only once for the next request
+     * @returns        this instance to chain commands
+     */
+    request(overwrite: RequestWithOptions, once?: boolean): this;
+    /**
+     * alias for `mock.request(…, true)`
+     */
+    requestOnce(payload: RequestWithOptions): this;
     /**
      * Always respond with same overwrite
-     * @param {*} overwrites  payload to overwrite the response
-     * @param {*} params      additional respond parameters to overwrite
-     * @param {boolean} once  apply overwrite only once for the next request
+     * @param {*}       payload  payload to overwrite the response
+     * @param {*}       params   additional respond parameters to overwrite
+     * @param {boolean} once     apply overwrite only once for the next request
+     * @returns                  this instance to chain commands
      */
     respond(payload: RespondBody, params?: Omit<RespondWithOptions, 'body'>, once?: boolean): this;
     /**

package/build/utils/interception/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,OAAO,KAAK,EAAE,WAAW,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAMpD,KAAK,WAAW,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,CAAA;AAEnD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;;IAetC,OAAO;WAgBM,QAAQ,CACjB,GAAG,EAAE,MAAM;IACX;;OAEG;IACH,aAAa,EAAE,WAAW,EAC1B,OAAO,EAAE,WAAW,CAAC,OAAO;IA6JhC;;OAEG;IACH,IAAI,KAAK,+CAER;IAED;;OAEG;IACH,KAAK;IAKL;;;OAGG;IACH,KAAK;IAML;;;;OAIG;IACG,OAAO;IAgBb;;;;;OAKG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAY3F;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM;IAI/E;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO;IAMpB;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAO5C;;OAEG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM;IAIhC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAClH,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAC9G,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IACnF,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IAC/E,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAYrH,eAAe,CAAE,EACb,OAA8C,EAC9C,QAAgD,EAChD,UAAU,GACb,GAAE,cAAmB;CA2BzB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,cAqBvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAMpD,KAAK,WAAW,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,CAAA;AAOnD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;;IAYtC,OAAO;WAkBM,QAAQ,CACjB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,iBAAiB,EAChC,OAAO,EAAE,WAAW,CAAC,OAAO;IAsNhC;;OAEG;IACH,IAAI,KAAK,+CAER;IAED;;OAEG;IACH,KAAK;IAKL;;;OAGG;IACH,KAAK;IAOL;;;;OAIG;IACG,OAAO;IAgBb;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,kBAAkB,EAAE,IAAI,CAAC,EAAE,OAAO;IAMrD;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,kBAAkB;IAIvC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAY3F;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM;IAI/E;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO;IAMpB;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAO5C;;OAEG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM;IAIhC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAClH,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAC9G,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IACnF,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IAC/E,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAYrH,eAAe,CAAE,EACb,OAA8C,EAC9C,QAAgD,EAChD,UAAU,GACb,GAAE,cAAmB;CA2BzB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,cAqBvD"}

package/build/utils/interception/index.js

@@ -16,14 +16,17 @@ let hasSubscribedToEvents = false;
 export default class WebDriverInterception {
     #pattern;
     #mockId;
+    #filterOptions;
     #browser;
     #emitter = new EventEmitter();
     #restored = false;
+    #requestOverwrites = [];
     #respondOverwrites = [];
     #calls = [];
-    constructor(pattern, mockId, browser) {
+    constructor(pattern, mockId, filterOptions, browser) {
         this.#pattern = pattern;
         this.#mockId = mockId;
+        this.#filterOptions = filterOptions;
         this.#browser = browser;
         /**
          * attach network listener to this mock
@@ -31,11 +34,7 @@ export default class WebDriverInterception {
         browser.on('network.beforeRequestSent', this.#handleBeforeRequestSent.bind(this));
         browser.on('network.responseStarted', this.#handleResponseStarted.bind(this));
     }
-    static async initiate(url, 
-    /**
-     * ToDo(Christian): incorporate filterOptions
-     */
-    filterOptions, browser) {
+    static async initiate(url, filterOptions, browser) {
         const pattern = parseUrlPattern(url);
         if (!hasSubscribedToEvents) {
             await browser.sessionSubscribe({
@@ -61,7 +60,7 @@ export default class WebDriverInterception {
                     search: getPatternParam(pattern, 'search')
                 }]
         });
-        return new WebDriverInterception(pattern, interception.intercept, browser);
+        return new WebDriverInterception(pattern, interception.intercept, filterOptions, browser);
     }
     #handleBeforeRequestSent(request) {
         /**
@@ -73,49 +72,33 @@ export default class WebDriverInterception {
             return;
         }
         /**
-         * continue the request without modifications, if:
-         */
-        const continueRequest = (
-        /**
-         * - mock has no request/respond overwrites
-         * - no request modifications are set
-         *   - no errorReason is set
-         *   - no requestWith is set
-         */
-        this.#respondOverwrites.length === 0 ||
-            (!this.#respondOverwrites[0].abort &&
-                !this.#respondOverwrites[0].requestWith));
-        /**
-         * check if request matches the mock url
+         * check if request matches filter option and do nothing if not
          */
-        if (continueRequest) {
-            this.#emitter.emit('continue', request.request.request);
+        if (!this.#matchesFilterOptions(request)) {
             return this.#browser.networkContinueRequest({
                 request: request.request.request
             });
         }
         this.#emitter.emit('request', request);
-        const { requestWith, abort } = this.#respondOverwrites[0].once
-            ? this.#respondOverwrites.shift() || {}
-            : this.#respondOverwrites[0];
-        /**
-         * check if should abort the request
-         */
-        if (abort) {
-            this.#emitter.emit('fail', request.request.request);
-            return this.#browser.networkFailRequest({ request: request.request.request });
-        }
-        /**
-         * continue request (possibly with overwrites)
-         */
-        if (requestWith) {
+        const hasRequestOverwrites = this.#requestOverwrites.length > 0;
+        if (hasRequestOverwrites) {
+            const { overwrite, abort } = this.#requestOverwrites[0].once
+                ? this.#requestOverwrites.shift() || {}
+                : this.#requestOverwrites[0];
+            if (abort) {
+                this.#emitter.emit('fail', request.request.request);
+                return this.#browser.networkFailRequest({ request: request.request.request });
+            }
             this.#emitter.emit('overwrite', request);
             return this.#browser.networkContinueRequest({
                 request: request.request.request,
-                ...parseOverwrite(requestWith, request)
+                ...(overwrite ? parseOverwrite(overwrite, request) : {})
             });
         }
-        throw new Error('This should never happen');
+        this.#emitter.emit('continue', request.request.request);
+        return this.#browser.networkContinueRequest({
+            request: request.request.request
+        });
     }
     #handleResponseStarted(request) {
         /**
@@ -134,7 +117,8 @@ export default class WebDriverInterception {
          * - mock has no request/respond overwrites
          * - no request modifications are set, e.g. no overwrite is set
          */
-        this.#respondOverwrites.length === 0 ||
+        !this.#matchesFilterOptions(request) ||
+            this.#respondOverwrites.length === 0 ||
             !this.#respondOverwrites[0].overwrite);
         /**
          * check if request matches the mock url
@@ -143,7 +127,7 @@ export default class WebDriverInterception {
             this.#emitter.emit('continue', request.request.request);
             return this.#browser.networkProvideResponse({
                 request: request.request.request
-            });
+            }).catch(this.#handleNetworkProvideResponseError);
         }
         this.#calls.push(request);
         const { overwrite } = this.#respondOverwrites[0].once
@@ -157,7 +141,7 @@ export default class WebDriverInterception {
             return this.#browser.networkProvideResponse({
                 request: request.request.request,
                 ...parseOverwrite(overwrite, request)
-            });
+            }).catch(this.#handleNetworkProvideResponseError);
         }
         /**
          * continue request as is
@@ -165,11 +149,76 @@ export default class WebDriverInterception {
         this.#emitter.emit('continue', request.request.request);
         return this.#browser.networkProvideResponse({
             request: request.request.request
-        });
+        }).catch(this.#handleNetworkProvideResponseError);
+    }
+    /**
+     * It appears that the networkProvideResponse method may throw an "no such request" error even though the request
+     * is marked as "blocked", in these cases we can safely ignore the error.
+     * @param err Bidi message error
+     */
+    #handleNetworkProvideResponseError(err) {
+        if (err.message.endsWith('no such request')) {
+            return;
+        }
+        throw err;
     }
     #isRequestMatching(request) {
         return request.isBlocked && this.#pattern && this.#pattern.test(request.request.url);
     }
+    #matchesFilterOptions(request) {
+        let isRequestMatching = true;
+        if (this.#filterOptions.method) {
+            isRequestMatching = typeof this.#filterOptions.method === 'function'
+                ? this.#filterOptions.method(request.request.method)
+                : this.#filterOptions.method === request.request.method;
+        }
+        if (this.#filterOptions.requestHeaders) {
+            isRequestMatching = typeof this.#filterOptions.requestHeaders === 'function'
+                ? this.#filterOptions.requestHeaders(request.request.headers.reduce((acc, { name, value }) => {
+                    acc[name] = value.type === 'string' ? value.value : Buffer.from(value.value, 'base64').toString();
+                    return acc;
+                }, {}))
+                : Object.entries(this.#filterOptions.requestHeaders).every(([key, value]) => {
+                    const header = request.request.headers.find(({ name }) => name === key);
+                    if (!header) {
+                        return false;
+                    }
+                    return header.value.type === 'string'
+                        ? header.value.value === value
+                        : Buffer.from(header.value.value, 'base64').toString() === value;
+                });
+        }
+        if (this.#filterOptions.responseHeaders && 'response' in request) {
+            isRequestMatching = typeof this.#filterOptions.responseHeaders === 'function'
+                ? this.#filterOptions.responseHeaders(request.response.headers.reduce((acc, { name, value }) => {
+                    acc[name] = value.type === 'string' ? value.value : Buffer.from(value.value, 'base64').toString();
+                    return acc;
+                }, {}))
+                : Object.entries(this.#filterOptions.responseHeaders).every(([key, value]) => {
+                    const header = request.response.headers.find(({ name }) => name === key);
+                    if (!header) {
+                        return false;
+                    }
+                    return header.value.type === 'string'
+                        ? header.value.value === value
+                        : Buffer.from(header.value.value, 'base64').toString() === value;
+                });
+        }
+        if (this.#filterOptions.statusCode && 'response' in request) {
+            isRequestMatching = typeof this.#filterOptions.statusCode === 'function'
+                ? this.#filterOptions.statusCode(request.response.status)
+                : this.#filterOptions.statusCode === request.response.status;
+        }
+        return isRequestMatching;
+    }
+    #setOverwrite = (overwriteProp, { overwrite, abort, once }) => {
+        return once
+            ? [
+                ...overwriteProp.filter(({ once }) => once),
+                { overwrite, abort, once }
+            ]
+            : [{ overwrite, abort }];
+    };
     /**
      * allows access to all requests made with given pattern
      */
@@ -190,6 +239,7 @@ export default class WebDriverInterception {
     reset() {
         this.clear();
         this.#respondOverwrites = [];
+        this.#requestOverwrites = [];
         return this;
     }
     /**
@@ -209,11 +259,29 @@ export default class WebDriverInterception {
         }
         return this;
     }
+    /**
+     * Always use request modification for the next request done by the browser.
+     * @param payload  payload to overwrite the request
+     * @param once     apply overwrite only once for the next request
+     * @returns        this instance to chain commands
+     */
+    request(overwrite, once) {
+        this.#ensureNotRestored();
+        this.#requestOverwrites = this.#setOverwrite(this.#requestOverwrites, { overwrite, once });
+        return this;
+    }
+    /**
+     * alias for `mock.request(…, true)`
+     */
+    requestOnce(payload) {
+        return this.request(payload, true);
+    }
     /**
      * Always respond with same overwrite
-     * @param {*} overwrites  payload to overwrite the response
-     * @param {*} params      additional respond parameters to overwrite
-     * @param {boolean} once  apply overwrite only once for the next request
+     * @param {*}       payload  payload to overwrite the response
+     * @param {*}       params   additional respond parameters to overwrite
+     * @param {boolean} once     apply overwrite only once for the next request
+     * @returns                  this instance to chain commands
      */
     respond(payload, params = {}, once) {
         this.#ensureNotRestored();
@@ -223,7 +291,7 @@ export default class WebDriverInterception {
                 ? payload.toString('base64')
                 : JSON.stringify(payload);
         const overwrite = { body, ...params };
-        this.#respondOverwrites.push({ overwrite, once });
+        this.#respondOverwrites = this.#setOverwrite(this.#respondOverwrites, { overwrite, once });
         return this;
     }
     /**
@@ -239,7 +307,7 @@ export default class WebDriverInterception {
      */
     abort(once) {
         this.#ensureNotRestored();
-        this.#respondOverwrites.push({ abort: true, once });
+        this.#requestOverwrites = this.#setOverwrite(this.#requestOverwrites, { abort: true, once });
         return this;
     }
     /**
@@ -256,7 +324,7 @@ export default class WebDriverInterception {
     redirect(redirectUrl, once) {
         this.#ensureNotRestored();
         const requestWith = { url: redirectUrl };
-        this.#respondOverwrites.push({ requestWith, once });
+        this.request(requestWith, once);
         return this;
     }
     /**

package/build/utils/interception/types.d.ts

@@ -2,11 +2,9 @@ import type { local } from 'webdriver';
 import type { Cookie } from '@wdio/protocols';
 export type MockFilterOptions = {
     method?: string | ((method: string) => boolean);
-    headers?: Record<string, string> | ((headers: Record<string, string>) => boolean);
     requestHeaders?: Record<string, string> | ((headers: Record<string, string>) => boolean);
     responseHeaders?: Record<string, string> | ((headers: Record<string, string>) => boolean);
     statusCode?: number | ((statusCode: number) => boolean);
-    postData?: string | ((payload: string | undefined) => boolean);
 };
 type Overwrite<T, Request> = T | ((request: Request) => T);
 type Methods = 'POST' | 'GET' | 'DELETE' | 'PUT' | 'PATCH' | 'OPTIONS' | 'HEAD';
@@ -23,6 +21,5 @@ export interface RespondWithOptions extends Omit<RequestWithOptions, 'url' | 'me
 export interface MockRequestOptions {
     requestWith?: RequestWithOptions;
 }
-export type MockOptions = MockFilterOptions & MockRequestOptions;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/build/utils/interception/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACxF,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACzF,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACvD,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,CAAA;CACjE,CAAA;AAED,KAAK,SAAS,CAAE,CAAC,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC,CAAA;AAC3D,KAAK,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAE/E,MAAM,WAAW,kBAAkB;IAC/B,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAC/D,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvE,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrF,MAAM,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrE,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CACpE;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClF,UAAU,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,CAAC,EAAE,kBAAkB,CAAA;CACnC;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACxF,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACzF,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;CAC1D,CAAA;AAED,KAAK,SAAS,CAAE,CAAC,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC,CAAA;AAC3D,KAAK,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAE/E,MAAM,WAAW,kBAAkB;IAC/B,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAC/D,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvE,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrF,MAAM,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrE,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CACpE;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClF,UAAU,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,CAAC,EAAE,kBAAkB,CAAA;CACnC"}

package/build/utils/interception/utils.d.ts

@@ -5,13 +5,6 @@ import type { RequestWithOptions, RespondWithOptions } from './types.js';
  * @param overwrite request or response overwrite
  * @returns object to pass to the protocol
  */
-export declare function parseOverwrite(overwrite: RequestWithOptions | RespondWithOptions, request: local.NetworkBeforeRequestSentParameters | local.NetworkResponseCompletedParameters): {
-    body: remote.NetworkBytesValue | undefined;
-    headers: remote.NetworkHeader[];
-    cookies: remote.NetworkSetCookieHeader[];
-    method: string | undefined;
-    statusCode: number | undefined;
-    url: string | undefined;
-};
+export declare function parseOverwrite<T extends RequestWithOptions | RespondWithOptions>(overwrite: T, request: local.NetworkBeforeRequestSentParameters | local.NetworkResponseCompletedParameters): Omit<T extends RequestWithOptions ? remote.NetworkContinueRequestParameters : remote.NetworkContinueResponseParameters, "request">;
 export declare function getPatternParam(pattern: URLPattern, key: keyof Omit<remote.NetworkUrlPatternPattern, 'type'>): string | undefined;
 //# sourceMappingURL=utils.d.ts.map

package/build/utils/interception/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAExE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,kCAAkC,GAAG,KAAK,CAAC,kCAAkC;;;;;;;EA6E9K;AAED,wBAAgB,eAAe,CAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAAC,sBAU7G"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAExE;;;;GAIG;AACH,wBAAgB,cAAc,CAC1B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,EAEjD,SAAS,EAAE,CAAC,EACZ,OAAO,EAAE,KAAK,CAAC,kCAAkC,GAAG,KAAK,CAAC,kCAAkC,sIA4E/F;AAED,wBAAgB,eAAe,CAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAAC,sBAU7G"}

package/build/utils/interception/utils.js

@@ -4,12 +4,12 @@
  * @returns object to pass to the protocol
  */
 export function parseOverwrite(overwrite, request) {
-    let body = undefined;
+    const result = {};
     if ('body' in overwrite && overwrite.body) {
         const bodyOverwrite = typeof overwrite.body === 'function'
             ? overwrite.body(request)
             : overwrite.body;
-        body = typeof bodyOverwrite === 'string' ?
+        result.body = typeof bodyOverwrite === 'string' ?
             /**
              * if body is a string we can pass it as is
              */
@@ -28,22 +28,20 @@ export function parseOverwrite(overwrite, request) {
                         : btoa(JSON.stringify(bodyOverwrite))
                 };
     }
-    let headers = [];
-    const headersOverwrite = typeof overwrite.headers === 'function'
-        ? overwrite.headers(request)
-        : overwrite.headers;
-    if (headersOverwrite) {
-        headers = Object.entries(headersOverwrite).map(([name, value]) => ({
+    if ('headers' in overwrite) {
+        const headersOverwrite = typeof overwrite.headers === 'function'
+            ? overwrite.headers(request)
+            : overwrite.headers;
+        result.headers = Object.entries(headersOverwrite || {}).map(([name, value]) => ({
             name,
             value: { type: 'string', value }
         }));
     }
-    let cookies = [];
     if ('cookies' in overwrite && overwrite.cookies) {
         const cookieOverwrite = typeof overwrite.cookies === 'function'
             ? overwrite.cookies(request) || []
             : overwrite.cookies;
-        cookies = cookieOverwrite.map((cookie) => ({
+        result.cookies = cookieOverwrite.map((cookie) => ({
             name: cookie.name,
             value: {
                 type: 'string',
@@ -57,24 +55,23 @@ export function parseOverwrite(overwrite, request) {
             sameSite: cookie.sameSite?.toLowerCase(),
         }));
     }
-    let statusCode = undefined;
     if ('statusCode' in overwrite && overwrite.statusCode) {
         const statusCodeOverwrite = typeof overwrite.statusCode === 'function'
             ? overwrite.statusCode(request)
             : overwrite.statusCode;
-        statusCode = statusCodeOverwrite;
+        result.statusCode = statusCodeOverwrite;
     }
-    const method = 'method' in overwrite
-        ? typeof overwrite.method === 'function'
+    if ('method' in overwrite) {
+        result.method = typeof overwrite.method === 'function'
             ? overwrite.method(request)
-            : overwrite.method
-        : undefined;
-    const url = 'url' in overwrite
-        ? typeof overwrite.url === 'function'
+            : overwrite.method;
+    }
+    if ('url' in overwrite) {
+        result.url = typeof overwrite.url === 'function'
             ? overwrite.url(request)
-            : overwrite.url
-        : undefined;
-    return { body, headers, cookies, method, statusCode, url };
+            : overwrite.url;
+    }
+    return result;
 }
 export function getPatternParam(pattern, key) {
     if (key !== 'pathname' && pattern[key] === '*') {

package/build/utils/refetchElement.js

@@ -19,8 +19,8 @@ export default async function refetchElement(currentElement, commandName) {
      */
     return selectors.reduce(async (elementPromise, { selector, index }, currentIndex) => {
         const resolvedElement = await elementPromise;
-        let nextElement = index > 0 ? (await resolvedElement.$$(selector))[index] : null;
-        nextElement = nextElement || await resolvedElement.$(selector);
+        let nextElement = index > 0 ? await resolvedElement.$$(selector)[index]?.getElement() : null;
+        nextElement = nextElement || await resolvedElement.$(selector).getElement();
         /**
          *  For error purposes, changing command name to '$' if we aren't
          *  on the last element of the array

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "9.0.0-alpha.114+b1a80c10f",
+  "version": "9.0.0-alpha.321+63953a607",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "cucumber",
     "testingbot"
   ],
-  "main": "./build/cjs/index.js",
+  "main": "./build/index.cjs",
   "type": "module",
   "module": "./build/index.js",
   "exports": {
@@ -51,9 +51,9 @@
       {
         "types": "./build/index.d.ts",
         "import": "./build/index.js",
-        "require": "./build/cjs/index.js"
+        "require": "./build/index.cjs"
       },
-      "./build/cjs/index.js"
+      "./build/index.cjs"
     ],
     "./package.json": "./package.json"
   },
@@ -68,12 +68,12 @@
   },
   "dependencies": {
     "@types/node": "^20.11.30",
-    "@wdio/config": "9.0.0-alpha.114+b1a80c10f",
-    "@wdio/logger": "9.0.0-alpha.114+b1a80c10f",
-    "@wdio/protocols": "9.0.0-alpha.114+b1a80c10f",
-    "@wdio/repl": "9.0.0-alpha.114+b1a80c10f",
-    "@wdio/types": "9.0.0-alpha.114+b1a80c10f",
-    "@wdio/utils": "9.0.0-alpha.114+b1a80c10f",
+    "@wdio/config": "9.0.0-alpha.321+63953a607",
+    "@wdio/logger": "9.0.0-alpha.321+63953a607",
+    "@wdio/protocols": "9.0.0-alpha.321+63953a607",
+    "@wdio/repl": "9.0.0-alpha.321+63953a607",
+    "@wdio/types": "9.0.0-alpha.321+63953a607",
+    "@wdio/utils": "9.0.0-alpha.321+63953a607",
     "archiver": "^7.0.1",
     "aria-query": "^5.3.0",
     "cheerio": "^1.0.0-rc.12",
@@ -83,6 +83,7 @@
     "htmlfy": "^0.2.1",
     "import-meta-resolve": "^4.0.0",
     "is-plain-obj": "^4.1.0",
+    "jszip": "^3.10.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.zip": "^4.2.0",
     "minimatch": "^9.0.3",
@@ -91,7 +92,7 @@
     "rgb2hex": "0.2.5",
     "serialize-error": "^11.0.3",
     "urlpattern-polyfill": "^10.0.0",
-    "webdriver": "9.0.0-alpha.114+b1a80c10f"
+    "webdriver": "9.0.0-alpha.321+63953a607"
   },
   "peerDependencies": {
     "puppeteer-core": "^22.3.0"
@@ -101,5 +102,5 @@
       "optional": true
     }
   },
-  "gitHead": "b1a80c10f41091e6ecfd8c5abff14788a8de499b"
+  "gitHead": "63953a6079023cb390a113fe5ce1c1b01b8e4bb6"
 }

package/build/cjs/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/build/cjs/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cjs/index.ts"],"names":[],"mappings":""}

package/build/cjs/package.json

@@ -1,5 +0,0 @@
-{
-    "name": "webdriverio-cjs",
-    "type": "commonjs",
-    "private": true
-}