@appium/base-driver 8.2.0 → 8.2.4

package/build/lib/basedriver/commands/execute.js

@@ -1,119 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _child_process = _interopRequireDefault(require("child_process"));
-
-var _logger = _interopRequireDefault(require("../logger"));
-
-var _bluebird = _interopRequireDefault(require("bluebird"));
-
-const FEAT_FLAG = 'execute_driver_script';
-const DEFAULT_SCRIPT_TIMEOUT = 1000 * 60 * 60;
-const SCRIPT_TYPE_WDIO = 'webdriverio';
-let commands = {};
-
-commands.executeDriverScript = async function (script, scriptType = 'webdriverio', timeout = DEFAULT_SCRIPT_TIMEOUT) {
-  if (!this.isFeatureEnabled(FEAT_FLAG)) {
-    throw new Error(`Execute driver script functionality is not available ` + `unless server is started with --allow-insecure including ` + `the '${FEAT_FLAG}' flag, e.g., --allow-insecure=${FEAT_FLAG}`);
-  }
-
-  if (scriptType !== SCRIPT_TYPE_WDIO) {
-    throw new Error(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
-  }
-
-  if (!this.opts.address || !this.opts.port) {
-    throw new Error('Address or port of running server were not defined; this ' + 'is required. This is probably a programming error in the driver');
-  }
-
-  if (!_lodash.default.isNumber(timeout)) {
-    throw new Error('Timeout parameter must be a number');
-  }
-
-  const driverOpts = {
-    sessionId: this.sessionId,
-    protocol: 'http',
-    hostname: this.opts.address,
-    port: this.opts.port,
-    path: this.basePath,
-    isW3C: this.isW3CProtocol(),
-    isMobile: true,
-    capabilities: this.caps
-  };
-
-  _logger.default.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
-
-  const childScript = _path.default.join(__dirname, 'execute-child.js');
-
-  _logger.default.info(`Forking process to run webdriver script as child using ${childScript}`);
-
-  const scriptProc = _child_process.default.fork(childScript);
-
-  let timeoutCanceled = false;
-
-  try {
-    const timeoutStart = Date.now();
-
-    const waitForResult = async function () {
-      const resPromise = new _bluebird.default(res => {
-        scriptProc.on('message', res);
-      });
-      const res = await resPromise;
-
-      _logger.default.info('Received execute driver script result from child process, shutting it down');
-
-      if (res.error) {
-        throw new Error(res.error.message);
-      }
-
-      return res.success;
-    };
-
-    const waitForTimeout = async function () {
-      while (!timeoutCanceled && Date.now() - timeoutStart < timeout) {
-        await _bluebird.default.delay(500);
-      }
-
-      if (timeoutCanceled) {
-        return;
-      }
-
-      throw new Error(`Execute driver script timed out after ${timeout}ms. ` + `You can adjust this with the 'timeout' parameter.`);
-    };
-
-    _logger.default.info('Sending driver and script data to child');
-
-    scriptProc.send({
-      driverOpts,
-      script,
-      timeout
-    });
-    return await _bluebird.default.race([waitForResult(), waitForTimeout()]);
-  } catch (err) {
-    throw new Error(`Could not execute driver script. Original error was: ${err}`);
-  } finally {
-    timeoutCanceled = true;
-
-    _logger.default.info('Disconnecting from and killing driver script child proc');
-
-    scriptProc.disconnect();
-    scriptProc.kill();
-  }
-};
-
-var _default = commands;
-exports.default = _default;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/basedriver/commands/execute.js"],"names":["FEAT_FLAG","DEFAULT_SCRIPT_TIMEOUT","SCRIPT_TYPE_WDIO","commands","executeDriverScript","script","scriptType","timeout","isFeatureEnabled","Error","opts","address","port","_","isNumber","driverOpts","sessionId","protocol","hostname","path","basePath","isW3C","isW3CProtocol","isMobile","capabilities","caps","log","info","childScript","join","__dirname","scriptProc","cp","fork","timeoutCanceled","timeoutStart","Date","now","waitForResult","resPromise","B","res","on","error","message","success","waitForTimeout","delay","send","race","err","disconnect","kill"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport path from 'path';\nimport cp from 'child_process';\nimport log from '../logger';\nimport B from 'bluebird';\n\nconst FEAT_FLAG = 'execute_driver_script';\nconst DEFAULT_SCRIPT_TIMEOUT = 1000 * 60 * 60; // default to 1 hour timeout\nconst SCRIPT_TYPE_WDIO = 'webdriverio';\n// TODO add wd script type at some point\n\nlet commands = {};\n\n/**\n * This method takes a string which is executed as javascript in the context of\n * a new nodejs VM, and which has available a webdriverio driver object, having\n * already been attached to the currently running session.\n *\n * @param {string} script - the string representing the driver script to run\n * @param {string} [scriptType='webdriverio'] - the name of the driver script\n * library (currently only webdriverio is supported)\n *\n * @returns {Object} - a JSONifiable object representing the return value of\n * the script\n */\ncommands.executeDriverScript = async function (script, scriptType = 'webdriverio',\n  timeout = DEFAULT_SCRIPT_TIMEOUT) {\n\n  if (!this.isFeatureEnabled(FEAT_FLAG)) {\n    throw new Error(`Execute driver script functionality is not available ` +\n                    `unless server is started with --allow-insecure including ` +\n                    `the '${FEAT_FLAG}' flag, e.g., --allow-insecure=${FEAT_FLAG}`);\n  }\n\n  if (scriptType !== SCRIPT_TYPE_WDIO) {\n    throw new Error(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);\n  }\n\n  if (!this.opts.address || !this.opts.port) {\n    throw new Error('Address or port of running server were not defined; this ' +\n                    'is required. This is probably a programming error in the driver');\n  }\n\n  if (!_.isNumber(timeout)) {\n    throw new Error('Timeout parameter must be a number');\n  }\n\n  const driverOpts = {\n    sessionId: this.sessionId,\n    protocol: 'http', // Appium won't ever be behind ssl locally\n    hostname: this.opts.address,\n    port: this.opts.port,\n    path: this.basePath,\n    isW3C: this.isW3CProtocol(),\n    isMobile: true,\n    capabilities: this.caps\n  };\n  log.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);\n\n\n  // fork the execution script as a child process\n  const childScript = path.join(__dirname, 'execute-child.js');\n  log.info(`Forking process to run webdriver script as child using ${childScript}`);\n  const scriptProc = cp.fork(childScript);\n\n  // keep track of whether we have canceled the script timeout, so we can stop\n  // waiting for it and allow this process to finish gracefully\n  let timeoutCanceled = false;\n\n  try {\n    const timeoutStart = Date.now();\n\n    // promise that deals with the result from the child process\n    const waitForResult = async function () {\n      const resPromise = new B((res) => {\n        scriptProc.on('message', res); // this is node IPC\n      });\n\n      const res = await resPromise;\n      log.info('Received execute driver script result from child process, shutting it down');\n\n      if (res.error) {\n        throw new Error(res.error.message);\n      }\n\n      return res.success;\n    };\n\n    // promise that waits up to the timeout and throws an error if so, or does\n    // nothing if the timeout is canceled because we got a result from the\n    // child script\n    const waitForTimeout = async function () {\n      while (!timeoutCanceled && (Date.now() - timeoutStart) < timeout) {\n        await B.delay(500);\n      }\n\n      if (timeoutCanceled) {\n        return;\n      }\n\n      throw new Error(`Execute driver script timed out after ${timeout}ms. ` +\n                      `You can adjust this with the 'timeout' parameter.`);\n    };\n\n    // now that the child script is alive, send it the data it needs to start\n    // running the driver script\n    log.info('Sending driver and script data to child');\n    scriptProc.send({driverOpts, script, timeout});\n\n    // and set up a race between the response from the child and the timeout\n    return await B.race([waitForResult(), waitForTimeout()]);\n  } catch (err) {\n    throw new Error(`Could not execute driver script. Original error was: ${err}`);\n  } finally {\n    // ensure we always cancel the timeout so that the timeout promise stops\n    // spinning and allows this process to die gracefully\n    timeoutCanceled = true;\n\n    log.info('Disconnecting from and killing driver script child proc');\n    scriptProc.disconnect();\n    scriptProc.kill();\n  }\n};\n\n\nexport default commands;\n"],"file":"lib/basedriver/commands/execute.js","sourceRoot":"../../../.."}

