@wdio/webdriver-mock-service 10.0.0-alpha.149 → 10.0.0-alpha.18

package/build/WebDriverMock.d.ts

@@ -1,45 +1,20 @@
-import { type Interceptable } from 'undici';
+import nock from 'nock';
 export interface CommandMock {
-    [commandName: string]: (...args: unknown[]) => MockInterceptor;
-}
-export interface MockInterceptor {
-    times(n: number): MockInterceptor;
-    once(): MockInterceptor;
-    twice(): MockInterceptor;
-    reply(statusCode: number, data?: unknown | (() => unknown)): void;
-}
-declare class UndiciMockInterceptor implements MockInterceptor {
-    #private;
-    private readonly pool;
-    private readonly opts;
-    constructor(pool: Interceptable, opts: {
-        path: (path: string) => boolean;
-        method: string;
-        body?: (body: Record<string, unknown>) => boolean;
-    });
-    times(n: number): this;
-    once(): this;
-    twice(): this;
-    reply(statusCode: number, data?: unknown | (() => unknown)): void;
+    [commandName: string]: (...args: unknown[]) => nock.Interceptor;
 }
 export default class WebDriverMock {
-    #private;
     path: string;
     command: CommandMock;
+    scope: nock.Scope;
     constructor(host?: string, port?: number, path?: string);
     /**
      * To allow random session IDs in url paths we have to set up a custom
      * matcher that strips out the sessionID part from the expected url
      * and actual url and replaces it with a constant session id
      * @param   {String}   expectedPath path to match against
-     * @returns {Function}              to be called by the mock agent to match actual path
+     * @returns {Function}              to be called by Nock to match actual path
      */
     static pathMatcher(expectedPath: string): (path: string) => boolean;
-    get(_obj: unknown, commandName: string): (...args: unknown[]) => UndiciMockInterceptor;
-    /**
-     * Clear all interceptors and recreate the shared MockAgent.
-     */
-    static reset(): void;
+    get(_obj: unknown, commandName: string): (...args: unknown[]) => nock.Interceptor;
 }
-export {};
 //# sourceMappingURL=WebDriverMock.d.ts.map

