fix: return desiredCapabilities to support jsonwp

Author: DudaGod

packages/webdriver/src/utils.ts

@@ -44,15 +44,15 @@ export async function startWebDriverSession (params: RemoteConfig): Promise<{ se
      * to check what style the user sent in so we know how to construct the
      * object for the other style
      */
-    const capabilities = params.capabilities && 'alwaysMatch' in params.capabilities
+    const [w3cCaps, jsonwpCaps] = params.capabilities && 'alwaysMatch' in params.capabilities
         /**
          * in case W3C compliant capabilities are provided
          */
-        ? params.capabilities
+        ? [params.capabilities, params.capabilities.alwaysMatch]
         /**
          * otherwise assume they passed in jsonwp-style caps (flat object)
          */
-        : { alwaysMatch: params.capabilities, firstMatch: [{}] }
+        : [{ alwaysMatch: params.capabilities, firstMatch: [{}] }, params.capabilities]
 
     /**
      * automatically opt-into WebDriver Bidi (@ref https://w3c.github.io/webdriver-bidi/)
@@ -61,28 +61,31 @@ export async function startWebDriverSession (params: RemoteConfig): Promise<{ se
         /**
          * except, if user does not want to opt-in
          */
-        !capabilities.alwaysMatch['wdio:enforceWebDriverClassic'] &&
+        !w3cCaps.alwaysMatch['wdio:enforceWebDriverClassic'] &&
         /**
          * or user requests a Safari session which does not support Bidi
          */
-        typeof capabilities.alwaysMatch.browserName === 'string' &&
-        capabilities.alwaysMatch.browserName.toLowerCase() !== 'safari'
+        typeof w3cCaps.alwaysMatch.browserName === 'string' &&
+        w3cCaps.alwaysMatch.browserName.toLowerCase() !== 'safari'
     ) {
         /**
          * opt-into WebDriver Bidi
          */
-        capabilities.alwaysMatch.webSocketUrl = true
+        w3cCaps.alwaysMatch.webSocketUrl = true
         /**
          * allow WebdriverIO to handle alerts
          */
-        capabilities.alwaysMatch.unhandledPromptBehavior = 'ignore'
+        w3cCaps.alwaysMatch.unhandledPromptBehavior = 'ignore'
     }
 
-    validateCapabilities(capabilities.alwaysMatch)
+    validateCapabilities(w3cCaps.alwaysMatch)
     const sessionRequest = new environment.value.Request(
         'POST',
         '/session',
-        { capabilities }
+        {
+            capabilities: w3cCaps, // W3C compliant
+            desiredCapabilities: jsonwpCaps // JSONWP compliant
+        }
     )
 
     let response: SessionInitializationResponse