appium 2.0.0-beta.23 → 2.0.0-beta.26

package/build/lib/utils.js

@@ -5,14 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ReadonlyMap = void 0;
 exports.getPackageVersion = getPackageVersion;
 exports.insertAppiumPrefixes = insertAppiumPrefixes;
-exports.inspectObject = inspectObject;
+exports.inspect = void 0;
 exports.parseCapsForInnerDriver = parseCapsForInnerDriver;
 exports.pullSettings = pullSettings;
 exports.removeAppiumPrefixes = removeAppiumPrefixes;
-exports.rootDir = void 0;
 
 require("source-map-support/register");
 
@@ -22,42 +20,20 @@ var _logger = _interopRequireDefault(require("./logger"));
 
 var _baseDriver = require("@appium/base-driver");
 
-var _support = require("@appium/support");
+var _util = require("util");
 
 const W3C_APPIUM_PREFIX = 'appium';
+const isStdoutTTY = process.stdout.isTTY;
+
+const inspect = _lodash.default.flow(_lodash.default.partialRight(_util.inspect, {
+  colors: true,
+  depth: null,
+  compact: !isStdoutTTY
+}), (...args) => {
+  _logger.default.info(...args);
+});
 
-function inspectObject(args) {
-  function getValueArray(obj, indent = '  ') {
-    if (!_lodash.default.isObject(obj)) {
-      return [obj];
-    }
-
-    let strArr = ['{'];
-
-    for (let [arg, value] of _lodash.default.toPairs(obj)) {
-      if (!_lodash.default.isObject(value)) {
-        strArr.push(`${indent}  ${arg}: ${value}`);
-      } else {
-        value = getValueArray(value, `${indent}  `);
-        strArr.push(`${indent}  ${arg}: ${value.shift()}`);
-        strArr.push(...value);
-      }
-    }
-
-    strArr.push(`${indent}}`);
-    return strArr;
-  }
-
-  for (let [arg, value] of _lodash.default.toPairs(args)) {
-    value = getValueArray(value);
-
-    _logger.default.info(`  ${arg}: ${value.shift()}`);
-
-    for (let val of value) {
-      _logger.default.info(val);
-    }
-  }
-}
+exports.inspect = inspect;
 
 function parseCapsForInnerDriver(jsonwpCapabilities, w3cCapabilities, constraints = {}, defaultCapabilities = {}) {
   const hasW3CCaps = _lodash.default.isPlainObject(w3cCapabilities) && (_lodash.default.has(w3cCapabilities, 'alwaysMatch') || _lodash.default.has(w3cCapabilities, 'firstMatch'));
@@ -210,31 +186,4 @@ function pullSettings(caps) {
 
   return result;
 }
-
-const rootDir = _support.fs.findRoot(__dirname);
-
-exports.rootDir = rootDir;
-
-class ReadonlyMap extends Map {
-  set(key, value) {
-    if (this.has(key)) {
-      throw new Error(`${key} is already set`);
-    }
-
-    return super.set(key, value);
-  }
-
-  delete(key) {
-    throw new Error(`${key} cannot be deleted`);
-  }
-
-  clear() {
-    throw new Error(`Cannot clear ReadonlyMap`);
-  }
-
-}
-
-exports.ReadonlyMap = ReadonlyMap;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/utils.js"],"names":["W3C_APPIUM_PREFIX","inspectObject","args","getValueArray","obj","indent","_","isObject","strArr","arg","value","toPairs","push","shift","logger","info","val","parseCapsForInnerDriver","jsonwpCapabilities","w3cCapabilities","constraints","defaultCapabilities","hasW3CCaps","isPlainObject","has","hasJSONWPCaps","desiredCaps","processedW3CCapabilities","processedJsonwpCapabilities","protocol","PROTOCOLS","W3C","error","Error","cloneDeep","isEmpty","defaultCapKey","defaultCapValue","isCapAlreadySet","firstMatchEntry","firstMatch","removeAppiumPrefixes","removeAppiumPrefix","alwaysMatch","Object","assign","message","insertAppiumPrefixes","caps","STANDARD_CAPS","prefixedCaps","name","includes","fixedCaps","key","prefix","startsWith","substring","length","getPackageVersion","pkgName","pkgInfo","require","version","pullSettings","result","match","exec","rootDir","fs","findRoot","__dirname","ReadonlyMap","Map","set","delete","clear"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport logger from './logger';\nimport { processCapabilities, PROTOCOLS } from '@appium/base-driver';\nimport { fs } from '@appium/support';\n\nconst W3C_APPIUM_PREFIX = 'appium';\n\nfunction inspectObject (args) {\n  function getValueArray (obj, indent = '  ') {\n    if (!_.isObject(obj)) {\n      return [obj];\n    }\n\n    let strArr = ['{'];\n    for (let [arg, value] of _.toPairs(obj)) {\n      if (!_.isObject(value)) {\n        strArr.push(`${indent}  ${arg}: ${value}`);\n      } else {\n        value = getValueArray(value, `${indent}  `);\n        strArr.push(`${indent}  ${arg}: ${value.shift()}`);\n        strArr.push(...value);\n      }\n    }\n    strArr.push(`${indent}}`);\n    return strArr;\n  }\n  for (let [arg, value] of _.toPairs(args)) {\n    value = getValueArray(value);\n    logger.info(`  ${arg}: ${value.shift()}`);\n    for (let val of value) {\n      logger.info(val);\n    }\n  }\n}\n\n/**\n * Takes the caps that were provided in the request and translates them\n * into caps that can be used by the inner drivers.\n *\n * @param {Object} jsonwpCapabilities\n * @param {Object} w3cCapabilities\n * @param {Object} constraints\n * @param {Object} defaultCapabilities\n */\nfunction parseCapsForInnerDriver (jsonwpCapabilities, w3cCapabilities, constraints = {}, defaultCapabilities = {}) {\n  // Check if the caller sent JSONWP caps, W3C caps, or both\n  const hasW3CCaps = _.isPlainObject(w3cCapabilities) &&\n    (_.has(w3cCapabilities, 'alwaysMatch') || _.has(w3cCapabilities, 'firstMatch'));\n  const hasJSONWPCaps = _.isPlainObject(jsonwpCapabilities);\n  let desiredCaps = {};\n  let processedW3CCapabilities = null;\n  let processedJsonwpCapabilities = null;\n\n  if (!hasW3CCaps) {\n    return {\n      protocol: PROTOCOLS.W3C,\n      error: new Error('W3C capabilities should be provided'),\n    };\n  }\n\n  const {W3C} = PROTOCOLS;\n  const protocol = W3C;\n\n  // Make sure we don't mutate the original arguments\n  jsonwpCapabilities = _.cloneDeep(jsonwpCapabilities);\n  w3cCapabilities = _.cloneDeep(w3cCapabilities);\n  defaultCapabilities = _.cloneDeep(defaultCapabilities);\n\n  if (!_.isEmpty(defaultCapabilities)) {\n    if (hasW3CCaps) {\n      for (const [defaultCapKey, defaultCapValue] of _.toPairs(defaultCapabilities)) {\n        let isCapAlreadySet = false;\n        // Check if the key is already present in firstMatch entries\n        for (const firstMatchEntry of (w3cCapabilities.firstMatch || [])) {\n          if (_.isPlainObject(firstMatchEntry)\n              && _.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))) {\n            isCapAlreadySet = true;\n            break;\n          }\n        }\n        // Check if the key is already present in alwaysMatch entries\n        isCapAlreadySet = isCapAlreadySet || (_.isPlainObject(w3cCapabilities.alwaysMatch)\n          && _.has(removeAppiumPrefixes(w3cCapabilities.alwaysMatch), removeAppiumPrefix(defaultCapKey)));\n        if (isCapAlreadySet) {\n          // Skip if the key is already present in the provided caps\n          continue;\n        }\n\n        // Only add the default capability if it is not overridden\n        if (_.isEmpty(w3cCapabilities.firstMatch)) {\n          w3cCapabilities.firstMatch = [{[defaultCapKey]: defaultCapValue}];\n        } else {\n          w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;\n        }\n      }\n    }\n    if (hasJSONWPCaps) {\n      jsonwpCapabilities = Object.assign({}, removeAppiumPrefixes(defaultCapabilities), jsonwpCapabilities);\n    }\n  }\n\n  // Get MJSONWP caps\n  if (hasJSONWPCaps) {\n    processedJsonwpCapabilities = {...jsonwpCapabilities};\n  }\n\n  // Get W3C caps\n  if (hasW3CCaps) {\n    // Call the process capabilities algorithm to find matching caps on the W3C\n    // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)\n    try {\n      desiredCaps = processCapabilities(w3cCapabilities, constraints, true);\n    } catch (error) {\n      logger.info(`Could not parse W3C capabilities: ${error.message}`);\n      return {\n        desiredCaps,\n        processedJsonwpCapabilities,\n        processedW3CCapabilities,\n        protocol,\n        error,\n      };\n    }\n\n    // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`\n    processedW3CCapabilities = {\n      alwaysMatch: {...insertAppiumPrefixes(desiredCaps)},\n      firstMatch: [{}],\n    };\n  }\n\n  return {desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities, protocol};\n}\n\n/**\n * Takes a capabilities objects and prefixes capabilities with `appium:`\n * @param {Object} caps Desired capabilities object\n */\nfunction insertAppiumPrefixes (caps) {\n  // Standard, non-prefixed capabilities (see https://www.w3.org/TR/webdriver/#dfn-table-of-standard-capabilities)\n  const STANDARD_CAPS = [\n    'browserName',\n    'browserVersion',\n    'platformName',\n    'acceptInsecureCerts',\n    'pageLoadStrategy',\n    'proxy',\n    'setWindowRect',\n    'timeouts',\n    'unhandledPromptBehavior'\n  ];\n\n  let prefixedCaps = {};\n  for (let [name, value] of _.toPairs(caps)) {\n    if (STANDARD_CAPS.includes(name) || name.includes(':')) {\n      prefixedCaps[name] = value;\n    } else {\n      prefixedCaps[`${W3C_APPIUM_PREFIX}:${name}`] = value;\n    }\n  }\n  return prefixedCaps;\n}\n\nfunction removeAppiumPrefixes (caps) {\n  if (!_.isPlainObject(caps)) {\n    return caps;\n  }\n\n  const fixedCaps = {};\n  for (let [name, value] of _.toPairs(caps)) {\n    fixedCaps[removeAppiumPrefix(name)] = value;\n  }\n  return fixedCaps;\n}\n\nfunction removeAppiumPrefix (key) {\n  const prefix = `${W3C_APPIUM_PREFIX}:`;\n  return _.startsWith(key, prefix) ? key.substring(prefix.length) : key;\n}\n\nfunction getPackageVersion (pkgName) {\n  const pkgInfo = require(`${pkgName}/package.json`) || {};\n  return pkgInfo.version;\n}\n\n/**\n * Pulls the initial values of Appium settings from the given capabilities argument.\n * Each setting item must satisfy the following format:\n * `setting[setting_name]: setting_value`\n * The capabilities argument itself gets mutated, so it does not contain parsed\n * settings anymore to avoid further parsing issues.\n * Check\n * https://github.com/appium/appium/blob/master/docs/en/advanced-concepts/settings.md\n * for more details on the available settings.\n *\n * @param {?Object} caps - Capabilities dictionary. It is mutated if\n * one or more settings have been pulled from it\n * @return {Object} - An empty dictionary if the given caps contains no\n * setting items or a dictionary containing parsed Appium setting names along with\n * their values.\n */\nfunction pullSettings (caps) {\n  if (!_.isPlainObject(caps) || _.isEmpty(caps)) {\n    return {};\n  }\n\n  const result = {};\n  for (const [key, value] of _.toPairs(caps)) {\n    const match = /\\bsettings\\[(\\S+)\\]$/.exec(key);\n    if (!match) {\n      continue;\n    }\n\n    result[match[1]] = value;\n    delete caps[key];\n  }\n  return result;\n}\n\nconst rootDir = fs.findRoot(__dirname);\n\n\n/**\n * A Map where you can set properties, but only once. And you can't remove anything. So there.\n * @template K,V\n * @extends {Map<K,V>}\n */\nclass ReadonlyMap extends Map {\n  /**\n   * @param {K} key\n   * @param {V} value\n   */\n  set (key, value) {\n    if (this.has(key)) {\n      throw new Error(`${key} is already set`);\n    }\n    return super.set(key, value);\n  }\n\n  delete (key) {\n    throw new Error(`${key} cannot be deleted`);\n  }\n\n  clear () {\n    throw new Error(`Cannot clear ReadonlyMap`);\n  }\n}\n\nexport {\n  inspectObject, parseCapsForInnerDriver, insertAppiumPrefixes, rootDir,\n  getPackageVersion, pullSettings, removeAppiumPrefixes, ReadonlyMap\n};\n"],"file":"lib/utils.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../lib/utils.js"],"names":["W3C_APPIUM_PREFIX","isStdoutTTY","process","stdout","isTTY","inspect","_","flow","partialRight","dump","colors","depth","compact","args","logger","info","parseCapsForInnerDriver","jsonwpCapabilities","w3cCapabilities","constraints","defaultCapabilities","hasW3CCaps","isPlainObject","has","hasJSONWPCaps","desiredCaps","processedW3CCapabilities","processedJsonwpCapabilities","protocol","PROTOCOLS","W3C","error","Error","cloneDeep","isEmpty","defaultCapKey","defaultCapValue","toPairs","isCapAlreadySet","firstMatchEntry","firstMatch","removeAppiumPrefixes","removeAppiumPrefix","alwaysMatch","Object","assign","message","insertAppiumPrefixes","caps","STANDARD_CAPS","prefixedCaps","name","value","includes","fixedCaps","key","prefix","startsWith","substring","length","getPackageVersion","pkgName","pkgInfo","require","version","pullSettings","result","match","exec"],"mappings":"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","sourcesContent":["// @ts-check\n\nimport _ from 'lodash';\nimport logger from './logger';\n// @ts-ignore\nimport { processCapabilities, PROTOCOLS } from '@appium/base-driver';\nimport { inspect as dump } from 'util';\n\nconst W3C_APPIUM_PREFIX = 'appium';\n\n/**\n *\n * If `stdout` is a TTY, this is `true`.\n *\n * Used for tighter control over log output.\n * @type {boolean}\n */\nconst isStdoutTTY = process.stdout.isTTY;\n\n/**\n * Dumps to value to the console using `info` logger.\n *\n * @todo May want to force color to be `false` if {@link isStdoutTTY} is `false`.\n */\nconst inspect = _.flow(\n  _.partialRight(\n    /** @type {(object: any, options: import('util').InspectOptions) => string} */(dump),\n    {colors: true, depth: null, compact: !isStdoutTTY}\n  ),\n  (...args) => {\n    logger.info(...args);\n  });\n\n/**\n * Takes the caps that were provided in the request and translates them\n * into caps that can be used by the inner drivers.\n *\n * @param {Object} jsonwpCapabilities\n * @param {Object} w3cCapabilities\n * @param {Object} constraints\n * @param {Object} defaultCapabilities\n */\nfunction parseCapsForInnerDriver (jsonwpCapabilities, w3cCapabilities, constraints = {}, defaultCapabilities = {}) {\n  // Check if the caller sent JSONWP caps, W3C caps, or both\n  const hasW3CCaps = _.isPlainObject(w3cCapabilities) &&\n    (_.has(w3cCapabilities, 'alwaysMatch') || _.has(w3cCapabilities, 'firstMatch'));\n  const hasJSONWPCaps = _.isPlainObject(jsonwpCapabilities);\n  let desiredCaps = {};\n  let processedW3CCapabilities = null;\n  let processedJsonwpCapabilities = null;\n\n  if (!hasW3CCaps) {\n    return {\n      protocol: PROTOCOLS.W3C,\n      error: new Error('W3C capabilities should be provided'),\n    };\n  }\n\n  const {W3C} = PROTOCOLS;\n  const protocol = W3C;\n\n  // Make sure we don't mutate the original arguments\n  jsonwpCapabilities = _.cloneDeep(jsonwpCapabilities);\n  w3cCapabilities = _.cloneDeep(w3cCapabilities);\n  defaultCapabilities = _.cloneDeep(defaultCapabilities);\n\n  if (!_.isEmpty(defaultCapabilities)) {\n    if (hasW3CCaps) {\n      for (const [defaultCapKey, defaultCapValue] of _.toPairs(defaultCapabilities)) {\n        let isCapAlreadySet = false;\n        // Check if the key is already present in firstMatch entries\n        for (const firstMatchEntry of (w3cCapabilities.firstMatch || [])) {\n          if (_.isPlainObject(firstMatchEntry)\n              && _.has(removeAppiumPrefixes(firstMatchEntry), removeAppiumPrefix(defaultCapKey))) {\n            isCapAlreadySet = true;\n            break;\n          }\n        }\n        // Check if the key is already present in alwaysMatch entries\n        isCapAlreadySet = isCapAlreadySet || (_.isPlainObject(w3cCapabilities.alwaysMatch)\n          && _.has(removeAppiumPrefixes(w3cCapabilities.alwaysMatch), removeAppiumPrefix(defaultCapKey)));\n        if (isCapAlreadySet) {\n          // Skip if the key is already present in the provided caps\n          continue;\n        }\n\n        // Only add the default capability if it is not overridden\n        if (_.isEmpty(w3cCapabilities.firstMatch)) {\n          w3cCapabilities.firstMatch = [{[defaultCapKey]: defaultCapValue}];\n        } else {\n          w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;\n        }\n      }\n    }\n    if (hasJSONWPCaps) {\n      jsonwpCapabilities = Object.assign({}, removeAppiumPrefixes(defaultCapabilities), jsonwpCapabilities);\n    }\n  }\n\n  // Get MJSONWP caps\n  if (hasJSONWPCaps) {\n    processedJsonwpCapabilities = {...jsonwpCapabilities};\n  }\n\n  // Get W3C caps\n  if (hasW3CCaps) {\n    // Call the process capabilities algorithm to find matching caps on the W3C\n    // (see: https://github.com/jlipps/simple-wd-spec#processing-capabilities)\n    try {\n      desiredCaps = processCapabilities(w3cCapabilities, constraints, true);\n    } catch (error) {\n      logger.info(`Could not parse W3C capabilities: ${error.message}`);\n      return {\n        desiredCaps,\n        processedJsonwpCapabilities,\n        processedW3CCapabilities,\n        protocol,\n        error,\n      };\n    }\n\n    // Create a new w3c capabilities payload that contains only the matching caps in `alwaysMatch`\n    processedW3CCapabilities = {\n      alwaysMatch: {...insertAppiumPrefixes(desiredCaps)},\n      firstMatch: [{}],\n    };\n  }\n\n  return {desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities, protocol};\n}\n\n/**\n * Takes a capabilities objects and prefixes capabilities with `appium:`\n * @param {Object} caps Desired capabilities object\n */\nfunction insertAppiumPrefixes (caps) {\n  // Standard, non-prefixed capabilities (see https://www.w3.org/TR/webdriver/#dfn-table-of-standard-capabilities)\n  const STANDARD_CAPS = [\n    'browserName',\n    'browserVersion',\n    'platformName',\n    'acceptInsecureCerts',\n    'pageLoadStrategy',\n    'proxy',\n    'setWindowRect',\n    'timeouts',\n    'unhandledPromptBehavior'\n  ];\n\n  let prefixedCaps = {};\n  for (let [name, value] of _.toPairs(caps)) {\n    if (STANDARD_CAPS.includes(name) || name.includes(':')) {\n      prefixedCaps[name] = value;\n    } else {\n      prefixedCaps[`${W3C_APPIUM_PREFIX}:${name}`] = value;\n    }\n  }\n  return prefixedCaps;\n}\n\nfunction removeAppiumPrefixes (caps) {\n  if (!_.isPlainObject(caps)) {\n    return caps;\n  }\n\n  const fixedCaps = {};\n  for (let [name, value] of _.toPairs(caps)) {\n    fixedCaps[removeAppiumPrefix(name)] = value;\n  }\n  return fixedCaps;\n}\n\nfunction removeAppiumPrefix (key) {\n  const prefix = `${W3C_APPIUM_PREFIX}:`;\n  return _.startsWith(key, prefix) ? key.substring(prefix.length) : key;\n}\n\nfunction getPackageVersion (pkgName) {\n  const pkgInfo = require(`${pkgName}/package.json`) || {};\n  return pkgInfo.version;\n}\n\n/**\n * Pulls the initial values of Appium settings from the given capabilities argument.\n * Each setting item must satisfy the following format:\n * `setting[setting_name]: setting_value`\n * The capabilities argument itself gets mutated, so it does not contain parsed\n * settings anymore to avoid further parsing issues.\n * Check\n * https://github.com/appium/appium/blob/master/docs/en/advanced-concepts/settings.md\n * for more details on the available settings.\n *\n * @param {?Object} caps - Capabilities dictionary. It is mutated if\n * one or more settings have been pulled from it\n * @return {Object} - An empty dictionary if the given caps contains no\n * setting items or a dictionary containing parsed Appium setting names along with\n * their values.\n */\nfunction pullSettings (caps) {\n  if (!_.isPlainObject(caps) || _.isEmpty(caps)) {\n    return {};\n  }\n\n  const result = {};\n  for (const [key, value] of _.toPairs(caps)) {\n    const match = /\\bsettings\\[(\\S+)\\]$/.exec(key);\n    if (!match) {\n      continue;\n    }\n\n    result[match[1]] = value;\n    delete caps[key];\n  }\n  return result;\n}\n\nexport {\n  inspect, parseCapsForInnerDriver, insertAppiumPrefixes,\n  getPackageVersion, pullSettings, removeAppiumPrefixes\n};\n"]}

