webdriver 8.29.3 → 8.30.0

package/build/command.d.ts

@@ -1,11 +1,5 @@
-/// <reference types="node" resolution-mode="require"/>
-import type { ChildProcess } from 'node:child_process';
 import { type CommandEndpoint } from '@wdio/protocols';
 import type { WebDriverResponse } from './request/index.js';
 import type { BaseClient, BidiResponses } from './types.js';
-interface BaseClientWithEventHandler extends BaseClient {
-    _driverProcess?: ChildProcess;
-}
-export default function (method: string, endpointUri: string, commandInfo: CommandEndpoint, doubleEncodeVariables?: boolean): (this: BaseClientWithEventHandler, ...args: any[]) => Promise<WebDriverResponse | BidiResponses | void>;
-export {};
+export default function (method: string, endpointUri: string, commandInfo: CommandEndpoint, doubleEncodeVariables?: boolean): (this: BaseClient, ...args: any[]) => Promise<WebDriverResponse | BidiResponses | void>;
 //# sourceMappingURL=command.d.ts.map

package/build/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGtD,OAAO,EAEH,KAAK,eAAe,EACvB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAA;AAKzE,UAAU,0BAA2B,SAAQ,UAAU;IACnD,cAAc,CAAC,EAAE,YAAY,CAAA;CAChC;AAED,MAAM,CAAC,OAAO,WACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,eAAe,EAC5B,qBAAqB,UAAQ,UAIgB,0BAA0B,WAAW,GAAG,EAAE,KAAG,QAAQ,iBAAiB,GAAG,aAAa,GAAG,IAAI,CAAC,CAsJ9I"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,KAAK,eAAe,EACvB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAA;AAKzE,MAAM,CAAC,OAAO,WACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,eAAe,EAC5B,qBAAqB,UAAQ,UAIgB,UAAU,WAAW,GAAG,EAAE,KAAG,QAAQ,iBAAiB,GAAG,aAAa,GAAG,IAAI,CAAC,CA0J9H"}

package/build/command.js

