appium 2.0.0-beta.46 → 2.0.0-beta.48

package/build/lib/grid-register.js

@@ -1,153 +1,135 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _axios = _interopRequireDefault(require("axios"));
-
-var _support = require("@appium/support");
-
-var _logger = _interopRequireDefault(require("./logger"));
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const hubUri = config => {
-  const protocol = config.hubProtocol || 'http';
-  return `${protocol}://${config.hubHost}:${config.hubPort}`;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const support_1 = require("@appium/support");
+const logger_1 = __importDefault(require("./logger"));
+const lodash_1 = __importDefault(require("lodash"));
+const hubUri = (config) => {
+    const protocol = config.hubProtocol || 'http';
+    return `${protocol}://${config.hubHost}:${config.hubPort}`;
+};
+/**
+ * Registers a new node with a selenium grid
+ * @param {string|object} data - Path or object representing selenium grid node config file. If a `string`, all subsequent arguments are required!
+ * @param {string} [addr] - Bind to this address
+ * @param {number} [port] - Bind to this port
+ * @param {string} [basePath] - Base path for the grid
+ */
 async function registerNode(data, addr, port, basePath) {
-  let configFilePath;
-
-  if (_lodash.default.isString(data)) {
-    configFilePath = data;
-
-    try {
-      data = await _support.fs.readFile(data, 'utf-8');
-    } catch (err) {
-      _logger.default.error(`Unable to load node configuration file ${configFilePath} to register with grid: ${err.message}`);
-
-      return;
+    let configFilePath;
+    if (lodash_1.default.isString(data)) {
+        configFilePath = data;
+        try {
+            data = await support_1.fs.readFile(data, 'utf-8');
+        }
+        catch (err) {
+            logger_1.default.error(`Unable to load node configuration file ${configFilePath} to register with grid: ${err.message}`);
+            return;
+        }
+        try {
+            data = JSON.parse(data);
+        }
+        catch (err) {
+            logger_1.default.errorAndThrow(`Syntax error in node configuration file ${configFilePath}: ${err.message}`);
+            return;
+        }
     }
-
-    try {
-      data = JSON.parse(data);
-    } catch (err) {
-      _logger.default.errorAndThrow(`Syntax error in node configuration file ${configFilePath}: ${err.message}`);
-
-      return;
-    }
-  }
-
-  postRequest(data, addr, port, basePath);
+    postRequest(data, addr, port, basePath);
 }
-
 async function registerToGrid(postOptions, configHolder) {
-  try {
-    const {
-      status
-    } = await (0, _axios.default)(postOptions);
-
-    if (status !== 200) {
-      throw new Error(`Request failed with code ${status}`);
+    try {
+        const { status } = await (0, axios_1.default)(postOptions);
+        if (status !== 200) {
+            throw new Error(`Request failed with code ${status}`);
+        }
+        logger_1.default.debug(`Appium successfully registered with the the grid on ` + hubUri(configHolder.configuration));
+    }
+    catch (err) {
+        logger_1.default.error(`An attempt to register with the grid was unsuccessful: ${err.message}`);
     }
-
-    _logger.default.debug(`Appium successfully registered with the the grid on ` + hubUri(configHolder.configuration));
-  } catch (err) {
-    _logger.default.error(`An attempt to register with the grid was unsuccessful: ${err.message}`);
-  }
 }
-
 function postRequest(configHolder, addr, port, basePath) {
-  if (!_lodash.default.has(configHolder, 'configuration')) {
-    let configuration = {};
-
-    for (const property in configHolder) {
-      if (_lodash.default.has(configHolder, property) && property !== 'capabilities') {
-        configuration[property] = configHolder[property];
-        delete configHolder[property];
-      }
+    // Move Selenium 3 configuration properties to configuration object
+    if (!lodash_1.default.has(configHolder, 'configuration')) {
+        let configuration = {};
+        for (const property in configHolder) {
+            if (lodash_1.default.has(configHolder, property) && property !== 'capabilities') {
+                configuration[property] = configHolder[property];
+                delete configHolder[property];
+            }
+        }
+        configHolder.configuration = configuration;
+    }
+    // if the node config does not have the appium/webdriver url, host, and port,
+    // automatically add it based on how appium was initialized
+    // otherwise, we will take whatever the user setup
+    // because we will always set localhost/127.0.0.1. this won't work if your
+    // node and grid aren't in the same place
+    if (!configHolder.configuration.url ||
+        !configHolder.configuration.host ||
+        !configHolder.configuration.port) {
+        configHolder.configuration.url = `http://${addr}:${port}${basePath}`;
+        configHolder.configuration.host = addr;
+        configHolder.configuration.port = port;
+    }
+    // if the node config does not have id automatically add it
+    if (!configHolder.configuration.id) {
+        configHolder.configuration.id = `http://${configHolder.configuration.host}:${configHolder.configuration.port}`;
     }
-
-    configHolder.configuration = configuration;
-  }
-
-  if (!configHolder.configuration.url || !configHolder.configuration.host || !configHolder.configuration.port) {
-    configHolder.configuration.url = `http://${addr}:${port}${basePath}`;
-    configHolder.configuration.host = addr;
-    configHolder.configuration.port = port;
-  }
-
-  if (!configHolder.configuration.id) {
-    configHolder.configuration.id = `http://${configHolder.configuration.host}:${configHolder.configuration.port}`;
-  }
-
-  const regRequest = {
-    url: `${hubUri(configHolder.configuration)}/grid/register`,
-    method: 'POST',
-    data: configHolder
-  };
-
-  if (configHolder.configuration.register !== true) {
-    _logger.default.debug(`No registration sent (${configHolder.configuration.register} = false)`);
-
-    return;
-  }
-
-  const registerCycleInterval = configHolder.configuration.registerCycle;
-
-  if (isNaN(registerCycleInterval) || registerCycleInterval <= 0) {
-    _logger.default.warn(`'registerCycle' is not a valid positive number. ` + `No registration request will be sent to the grid.`);
-
-    return;
-  }
-
-  let first = true;
-
-  _logger.default.debug(`Starting auto register thread for the grid. ` + `Will try to register every ${registerCycleInterval} ms.`);
-
-  setInterval(async function registerRetry() {
-    if (first) {
-      first = false;
-      await registerToGrid(regRequest, configHolder);
-    } else if (!(await isAlreadyRegistered(configHolder))) {
-      await registerToGrid(regRequest, configHolder);
+    // the post options
+    const regRequest = {
+        url: `${hubUri(configHolder.configuration)}/grid/register`,
+        method: 'POST',
+        data: configHolder,
+    };
+    if (configHolder.configuration.register !== true) {
+        logger_1.default.debug(`No registration sent (${configHolder.configuration.register} = false)`);
+        return;
     }
-  }, registerCycleInterval);
+    const registerCycleInterval = configHolder.configuration.registerCycle;
+    if (isNaN(registerCycleInterval) || registerCycleInterval <= 0) {
+        logger_1.default.warn(`'registerCycle' is not a valid positive number. ` +
+            `No registration request will be sent to the grid.`);
+        return;
+    }
+    // initiate a new Thread
+    let first = true;
+    logger_1.default.debug(`Starting auto register thread for the grid. ` +
+        `Will try to register every ${registerCycleInterval} ms.`);
+    setInterval(async function registerRetry() {
+        if (first) {
+            first = false;
+            await registerToGrid(regRequest, configHolder);
+        }
+        else if (!(await isAlreadyRegistered(configHolder))) {
+            // make the http POST to the grid for registration
+            await registerToGrid(regRequest, configHolder);
+        }
+    }, registerCycleInterval);
 }
-
 async function isAlreadyRegistered(configHolder) {
-  const id = configHolder.configuration.id;
-
-  try {
-    const {
-      data,
-      status
-    } = await (0, _axios.default)({
-      url: `${hubUri(configHolder.configuration)}/grid/api/proxy?id=${id}`,
-      timeout: 10000
-    });
-
-    if (status !== 200) {
-      throw new Error(`Request failed with code ${status}`);
+    //check if node is already registered
+    const id = configHolder.configuration.id;
+    try {
+        const { data, status } = await (0, axios_1.default)({
+            url: `${hubUri(configHolder.configuration)}/grid/api/proxy?id=${id}`,
+            timeout: 10000,
+        });
+        if (status !== 200) {
+            throw new Error(`Request failed with code ${status}`);
+        }
+        if (!data.success) {
+            // if register fail, print the debug msg
+            logger_1.default.debug(`Grid registration error: ${data.msg}`);
+        }
+        return data.success;
     }
-
-    if (!data.success) {
-      _logger.default.debug(`Grid registration error: ${data.msg}`);
+    catch (err) {
+        logger_1.default.debug(`Hub down or not responding: ${err.message}`);
     }
-
-    return data.success;
-  } catch (err) {
-    _logger.default.debug(`Hub down or not responding: ${err.message}`);
-  }
 }
-
-var _default = registerNode;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["hubUri","config","protocol","hubProtocol","hubHost","hubPort","registerNode","data","addr","port","basePath","configFilePath","_","isString","fs","readFile","err","logger","error","message","JSON","parse","errorAndThrow","postRequest","registerToGrid","postOptions","configHolder","status","axios","Error","debug","configuration","has","property","url","host","id","regRequest","method","register","registerCycleInterval","registerCycle","isNaN","warn","first","setInterval","registerRetry","isAlreadyRegistered","timeout","success","msg"],"sources":["../../lib/grid-register.js"],"sourcesContent":["import axios from 'axios';\nimport {fs} from '@appium/support';\nimport logger from './logger';\nimport _ from 'lodash';\n\nconst hubUri = (config) => {\n  const protocol = config.hubProtocol || 'http';\n  return `${protocol}://${config.hubHost}:${config.hubPort}`;\n};\n\n/**\n * Registers a new node with a selenium grid\n * @param {string|object} data - Path or object representing selenium grid node config file. If a `string`, all subsequent arguments are required!\n * @param {string} [addr] - Bind to this address\n * @param {number} [port] - Bind to this port\n * @param {string} [basePath] - Base path for the grid\n */\nasync function registerNode(data, addr, port, basePath) {\n  let configFilePath;\n  if (_.isString(data)) {\n    configFilePath = data;\n    try {\n      data = await fs.readFile(data, 'utf-8');\n    } catch (err) {\n      logger.error(\n        `Unable to load node configuration file ${configFilePath} to register with grid: ${err.message}`\n      );\n      return;\n    }\n    try {\n      data = JSON.parse(data);\n    } catch (err) {\n      logger.errorAndThrow(\n        `Syntax error in node configuration file ${configFilePath}: ${err.message}`\n      );\n      return;\n    }\n  }\n\n  postRequest(data, addr, port, basePath);\n}\n\nasync function registerToGrid(postOptions, configHolder) {\n  try {\n    const {status} = await axios(postOptions);\n    if (status !== 200) {\n      throw new Error(`Request failed with code ${status}`);\n    }\n    logger.debug(\n      `Appium successfully registered with the the grid on ` + hubUri(configHolder.configuration)\n    );\n  } catch (err) {\n    logger.error(`An attempt to register with the grid was unsuccessful: ${err.message}`);\n  }\n}\n\nfunction postRequest(configHolder, addr, port, basePath) {\n  // Move Selenium 3 configuration properties to configuration object\n  if (!_.has(configHolder, 'configuration')) {\n    let configuration = {};\n    for (const property in configHolder) {\n      if (_.has(configHolder, property) && property !== 'capabilities') {\n        configuration[property] = configHolder[property];\n        delete configHolder[property];\n      }\n    }\n    configHolder.configuration = configuration;\n  }\n\n  // if the node config does not have the appium/webdriver url, host, and port,\n  // automatically add it based on how appium was initialized\n  // otherwise, we will take whatever the user setup\n  // because we will always set localhost/127.0.0.1. this won't work if your\n  // node and grid aren't in the same place\n  if (\n    !configHolder.configuration.url ||\n    !configHolder.configuration.host ||\n    !configHolder.configuration.port\n  ) {\n    configHolder.configuration.url = `http://${addr}:${port}${basePath}`;\n    configHolder.configuration.host = addr;\n    configHolder.configuration.port = port;\n  }\n  // if the node config does not have id automatically add it\n  if (!configHolder.configuration.id) {\n    configHolder.configuration.id = `http://${configHolder.configuration.host}:${configHolder.configuration.port}`;\n  }\n\n  // the post options\n  const regRequest = {\n    url: `${hubUri(configHolder.configuration)}/grid/register`,\n    method: 'POST',\n    data: configHolder,\n  };\n\n  if (configHolder.configuration.register !== true) {\n    logger.debug(`No registration sent (${configHolder.configuration.register} = false)`);\n    return;\n  }\n\n  const registerCycleInterval = configHolder.configuration.registerCycle;\n  if (isNaN(registerCycleInterval) || registerCycleInterval <= 0) {\n    logger.warn(\n      `'registerCycle' is not a valid positive number. ` +\n        `No registration request will be sent to the grid.`\n    );\n    return;\n  }\n  // initiate a new Thread\n  let first = true;\n  logger.debug(\n    `Starting auto register thread for the grid. ` +\n      `Will try to register every ${registerCycleInterval} ms.`\n  );\n  setInterval(async function registerRetry() {\n    if (first) {\n      first = false;\n      await registerToGrid(regRequest, configHolder);\n    } else if (!(await isAlreadyRegistered(configHolder))) {\n      // make the http POST to the grid for registration\n      await registerToGrid(regRequest, configHolder);\n    }\n  }, registerCycleInterval);\n}\n\nasync function isAlreadyRegistered(configHolder) {\n  //check if node is already registered\n  const id = configHolder.configuration.id;\n  try {\n    const {data, status} = await axios({\n      url: `${hubUri(configHolder.configuration)}/grid/api/proxy?id=${id}`,\n      timeout: 10000,\n    });\n    if (status !== 200) {\n      throw new Error(`Request failed with code ${status}`);\n    }\n    if (!data.success) {\n      // if register fail, print the debug msg\n      logger.debug(`Grid registration error: ${data.msg}`);\n    }\n    return data.success;\n  } catch (err) {\n    logger.debug(`Hub down or not responding: ${err.message}`);\n  }\n}\n\nexport default registerNode;\n"],"mappings":"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"}
+exports.default = registerNode;
+//# sourceMappingURL=grid-register.js.map

package/build/lib/grid-register.js.map

@@ -1 +1 @@
-{"version":3,"file":"grid-register.js","names":["hubUri","config","protocol","hubProtocol","hubHost","hubPort","registerNode","data","addr","port","basePath","configFilePath","_","isString","fs","readFile","err","logger","error","message","JSON","parse","errorAndThrow","postRequest","registerToGrid","postOptions","configHolder","status","axios","Error","debug","configuration","has","property","url","host","id","regRequest","method","register","registerCycleInterval","registerCycle","isNaN","warn","first","setInterval","registerRetry","isAlreadyRegistered","timeout","success","msg"],"sources":["../../lib/grid-register.js"],"sourcesContent":["import axios from 'axios';\nimport {fs} from '@appium/support';\nimport logger from './logger';\nimport _ from 'lodash';\n\nconst hubUri = (config) => {\n  const protocol = config.hubProtocol || 'http';\n  return `${protocol}://${config.hubHost}:${config.hubPort}`;\n};\n\n/**\n * Registers a new node with a selenium grid\n * @param {string|object} data - Path or object representing selenium grid node config file. If a `string`, all subsequent arguments are required!\n * @param {string} [addr] - Bind to this address\n * @param {number} [port] - Bind to this port\n * @param {string} [basePath] - Base path for the grid\n */\nasync function registerNode(data, addr, port, basePath) {\n  let configFilePath;\n  if (_.isString(data)) {\n    configFilePath = data;\n    try {\n      data = await fs.readFile(data, 'utf-8');\n    } catch (err) {\n      logger.error(\n        `Unable to load node configuration file ${configFilePath} to register with grid: ${err.message}`\n      );\n      return;\n    }\n    try {\n      data = JSON.parse(data);\n    } catch (err) {\n      logger.errorAndThrow(\n        `Syntax error in node configuration file ${configFilePath}: ${err.message}`\n      );\n      return;\n    }\n  }\n\n  postRequest(data, addr, port, basePath);\n}\n\nasync function registerToGrid(postOptions, configHolder) {\n  try {\n    const {status} = await axios(postOptions);\n    if (status !== 200) {\n      throw new Error(`Request failed with code ${status}`);\n    }\n    logger.debug(\n      `Appium successfully registered with the the grid on ` + hubUri(configHolder.configuration)\n    );\n  } catch (err) {\n    logger.error(`An attempt to register with the grid was unsuccessful: ${err.message}`);\n  }\n}\n\nfunction postRequest(configHolder, addr, port, basePath) {\n  // Move Selenium 3 configuration properties to configuration object\n  if (!_.has(configHolder, 'configuration')) {\n    let configuration = {};\n    for (const property in configHolder) {\n      if (_.has(configHolder, property) && property !== 'capabilities') {\n        configuration[property] = configHolder[property];\n        delete configHolder[property];\n      }\n    }\n    configHolder.configuration = configuration;\n  }\n\n  // if the node config does not have the appium/webdriver url, host, and port,\n  // automatically add it based on how appium was initialized\n  // otherwise, we will take whatever the user setup\n  // because we will always set localhost/127.0.0.1. this won't work if your\n  // node and grid aren't in the same place\n  if (\n    !configHolder.configuration.url ||\n    !configHolder.configuration.host ||\n    !configHolder.configuration.port\n  ) {\n    configHolder.configuration.url = `http://${addr}:${port}${basePath}`;\n    configHolder.configuration.host = addr;\n    configHolder.configuration.port = port;\n  }\n  // if the node config does not have id automatically add it\n  if (!configHolder.configuration.id) {\n    configHolder.configuration.id = `http://${configHolder.configuration.host}:${configHolder.configuration.port}`;\n  }\n\n  // the post options\n  const regRequest = {\n    url: `${hubUri(configHolder.configuration)}/grid/register`,\n    method: 'POST',\n    data: configHolder,\n  };\n\n  if (configHolder.configuration.register !== true) {\n    logger.debug(`No registration sent (${configHolder.configuration.register} = false)`);\n    return;\n  }\n\n  const registerCycleInterval = configHolder.configuration.registerCycle;\n  if (isNaN(registerCycleInterval) || registerCycleInterval <= 0) {\n    logger.warn(\n      `'registerCycle' is not a valid positive number. ` +\n        `No registration request will be sent to the grid.`\n    );\n    return;\n  }\n  // initiate a new Thread\n  let first = true;\n  logger.debug(\n    `Starting auto register thread for the grid. ` +\n      `Will try to register every ${registerCycleInterval} ms.`\n  );\n  setInterval(async function registerRetry() {\n    if (first) {\n      first = false;\n      await registerToGrid(regRequest, configHolder);\n    } else if (!(await isAlreadyRegistered(configHolder))) {\n      // make the http POST to the grid for registration\n      await registerToGrid(regRequest, configHolder);\n    }\n  }, registerCycleInterval);\n}\n\nasync function isAlreadyRegistered(configHolder) {\n  //check if node is already registered\n  const id = configHolder.configuration.id;\n  try {\n    const {data, status} = await axios({\n      url: `${hubUri(configHolder.configuration)}/grid/api/proxy?id=${id}`,\n      timeout: 10000,\n    });\n    if (status !== 200) {\n      throw new Error(`Request failed with code ${status}`);\n    }\n    if (!data.success) {\n      // if register fail, print the debug msg\n      logger.debug(`Grid registration error: ${data.msg}`);\n    }\n    return data.success;\n  } catch (err) {\n    logger.debug(`Hub down or not responding: ${err.message}`);\n  }\n}\n\nexport default registerNode;\n"],"mappings":"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"}
+{"version":3,"file":"grid-register.js","sourceRoot":"","sources":["../../lib/grid-register.js"],"names":[],"mappings":"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"}

package/build/lib/logger.d.ts

@@ -1,3 +1,3 @@
 export default log;
-declare let log: import("../../types/build").AppiumLogger;
+declare let log: import("../../types/build/lib").AppiumLogger;
 //# sourceMappingURL=logger.d.ts.map

package/build/lib/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,0DAAqC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,8DAAqC"}

package/build/lib/logger.js

@@ -1,16 +1,6 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _support = require("@appium/support");
-
-let log = _support.logger.getLogger('Appium');
-
-var _default = log;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJsb2ciLCJsb2dnZXIiLCJnZXRMb2dnZXIiXSwic291cmNlcyI6WyIuLi8uLi9saWIvbG9nZ2VyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7bG9nZ2VyfSBmcm9tICdAYXBwaXVtL3N1cHBvcnQnO1xuXG5sZXQgbG9nID0gbG9nZ2VyLmdldExvZ2dlcignQXBwaXVtJyk7XG5cbmV4cG9ydCBkZWZhdWx0IGxvZztcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBRUEsSUFBSUEsR0FBRyxHQUFHQyxlQUFBLENBQU9DLFNBQVAsQ0FBaUIsUUFBakIsQ0FBVjs7ZUFFZUYsRyJ9
+Object.defineProperty(exports, "__esModule", { value: true });
+const support_1 = require("@appium/support");
+let log = support_1.logger.getLogger('Appium');
+exports.default = log;
+//# sourceMappingURL=logger.js.map

package/build/lib/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","names":["log","logger","getLogger"],"sources":["../../lib/logger.js"],"sourcesContent":["import {logger} from '@appium/support';\n\nlet log = logger.getLogger('Appium');\n\nexport default log;\n"],"mappings":";;;;;;;;;AAAA;;AAEA,IAAIA,GAAG,GAAGC,eAAA,CAAOC,SAAP,CAAiB,QAAjB,CAAV;;eAEeF,G"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";;AAAA,6CAAuC;AAEvC,IAAI,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAErC,kBAAe,GAAG,CAAC"}

package/build/lib/logsink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";AA4LA,+CA0BC;AAED,8BAOC"}
+{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";AA0MA,+CAiCC;AAED,8BAOC"}