package/build/test/basedriver/fixtures/custom-element-finder-bad.js

@@ -1,12 +0,0 @@
-"use strict";
-
-require("source-map-support/register");
-
-module.exports = {
-  notFind: function () {
-    return [];
-  }
-};require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvYmFzZWRyaXZlci9maXh0dXJlcy9jdXN0b20tZWxlbWVudC1maW5kZXItYmFkLmpzIl0sIm5hbWVzIjpbIm1vZHVsZSIsImV4cG9ydHMiLCJub3RGaW5kIl0sIm1hcHBpbmdzIjoiOzs7O0FBQUFBLE1BQU0sQ0FBQ0MsT0FBUCxHQUFpQjtBQUNmQyxFQUFBQSxPQUFPLEVBQUUsWUFBWTtBQUNuQixXQUFPLEVBQVA7QUFDRDtBQUhjLENBQWpCIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSB7XG4gIG5vdEZpbmQ6IGZ1bmN0aW9uICgpIHsgLy8gZXNsaW50LWRpc2FibGUtbGluZSBvYmplY3Qtc2hvcnRoYW5kXG4gICAgcmV0dXJuIFtdO1xuICB9XG59O1xuIl0sImZpbGUiOiJ0ZXN0L2Jhc2Vkcml2ZXIvZml4dHVyZXMvY3VzdG9tLWVsZW1lbnQtZmluZGVyLWJhZC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLi8uLiJ9