package/build/WebDriverMock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebDriverMock.d.ts","sourceRoot":"","sources":["../src/WebDriverMock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAA;AAkBhG,MAAM,WAAW,WAAW;IACxB,CAAC,WAAW,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,eAAe,CAAA;CACjE;AAED,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAA;IACjC,IAAI,IAAI,eAAe,CAAA;IACvB,KAAK,IAAI,eAAe,CAAA;IACxB,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,IAAI,CAAA;CACpE;AA8BD,cAAM,qBAAsB,YAAW,eAAe;;IAI9C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBADJ,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE;QACnB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;QAC/B,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAA;KACpD;IAGL,KAAK,CAAC,CAAC,EAAE,MAAM;IAKf,IAAI;IAIJ,KAAK;IAIL,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;CA4B7D;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;;IAKsC,IAAI,EAAE,MAAM;IAJhF,OAAO,EAAE,WAAW,CAAA;gBAIR,IAAI,GAAE,MAAoB,EAAE,IAAI,GAAE,MAAa,EAAS,IAAI,GAAE,MAAY;IAOtF;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO;IAqBnE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,IAG1B,GAAG,MAAM,OAAO,EAAE;IAwC9B;;OAEG;IACH,MAAM,CAAC,KAAK;CAYf"}
+{"version":3,"file":"WebDriverMock.d.ts","sourceRoot":"","sources":["../src/WebDriverMock.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AAmBvB,MAAM,WAAW,WAAW;IACxB,CAAC,WAAW,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,WAAW,CAAA;CAClE;AAUD,MAAM,CAAC,OAAO,OAAO,aAAa;IAGsC,IAAI,EAAE,MAAM;IAFhF,OAAO,EAAE,WAAW,CAAA;IACpB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAA;gBACL,IAAI,GAAE,MAAoB,EAAE,IAAI,GAAE,MAAa,EAAS,IAAI,GAAE,MAAY;IAOtF;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,IAAI,EAAC,MAAM,KAAI,OAAO;IAqBjE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,IAI1B,GAAG,MAAM,OAAO,EAAE;CAoCjC"}

package/build/index.d.ts

@@ -18,17 +18,13 @@ export default class WebdriverMockService implements Services.ServiceInstance {
     waitForExistScenario(): void;
     asyncIterationScenario(): string[];
     parentNextPreviousElementChaining(): void;
-    multiRemoteFetch(): void;
+    multiremoteFetch(): void;
     customCommandScenario(times?: number): void;
     customSelectorScenario(): void;
     waitForDisplayedScenario(): void;
     cucumberScenario(): void;
     executeMemLeakScenario(executeCalls: number): () => void;
     requestRetryScenario(): void;
-    /**
-     * Reset all mock interceptors and re-register the default command stubs.
-     * Kept as `nockReset` for compatibility with smoke tests that call it by name.
-     */
     nockReset(): void;
 }
 /**

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAW9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,QAAQ,CAAC,eAAe;IACzE,OAAO,CAAC,QAAQ,CAAC,CAAsD;IACvE,OAAO,CAAC,KAAK,CAAsB;;IAMnC,IAAI;IAiBJ,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,GAAG,IAAI;IAK/C,MAAM,CACF,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB;IA4BjE,aAAa;IAQb,kBAAkB;IASlB,qBAAqB;IAKrB,sBAAsB;IAYtB,wBAAwB;IAUxB,6BAA6B;IAU7B,2BAA2B;IA+B3B,sBAAsB;IAgBtB,oBAAoB;IAQpB,sBAAsB;IAStB,iCAAiC;IAQjC,gBAAgB;IAShB,qBAAqB,CAAC,KAAK,SAAI;IAa/B,sBAAsB;IAUtB,wBAAwB;IASxB,gBAAgB;IAShB,sBAAsB,CAAC,YAAY,EAAE,MAAM;IAY3C,oBAAoB;IAOpB;;;OAGG;IACH,SAAS;CAKZ;AAED;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,CAAA;AAExB,eAAO,MAAM,QAAQ;;0BACC,WAAW,CAAC,MAAM;;CAavC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAW9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,QAAQ,CAAC,eAAe;IACzE,OAAO,CAAC,QAAQ,CAAC,CAAsD;IACvE,OAAO,CAAC,KAAK,CAAsB;;IAMnC,IAAI;IAiBJ,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,GAAG,IAAI;IAK/C,MAAM,CACF,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB;IA4BjE,aAAa;IAQb,kBAAkB;IASlB,qBAAqB;IAKrB,sBAAsB;IAYtB,wBAAwB;IAUxB,6BAA6B;IAU7B,2BAA2B;IA+B3B,sBAAsB;IAgBtB,oBAAoB;IAQpB,sBAAsB;IAStB,iCAAiC;IAQjC,gBAAgB;IAShB,qBAAqB,CAAC,KAAK,SAAI;IAa/B,sBAAsB;IAUtB,wBAAwB;IASxB,gBAAgB;IAShB,sBAAsB,CAAC,YAAY,EAAE,MAAM;IAa3C,oBAAoB;IAOpB,SAAS;CAKZ;AAED;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,CAAA;AAExB,eAAO,MAAM,QAAQ;;0BACC,WAAW,CAAC,MAAM;;CAQvC,CAAA"}

package/build/index.js

@@ -1,7 +1,12 @@
+// src/index.ts
+import nock2 from "nock";
+import { v4 as uuidv4 } from "uuid";
+
 // src/WebDriverMock.ts
-import { MockAgent, setGlobalDispatcher, getGlobalDispatcher } from "undici";
+import nock from "nock";
 import {
   WebDriverProtocol,
+  MJsonWProtocol,
   AppiumProtocol,
   ChromiumProtocol,
   SauceLabsProtocol,
@@ -11,6 +16,7 @@ var REGEXP_SESSION_ID = /\/[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0
 var SESSION_ID = "XXX";
 var protocols = [
   WebDriverProtocol,
+  MJsonWProtocol,
   AppiumProtocol,
   ChromiumProtocol,
   SauceLabsProtocol,
@@ -24,79 +30,23 @@ for (const protocol of protocols) {
     }
   }
 }
-var sharedAgent;
-function configureNetConnect(agent) {
-  agent.disableNetConnect();
-  agent.enableNetConnect((host) => !String(host).endsWith(":4444"));
-}
-function getOrCreateAgent() {
-  if (!sharedAgent) {
-    sharedAgent = new MockAgent();
-    configureNetConnect(sharedAgent);
-    setGlobalDispatcher(sharedAgent);
-  }
-  return sharedAgent;
-}
-var UndiciMockInterceptor = class {
-  constructor(pool, opts) {
-    this.pool = pool;
-    this.opts = opts;
-  }
-  pool;
-  opts;
-  #times = null;
-  times(n) {
-    this.#times = n;
-    return this;
-  }
-  once() {
-    return this.times(1);
-  }
-  twice() {
-    return this.times(2);
-  }
-  reply(statusCode, data) {
-    const interceptOpts = {
-      path: this.opts.path,
-      method: this.opts.method
-    };
-    if (this.opts.body) {
-      interceptOpts.body = (body) => {
-        try {
-          const parsed = typeof body === "string" ? JSON.parse(body) : body;
-          return this.opts.body(parsed);
-        } catch {
-          return false;
-        }
-      };
-    }
-    const dataOrFn = typeof data === "function" ? () => data() : data;
-    const mock = this.pool.intercept(interceptOpts).reply(statusCode, dataOrFn);
-    if (this.#times === Infinity) {
-      mock.persist();
-    } else if (this.#times !== null && this.#times > 0) {
-      mock.times(this.#times);
-    }
-  }
-};
 var WebDriverMock = class _WebDriverMock {
   constructor(host = "localhost", port = 4444, path = "/") {
     this.path = path;
-    this.#origin = `http://${host}:${port}`;
-    const agent = getOrCreateAgent();
-    this.#pool = agent.get(this.#origin);
+    this.scope = nock(`http://${host}:${port}`, {
+      encodedQueryParams: true
+    });
     this.command = new Proxy({}, { get: this.get.bind(this) });
   }
   path;
   command;
-  #origin;
-  #pool;
+  scope;
   /**
    * To allow random session IDs in url paths we have to set up a custom
    * matcher that strips out the sessionID part from the expected url
    * and actual url and replaces it with a constant session id
    * @param   {String}   expectedPath path to match against
-   * @returns {Function}              to be called by the mock agent to match actual path
+   * @returns {Function}              to be called by Nock to match actual path
    */
   static pathMatcher(expectedPath) {
     return (path) => {
@@ -104,9 +54,9 @@ var WebDriverMock = class _WebDriverMock {
       if (!sessionId) {
         return path === expectedPath;
       }
-      const normalizedExpected = expectedPath.replace(":sessionId", SESSION_ID);
-      const normalizedPath = path.replace(`${sessionId[0].slice(1)}`, SESSION_ID);
-      return normalizedPath === normalizedExpected;
+      expectedPath = expectedPath.replace(":sessionId", SESSION_ID);
+      path = path.replace(`${sessionId[0].slice(1)}`, SESSION_ID);
+      return path === expectedPath;
     };
   }
   get(_obj, commandName) {
@@ -116,42 +66,24 @@ var WebDriverMock = class _WebDriverMock {
       for (const [i, param] of Object.entries(commandData.variables || [])) {
         urlPath = urlPath.replace(`:${param.name}`, args[parseInt(i)]);
       }
-      const path = _WebDriverMock.pathMatcher(urlPath);
       if (method === "POST") {
-        return new UndiciMockInterceptor(this.#pool, {
-          path,
-          method,
-          body: (body) => {
-            for (const param of commandData.parameters) {
-              if (!body[param.name]) {
-                return false;
-              }
-              if (param.required && typeof body[param.name] === "undefined") {
-                return false;
-              }
+        const reqMethod2 = method.toLowerCase();
+        return this.scope[reqMethod2](_WebDriverMock.pathMatcher(urlPath), (body) => {
+          for (const param of commandData.parameters) {
+            if (!body[param.name]) {
+              return false;
+            }
+            if (param.required && typeof body[param.name] === "undefined") {
+              return false;
             }
-            return true;
           }
+          return true;
         });
       }
-      return new UndiciMockInterceptor(this.#pool, { path, method });
+      const reqMethod = method.toLowerCase();
+      return this.scope[reqMethod](_WebDriverMock.pathMatcher(urlPath));
     };
   }
-  /**
-   * Clear all interceptors and recreate the shared MockAgent.
-   */
-  static reset() {
-    const previous = sharedAgent;
-    sharedAgent = new MockAgent();
-    configureNetConnect(sharedAgent);
-    setGlobalDispatcher(sharedAgent);
-    if (previous) {
-      void previous.close();
-    }
-    if (getGlobalDispatcher().constructor.name !== "MockAgent") {
-      setGlobalDispatcher(sharedAgent);
-    }
-  }
 };
 
 // src/constants.ts
@@ -206,7 +138,7 @@ var WebdriverMockService = class {
   init() {
     this._mock.command.status().times(Infinity).reply(200, { value: {} });
     this._mock.command.newSession().times(Infinity).reply(200, () => {
-      newSession.value.sessionId = crypto.randomUUID();
+      newSession.value.sessionId = uuidv4();
       return newSession;
     });
     this._mock.command.deleteSession().times(2).reply(200, deleteSession);
@@ -235,7 +167,7 @@ var WebdriverMockService = class {
     this._browser.addCommand("clickScenario", this.clickScenario.bind(this));
     this._browser.addCommand("isExistingScenario", this.isExistingScenario.bind(this));
     this._browser.addCommand("isNotExistingScenario", this.isNotExistingScenario.bind(this));
-    this._browser.addCommand("multiRemoteFetch", this.multiRemoteFetch.bind(this));
+    this._browser.addCommand("multiremoteFetch", this.multiremoteFetch.bind(this));
     this._browser.addCommand("asyncIterationScenario", this.asyncIterationScenario.bind(this));
     this._browser.addCommand("parentElementChaining", this.parentNextPreviousElementChaining.bind(this));
     this._browser.addCommand("refetchElementScenario", this.refetchElementScenario.bind(this));
@@ -338,7 +270,7 @@ var WebdriverMockService = class {
     this._mock.command.executeScript().reply(200, { value: elemParentResponse });
     this._mock.command.getElementText(ELEMENT_REFETCHED).reply(200, { value: "some element text" });
   }
-  multiRemoteFetch() {
+  multiremoteFetch() {
     const elemResponse = { [ELEM_PROP]: ELEMENT_ID };
     const elem2Response = { [ELEM_PROP]: ELEMENT_REFETCHED };
     this._mock.command.findElement().twice().reply(200, { value: elemResponse });
@@ -389,13 +321,9 @@ var WebdriverMockService = class {
     this._mock.command.navigateTo().times(3).reply(500, {});
     this._mock.command.navigateTo().reply(200, { value: null });
   }
-  /**
-   * Reset all mock interceptors and re-register the default command stubs.
-   * Kept as `nockReset` for compatibility with smoke tests that call it by name.
-   */
   nockReset() {
-    WebDriverMock.reset();
-    this._mock = new WebDriverMock();
+    nock2.cleanAll();
+    nock2.abortPendingRequests();
     this.init();
   }
 };
@@ -405,12 +333,7 @@ var launcher = class WebdriverMockLauncher {
     config.port = 4444;
     config.runnerEnv = {
       ...config.runnerEnv || {},
-      /**
-       * Opt workers into undici + MockAgent instead of native fetch + nock.
-       * `WDIO_UNIT_TESTS` alone still selects the web fetch implementation for
-       * Vitest unit tests that stub `globalThis.fetch`.
-       */
-      WDIO_USE_UNDICI_MOCK: "true"
+      WDIO_USE_NATIVE_FETCH: "true"
     };
   }
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@wdio/webdriver-mock-service",
-  "version": "10.0.0-alpha.149+ce13bea83",
+  "version": "10.0.0-alpha.18+dbf0f4971",
   "description": "A WebdriverIO service to stub all endpoints for internal testing purposes.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-webdriver-mock-service",
   "license": "MIT",
   "engines": {
-    "node": ">=22.19.0"
+    "node": ">=18.20.0"
   },
   "repository": {
     "type": "git",
@@ -25,18 +25,20 @@
       "import": "./build/index.js"
     }
   },
-  "typeScriptVersion": "6.0.3",
+  "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@wdio/protocols": "10.0.0-alpha.149+ce13bea83",
-    "@wdio/types": "10.0.0-alpha.149+ce13bea83",
-    "undici": "^8.11.2",
-    "webdriverio": "10.0.0-alpha.149+ce13bea83"
+    "@types/uuid": "^10.0.0",
+    "@wdio/protocols": "9.31.5",
+    "@wdio/types": "9.32.0",
+    "nock": "14.0.15",
+    "uuid": "^11.1.0",
+    "webdriverio": "9.32.0"
   },
   "devDependencies": {
-    "@wdio/globals": "10.0.0-alpha.149+ce13bea83"
+    "@wdio/globals": "10.0.0-alpha.18+dbf0f4971"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ce13bea839fb037eceda429dbf94cd387b7c3584"
+  "gitHead": "dbf0f497130676040ce4212d9cf6459adfe16c42"
 }