appium 2.0.0-beta.15 → 2.0.0-beta.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/build/lib/cli/argparse-actions.js +1 -1
  2. package/build/lib/cli/args.js +1 -1
  3. package/build/lib/cli/parser-helpers.js +3 -3
  4. package/build/lib/cli/parser.js +2 -2
  5. package/build/lib/cli/utils.js +1 -1
  6. package/build/lib/config.js +9 -9
  7. package/build/lib/drivers.js +1 -1
  8. package/build/lib/extension-config.js +13 -3
  9. package/build/lib/logsink.js +1 -1
  10. package/build/lib/utils.js +4 -4
  11. package/lib/extension-config.js +7 -1
  12. package/package.json +9 -9
package/build/lib/cli/argparse-actions.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.DEFAULT_CAPS_ARG = exports.StoreDeprecatedDefaultCapabilityTrueAction = exports.StoreDeprecatedDefaultCapabilityAction = exports.StoreDeprecatedTrueAction = exports.StoreDeprecatedAction = void 0;
6
+ exports.StoreDeprecatedTrueAction = exports.StoreDeprecatedDefaultCapabilityTrueAction = exports.StoreDeprecatedDefaultCapabilityAction = exports.StoreDeprecatedAction = exports.DEFAULT_CAPS_ARG = void 0;
7
7
 
8
8
  require("source-map-support/register");
9
9
 
package/build/lib/cli/args.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.USE_ALL_PLUGINS = exports.extensionArgs = exports.serverArgs = exports.sharedArgs = void 0;
6
+ exports.sharedArgs = exports.serverArgs = exports.extensionArgs = exports.USE_ALL_PLUGINS = void 0;
7
7
 
8
8
  require("source-map-support/register");
9
9
 
package/build/lib/cli/parser-helpers.js CHANGED
@@ -5,11 +5,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.parseSecurityFeatures = parseSecurityFeatures;
9
- exports.parseJsonStringOrFile = parseJsonStringOrFile;
8
+ exports.parseDriverNames = parseDriverNames;
10
9
  exports.parseInstallTypes = parseInstallTypes;
10
+ exports.parseJsonStringOrFile = parseJsonStringOrFile;
11
11
  exports.parsePluginNames = parsePluginNames;
12
- exports.parseDriverNames = parseDriverNames;
12
+ exports.parseSecurityFeatures = parseSecurityFeatures;
13
13
 
14
14
  require("source-map-support/register");
15
15
 
package/build/lib/cli/parser.js CHANGED
@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.getParser = getParser;
9
- exports.getDefaultServerArgs = getDefaultServerArgs;
10
8
  exports.default = void 0;
9
+ exports.getDefaultServerArgs = getDefaultServerArgs;
10
+ exports.getParser = getParser;
11
11
 
12
12
  require("source-map-support/register");
13
13
 
package/build/lib/cli/utils.js CHANGED
@@ -5,10 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
+ exports.RingBuffer = exports.JSON_SPACES = void 0;
8
9
  exports.errAndQuit = errAndQuit;
9
10
  exports.log = log;
10
11
  exports.spinWith = spinWith;
11
- exports.RingBuffer = exports.JSON_SPACES = void 0;
12
12
 
13
13
  require("source-map-support/register");
14
14
 
package/build/lib/config.js CHANGED
@@ -5,18 +5,18 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.getBuildInfo = getBuildInfo;
9
- exports.validateServerArgs = validateServerArgs;
8
+ exports.APPIUM_VER = void 0;
10
9
  exports.checkNodeOk = checkNodeOk;
11
- exports.showConfig = showConfig;
12
- exports.warnNodeDeprecations = warnNodeDeprecations;
13
- exports.validateTmpDir = validateTmpDir;
14
- exports.getNonDefaultArgs = getNonDefaultArgs;
15
- exports.getGitRev = getGitRev;
16
10
  exports.checkValidPort = checkValidPort;
17
- exports.updateBuildInfo = updateBuildInfo;
11
+ exports.getBuildInfo = getBuildInfo;
18
12
  exports.getDeprecatedArgs = getDeprecatedArgs;