package/lib/appium.js

@@ -1,12 +1,12 @@
 import _ from 'lodash';
-import log from './logger';
 import { getBuildInfo, updateBuildInfo, APPIUM_VER } from './config';
-import { findMatchingDriver } from './drivers';
 import { BaseDriver, errors, isSessionCommand,
-         CREATE_SESSION_COMMAND } from '@appium/base-driver';
+         CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND
+} from '@appium/base-driver';
 import AsyncLock from 'async-lock';
 import { parseCapsForInnerDriver, pullSettings } from './utils';
-import { util } from '@appium/support';
+import { util, node, logger } from '@appium/support';
+import { getDefaultsForExtension } from './schema';
 
 const desiredCapabilityConstraints = {
   automationName: {
@@ -51,6 +51,7 @@ class AppiumDriver extends BaseDriver {
     // It is not recommended to access this property directly from the outside
     this.pendingDrivers = {};
 
+    /** @type {PluginExtensionClass[]} */
     this.pluginClasses = []; // list of which plugins are active
     this.sessionPlugins = {}; // map of sessions to actual plugin instances per session
     this.sessionlessPlugins = []; // some commands are sessionless, so we need a set of plugins for them
@@ -59,9 +60,24 @@ class AppiumDriver extends BaseDriver {
     updateBuildInfo();
   }
 
-  /** @type {DriverConfig|undefined} */
+  /**
+   * Retrieves logger instance for the current umbrella driver instance
+   * @override
+   */
+  get log () {
+    if (!this._log) {
+      const instanceName = `${this.constructor.name}@${node.getObjectId(this).substring(0, 8)}`;
+      this._log = logger.getLogger(instanceName);
+    }
+    return this._log;
+  }
+
+  /** @type {import('./extension/driver-config').DriverConfig|undefined} */
   driverConfig;
 
+  /** @type {import('express').Express|undefined} */
+  server;
+
   /**
    * Cancel commands queueing for the umbrella Appium driver
    */
@@ -91,41 +107,41 @@ class AppiumDriver extends BaseDriver {
   }
 
   printNewSessionAnnouncement (driverName, driverVersion, driverBaseVersion) {
-    log.info(driverVersion
+    this.log.info(driverVersion
       ? `Appium v${APPIUM_VER} creating new ${driverName} (v${driverVersion}) session`
       : `Appium v${APPIUM_VER} creating new ${driverName} session`
     );
-    log.info(`Checking BaseDriver versions for Appium and ${driverName}`);
-    log.info(AppiumDriver.baseVersion
+    this.log.info(`Checking BaseDriver versions for Appium and ${driverName}`);
+    this.log.info(AppiumDriver.baseVersion
       ? `Appium's BaseDriver version is ${AppiumDriver.baseVersion}`
       : `Could not determine Appium's BaseDriver version`
     );
-    log.info(driverBaseVersion
+    this.log.info(driverBaseVersion
       ? `${driverName}'s BaseDriver version is ${driverBaseVersion}`
       : `Could not determine ${driverName}'s BaseDriver version`
     );
   }
 
-  /**
-   * This is just an alias for driver.js's method, which is necessary for
-   * mocking in the test suite
-   */
-  _findMatchingDriver (...args) {
-    return findMatchingDriver(...args);
-  }
-
   /**
    * Validate and assign CLI args for a driver or plugin
    *
    * If the extension has provided a schema, validation has already happened.
-   * @param {import('./ext-config-io').ExtensionType} extType 'driver' or 'plugin'
+   *
+   * Any arg which is equal to its default value will not be assigned to the extension.
+   * @param {import('./manifest').ExtensionType} extType 'driver' or 'plugin'
    * @param {string} extName the name of the extension
    * @param {Object} extInstance the driver or plugin instance
    */
   assignCliArgsToExtension (extType, extName, extInstance) {
-    const cliArgs = this.args[extType]?.[extName];
-    if (!_.isEmpty(cliArgs)) {
-      extInstance.cliArgs = cliArgs;
+    const allCliArgsForExt = this.args[extType]?.[extName];
+    if (!_.isEmpty(allCliArgsForExt)) {
+      const defaults = getDefaultsForExtension(extType, extName);
+      const cliArgs = _.isEmpty(defaults)
+        ? allCliArgsForExt
+        : _.omitBy(allCliArgsForExt, (value, key) => _.isEqual(defaults[key], value));
+      if (!_.isEmpty(cliArgs)) {
+        extInstance.cliArgs = cliArgs;
+      }
     }
   }
 
@@ -175,7 +191,7 @@ class AppiumDriver extends BaseDriver {
         driver: InnerDriver,
         version: driverVersion,
         driverName
-      } = this._findMatchingDriver(this.driverConfig, desiredCaps);
+      } = this.driverConfig.findMatchingDriver(desiredCaps);
       this.printNewSessionAnnouncement(InnerDriver.name, driverVersion, InnerDriver.baseVersion);
 
       if (this.args.sessionOverride) {
@@ -191,21 +207,21 @@ class AppiumDriver extends BaseDriver {
       // could have been set by a malicious user via capabilities, whereas we
       // want a guarantee the values were set by the appium server admin
       if (this.args.relaxedSecurityEnabled) {
-        log.info(`Applying relaxed security to '${InnerDriver.name}' as per ` +
-                 `server command line argument. All insecure features will be ` +
-                 `enabled unless explicitly disabled by --deny-insecure`);
+        this.log.info(`Applying relaxed security to '${InnerDriver.name}' as per ` +
+          `server command line argument. All insecure features will be ` +
+          `enabled unless explicitly disabled by --deny-insecure`);
         driverInstance.relaxedSecurityEnabled = true;
       }
 
       if (!_.isEmpty(this.args.denyInsecure)) {
-        log.info('Explicitly preventing use of insecure features:');
-        this.args.denyInsecure.map((a) => log.info(`    ${a}`));
+        this.log.info('Explicitly preventing use of insecure features:');
+        this.args.denyInsecure.map((a) => this.log.info(`    ${a}`));
         driverInstance.denyInsecure = this.args.denyInsecure;
       }
 
       if (!_.isEmpty(this.args.allowInsecure)) {
-        log.info('Explicitly enabling use of insecure features:');
-        this.args.allowInsecure.map((a) => log.info(`    ${a}`));
+        this.log.info('Explicitly enabling use of insecure features:');
+        this.args.allowInsecure.map((a) => this.log.info(`    ${a}`));
         driverInstance.allowInsecure = this.args.allowInsecure;
       }
 
@@ -252,19 +268,19 @@ class AppiumDriver extends BaseDriver {
 
       this.attachUnexpectedShutdownHandler(driverInstance, innerSessionId);
 
-      log.info(`New ${InnerDriver.name} session created successfully, session ` +
-              `${innerSessionId} added to master session list`);
+      this.log.info(`New ${InnerDriver.name} session created successfully, session ` +
+        `${innerSessionId} added to master session list`);
 
       // set the New Command Timeout for the inner driver
       driverInstance.startNewCommandTimeout();
 
       // apply initial values to Appium settings (if provided)
       if (driverInstance.isW3CProtocol() && !_.isEmpty(w3cSettings)) {
-        log.info(`Applying the initial values to Appium settings parsed from W3C caps: ` +
+        this.log.info(`Applying the initial values to Appium settings parsed from W3C caps: ` +
           JSON.stringify(w3cSettings));
         await driverInstance.updateSettings(w3cSettings);
       } else if (driverInstance.isMjsonwpProtocol() && !_.isEmpty(jwpSettings)) {
-        log.info(`Applying the initial values to Appium settings parsed from MJSONWP caps: ` +
+        this.log.info(`Applying the initial values to Appium settings parsed from MJSONWP caps: ` +
           JSON.stringify(jwpSettings));
         await driverInstance.updateSettings(jwpSettings);
       }
@@ -283,24 +299,24 @@ class AppiumDriver extends BaseDriver {
 
   attachUnexpectedShutdownHandler (driver, innerSessionId) {
     const onShutdown = (cause = new Error('Unknown error')) => {
-      log.warn(`Ending session, cause was '${cause.message}'`);
+      this.log.warn(`Ending session, cause was '${cause.message}'`);
 
       if (this.sessionPlugins[innerSessionId]) {
         for (const plugin of this.sessionPlugins[innerSessionId]) {
           if (_.isFunction(plugin.onUnexpectedShutdown)) {
-            log.debug(`Plugin ${plugin.name} defines an unexpected shutdown handler; calling it now`);
+            this.log.debug(`Plugin ${plugin.name} defines an unexpected shutdown handler; calling it now`);
             try {
               plugin.onUnexpectedShutdown(driver, cause);
             } catch (e) {
-              log.warn(`Got an error when running plugin ${plugin.name} shutdown handler: ${e}`);
+              this.log.warn(`Got an error when running plugin ${plugin.name} shutdown handler: ${e}`);
             }
           } else {
-            log.debug(`Plugin ${plugin.name} does not define an unexpected shutdown handler`);
+            this.log.debug(`Plugin ${plugin.name} does not define an unexpected shutdown handler`);
           }
         }
       }
 
-      log.info(`Removing session '${innerSessionId}' from our master session list`);
+      this.log.info(`Removing session '${innerSessionId}' from our master session list`);
       delete this.sessions[innerSessionId];
       delete this.sessionPlugins[innerSessionId];
     };
@@ -308,7 +324,7 @@ class AppiumDriver extends BaseDriver {
     if (_.isFunction(driver.onUnexpectedShutdown)) {
       driver.onUnexpectedShutdown(onShutdown);
     } else {
-      log.warn(`Failed to attach the unexpected shutdown listener. ` +
+      this.log.warn(`Failed to attach the unexpected shutdown listener. ` +
         `Is 'onUnexpectedShutdown' method available for '${driver.constructor.name}'?`);
     }
   }
@@ -343,7 +359,7 @@ class AppiumDriver extends BaseDriver {
               .map(([, value]) => value.driverData);
         dstSession = this.sessions[sessionId];
         protocol = dstSession.protocol;
-        log.info(`Removing session ${sessionId} from our master session list`);
+        this.log.info(`Removing session ${sessionId} from our master session list`);
         // regardless of whether the deleteSession completes successfully or not
         // make the session unavailable, because who knows what state it might
         // be in otherwise
@@ -355,7 +371,7 @@ class AppiumDriver extends BaseDriver {
         value: await dstSession.deleteSession(sessionId, otherSessionsData),
       };
     } catch (e) {
-      log.error(`Had trouble ending session ${sessionId}: ${e.message}`);
+      this.log.error(`Had trouble ending session ${sessionId}: ${e.message}`);
       return {
         protocol,
         error: e,
@@ -366,7 +382,7 @@ class AppiumDriver extends BaseDriver {
   async deleteAllSessions (opts = {}) {
     const sessionsCount = _.size(this.sessions);
     if (0 === sessionsCount) {
-      log.debug('There are no active sessions for cleanup');
+      this.log.debug('There are no active sessions for cleanup');
       return;
     }
 
@@ -374,7 +390,7 @@ class AppiumDriver extends BaseDriver {
       force = false,
       reason,
     } = opts;
-    log.debug(`Cleaning up ${util.pluralize('active session', sessionsCount, true)}`);
+    this.log.debug(`Cleaning up ${util.pluralize('active session', sessionsCount, true)}`);
     const cleanupPromises = force
       ? _.values(this.sessions).map((drv) => drv.startUnexpectedShutdown(reason && new Error(reason)))
       : _.keys(this.sessions).map((id) => this.deleteSession(id));
@@ -382,7 +398,7 @@ class AppiumDriver extends BaseDriver {
       try {
         await cleanupPromise;
       } catch (e) {
-        log.debug(e);
+        this.log.debug(e);
       }
     }
   }
@@ -443,9 +459,10 @@ class AppiumDriver extends BaseDriver {
     // The tricky part is that because we support command plugins, we need to wrap any of these
     // cases with plugin handling.
 
-    const isGetStatus = cmd === 'getStatus';
+    const isGetStatus = cmd === GET_STATUS_COMMAND;
+    const isDeleteSession = cmd === DELETE_SESSION_COMMAND;
     const isUmbrellaCmd = !isGetStatus && isAppiumDriverCommand(cmd);
-    const isSessionCmd = !isGetStatus && !isUmbrellaCmd;
+    const isSessionCmd = !isUmbrellaCmd || isDeleteSession;
 
     // if a plugin override proxying for this command and that is why we are here instead of just
     // letting the protocol proxy the command entirely, determine that, get the request object for
@@ -470,7 +487,9 @@ class AppiumDriver extends BaseDriver {
       }
       // now save the response protocol given that the session driver's protocol might differ
       protocol = dstSession.protocol;
-      driver = dstSession;
+      if (!isUmbrellaCmd) {
+        driver = dstSession;
+      }
     }
 
     // get any plugins which are registered as handling this command
@@ -492,7 +511,7 @@ class AppiumDriver extends BaseDriver {
       // if we're running with plugins, make sure we log that the default behavior is actually
       // happening so we can tell when the plugin call chain is unwrapping to the default behavior
       // if that's what happens
-      plugins.length && log.info(`Executing default handling behavior for command '${cmd}'`);
+      plugins.length && this.log.info(`Executing default handling behavior for command '${cmd}'`);
 
       // if we make it here, we know that the default behavior is handled
       cmdHandledBy.default = true;
@@ -538,8 +557,8 @@ class AppiumDriver extends BaseDriver {
     // their createSession method and other instance methods
     if (cmd === CREATE_SESSION_COMMAND && this.sessionlessPlugins.length && !res.error) {
       const sessionId = _.first(res.value);
-      log.info(`Promoting ${this.sessionlessPlugins.length} sessionless plugins to be attached ` +
-               `to session ID ${sessionId}`);
+      this.log.info(`Promoting ${this.sessionlessPlugins.length} sessionless plugins to be attached ` +
+        `to session ID ${sessionId}`);
       this.sessionPlugins[sessionId] = this.sessionlessPlugins;
       this.sessionlessPlugins = [];
     }
@@ -548,7 +567,7 @@ class AppiumDriver extends BaseDriver {
   }
 
   wrapCommandWithPlugins ({driver, cmd, args, next, cmdHandledBy, plugins}) {
-    plugins.length && log.info(`Plugins which can handle cmd '${cmd}': ${plugins.map((p) => p.name)}`);
+    plugins.length && this.log.info(`Plugins which can handle cmd '${cmd}': ${plugins.map((p) => p.name)}`);
 
     // now we can go through each plugin and wrap `next` around its own handler, passing the *old*
     // next in so that it can call it if it wants to
@@ -558,7 +577,7 @@ class AppiumDriver extends BaseDriver {
       // evaluated, otherwise we end up with infinite recursion of the last `next` to be defined.
       cmdHandledBy[plugin.name] = false; // we see a new plugin, so add it to the 'cmdHandledBy' object
       next = ((_next) => async () => {
-        log.info(`Plugin ${plugin.name} is now handling cmd '${cmd}'`);
+        this.log.info(`Plugin ${plugin.name} is now handling cmd '${cmd}'`);
         cmdHandledBy[plugin.name] = true; // if we make it here, this plugin has attempted to handle cmd
         // first attempt to handle the command via a command-specific handler on the plugin
         if (plugin[cmd]) {
@@ -586,9 +605,9 @@ class AppiumDriver extends BaseDriver {
     const didHandle = Object.keys(cmdHandledBy).filter((k) => cmdHandledBy[k]);
     const didntHandle = Object.keys(cmdHandledBy).filter((k) => !cmdHandledBy[k]);
     if (didntHandle.length > 0) {
-      log.info(`Command '${cmd}' was *not* handled by the following behaviours or plugins, even ` +
-               `though they were registered to handle it: ${JSON.stringify(didntHandle)}. The ` +
-               `command *was* handled by these: ${JSON.stringify(didHandle)}.`);
+      this.log.info(`Command '${cmd}' was *not* handled by the following behaviours or plugins, even ` +
+        `though they were registered to handle it: ${JSON.stringify(didntHandle)}. The ` +
+        `command *was* handled by these: ${JSON.stringify(didHandle)}.`);
     }
   }
 

package/lib/cli/args.js

@@ -1,23 +1,22 @@
 // @ts-check
 
 // @ts-ignore
-import { DEFAULT_BASE_PATH } from '@appium/base-driver';
 import _ from 'lodash';
-import DriverConfig from '../driver-config';
-import { APPIUM_HOME, DRIVER_TYPE, INSTALL_TYPES, PLUGIN_TYPE } from '../extension-config';
-import PluginConfig from '../plugin-config';
+import { DRIVER_TYPE, PLUGIN_TYPE, EXT_SUBCOMMAND_INSTALL, EXT_SUBCOMMAND_LIST, EXT_SUBCOMMAND_RUN, EXT_SUBCOMMAND_UNINSTALL, EXT_SUBCOMMAND_UPDATE } from '../constants';
+import { INSTALL_TYPES } from '../extension/extension-config';
 import { toParserArgs } from '../schema/cli-args';
-
 const DRIVER_EXAMPLE = 'xcuitest';
 const PLUGIN_EXAMPLE = 'find_by_image';
-const USE_ALL_PLUGINS = 'all';
+
+/**
+ * This is necessary because we pass the array into `argparse`. `argparse` is bad and mutates things. We don't want that.
+ * Bad `argparse`! Bad!
+ */
+const INSTALL_TYPES_ARRAY = [...INSTALL_TYPES];
 
 /** @type {Set<ExtensionType>} */
 const EXTENSION_TYPES = new Set([DRIVER_TYPE, PLUGIN_TYPE]);
 
-const driverConfig = DriverConfig.getInstance(APPIUM_HOME);
-const pluginConfig = PluginConfig.getInstance(APPIUM_HOME);
-
 // this set of args works for both drivers and plugins ('extensions')
 /** @type {ArgumentDefinitions} */
 const globalExtensionArgs = new Map([
@@ -33,18 +32,18 @@ const globalExtensionArgs = new Map([
 /**
  * Builds a Record of extension types to a Record of subcommands to their argument definitions
  */
-const getExtensionArgs = _.once(function getExtensionArgs () {
+const getExtensionArgs = _.memoize(function getExtensionArgs () {
   const extensionArgs = {};
   for (const type of EXTENSION_TYPES) {
     extensionArgs[type] = {
-      list: makeListArgs(type),
-      install: makeInstallArgs(type),
-      uninstall: makeUninstallArgs(type),
-      update: makeUpdateArgs(type),
-      run: makeRunArgs(type),
+      [EXT_SUBCOMMAND_LIST]: makeListArgs(type),
+      [EXT_SUBCOMMAND_INSTALL]: makeInstallArgs(type),
+      [EXT_SUBCOMMAND_UNINSTALL]: makeUninstallArgs(type),
+      [EXT_SUBCOMMAND_UPDATE]: makeUpdateArgs(type),
+      [EXT_SUBCOMMAND_RUN]: makeRunArgs(type),
     };
   }
-  return /** @type {Record<ExtensionType, Record<string,ArgumentDefinitions[]>>} */ (extensionArgs);
+  return /** @type {Record<ExtensionType, Record<import('../../types/types').CliExtensionSubcommand,ArgumentDefinitions>>} */(extensionArgs);
 });
 
 /**
@@ -88,9 +87,9 @@ function makeInstallArgs (type) {
     [['--source'], {
       required: false,
       default: null,
-      choices: INSTALL_TYPES,
+      choices: INSTALL_TYPES_ARRAY,
       help: `Where to look for the ${type} if it is not one of Appium's verified ` +
-            `${type}s. Possible values: ${INSTALL_TYPES.join(', ')}`,
+            `${type}s. Possible values: ${INSTALL_TYPES_ARRAY.join(', ')}`,
       dest: 'installType'
     }],
     [['--package'], {
@@ -175,13 +174,7 @@ function makeRunArgs (type) {
  */
 function getServerArgs () {
   return new Map([
-    ...toParserArgs({
-      overrides: {
-        basePath: {
-          default: DEFAULT_BASE_PATH
-        },
-      }
-    }),
+    ...toParserArgs(),
     ...serverArgsDisallowedInConfig,
   ]);
 }
@@ -195,21 +188,31 @@ const serverArgsDisallowedInConfig = new Map([
     ['--shell'],
     {
       required: false,
-      default: null,
       help: 'Enter REPL mode',
-      action: 'store_true',
+      action: 'store_const',
+      const: true,
       dest: 'shell',
     },
   ],
+  [
+    ['--show-build-info'],
+    {
+      dest: 'showBuildInfo',
+      action: 'store_const',
+      const: true,
+      required: false,
+      help: 'Show info about the Appium build and exit',
+    },
+  ],
   [
     ['--show-config'],
     {
-      default: false,
       dest: 'showConfig',
-      action: 'store_true',
+      action: 'store_const',
+      const: true,
       required: false,
-      help: 'Show info about the appium server configuration and exit',
-    },
+      help: 'Show the current Appium configuration and exit',
+    }
   ],
   [
     ['--config'],
@@ -224,16 +227,12 @@ const serverArgsDisallowedInConfig = new Map([
 
 export {
   getServerArgs,
-  getExtensionArgs,
-  USE_ALL_PLUGINS,
-  driverConfig,
-  pluginConfig,
-  APPIUM_HOME
+  getExtensionArgs
 };
 
 /**
  * Alias
- * @typedef {import('../ext-config-io').ExtensionType} ExtensionType
+ * @typedef {import('../extension/manifest').ExtensionType} ExtensionType
  */
 
 /**