package/build/test/basedriver/fixtures/custom-element-finder.js

@@ -1,36 +0,0 @@
-"use strict";
-
-require("source-map-support/register");
-
-module.exports = {
-  find: function (driver, logger, selector, multiple) {
-    if (!driver || !driver.opts) {
-      throw new Error('Expected driver object');
-    }
-
-    if (!logger || !logger.info) {
-      throw new Error('Expected logger object');
-    }
-
-    if (selector === 'foo') {
-      return ['bar'];
-    }
-
-    if (selector === 'foos') {
-      if (multiple) {
-        return ['baz1', 'baz2'];
-      }
-
-      return ['bar1', 'bar2'];
-    }
-
-    if (selector === 'error') {
-      throw new Error('This is a plugin error');
-    }
-
-    return [];
-  }
-};require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvYmFzZWRyaXZlci9maXh0dXJlcy9jdXN0b20tZWxlbWVudC1maW5kZXIuanMiXSwibmFtZXMiOlsibW9kdWxlIiwiZXhwb3J0cyIsImZpbmQiLCJkcml2ZXIiLCJsb2dnZXIiLCJzZWxlY3RvciIsIm11bHRpcGxlIiwib3B0cyIsIkVycm9yIiwiaW5mbyJdLCJtYXBwaW5ncyI6Ijs7OztBQUFBQSxNQUFNLENBQUNDLE9BQVAsR0FBaUI7QUFDZkMsRUFBQUEsSUFBSSxFQUFFLFVBQVVDLE1BQVYsRUFBa0JDLE1BQWxCLEVBQTBCQyxRQUExQixFQUFvQ0MsUUFBcEMsRUFBOEM7QUFDbEQsUUFBSSxDQUFDSCxNQUFELElBQVcsQ0FBQ0EsTUFBTSxDQUFDSSxJQUF2QixFQUE2QjtBQUMzQixZQUFNLElBQUlDLEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsUUFBSSxDQUFDSixNQUFELElBQVcsQ0FBQ0EsTUFBTSxDQUFDSyxJQUF2QixFQUE2QjtBQUMzQixZQUFNLElBQUlELEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsUUFBSUgsUUFBUSxLQUFLLEtBQWpCLEVBQXdCO0FBQ3RCLGFBQU8sQ0FBQyxLQUFELENBQVA7QUFDRDs7QUFFRCxRQUFJQSxRQUFRLEtBQUssTUFBakIsRUFBeUI7QUFDdkIsVUFBSUMsUUFBSixFQUFjO0FBQ1osZUFBTyxDQUFDLE1BQUQsRUFBUyxNQUFULENBQVA7QUFDRDs7QUFFRCxhQUFPLENBQUMsTUFBRCxFQUFTLE1BQVQsQ0FBUDtBQUNEOztBQUVELFFBQUlELFFBQVEsS0FBSyxPQUFqQixFQUEwQjtBQUN4QixZQUFNLElBQUlHLEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsV0FBTyxFQUFQO0FBQ0Q7QUEzQmMsQ0FBakIiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuZXhwb3J0cyA9IHtcbiAgZmluZDogZnVuY3Rpb24gKGRyaXZlciwgbG9nZ2VyLCBzZWxlY3RvciwgbXVsdGlwbGUpIHsgLy8gZXNsaW50LWRpc2FibGUtbGluZSBvYmplY3Qtc2hvcnRoYW5kXG4gICAgaWYgKCFkcml2ZXIgfHwgIWRyaXZlci5vcHRzKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoJ0V4cGVjdGVkIGRyaXZlciBvYmplY3QnKTtcbiAgICB9XG5cbiAgICBpZiAoIWxvZ2dlciB8fCAhbG9nZ2VyLmluZm8pIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignRXhwZWN0ZWQgbG9nZ2VyIG9iamVjdCcpO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2ZvbycpIHtcbiAgICAgIHJldHVybiBbJ2JhciddO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2Zvb3MnKSB7XG4gICAgICBpZiAobXVsdGlwbGUpIHtcbiAgICAgICAgcmV0dXJuIFsnYmF6MScsICdiYXoyJ107XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBbJ2JhcjEnLCAnYmFyMiddO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2Vycm9yJykge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdUaGlzIGlzIGEgcGx1Z2luIGVycm9yJyk7XG4gICAgfVxuXG4gICAgcmV0dXJuIFtdO1xuICB9XG59O1xuIl0sImZpbGUiOiJ0ZXN0L2Jhc2Vkcml2ZXIvZml4dHVyZXMvY3VzdG9tLWVsZW1lbnQtZmluZGVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uLy4uIn0=