19
- exports.APPIUM_VER = void 0;
13
+ exports.getGitRev = getGitRev;
14
+ exports.getNonDefaultArgs = getNonDefaultArgs;
15
+ exports.showConfig = showConfig;
16
+ exports.updateBuildInfo = updateBuildInfo;
17
+ exports.validateServerArgs = validateServerArgs;
18
+ exports.validateTmpDir = validateTmpDir;
19
+ exports.warnNodeDeprecations = warnNodeDeprecations;
20
20
 
21
21
  require("source-map-support/register");
22
22
 
package/build/lib/drivers.js CHANGED
@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.findMatchingDriver = findMatchingDriver;
9
8
  exports.KNOWN_DRIVERS = void 0;
9
+ exports.findMatchingDriver = findMatchingDriver;
10
10
 
11
11
  require("source-map-support/register");
12
12
 
package/build/lib/extension-config.js CHANGED
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.PLUGIN_TYPE = exports.DRIVER_TYPE = exports.DEFAULT_APPIUM_HOME = exports.INSTALL_TYPES = exports.INSTALL_TYPE_GITHUB = exports.INSTALL_TYPE_LOCAL = exports.INSTALL_TYPE_GIT = exports.INSTALL_TYPE_NPM = exports.default = void 0;
8
+ exports.default = exports.PLUGIN_TYPE = exports.INSTALL_TYPE_NPM = exports.INSTALL_TYPE_LOCAL = exports.INSTALL_TYPE_GITHUB = exports.INSTALL_TYPE_GIT = exports.INSTALL_TYPES = exports.DRIVER_TYPE = exports.DEFAULT_APPIUM_HOME = void 0;
9
9
 
10
10
  require("source-map-support/register");
11
11
 
@@ -245,7 +245,17 @@ class ExtensionConfig {
245
245
  const {
246
246
  mainClass
247
247
  } = this.installedExtensions[extName];
248
- return require(this.getExtensionRequirePath(extName))[mainClass];
248
+ const reqPath = this.getExtensionRequirePath(extName);
249
+
250
+ const reqResolved = require.resolve(reqPath);
251
+
252
+ if (process.env.APPIUM_RELOAD_EXTENSIONS && require.cache[reqResolved]) {
253
+ _logger.default.debug(`Removing ${reqResolved} from require cache`);
254
+
255
+ delete require.cache[reqResolved];
256
+ }
257
+
258
+ return require(reqPath)[mainClass];
249
259
  }
250
260
 
