@appium/base-driver 8.2.4 → 8.4.0

package/lib/protocol/errors.js

@@ -9,7 +9,7 @@ const w3cLog = logger.getLogger('W3C');
 const W3C_UNKNOWN_ERROR = 'unknown error';
 
 // base error class for all of our errors
-class ProtocolError extends ES6Error {
+export class ProtocolError extends ES6Error {
   constructor (msg, jsonwpCode, w3cStatus, error) {
     super(msg);
     this.jsonwpCode = jsonwpCode;
@@ -34,7 +34,7 @@ class ProtocolError extends ES6Error {
 // https://github.com/SeleniumHQ/selenium/issues/5562#issuecomment-370379470
 // https://w3c.github.io/webdriver/webdriver-spec.html#dfn-error-code
 
-class NoSuchDriverError extends ProtocolError {
+export class NoSuchDriverError extends ProtocolError {
   static code () {
     return 6;
   }
@@ -51,7 +51,7 @@ class NoSuchDriverError extends ProtocolError {
   }
 }
 
-class NoSuchElementError extends ProtocolError {
+export class NoSuchElementError extends ProtocolError {
   static code () {
     return 7;
   }
@@ -68,7 +68,7 @@ class NoSuchElementError extends ProtocolError {
   }
 }
 
-class NoSuchFrameError extends ProtocolError {
+export class NoSuchFrameError extends ProtocolError {
   static code () {
     return 8;
   }
@@ -85,7 +85,7 @@ class NoSuchFrameError extends ProtocolError {
   }
 }
 
-class UnknownCommandError extends ProtocolError {
+export class UnknownCommandError extends ProtocolError {
   static code () {
     return 9;
   }
@@ -102,7 +102,7 @@ class UnknownCommandError extends ProtocolError {
   }
 }
 
-class StaleElementReferenceError extends ProtocolError {
+export class StaleElementReferenceError extends ProtocolError {
   static code () {
     return 10;
   }
@@ -119,7 +119,7 @@ class StaleElementReferenceError extends ProtocolError {
   }
 }
 
-class ElementNotVisibleError extends ProtocolError {
+export class ElementNotVisibleError extends ProtocolError {
   static code () {
     return 11;
   }
@@ -136,7 +136,7 @@ class ElementNotVisibleError extends ProtocolError {
   }
 }
 
-class InvalidElementStateError extends ProtocolError {
+export class InvalidElementStateError extends ProtocolError {
   static code () {
     return 12;
   }
@@ -154,7 +154,7 @@ class InvalidElementStateError extends ProtocolError {
   }
 }
 
-class UnknownError extends ProtocolError {
+export class UnknownError extends ProtocolError {
   static code () {
     return 13;
   }
@@ -174,7 +174,7 @@ class UnknownError extends ProtocolError {
   }
 }
 
-class UnknownMethodError extends ProtocolError {
+export class UnknownMethodError extends ProtocolError {
   static code () {
     return 405;
   }
@@ -190,7 +190,7 @@ class UnknownMethodError extends ProtocolError {
   }
 }
 
-class UnsupportedOperationError extends ProtocolError {
+export class UnsupportedOperationError extends ProtocolError {
   static code () {
     return 405;
   }
@@ -207,7 +207,7 @@ class UnsupportedOperationError extends ProtocolError {
   }
 }
 
-class ElementIsNotSelectableError extends ProtocolError {
+export class ElementIsNotSelectableError extends ProtocolError {
   static code () {
     return 15;
   }
@@ -224,7 +224,7 @@ class ElementIsNotSelectableError extends ProtocolError {
   }
 }
 
-class ElementClickInterceptedError extends ProtocolError {
+export class ElementClickInterceptedError extends ProtocolError {
   static code () {
     return 64;
   }
@@ -242,7 +242,7 @@ class ElementClickInterceptedError extends ProtocolError {
   }
 }
 
-class ElementNotInteractableError extends ProtocolError {
+export class ElementNotInteractableError extends ProtocolError {
   static code () {
     return 60;
   }
@@ -259,7 +259,7 @@ class ElementNotInteractableError extends ProtocolError {
   }
 }
 
-class InsecureCertificateError extends ProtocolError {
+export class InsecureCertificateError extends ProtocolError {
   static error () {
     return 'insecure certificate';
   }
@@ -269,7 +269,7 @@ class InsecureCertificateError extends ProtocolError {
   }
 }
 
-class JavaScriptError extends ProtocolError {
+export class JavaScriptError extends ProtocolError {
   static code () {
     return 17;
   }
@@ -285,7 +285,7 @@ class JavaScriptError extends ProtocolError {
   }
 }
 
-class XPathLookupError extends ProtocolError {
+export class XPathLookupError extends ProtocolError {
   static code () {
     return 19;
   }
@@ -301,7 +301,7 @@ class XPathLookupError extends ProtocolError {
   }
 }
 
-class TimeoutError extends ProtocolError {
+export class TimeoutError extends ProtocolError {
   static code () {
     return 21;
   }
@@ -317,7 +317,7 @@ class TimeoutError extends ProtocolError {
   }
 }
 
-class NoSuchWindowError extends ProtocolError {
+export class NoSuchWindowError extends ProtocolError {
   static code () {
     return 23;
   }
@@ -334,7 +334,7 @@ class NoSuchWindowError extends ProtocolError {
   }
 }
 
-class InvalidArgumentError extends ProtocolError {
+export class InvalidArgumentError extends ProtocolError {
   static code () {
     return 61;
   }
@@ -351,7 +351,7 @@ class InvalidArgumentError extends ProtocolError {
   }
 }
 
-class InvalidCookieDomainError extends ProtocolError {
+export class InvalidCookieDomainError extends ProtocolError {
   static code () {
     return 24;
   }
@@ -368,7 +368,7 @@ class InvalidCookieDomainError extends ProtocolError {
   }
 }
 
-class NoSuchCookieError extends ProtocolError {
+export class NoSuchCookieError extends ProtocolError {
   static code () {
     return 62;
   }
@@ -384,7 +384,7 @@ class NoSuchCookieError extends ProtocolError {
   }
 }
 
-class UnableToSetCookieError extends ProtocolError {
+export class UnableToSetCookieError extends ProtocolError {
   static code () {
     return 25;
   }
@@ -400,7 +400,7 @@ class UnableToSetCookieError extends ProtocolError {
   }
 }
 
-class UnexpectedAlertOpenError extends ProtocolError {
+export class UnexpectedAlertOpenError extends ProtocolError {
   static code () {
     return 26;
   }
@@ -416,7 +416,7 @@ class UnexpectedAlertOpenError extends ProtocolError {
   }
 }
 
-class NoAlertOpenError extends ProtocolError {
+export class NoAlertOpenError extends ProtocolError {
   static code () {
     return 27;
   }
@@ -432,9 +432,9 @@ class NoAlertOpenError extends ProtocolError {
   }
 }
 
-class NoSuchAlertError extends NoAlertOpenError {}
+export class NoSuchAlertError extends NoAlertOpenError {}
 
-class ScriptTimeoutError extends ProtocolError {
+export class ScriptTimeoutError extends ProtocolError {
   static code () {
     return 28;
   }
@@ -450,7 +450,7 @@ class ScriptTimeoutError extends ProtocolError {
   }
 }
 
-class InvalidElementCoordinatesError extends ProtocolError {
+export class InvalidElementCoordinatesError extends ProtocolError {
   static code () {
     return 29;
   }
@@ -467,9 +467,9 @@ class InvalidElementCoordinatesError extends ProtocolError {
   }
 }
 
-class InvalidCoordinatesError extends InvalidElementCoordinatesError {}
+export class InvalidCoordinatesError extends InvalidElementCoordinatesError {}
 
-class IMENotAvailableError extends ProtocolError {
+export class IMENotAvailableError extends ProtocolError {
   static code () {
     return 30;
   }
@@ -485,7 +485,7 @@ class IMENotAvailableError extends ProtocolError {
   }
 }
 
-class IMEEngineActivationFailedError extends ProtocolError {
+export class IMEEngineActivationFailedError extends ProtocolError {
   static code () {
     return 31;
   }
@@ -502,7 +502,7 @@ class IMEEngineActivationFailedError extends ProtocolError {
   }
 }
 
-class InvalidSelectorError extends ProtocolError {
+export class InvalidSelectorError extends ProtocolError {
   static code () {
     return 32;
   }
@@ -519,7 +519,7 @@ class InvalidSelectorError extends ProtocolError {
   }
 }
 
-class SessionNotCreatedError extends ProtocolError {
+export class SessionNotCreatedError extends ProtocolError {
   static code () {
     return 33;
   }
@@ -539,7 +539,7 @@ class SessionNotCreatedError extends ProtocolError {
   }
 }
 
-class MoveTargetOutOfBoundsError extends ProtocolError {
+export class MoveTargetOutOfBoundsError extends ProtocolError {
   static code () {
     return 34;
   }
@@ -555,7 +555,7 @@ class MoveTargetOutOfBoundsError extends ProtocolError {
   }
 }
 
-class NoSuchContextError extends ProtocolError {
+export class NoSuchContextError extends ProtocolError {
   static code () {
     return 35;
   }
@@ -564,7 +564,7 @@ class NoSuchContextError extends ProtocolError {
   }
 }
 
-class InvalidContextError extends ProtocolError {
+export class InvalidContextError extends ProtocolError {
   static code () {
     return 36;
   }
@@ -575,18 +575,18 @@ class InvalidContextError extends ProtocolError {
 }
 
 // These are aliases for UnknownMethodError
-class NotYetImplementedError extends UnknownMethodError {
+export class NotYetImplementedError extends UnknownMethodError {
   constructor (err) {
     super(err || 'Method has not yet been implemented');
   }
 }
-class NotImplementedError extends UnknownMethodError {
+export class NotImplementedError extends UnknownMethodError {
   constructor (err) {
     super(err || 'Method is not implemented');
   }
 }
 
-class UnableToCaptureScreen extends ProtocolError {
+export class UnableToCaptureScreen extends ProtocolError {
   static code () {
     return 63;
   }
@@ -604,7 +604,7 @@ class UnableToCaptureScreen extends ProtocolError {
 
 
 // Equivalent to W3C InvalidArgumentError
-class BadParametersError extends ES6Error {
+export class BadParametersError extends ES6Error {
   static error () {
     return 'invalid argument';
   }
@@ -628,7 +628,7 @@ class BadParametersError extends ES6Error {
  * In case of ProxyRequestError should fetch the actual error by calling `getActualError()`
  * for proxy failure to generate the client response.
  */
-class ProxyRequestError extends ES6Error {
+export class ProxyRequestError extends ES6Error {
   constructor (err, responseError, httpStatus) {
     let responseErrorObj = util.safeJsonParse(responseError);
     if (!_.isPlainObject(responseErrorObj)) {
@@ -864,7 +864,7 @@ function getResponseForJsonwpError (err) {
 }
 
 export {
-  ProtocolError, errors, isErrorType, isUnknownError,
+  errors, isErrorType, isUnknownError,
   errorFromMJSONWPStatusCode, errorFromW3CJsonCode,
   getResponseForW3CError, getResponseForJsonwpError,
 };

package/lib/protocol/index.js

@@ -1,8 +1,8 @@
 // transpile:main
 
 import {
-  Protocol, isSessionCommand, routeConfiguringFunction, determineProtocol,
-  CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND,
+  isSessionCommand, routeConfiguringFunction, determineProtocol,
+  CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND
 } from './protocol';
 import {
   NO_SESSION_ID_COMMANDS, ALL_COMMANDS, METHOD_MAP,
@@ -13,8 +13,8 @@ import {
 } from './errors';
 
 export {
-  Protocol, routeConfiguringFunction, errors, isErrorType,
+  routeConfiguringFunction, errors, isErrorType,
   errorFromMJSONWPStatusCode, errorFromW3CJsonCode, ALL_COMMANDS, METHOD_MAP,
   routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand, determineProtocol,
-  CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND,
+  CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND
 };

package/lib/protocol/protocol.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { util } from '@appium/support';
+import { util, logger, node } from '@appium/support';
 import { validators } from './validators';
 import {
   errors, isErrorType, getResponseForW3CError,
@@ -7,23 +7,17 @@ import {
 } from './errors';
 import { METHOD_MAP, NO_SESSION_ID_COMMANDS } from './routes';
 import B from 'bluebird';
-import {
-  formatResponseValue, formatStatus,
-} from './helpers';
+import { formatResponseValue, formatStatus } from './helpers';
 import { MAX_LOG_BODY_LENGTH, PROTOCOLS, DEFAULT_BASE_PATH } from '../constants';
-import SESSIONS_CACHE from './sessions-cache';
+import { isW3cCaps } from '../helpers/capabilities';
 
 
 const CREATE_SESSION_COMMAND = 'createSession';
 const DELETE_SESSION_COMMAND = 'deleteSession';
 const GET_STATUS_COMMAND = 'getStatus';
 
-class Protocol {}
-
-function determineProtocol (desiredCapabilities, requiredCapabilities, capabilities) {
-  return _.isPlainObject(capabilities) ?
-    PROTOCOLS.W3C :
-    PROTOCOLS.MJSONWP;
+function determineProtocol (createSessionArgs) {
+  return _.some(createSessionArgs, isW3cCaps) ? PROTOCOLS.W3C : PROTOCOLS.MJSONWP;
 }
 
 function extractProtocol (driver, sessionId = null) {
@@ -38,13 +32,30 @@ function extractProtocol (driver, sessionId = null) {
   }
 
   // Extract the protocol for the current session if the given driver is the umbrella one
-  return dstDriver ? dstDriver.protocol : SESSIONS_CACHE.getProtocol(sessionId);
+  return dstDriver?.protocol ?? PROTOCOLS.W3C;
 }
 
 function isSessionCommand (command) {
   return !_.includes(NO_SESSION_ID_COMMANDS, command);
 }
 
+function getLogger (driver, sessionId = null) {
+  const dstDriver = sessionId && _.isFunction(driver.driverForSession)
+    ? (driver.driverForSession(sessionId) ?? driver)
+    : driver;
+  if (_.isFunction(dstDriver.log?.info)) {
+    return dstDriver.log;
+  }
+
+  let logPrefix = dstDriver.constructor
+    ? `${dstDriver.constructor.name}@${node.getObjectId(dstDriver).substring(0, 8)}`
+    : 'AppiumDriver';
+  if (sessionId) {
+    logPrefix += ` (${sessionId.substring(0, 8)})`;
+  }
+  return logger.getLogger(logPrefix);
+}
+
 function wrapParams (paramSets, jsonObj) {
   /* There are commands like performTouch which take a single parameter (primitive type or array).
    * Some drivers choose to pass this parameter as a value (eg. [action1, action2...]) while others to
@@ -192,11 +203,11 @@ function makeArgs (requestParams, jsonObj, payloadParams, protocol) {
 
 function routeConfiguringFunction (driver) {
   if (!driver.sessionExists) {
-    throw new Error('Drivers used with MJSONWP must implement `sessionExists`');
+    throw new Error('Drivers must implement `sessionExists` property');
   }
 
   if (!(driver.executeCommand || driver.execute)) {
-    throw new Error('Drivers used with MJSONWP must implement `executeCommand` or `execute`');
+    throw new Error('Drivers must implement `executeCommand` or `execute` method');
   }
 
   // return a function which will add all the routes to the driver. Here extraMethods might be
@@ -247,7 +258,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
           await doJwpProxy(driver, req, res);
           return;
         }
-        SESSIONS_CACHE.getLogger(req.params.sessionId, currentProtocol).debug(`Would have proxied ` +
+        getLogger(driver, req.params.sessionId).debug(`Would have proxied ` +
           `command directly, but a plugin exists which might require its value, so will let ` +
           `its value be collected internally and made part of plugin chain`);
         didPluginOverrideProxy = true;
@@ -272,7 +283,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       if (spec.command === CREATE_SESSION_COMMAND) {
         // try to determine protocol by session creation args, so we can throw a
         // properly formatted error if arguments validation fails
-        currentProtocol = determineProtocol(...makeArgs(req.params, jsonObj, spec.payloadParams || {}));
+        currentProtocol = determineProtocol(makeArgs(req.params, jsonObj, spec.payloadParams || {}));
       }
 
       // ensure that the json payload conforms to the spec
@@ -288,7 +299,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       }
 
       // run the driver command wrapped inside the argument validators
-      SESSIONS_CACHE.getLogger(req.params.sessionId, currentProtocol).debug(`Calling ` +
+      getLogger(driver, req.params.sessionId).debug(`Calling ` +
         `${driver.constructor.name}.${spec.command}() with args: ` +
         _.truncate(JSON.stringify(args), {length: MAX_LOG_BODY_LENGTH}));
 
@@ -317,8 +328,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       // unpack createSession response
       if (spec.command === CREATE_SESSION_COMMAND) {
         newSessionId = driverRes[0];
-        SESSIONS_CACHE.putSession(newSessionId, currentProtocol);
-        SESSIONS_CACHE.getLogger(newSessionId, currentProtocol)
+        getLogger(driver, newSessionId)
           .debug(`Cached the protocol value '${currentProtocol}' for the new session ${newSessionId}`);
         if (currentProtocol === PROTOCOLS.MJSONWP) {
           driverRes = driverRes[1];
@@ -333,9 +343,9 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
 
       // delete should not return anything even if successful
       if (spec.command === DELETE_SESSION_COMMAND) {
-        SESSIONS_CACHE.getLogger(req.params.sessionId, currentProtocol)
+        getLogger(driver, req.params.sessionId)
           .debug(`Received response: ${_.truncate(JSON.stringify(driverRes), {length: MAX_LOG_BODY_LENGTH})}`);
-        SESSIONS_CACHE.getLogger(req.params.sessionId, currentProtocol).debug('But deleting session, so not returning');
+        getLogger(driver, req.params.sessionId).debug('But deleting session, so not returning');
         driverRes = null;
       }
 
@@ -349,15 +359,8 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       }
 
       httpResBody.value = driverRes;
-      SESSIONS_CACHE.getLogger(req.params.sessionId || newSessionId, currentProtocol).debug(`Responding ` +
+      getLogger(driver, req.params.sessionId || newSessionId).debug(`Responding ` +
         `to client with driver.${spec.command}() result: ${_.truncate(JSON.stringify(driverRes), {length: MAX_LOG_BODY_LENGTH})}`);
-
-      if (spec.command === DELETE_SESSION_COMMAND) {
-        // We don't want to keep the logger instance in the cache
-        // after the session is deleted, because it contains the logging history
-        // and consumes the memory
-        SESSIONS_CACHE.resetLogger(req.params.sessionId);
-      }
     } catch (err) {
       // if anything goes wrong, figure out what our response should be
       // based on the type of error that we encountered
@@ -374,7 +377,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       if (isErrorType(err, errors.ProxyRequestError)) {
         actualErr = err.getActualError();
       } else {
-        SESSIONS_CACHE.getLogger(req.params.sessionId || newSessionId, currentProtocol)
+        getLogger(driver, req.params.sessionId || newSessionId)
           .debug(`Encountered internal error running command: ${errMsg}`);
       }
 
@@ -431,7 +434,7 @@ function driverShouldDoJwpProxy (driver, req, command) {
 }
 
 async function doJwpProxy (driver, req, res) {
-  SESSIONS_CACHE.getLogger(req.params.sessionId, extractProtocol(driver, req.params.sessionId))
+  getLogger(driver, req.params.sessionId)
     .info('Driver proxy active, passing request on via HTTP proxy');
 
   // check that the inner driver has a proxy function
@@ -451,7 +454,7 @@ async function doJwpProxy (driver, req, res) {
 
 
 export {
-  Protocol, routeConfiguringFunction, isSessionCommand,
+  routeConfiguringFunction, isSessionCommand,
   driverShouldDoJwpProxy, determineProtocol, CREATE_SESSION_COMMAND,
   DELETE_SESSION_COMMAND, GET_STATUS_COMMAND,
 };

package/lib/protocol/routes.js

@@ -1,6 +1,8 @@
+// @ts-check
+
 import _ from 'lodash';
 import { util } from '@appium/support';
-import { DEFAULT_BASE_PATH } from '../constants';
+import { PROTOCOLS, DEFAULT_BASE_PATH } from '../constants';
 
 
 const SET_ALERT_TEXT_PAYLOAD_PARAMS = {
@@ -14,6 +16,7 @@ const SET_ALERT_TEXT_PAYLOAD_PARAMS = {
 // define the routes, mapping of HTTP methods to particular driver commands,
 // and any parameters that are expected in a request
 // parameters can be `required` or `optional`
+/** @type {import('@appium/types').MethodMap} */
 const METHOD_MAP = {
   '/status': {
     GET: {command: 'getStatus'}
@@ -33,6 +36,18 @@ const METHOD_MAP = {
   '/session/:sessionId/timeouts': {
     GET: {command: 'getTimeouts'}, // W3C route
     POST: {command: 'timeouts', payloadParams: {
+      validate: (jsonObj, protocolName) => {
+        if (protocolName === PROTOCOLS.W3C) {
+          if (!util.hasValue(jsonObj.script) && !util.hasValue(jsonObj.pageLoad) && !util.hasValue(jsonObj.implicit)) {
+            return 'W3C protocol expects any of script, pageLoad or implicit to be set';
+          }
+        } else {
+          // MJSONWP
+          if (!util.hasValue(jsonObj.type) || !util.hasValue(jsonObj.ms)) {
+            return 'MJSONWP protocol requires type and ms';
+          }
+        }
+      },
       optional: ['type', 'ms', 'script', 'pageLoad', 'implicit'],
     }}
   },
@@ -42,9 +57,19 @@ const METHOD_MAP = {
   '/session/:sessionId/timeouts/implicit_wait': {
     POST: {command: 'implicitWait', payloadParams: {required: ['ms']}}
   },
+  // JSONWP
+  '/session/:sessionId/window_handle': {
+    GET: {command: 'getWindowHandle'}
+  },
+  // W3C
   '/session/:sessionId/window/handle': {
     GET: {command: 'getWindowHandle'}
   },
+  // JSONWP
+  '/session/:sessionId/window_handles': {
+    GET: {command: 'getWindowHandles'}
+  },
+  // W3C
   '/session/:sessionId/window/handles': {
     GET: {command: 'getWindowHandles'}
   },
@@ -61,6 +86,14 @@ const METHOD_MAP = {
   '/session/:sessionId/refresh': {
     POST: {command: 'refresh'}
   },
+  // MJSONWP
+  '/session/:sessionId/execute': {
+    POST: {command: 'execute', payloadParams: {required: ['script', 'args']}}
+  },
+  // MJSONWP
+  '/session/:sessionId/execute_async': {
+    POST: {command: 'executeAsync', payloadParams: {required: ['script', 'args']}}
+  },
   '/session/:sessionId/screenshot': {
     GET: {command: 'getScreenshot'}
   },
@@ -207,6 +240,15 @@ const METHOD_MAP = {
   '/session/:sessionId/element/:elementId/size': {
     GET: {command: 'getSize'}
   },
+  '/session/:sessionId/element/:elementId/shadow': {
+    GET: {command: 'elementShadowRoot'}
+  },
+  '/session/:sessionId/shadow/:shadowId/element': {
+    POST: {command: 'findElementFromShadowRoot', payloadParams: {required: ['using', 'value']}}
+  },
+  '/session/:sessionId/shadow/:shadowId/elements': {
+    POST: {command: 'findElementsFromShadowRoot', payloadParams: {required: ['using', 'value']}}
+  },
   '/session/:sessionId/element/:elementId/css/:propertyName': {
     GET: {command: 'getCssProperty'}
   },
@@ -582,6 +624,28 @@ const METHOD_MAP = {
     POST: {command: 'logCustomEvent', payloadParams: {required: ['vendor', 'event']}}
   },
 
+  /*
+   * The W3C spec has some changes to the wire protocol.
+   * https://w3c.github.io/webdriver/webdriver-spec.html
+   * Begin to add those changes here, keeping the old version
+   * since clients still implement them.
+   */
+  // MJSONWP
+  '/session/:sessionId/alert_text': {
+    GET: {command: 'getAlertText'},
+    POST: {
+      command: 'setAlertText',
+      payloadParams: SET_ALERT_TEXT_PAYLOAD_PARAMS,
+    }
+  },
+  // MJSONWP
+  '/session/:sessionId/accept_alert': {
+    POST: {command: 'postAcceptAlert'}
+  },
+  // MJSONWP
+  '/session/:sessionId/dismiss_alert': {
+    POST: {command: 'postDismissAlert'}
+  },
   // https://w3c.github.io/webdriver/webdriver-spec.html#user-prompts
   '/session/:sessionId/alert/text': {
     GET: {command: 'getAlertText'},
@@ -606,6 +670,10 @@ const METHOD_MAP = {
   '/session/:sessionId/execute/async': {
     POST: {command: 'executeAsync', payloadParams: {required: ['script', 'args']}}
   },
+  // Pre-W3C endpoint for element screenshot
+  '/session/:sessionId/screenshot/:elementId': {
+    GET: {command: 'getElementScreenshot'}
+  },
   '/session/:sessionId/element/:elementId/screenshot': {
     GET: {command: 'getElementScreenshot'}
   },