package/lib/basedriver/commands/execute-child.js

@@ -1,132 +0,0 @@
-import _ from 'lodash';
-import B from 'bluebird';
-import vm from 'vm';
-import log from '../logger';
-import { attach } from 'webdriverio';
-
-// duplicate defining these keys here so we don't need to re-load a huge appium
-// dependency tree into memory just to run a wdio script
-const W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
-const MJSONWP_ELEMENT_KEY = 'ELEMENT';
-
-async function runScript (driverOpts, script, timeout) {
-  if (!_.isNumber(timeout)) {
-    throw new Error('Timeout parameter must be a number');
-  }
-
-  // set up fake logger
-  const logLevels = ['error', 'warn', 'log'];
-  const logs = {};
-  const consoleFns = {};
-  for (const level of logLevels) {
-    logs[level] = [];
-    consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
-  }
-
-  const driver = attach(driverOpts);
-
-  const fullScript = buildScript(script);
-  // the timeout here will not matter really, but set it anyway to be on the
-  // safe side
-  const vmCtx = vm.runInNewContext(fullScript, {}, {timeout});
-
-  // run the driver script, giving user access to the driver object, a fake
-  // console logger, and a promise library
-  log.info('Running driver script in Node vm');
-  let result = await vmCtx(driver, consoleFns, B);
-
-  log.info('Ensuring driver script result is appropriate type for return');
-  result = coerceScriptResult(result);
-  return {result, logs};
-}
-
-/**
- * Embed a user-generated script inside a method which takes only the
- * predetermined objects we specify
- *
- * @param {string} script - the javascript to execute
- *
- * @return {string} - the full script to execute
- */
-function buildScript (script) {
-  return `(async function execute (driver, console, Promise) {
-    ${script}
-  })`;
-}
-
-/**
- * We can get any manner of crazy thing back from a vm executing untrusted
- * code. We might also get WebdriverIO objects that aren't suitable for JSON
- * response. So make sure we convert the things we know about to their
- * appropriate response format, and squash other weird things.
- *
- * @param {Object} obj - object to convert and sanitize
- *
- * @return {Object} - safely converted object
- */
-function coerceScriptResult (obj) {
-  // first ensure obj is of a type that can be JSON encoded safely. This will
-  // get rid of custom objects, functions, etc... and turn them into POJOs
-  try {
-    obj = JSON.parse(JSON.stringify(obj));
-  } catch (e) {
-    log.warn('Could not convert executeDriverScript to safe response!' +
-             `Result was: ${obj}. Will make it null`);
-    return null;
-  }
-
-  let res;
-
-  // now we begin our recursive case options
-  if (_.isPlainObject(obj)) {
-    // if we have an object, it's either an element object or something else
-    // webdriverio has no monadic object types other than element and driver,
-    // and we don't want to allow special casing return of driver
-    res = {};
-
-    if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {
-      // if it's an element object, clear out anything that's not the key, and
-      // then return the object
-      if (obj[MJSONWP_ELEMENT_KEY]) {
-        res[MJSONWP_ELEMENT_KEY] = obj[MJSONWP_ELEMENT_KEY];
-      }
-
-      if (obj[W3C_ELEMENT_KEY]) {
-        res[W3C_ELEMENT_KEY] = obj[W3C_ELEMENT_KEY];
-      }
-      return res;
-    }
-
-    // otherwise, recurse into the object
-    for (const key of Object.keys(obj)) {
-      res[key] = coerceScriptResult(obj[key]);
-    }
-    return res;
-  }
-
-  // in the cae of an array, just recurse into the items
-  if (_.isArray(obj)) {
-    return obj.map(coerceScriptResult);
-  }
-
-  // base case, if it's not an object or array, return straightaway
-  return obj;
-}
-
-async function main (driverOpts, script, timeout) {
-  let res;
-  try {
-    res = {success: await runScript(driverOpts, script, timeout)};
-  } catch (error) {
-    res = {error: {message: error.message, stack: error.stack}};
-  }
-  await B.promisify(process.send, {context: process})(res);
-}
-
-if (require.main === module) {
-  log.info('Running driver execution in child process');
-  process.on('message', ({driverOpts, script, timeout}) => {
-    log.info('Parameters received from parent process');
-    main(driverOpts, script, timeout);
-  });
-}