251
261
  isInstalled(extName) {
@@ -257,4 +267,4 @@ class ExtensionConfig {
257
267
  exports.default = ExtensionConfig;require('source-map-support').install();
258
268
 
259
269
 
260
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/extension-config.js"],"names":["DRIVER_TYPE","PLUGIN_TYPE","DEFAULT_APPIUM_HOME","path","resolve","os","homedir","CONFIG_FILE_NAME","CONFIG_SCHEMA_REV","INSTALL_TYPE_NPM","INSTALL_TYPE_LOCAL","INSTALL_TYPE_GITHUB","INSTALL_TYPE_GIT","INSTALL_TYPES","ExtensionConfig","constructor","appiumHome","extensionType","logFn","log","error","bind","configFile","installedExtensions","configKey","yamlData","validate","exts","foundProblems","extName","extData","_","toPairs","getGenericConfigProblems","getConfigProblems","problemSummaries","problems","isEmpty","push","problem","err","JSON","stringify","val","summary","ext","version","pkgName","installSpec","installType","installPath","mainClass","isString","includes","applySchemaMigrations","schemaRev","isUndefined","read","YAML","parse","fs","readFile","exists","Error","message","write","newYamlData","writeFile","addExtension","updateExtension","removeExtension","print","extNames","Object","keys","info","extensionDesc","getExtensionRequirePath","getInstallPath","require","isInstalled"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport log from './logger';\nimport { fs, mkdirp } from '@appium/support';\nimport path from 'path';\nimport os from 'os';\nimport YAML from 'yaml';\n\nconst DRIVER_TYPE = 'driver';\nconst PLUGIN_TYPE = 'plugin';\nconst DEFAULT_APPIUM_HOME = path.resolve(os.homedir(), '.appium');\n\nconst CONFIG_FILE_NAME = 'extensions.yaml';\nconst CONFIG_SCHEMA_REV = 2;\n\nconst INSTALL_TYPE_NPM = 'npm';\nconst INSTALL_TYPE_LOCAL = 'local';\nconst INSTALL_TYPE_GITHUB = 'github';\nconst INSTALL_TYPE_GIT = 'git';\nconst INSTALL_TYPES = [\n  INSTALL_TYPE_GIT,\n  INSTALL_TYPE_GITHUB,\n  INSTALL_TYPE_LOCAL,\n  INSTALL_TYPE_NPM\n];\n\n\nexport default class ExtensionConfig {\n  constructor (appiumHome, extensionType, logFn = null) {\n    if (logFn === null) {\n      logFn = log.error.bind(log);\n    }\n    this.appiumHome = appiumHome;\n    this.configFile = path.resolve(this.appiumHome, CONFIG_FILE_NAME);\n    this.installedExtensions = {};\n    this.extensionType = extensionType;\n    this.configKey = `${extensionType}s`;\n    this.yamlData = {[`${DRIVER_TYPE}s`]: {}, [`${PLUGIN_TYPE}s`]: {}};\n    this.log = logFn;\n  }\n\n  validate (exts) {\n    const foundProblems = {};\n    for (const [extName, extData] of _.toPairs(exts)) {\n      foundProblems[extName] = [\n        ...this.getGenericConfigProblems(extData),\n        ...this.getConfigProblems(extData)\n      ];\n    }\n\n    const problemSummaries = [];\n    for (const [extName, problems] of _.toPairs(foundProblems)) {\n      if (_.isEmpty(problems)) {\n        continue;\n      }\n      // remove this extension from the list since it's not valid\n      delete exts[extName];\n      problemSummaries.push(`${this.extensionType} ${extName} had errors and will not ` +\n                            `be available. Errors:`);\n      for (const problem of problems) {\n        problemSummaries.push(`  - ${problem.err} (Actual value: ` +\n                              `${JSON.stringify(problem.val)})`);\n      }\n    }\n\n    if (!_.isEmpty(problemSummaries)) {\n      this.log(`Appium encountered one or more errors while validating ` +\n               `the ${this.configKey} extension file (${this.configFile}):`);\n      for (const summary of problemSummaries) {\n        this.log(summary);\n      }\n    }\n\n    return exts;\n  }\n\n  getGenericConfigProblems (ext) {\n    const {version, pkgName, installSpec, installType, installPath, mainClass} = ext;\n    const problems = [];\n\n    if (!_.isString(version)) {\n      problems.push({err: 'Missing or incorrect version', val: version});\n    }\n\n    if (!_.isString(pkgName)) {\n      problems.push({err: 'Missing or incorrect NPM package name', val: pkgName});\n    }\n\n    if (!_.isString(installSpec)) {\n      problems.push({err: 'Missing or incorrect installation spec', val: installSpec});\n    }\n\n    if (!_.includes(INSTALL_TYPES, installType)) {\n      problems.push({err: 'Missing or incorrect install type', val: installType});\n    }\n\n    if (!_.isString(installPath)) {\n      problems.push({err: 'Missing or incorrect installation path', val: installPath});\n    }\n\n    if (!_.isString(mainClass)) {\n      problems.push({err: 'Missing or incorrect driver class name', val: mainClass});\n    }\n\n    return problems;\n  }\n\n  getConfigProblems (/*ext*/) {\n    // shoud override this method if special validation is necessary for this extension type\n    return [];\n  }\n\n  applySchemaMigrations () {\n    if (this.yamlData.schemaRev < 2 && _.isUndefined(this.yamlData[PLUGIN_TYPE])) {\n      // at schema revision 2, we started including plugins as well as drivers in the file,\n      // so make sure we at least have an empty section for it\n      this.yamlData[PLUGIN_TYPE] = {};\n    }\n  }\n\n  async read () {\n    await mkdirp(this.appiumHome); // ensure appium home exists\n    try {\n      this.yamlData = YAML.parse(await fs.readFile(this.configFile, 'utf8'));\n      this.applySchemaMigrations();\n\n      // set the list of drivers the user has installed\n      this.installedExtensions = this.validate(this.yamlData[this.configKey]);\n    } catch (err) {\n      if (await fs.exists(this.configFile)) {\n        // if the file exists and we couldn't parse it, that's a problem\n        throw new Error(`Appium had trouble loading the extension installation ` +\n                        `cache file (${this.configFile}). Ensure it exists and is ` +\n                        `readable. Specific error: ${err.message}`);\n      }\n\n      // if the config file doesn't exist, try to write an empty one, to make\n      // sure we actually have write privileges, and complain if we don't\n      try {\n        await this.write();\n      } catch {\n        throw new Error(`Appium could not read or write from the Appium Home directory ` +\n                        `(${this.appiumHome}). Please ensure it is writable.`);\n      }\n    }\n    return this.installedExtensions;\n  }\n\n\n  async write () {\n    const newYamlData = {\n      ...this.yamlData,\n      schemaRev: CONFIG_SCHEMA_REV,\n      [this.configKey]: this.installedExtensions\n    };\n    await fs.writeFile(this.configFile, YAML.stringify(newYamlData), 'utf8');\n  }\n\n  async addExtension (extName, extData) {\n    this.installedExtensions[extName] = extData;\n    await this.write();\n  }\n\n  async updateExtension (extName, extData) {\n    this.installedExtensions[extName] = {\n      ...this.installedExtensions[extName],\n      ...extData,\n    };\n    await this.write();\n  }\n\n  async removeExtension (extName) {\n    delete this.installedExtensions[extName];\n    await this.write();\n  }\n\n  print () {\n    const extNames = Object.keys(this.installedExtensions);\n    if (_.isEmpty(extNames)) {\n      log.info(`No ${this.configKey} have been installed. Use the \"appium ${this.extensionType}\" ` +\n               'command to install the one(s) you want to use.');\n      return;\n    }\n\n    log.info(`Available ${this.configKey}:`);\n    for (const [extName, extData] of _.toPairs(this.installedExtensions)) {\n      log.info(`  - ${this.extensionDesc(extName, extData)}`);\n    }\n  }\n\n  extensionDesc () {\n    throw new Error('This must be implemented in a final class');\n  }\n\n  getExtensionRequirePath (extName) {\n    const {pkgName, installPath} = this.installedExtensions[extName];\n    return path.resolve(this.appiumHome, installPath, 'node_modules', pkgName);\n  }\n\n  getInstallPath (extName) {\n    const {installPath} = this.installedExtensions[extName];\n    return path.resolve(this.appiumHome, installPath);\n  }\n\n  require (extName) {\n    const {mainClass} = this.installedExtensions[extName];\n    return require(this.getExtensionRequirePath(extName))[mainClass];\n  }\n\n  isInstalled (extName) {\n    return _.includes(Object.keys(this.installedExtensions), extName);\n  }\n}\n\nexport {\n  INSTALL_TYPE_NPM, INSTALL_TYPE_GIT, INSTALL_TYPE_LOCAL, INSTALL_TYPE_GITHUB,\n  INSTALL_TYPES, DEFAULT_APPIUM_HOME, DRIVER_TYPE, PLUGIN_TYPE,\n};\n"],"file":"lib/extension-config.js","sourceRoot":"../.."}
270
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/extension-config.js"],"names":["DRIVER_TYPE","PLUGIN_TYPE","DEFAULT_APPIUM_HOME","path","resolve","os","homedir","CONFIG_FILE_NAME","CONFIG_SCHEMA_REV","INSTALL_TYPE_NPM","INSTALL_TYPE_LOCAL","INSTALL_TYPE_GITHUB","INSTALL_TYPE_GIT","INSTALL_TYPES","ExtensionConfig","constructor","appiumHome","extensionType","logFn","log","error","bind","configFile","installedExtensions","configKey","yamlData","validate","exts","foundProblems","extName","extData","_","toPairs","getGenericConfigProblems","getConfigProblems","problemSummaries","problems","isEmpty","push","problem","err","JSON","stringify","val","summary","ext","version","pkgName","installSpec","installType","installPath","mainClass","isString","includes","applySchemaMigrations","schemaRev","isUndefined","read","YAML","parse","fs","readFile","exists","Error","message","write","newYamlData","writeFile","addExtension","updateExtension","removeExtension","print","extNames","Object","keys","info","extensionDesc","getExtensionRequirePath","getInstallPath","require","reqPath","reqResolved","process","env","APPIUM_RELOAD_EXTENSIONS","cache","debug","isInstalled"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport log from './logger';\nimport { fs, mkdirp } from '@appium/support';\nimport path from 'path';\nimport os from 'os';\nimport YAML from 'yaml';\n\nconst DRIVER_TYPE = 'driver';\nconst PLUGIN_TYPE = 'plugin';\nconst DEFAULT_APPIUM_HOME = path.resolve(os.homedir(), '.appium');\n\nconst CONFIG_FILE_NAME = 'extensions.yaml';\nconst CONFIG_SCHEMA_REV = 2;\n\nconst INSTALL_TYPE_NPM = 'npm';\nconst INSTALL_TYPE_LOCAL = 'local';\nconst INSTALL_TYPE_GITHUB = 'github';\nconst INSTALL_TYPE_GIT = 'git';\nconst INSTALL_TYPES = [\n  INSTALL_TYPE_GIT,\n  INSTALL_TYPE_GITHUB,\n  INSTALL_TYPE_LOCAL,\n  INSTALL_TYPE_NPM\n];\n\n\nexport default class ExtensionConfig {\n  constructor (appiumHome, extensionType, logFn = null) {\n    if (logFn === null) {\n      logFn = log.error.bind(log);\n    }\n    this.appiumHome = appiumHome;\n    this.configFile = path.resolve(this.appiumHome, CONFIG_FILE_NAME);\n    this.installedExtensions = {};\n    this.extensionType = extensionType;\n    this.configKey = `${extensionType}s`;\n    this.yamlData = {[`${DRIVER_TYPE}s`]: {}, [`${PLUGIN_TYPE}s`]: {}};\n    this.log = logFn;\n  }\n\n  validate (exts) {\n    const foundProblems = {};\n    for (const [extName, extData] of _.toPairs(exts)) {\n      foundProblems[extName] = [\n        ...this.getGenericConfigProblems(extData),\n        ...this.getConfigProblems(extData)\n      ];\n    }\n\n    const problemSummaries = [];\n    for (const [extName, problems] of _.toPairs(foundProblems)) {\n      if (_.isEmpty(problems)) {\n        continue;\n      }\n      // remove this extension from the list since it's not valid\n      delete exts[extName];\n      problemSummaries.push(`${this.extensionType} ${extName} had errors and will not ` +\n                            `be available. Errors:`);\n      for (const problem of problems) {\n        problemSummaries.push(`  - ${problem.err} (Actual value: ` +\n                              `${JSON.stringify(problem.val)})`);\n      }\n    }\n\n    if (!_.isEmpty(problemSummaries)) {\n      this.log(`Appium encountered one or more errors while validating ` +\n               `the ${this.configKey} extension file (${this.configFile}):`);\n      for (const summary of problemSummaries) {\n        this.log(summary);\n      }\n    }\n\n    return exts;\n  }\n\n  getGenericConfigProblems (ext) {\n    const {version, pkgName, installSpec, installType, installPath, mainClass} = ext;\n    const problems = [];\n\n    if (!_.isString(version)) {\n      problems.push({err: 'Missing or incorrect version', val: version});\n    }\n\n    if (!_.isString(pkgName)) {\n      problems.push({err: 'Missing or incorrect NPM package name', val: pkgName});\n    }\n\n    if (!_.isString(installSpec)) {\n      problems.push({err: 'Missing or incorrect installation spec', val: installSpec});\n    }\n\n    if (!_.includes(INSTALL_TYPES, installType)) {\n      problems.push({err: 'Missing or incorrect install type', val: installType});\n    }\n\n    if (!_.isString(installPath)) {\n      problems.push({err: 'Missing or incorrect installation path', val: installPath});\n    }\n\n    if (!_.isString(mainClass)) {\n      problems.push({err: 'Missing or incorrect driver class name', val: mainClass});\n    }\n\n    return problems;\n  }\n\n  getConfigProblems (/*ext*/) {\n    // shoud override this method if special validation is necessary for this extension type\n    return [];\n  }\n\n  applySchemaMigrations () {\n    if (this.yamlData.schemaRev < 2 && _.isUndefined(this.yamlData[PLUGIN_TYPE])) {\n      // at schema revision 2, we started including plugins as well as drivers in the file,\n      // so make sure we at least have an empty section for it\n      this.yamlData[PLUGIN_TYPE] = {};\n    }\n  }\n\n  async read () {\n    await mkdirp(this.appiumHome); // ensure appium home exists\n    try {\n      this.yamlData = YAML.parse(await fs.readFile(this.configFile, 'utf8'));\n      this.applySchemaMigrations();\n\n      // set the list of drivers the user has installed\n      this.installedExtensions = this.validate(this.yamlData[this.configKey]);\n    } catch (err) {\n      if (await fs.exists(this.configFile)) {\n        // if the file exists and we couldn't parse it, that's a problem\n        throw new Error(`Appium had trouble loading the extension installation ` +\n                        `cache file (${this.configFile}). Ensure it exists and is ` +\n                        `readable. Specific error: ${err.message}`);\n      }\n\n      // if the config file doesn't exist, try to write an empty one, to make\n      // sure we actually have write privileges, and complain if we don't\n      try {\n        await this.write();\n      } catch {\n        throw new Error(`Appium could not read or write from the Appium Home directory ` +\n                        `(${this.appiumHome}). Please ensure it is writable.`);\n      }\n    }\n    return this.installedExtensions;\n  }\n\n\n  async write () {\n    const newYamlData = {\n      ...this.yamlData,\n      schemaRev: CONFIG_SCHEMA_REV,\n      [this.configKey]: this.installedExtensions\n    };\n    await fs.writeFile(this.configFile, YAML.stringify(newYamlData), 'utf8');\n  }\n\n  async addExtension (extName, extData) {\n    this.installedExtensions[extName] = extData;\n    await this.write();\n  }\n\n  async updateExtension (extName, extData) {\n    this.installedExtensions[extName] = {\n      ...this.installedExtensions[extName],\n      ...extData,\n    };\n    await this.write();\n  }\n\n  async removeExtension (extName) {\n    delete this.installedExtensions[extName];\n    await this.write();\n  }\n\n  print () {\n    const extNames = Object.keys(this.installedExtensions);\n    if (_.isEmpty(extNames)) {\n      log.info(`No ${this.configKey} have been installed. Use the \"appium ${this.extensionType}\" ` +\n               'command to install the one(s) you want to use.');\n      return;\n    }\n\n    log.info(`Available ${this.configKey}:`);\n    for (const [extName, extData] of _.toPairs(this.installedExtensions)) {\n      log.info(`  - ${this.extensionDesc(extName, extData)}`);\n    }\n  }\n\n  extensionDesc () {\n    throw new Error('This must be implemented in a final class');\n  }\n\n  getExtensionRequirePath (extName) {\n    const {pkgName, installPath} = this.installedExtensions[extName];\n    return path.resolve(this.appiumHome, installPath, 'node_modules', pkgName);\n  }\n\n  getInstallPath (extName) {\n    const {installPath} = this.installedExtensions[extName];\n    return path.resolve(this.appiumHome, installPath);\n  }\n\n  require (extName) {\n    const {mainClass} = this.installedExtensions[extName];\n    const reqPath = this.getExtensionRequirePath(extName);\n    const reqResolved = require.resolve(reqPath);\n    if (process.env.APPIUM_RELOAD_EXTENSIONS && require.cache[reqResolved]) {\n      log.debug(`Removing ${reqResolved} from require cache`);\n      delete require.cache[reqResolved];\n    }\n    return require(reqPath)[mainClass];\n  }\n\n  isInstalled (extName) {\n    return _.includes(Object.keys(this.installedExtensions), extName);\n  }\n}\n\nexport {\n  INSTALL_TYPE_NPM, INSTALL_TYPE_GIT, INSTALL_TYPE_LOCAL, INSTALL_TYPE_GITHUB,\n  INSTALL_TYPES, DEFAULT_APPIUM_HOME, DRIVER_TYPE, PLUGIN_TYPE,\n};\n"],"file":"lib/extension-config.js","sourceRoot":"../.."}
package/build/lib/logsink.js CHANGED
@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.init = init;
9
8
  exports.clear = clear;
