webdriver 8.38.0 → 8.39.0

package/build/command.js

@@ -87,7 +87,7 @@ export default function (method, endpointUri, commandInfo, doubleEncodeVariables
         }
         const request = await RequestFactory.getInstance(method, endpoint, body, isHubCommand);
         request.on('performance', (...args) => this.emit('request.performance', ...args));
-        this.emit('command', { method, endpoint, body });
+        this.emit('command', { 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
@@ -103,7 +103,7 @@ export default function (method, endpointUri, commandInfo, doubleEncodeVariables
                 }
                 log.info('RESULT', resultLog);
             }
-            this.emit('result', { method, endpoint, body, result });
+            this.emit('result', { command, method, endpoint, body, result });
             if (command === 'deleteSession') {
                 const shutdownDriver = body.deleteSessionOpts?.shutdownDriver !== false;
                 /**

package/build/index.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,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;IAmCvF,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,7 +1,6 @@
 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';
@@ -114,10 +113,16 @@ export default class WebDriver {
      * @returns {string}           the new session id of the browser
      */
     static async reloadSession(instance, newCapabilities) {
-        const capabilities = deepmerge(instance.requestedCapabilities, newCapabilities || {});
-        const params = { ...instance.options, capabilities };
+        const capabilities = newCapabilities ? newCapabilities : instance.requestedCapabilities;
+        let params = { ...instance.options, capabilities };
+        for (const prop of ['protocol', 'hostname', 'port', 'path', 'queryParams', 'user', 'key']) {
+            if (prop in capabilities) {
+                params = { ...params, [prop]: capabilities[prop] };
+                delete capabilities[prop];
+            }
+        }
         let driverProcess;
-        if (newCapabilities?.browserName) {
+        if (params.hostname === DEFAULTS.hostname.default && newCapabilities?.browserName) {
             delete params.port;
             delete params.hostname;
             driverProcess = await startWebDriver(params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "8.38.0",
+  "version": "8.39.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.38.0",
+    "@wdio/config": "8.39.0",
     "@wdio/logger": "8.38.0",
     "@wdio/protocols": "8.38.0",
-    "@wdio/types": "8.37.0",
-    "@wdio/utils": "8.38.0",
+    "@wdio/types": "8.39.0",
+    "@wdio/utils": "8.39.0",
     "deepmerge-ts": "^5.1.0",
     "got": "^12.6.1",
     "ky": "^0.33.0",
     "ws": "^8.8.0"
   },
-  "gitHead": "b8ebe679c772a858709164896c6b5ea86a42b146"
+  "gitHead": "82da6a28fabaf5f5fad29ea6dc976091027955f8"
 }