package/lib/basedriver/commands/execute.js

@@ -1,126 +0,0 @@
-import _ from 'lodash';
-import path from 'path';
-import cp from 'child_process';
-import log from '../logger';
-import B from 'bluebird';
-
-const FEAT_FLAG = 'execute_driver_script';
-const DEFAULT_SCRIPT_TIMEOUT = 1000 * 60 * 60; // default to 1 hour timeout
-const SCRIPT_TYPE_WDIO = 'webdriverio';
-// TODO add wd script type at some point
-
-let commands = {};
-
-/**
- * This method takes a string which is executed as javascript in the context of
- * a new nodejs VM, and which has available a webdriverio driver object, having
- * already been attached to the currently running session.
- *
- * @param {string} script - the string representing the driver script to run
- * @param {string} [scriptType='webdriverio'] - the name of the driver script
- * library (currently only webdriverio is supported)
- *
- * @returns {Object} - a JSONifiable object representing the return value of
- * the script
- */
-commands.executeDriverScript = async function (script, scriptType = 'webdriverio',
-  timeout = DEFAULT_SCRIPT_TIMEOUT) {
-
-  if (!this.isFeatureEnabled(FEAT_FLAG)) {
-    throw new Error(`Execute driver script functionality is not available ` +
-                    `unless server is started with --allow-insecure including ` +
-                    `the '${FEAT_FLAG}' flag, e.g., --allow-insecure=${FEAT_FLAG}`);
-  }
-
-  if (scriptType !== SCRIPT_TYPE_WDIO) {
-    throw new Error(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
-  }
-
-  if (!this.opts.address || !this.opts.port) {
-    throw new Error('Address or port of running server were not defined; this ' +
-                    'is required. This is probably a programming error in the driver');
-  }
-
-  if (!_.isNumber(timeout)) {
-    throw new Error('Timeout parameter must be a number');
-  }
-
-  const driverOpts = {
-    sessionId: this.sessionId,
-    protocol: 'http', // Appium won't ever be behind ssl locally
-    hostname: this.opts.address,
-    port: this.opts.port,
-    path: this.basePath,
-    isW3C: this.isW3CProtocol(),
-    isMobile: true,
-    capabilities: this.caps
-  };
-  log.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
-
-
-  // fork the execution script as a child process
-  const childScript = path.join(__dirname, 'execute-child.js');
-  log.info(`Forking process to run webdriver script as child using ${childScript}`);
-  const scriptProc = cp.fork(childScript);
-
-  // keep track of whether we have canceled the script timeout, so we can stop
-  // waiting for it and allow this process to finish gracefully
-  let timeoutCanceled = false;
-
-  try {
-    const timeoutStart = Date.now();
-
-    // promise that deals with the result from the child process
-    const waitForResult = async function () {
-      const resPromise = new B((res) => {
-        scriptProc.on('message', res); // this is node IPC
-      });
-
-      const res = await resPromise;
-      log.info('Received execute driver script result from child process, shutting it down');
-
-      if (res.error) {
-        throw new Error(res.error.message);
-      }
-
-      return res.success;
-    };
-
-    // promise that waits up to the timeout and throws an error if so, or does
-    // nothing if the timeout is canceled because we got a result from the
-    // child script
-    const waitForTimeout = async function () {
-      while (!timeoutCanceled && (Date.now() - timeoutStart) < timeout) {
-        await B.delay(500);
-      }
-
-      if (timeoutCanceled) {
-        return;
-      }
-
-      throw new Error(`Execute driver script timed out after ${timeout}ms. ` +
-                      `You can adjust this with the 'timeout' parameter.`);
-    };
-
-    // now that the child script is alive, send it the data it needs to start
-    // running the driver script
-    log.info('Sending driver and script data to child');
-    scriptProc.send({driverOpts, script, timeout});
-
-    // and set up a race between the response from the child and the timeout
-    return await B.race([waitForResult(), waitForTimeout()]);
-  } catch (err) {
-    throw new Error(`Could not execute driver script. Original error was: ${err}`);
-  } finally {
-    // ensure we always cancel the timeout so that the timeout promise stops
-    // spinning and allows this process to die gracefully
-    timeoutCanceled = true;
-
-    log.info('Disconnecting from and killing driver script child proc');
-    scriptProc.disconnect();
-    scriptProc.kill();
-  }
-};
-
-
-export default commands;