10
9
  exports.default = void 0;
10
+ exports.init = init;
11
11
 
12
12
  require("source-map-support/register");
13
13
 
package/build/lib/utils.js CHANGED
@@ -5,15 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
+ exports.getExtensionArgs = getExtensionArgs;
9
+ exports.getPackageVersion = getPackageVersion;
10
+ exports.insertAppiumPrefixes = insertAppiumPrefixes;
8
11
  exports.inspectObject = inspectObject;
9
12
  exports.parseCapsForInnerDriver = parseCapsForInnerDriver;
10
- exports.insertAppiumPrefixes = insertAppiumPrefixes;
11
- exports.getPackageVersion = getPackageVersion;
12
13
  exports.pullSettings = pullSettings;
13
14
  exports.removeAppiumPrefixes = removeAppiumPrefixes;
14
- exports.getExtensionArgs = getExtensionArgs;
15
- exports.validateExtensionArgs = validateExtensionArgs;
16
15
  exports.rootDir = void 0;
16
+ exports.validateExtensionArgs = validateExtensionArgs;
17
17
 
18
18
  require("source-map-support/register");
19
19
 
package/lib/extension-config.js CHANGED
@@ -203,7 +203,13 @@ export default class ExtensionConfig {
203
203
 
204
204
  require (extName) {
205
205
  const {mainClass} = this.installedExtensions[extName];
206
- return require(this.getExtensionRequirePath(extName))[mainClass];
206
+ const reqPath = this.getExtensionRequirePath(extName);
207
+ const reqResolved = require.resolve(reqPath);
208
+ if (process.env.APPIUM_RELOAD_EXTENSIONS && require.cache[reqResolved]) {
209
+ log.debug(`Removing ${reqResolved} from require cache`);
210
+ delete require.cache[reqResolved];
211
+ }
212
+ return require(reqPath)[mainClass];
207
213
  }
208
214
 
209
215
  isInstalled (extName) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium",
3
- "version": "2.0.0-beta.15",
3
+ "version": "2.0.0-beta.19",
4
4
  "description": "Automation for Apps.",
5
5
  "keywords": [
6
6
  "automation",
@@ -43,14 +43,14 @@
43
43
  "zip-and-upload": "npm run zip && npm run upload"
44
44
  },
45
45
  "dependencies": {
46
- "@appium/base-driver": "^8.0.2",
46
+ "@appium/base-driver": "^8.1.2",
47
47
  "@appium/base-plugin": "1.7.2",
48
- "@appium/support": "^2.54.2",
49
- "@babel/runtime": "7.15.4",
48
+ "@appium/support": "^2.55.0",
49
+ "@babel/runtime": "7.16.0",
50
50
  "argparse": "2.0.1",
51
51
  "async-lock": "1.3.0",
52
- "asyncbox": "2.8.0",
53
- "axios": "0.21.4",
52
+ "asyncbox": "2.9.2",
53
+ "axios": "0.24.0",
54
54
  "bluebird": "3.7.2",
55
55
  "continuation-local-storage": "3.2.1",
56
56
  "find-up": "5.0.0",
@@ -66,8 +66,8 @@
66
66
  "yaml": "1.10.2"
67
67
  },
68
68
  "devDependencies": {
69
- "@appium/fake-driver": "^3.0.2",
70
- "@appium/gulp-plugins": "^5.5.3"
69
+ "@appium/fake-driver": "^3.1.0",
70
+ "@appium/gulp-plugins": "^5.5.4"
71
71
  },
72
72
  "engines": {
73
73
  "node": ">=12",
@@ -78,5 +78,5 @@
78
78
  "tag": "next"
79
79
  },
80
80
  "homepage": "https://appium.io",
81
- "gitHead": "4ec2d1edd7f93685d99fb3186b2ab7b42c591eba"
81
+ "gitHead": "71357e52e1b6211241975ca349411f2df92628fc"
82
82
  }