webdriver 6.0.16 → 6.1.4

package/README.md

@@ -99,7 +99,7 @@ Default: `null`
 Timeout for any WebDriver request to a driver or grid.
 
 Type: `Number`<br>
-Default: *90000*
+Default: *120000*
 
 ### connectionRetryCount
 Count of request retries to the Selenium server.
@@ -107,6 +107,20 @@ Count of request retries to the Selenium server.
 Type: `Number`<br>
 Default: *2*
 
+### agent
+
+Allows you to use a custom` http`/`https`/`http2` [agent](https://www.npmjs.com/package/got#agent) to make requests.
+
+Type: `Object`<br>
+Default:
+
+```js
+{
+    http: new http.Agent({ keepAlive: true }),
+    https: new https.Agent({ keepAlive: true })
+}
+```
+
 ### transformRequest
 Function intercepting [HTTP request options](https://github.com/sindresorhus/got#options) before a WebDriver request is made
 

package/build/constants.js

@@ -46,7 +46,7 @@ const DEFAULTS = {
   },
   connectionRetryTimeout: {
     type: 'number',
-    default: 90000
+    default: 120000
   },
   connectionRetryCount: {
     type: 'number',

package/build/request.js

@@ -76,7 +76,7 @@ class WebDriverRequest extends _events.default {
 
   _createOptions(options, sessionId) {
     const requestOptions = {
-      agent: options.agent || agents[options.protocol],
+      agent: options.agent || agents,
       headers: _objectSpread({}, DEFAULT_HEADERS, {}, typeof options.headers === 'object' ? options.headers : {}),
       searchParams: typeof options.queryParams === 'object' ? options.queryParams : {},
       timeout: options.connectionRetryTimeout
@@ -95,7 +95,8 @@ class WebDriverRequest extends _events.default {
     requestOptions.uri = new URL(`${options.protocol}://` + `${options.hostname}:${options.port}` + (this.isHubCommand ? this.endpoint : _path.default.join(options.path, this.endpoint.replace(':sessionId', sessionId))));
 
     if (this.endpoint === '/session' && options.user && options.key) {
-      requestOptions.auth = `${options.user}:${options.key}`;
+      requestOptions.username = options.user;
+      requestOptions.password = options.key;
     }
 
     requestOptions.rejectUnauthorized = !(process.env.STRICT_SSL === 'false' || process.env.strict_ssl === 'false');
@@ -109,7 +110,36 @@ class WebDriverRequest extends _events.default {
       log.info('DATA', (0, _utils.transformCommandLogResult)(fullRequestOptions.json));
     }
 
-    let response = await (0, _got.default)(fullRequestOptions.uri, _objectSpread({}, fullRequestOptions));
+    const retry = (error, msg) => {
+      if (retryCount >= totalRetryCount || error.message.includes('invalid session id')) {
+        log.error(`Request failed with status ${response.statusCode} due to ${error}`);
+        this.emit('response', {
+          error
+        });
+        error.statusCode = response.statusCode;
+        error.statusMessage = response.statusMessage;
+        throw error;
+      }
+
+      ++retryCount;
+      this.emit('retry', {
+        error,
+        retryCount
+      });
+      log.warn(msg);
+      log.info(`Retrying ${retryCount}/${totalRetryCount}`);
+      return this._request(fullRequestOptions, transformResponse, totalRetryCount, retryCount);
+    };
+
+    let response = await (0, _got.default)(fullRequestOptions.uri, _objectSpread({}, fullRequestOptions)).catch(err => err);
+
+    if (response instanceof Error) {
+      if (response.code === 'ETIMEDOUT') {
+        return retry(response, 'Request timed out! Consider increasing the "connectionRetryTimeout" option.');
+      }
+
+      throw response;
+    }
 
     if (typeof transformResponse === 'function') {
       response = transformResponse(response, fullRequestOptions);
@@ -142,24 +172,7 @@ class WebDriverRequest extends _events.default {
       throw error;
     }
 
-    if (retryCount >= totalRetryCount || error.message.includes('invalid session id')) {
-      log.error(`Request failed with status ${response.statusCode} due to ${error}`);
-      this.emit('response', {
-        error
-      });
-      error.statusCode = response.statusCode;
-      error.statusMessage = response.statusMessage;
-      throw error;
-    }
-
-    ++retryCount;
-    this.emit('retry', {
-      error,
-      retryCount
-    });
-    log.warn(`Request failed with status ${response.statusCode} due to ${error.message}`);
-    log.info(`Retrying ${retryCount}/${totalRetryCount}`);
-    return this._request(fullRequestOptions, transformResponse, totalRetryCount, retryCount);
+    return retry(error, `Request failed with status ${response.statusCode} due to ${error.message}`);
   }
 
 }

package/build/utils.js

@@ -117,7 +117,7 @@ function getErrorFromResponseBody(body) {
     return new Error(body);
   }
 
-  if (typeof body !== 'object' || !body.value) {
+  if (typeof body !== 'object' || !body.value && !body.error) {
     return new Error('unknown error');
   }
 
@@ -126,11 +126,12 @@ function getErrorFromResponseBody(body) {
 
 class CustomRequestError extends Error {
   constructor(body) {
-    super(body.value.message || body.value.class || 'unknown error');
+    const errorObj = body.value || body;
+    super(errorObj.message || errorObj.class || 'unknown error');
 
-    if (body.value.error) {
-      this.name = body.value.error;
-    } else if (body.value.message && body.value.message.includes('stale element reference')) {
+    if (errorObj.error) {
+      this.name = errorObj.error;
+    } else if (errorObj.message && errorObj.message.includes('stale element reference')) {
       this.name = 'stale element reference';
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "6.0.16",
+  "version": "6.1.4",
   "description": "A Node.js bindings implementation for the W3C WebDriver and Mobile JSONWire Protocol",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/webdriver",
@@ -30,15 +30,15 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/config": "6.0.16",
+    "@wdio/config": "6.1.2",
     "@wdio/logger": "6.0.16",
-    "@wdio/protocols": "6.0.12",
-    "@wdio/utils": "6.0.16",
-    "got": "^10.7.0",
+    "@wdio/protocols": "6.1.2",
+    "@wdio/utils": "6.1.0",
+    "got": "^11.0.2",
     "lodash.merge": "^4.6.1"
   },
   "devDependencies": {
-    "@types/got": "^9.6.9"
+    "@types/got": "^9.6.10"
   },
-  "gitHead": "b165926711d8a4dc0cc8b885874651da8dda3e20"
+  "gitHead": "e186dd1169872769741244602b0c68f5932c7d1a"
 }

package/webdriver.d.ts

@@ -10,7 +10,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node"/>
 
-declare type HTTPRequestOptions = import('got').GotOptions;
+declare type HTTPRequestOptions = import('got').Options;
 declare type HTTPResponse = import('got').Response;
 
 declare namespace WebDriver {
@@ -499,6 +499,11 @@ declare namespace WebDriver {
          * Level of logging verbosity.
          */
         logLevel?: WebDriverLogTypes;
+        /**
+         * Set specific log levels per logger
+         * use 'silent' level to disable logger
+         */
+        logLevels?: object;
         /**
          * Timeout for any WebDriver request to a driver or grid.
          */
@@ -887,7 +892,7 @@ declare namespace WebDriver {
          * The Element Send Keys command scrolls into view the form control element and then sends the provided keys to the element. In case the element is not keyboard-interactable, an element not interactable error is returned.<br><br>The key input state used for input may be cleared mid-way through "typing" by sending the null key, which is U+E000 (NULL).
          * https://w3c.github.io/webdriver/#dfn-element-send-keys
          */
-        elementSendKeys(elementId: string, text: string, value?: string[]): void;
+        elementSendKeys(elementId: string, text: string): void;
 
         /**
          * [webdriver]