@@ -89,6 +89,9 @@ export default function (method, endpointUri, commandInfo, doubleEncodeVariables
         request.on('performance', (...args) => this.emit('request.performance', ...args));
         this.emit('command', { method, endpoint, body });
         log.info('COMMAND', commandCallStructure(command, args));
+        /**
+         * use then here so we can better unit test what happens before and after the request
+         */
         return request.makeRequest(this.options, this.sessionId).then((result) => {
             if (typeof result.value !== 'undefined') {
                 let resultLog = result.value;
@@ -102,16 +105,16 @@ export default function (method, endpointUri, commandInfo, doubleEncodeVariables
             }
             this.emit('result', { method, endpoint, body, result });
             if (command === 'deleteSession') {
+                const shutdownDriver = body.deleteSessionOpts?.shutdownDriver !== false;
                 /**
                  * kill driver process if there is one
                  */
-                if (this._driverProcess && body.deleteSessionOpts?.shutdownDriver !== false) {
-                    log.info(`Kill ${this._driverProcess.spawnfile} driver process with command line: ${this._driverProcess.spawnargs.slice(1).join(' ')}`);
-                    const killedSuccessfully = this._driverProcess.kill('SIGKILL');
+                if (shutdownDriver && 'wdio:driverPID' in this.capabilities && this.capabilities['wdio:driverPID']) {
+                    log.info(`Kill driver process with PID ${this.capabilities['wdio:driverPID']}`);
+                    const killedSuccessfully = process.kill(this.capabilities['wdio:driverPID'], 'SIGKILL');
                     if (!killedSuccessfully) {
-                        log.warn('Failed to kill driver process, manully clean-up might be required');
+                        log.warn('Failed to kill driver process, manually clean-up might be required');
                     }
-                    this._driverProcess = undefined;
                     setTimeout(() => {
                         /**
                          * clear up potential leaked TLS Socket handles

package/build/index.d.ts

@@ -16,7 +16,7 @@ export default class WebDriver {
      * @param   {object} instance  the object we get from a new browser session.
      * @returns {string}           the new session id of the browser
      */
-    static reloadSession(instance: Client): Promise<string>;
+    static reloadSession(instance: Client, newCapabilities?: WebdriverIO.Capabilities): Promise<string>;
     static get WebDriver(): typeof WebDriver;
 }
 /**

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAA;AAExD,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAyB,YAAY,EAAE,kBAAkB,EAAsD,MAAM,YAAY,CAAA;AACxI,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAgB,MAAM,YAAY,CAAA;AAIrE,MAAM,CAAC,OAAO,OAAO,SAAS;WACb,UAAU,CACnB,OAAO,EAAE,OAAO,CAAC,SAAS,EAC1B,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAClC,aAAa,KAAK,EAClB,oBAAoB,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAC/C,OAAO,CAAC,MAAM,CAAC;IAiElB;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,OAAO,CAAC,EAAE,aAAa,EACvB,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAClC,aAAa,KAAK,EAClB,cAAc,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GACzC,MAAM;IA+CT;;;;;;OAMG;WACU,aAAa,CAAC,QAAQ,EAAE,MAAM;IAW3C,MAAM,KAAK,SAAS,qBAEnB;CACJ;AAED;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC9D,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAyB,YAAY,EAAE,kBAAkB,EAAsD,MAAM,YAAY,CAAA;AACxI,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAgB,MAAM,YAAY,CAAA;AAIrE,MAAM,CAAC,OAAO,OAAO,SAAS;WACb,UAAU,CACnB,OAAO,EAAE,OAAO,CAAC,SAAS,EAC1B,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAClC,aAAa,KAAK,EAClB,oBAAoB,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAC/C,OAAO,CAAC,MAAM,CAAC;IAqElB;;OAEG;IACH,MAAM,CAAC,eAAe,CAClB,OAAO,CAAC,EAAE,aAAa,EACvB,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAClC,aAAa,KAAK,EAClB,cAAc,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GACzC,MAAM;IA+CT;;;;;;OAMG;WACU,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,WAAW,CAAC,YAAY;IA4BvF,MAAM,KAAK,SAAS,qBAEnB;CACJ;AAED;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC9D,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA"}

package/build/index.js

@@ -1,6 +1,7 @@
 import logger from '@wdio/logger';
 import { webdriverMonad, sessionEnvironmentDetector, startWebDriver } from '@wdio/utils';
 import { validateConfig } from '@wdio/config';
+import { deepmerge } from 'deepmerge-ts';
 import command from './command.js';
 import { DEFAULTS } from './constants.js';
 import { startWebDriverSession, getPrototype, getEnvironmentVars, setupDirectConnect, initiateBidi, parseBidiMessage } from './utils.js';
@@ -20,9 +21,13 @@ export default class WebDriver {
         const environment = sessionEnvironmentDetector({ capabilities, requestedCapabilities });
         const environmentPrototype = getEnvironmentVars(environment);
         const protocolCommands = getPrototype(environment);
-        const driverPrototype = {
-            _driverProcess: { value: driverProcess, configurable: false, writable: true }
-        };
+        /**
+         * attach driver process to instance capabilities so we can kill the driver process
+         * even after attaching to this session
+         */
+        if (driverProcess?.pid) {
+            capabilities['wdio:driverPID'] = driverProcess.pid;
+        }
         /**
          * initiate WebDriver Bidi
          */
@@ -35,7 +40,6 @@ export default class WebDriver {
             ...protocolCommands,
             ...environmentPrototype,
             ...userPrototype,
-            ...driverPrototype,
             ...bidiPrototype
         });
         const client = monad(sessionId, customCommandWrapper);
@@ -109,14 +113,27 @@ export default class WebDriver {
      * @param   {object} instance  the object we get from a new browser session.
      * @returns {string}           the new session id of the browser
      */
-    static async reloadSession(instance) {
-        const params = {
-            ...instance.options,
-            capabilities: instance.requestedCapabilities
-        };
-        const { sessionId, capabilities } = await startWebDriverSession(params);
+    static async reloadSession(instance, newCapabilities) {
+        const capabilities = deepmerge(instance.requestedCapabilities, newCapabilities || {});
+        const params = { ...instance.options, capabilities };
+        let driverProcess;
+        if (newCapabilities?.browserName) {
+            delete params.port;
+            delete params.hostname;
+            driverProcess = await startWebDriver(params);
+        }
+        const { sessionId, capabilities: newSessionCapabilities } = await startWebDriverSession(params);
+        /**
+         * attach driver process to instance capabilities so we can kill the driver process
+         * even after attaching to this session
+         */
+        if (driverProcess?.pid) {
+            newSessionCapabilities['wdio:driverPID'] = driverProcess.pid;
+        }
+        instance.options.hostname = params.hostname;
+        instance.options.port = params.port;
         instance.sessionId = sessionId;
-        instance.capabilities = capabilities;
+        instance.capabilities = newSessionCapabilities;
         return sessionId;
     }
     static get WebDriver() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "8.29.3",
+  "version": "8.30.0",
   "description": "A Node.js bindings implementation for the W3C WebDriver and Mobile JSONWire Protocol",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/webdriver",
@@ -38,15 +38,15 @@
   "dependencies": {
     "@types/node": "^20.1.0",
     "@types/ws": "^8.5.3",
-    "@wdio/config": "8.29.3",
+    "@wdio/config": "8.30.0",
     "@wdio/logger": "8.28.0",
-    "@wdio/protocols": "8.24.12",
-    "@wdio/types": "8.29.1",
-    "@wdio/utils": "8.29.3",
+    "@wdio/protocols": "8.29.7",
+    "@wdio/types": "8.30.0",
+    "@wdio/utils": "8.30.0",
     "deepmerge-ts": "^5.1.0",
     "got": "^12.6.1",
     "ky": "^0.33.0",
     "ws": "^8.8.0"
   },
-  "gitHead": "4c6433be548950dc6ccf0efff77507dfa2f0b321"
+  "gitHead": "033e2a91e97c9bd060eb70f2e4e412d382bec3af"
 }