@appium/base-driver 8.2.1 → 8.2.2

package/test/basedriver/driver-e2e-tests.js

@@ -1,8 +1,5 @@
 import _ from 'lodash';
-import { BaseDriver, server, routeConfiguringFunction, DeviceSettings, errors } from '../../lib';
-import {
-  MJSONWP_ELEMENT_KEY, W3C_ELEMENT_KEY
-} from '../../lib/constants';
+import { BaseDriver, server, routeConfiguringFunction, DeviceSettings } from '../../lib';
 import axios from 'axios';
 import B from 'bluebird';
 import {TEST_HOST, getTestPort, createAppiumURL, METHODS} from '../helpers';
@@ -339,181 +336,6 @@ function baseDriverE2ETests (DriverClass, defaultCaps = {}) {
       });
     });
 
-    describe('execute driver script', function () {
-      // mock some methods on BaseDriver that aren't normally there except in
-      // a fully blown driver
-      let originalFindElement, sessionId;
-      before(function () {
-        d.allowInsecure = ['execute_driver_script'];
-        originalFindElement = d.findElement;
-        d.findElement = (function (strategy, selector) {
-          if (strategy === 'accessibility id' && selector === 'amazing') {
-            return {[W3C_ELEMENT_KEY]: 'element-id-1'};
-          }
-
-          throw new errors.NoSuchElementError('not found');
-        }).bind(d);
-      });
-
-      beforeEach(async function () {
-        ({sessionId} = await startSession(defaultCaps));
-      });
-
-      after(function () {
-        d.findElement = originalFindElement;
-      });
-
-      afterEach(async function () {
-        await endSession(sessionId);
-      });
-
-      it('should not work unless the allowInsecure feature flag is set', async function () {
-        d._allowInsecure = d.allowInsecure;
-        try {
-          d.allowInsecure = [];
-          const script = `return 'foo'`;
-          await axios({
-            url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-            method: POST,
-            data: {script, type: 'wd'},
-          }).should.eventually.be.rejected;
-          await endSession(sessionId);
-        } finally {
-          d.allowInsecure = d._allowInsecure;
-        }
-      });
-
-      it('should execute a webdriverio script in the context of session', async function () {
-        const script = `
-          const timeouts = await driver.getTimeouts();
-          const status = await driver.status();
-          return [timeouts, status];
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script, type: 'webdriverio'},
-        })).data;
-        const expectedTimeouts = {command: 250, implicit: 0};
-        const expectedStatus = {};
-        value.result.should.eql([expectedTimeouts, expectedStatus]);
-      });
-
-      it('should fail with any script type other than webdriverio currently', async function () {
-        const script = `return 'foo'`;
-        await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script, type: 'wd'},
-        }).should.eventually.be.rejected;
-      });
-
-      it('should execute a webdriverio script that returns elements correctly', async function () {
-        const script = `
-          return await driver.$("~amazing");
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.result.should.eql({
-          [W3C_ELEMENT_KEY]: 'element-id-1',
-          [MJSONWP_ELEMENT_KEY]: 'element-id-1'
-        });
-      });
-
-      it('should execute a webdriverio script that returns elements in deep structure', async function () {
-        const script = `
-          const el = await driver.$("~amazing");
-          return {element: el, elements: [el, el]};
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        const elObj = {
-          [W3C_ELEMENT_KEY]: 'element-id-1',
-          [MJSONWP_ELEMENT_KEY]: 'element-id-1'
-        };
-        value.result.should.eql({element: elObj, elements: [elObj, elObj]});
-      });
-
-      it('should store and return logs to the user', async function () {
-        const script = `
-          console.log("foo");
-          console.log("foo2");
-          console.warn("bar");
-          console.error("baz");
-          return null;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.logs.should.eql({log: ['foo', 'foo2'], warn: ['bar'], error: ['baz']});
-      });
-
-      it('should have appium specific commands available', async function () {
-        const script = `
-          return typeof driver.lock;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.result.should.eql('function');
-      });
-
-      it('should correctly handle errors that happen in a webdriverio script', async function () {
-        const script = `
-          return await driver.$("~notfound");
-        `;
-        const {data} = await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script},
-        });
-        data.value.result.error.error.should.equal('no such element');
-        data.value.result.error.message.should.equal('not found');
-        data.value.result.error.stacktrace.should.includes('NoSuchElementError:');
-        data.value.result.selector.should.equal('~notfound');
-        data.value.result.sessionId.should.equal(sessionId);
-      });
-
-      it('should correctly handle errors that happen when a script cannot be compiled', async function () {
-        const script = `
-          return {;
-        `;
-        const {data} = await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script},
-        });
-        data.value.should.have.property('message');
-        data.value.message.should.match(/An unknown server-side error occurred while processing the command. Original error: Could not execute driver script. Original error was: Error: Unexpected token '?;'?/);
-      });
-
-      it('should be able to set a timeout on a driver script', async function () {
-        const script = `
-          await Promise.delay(1000);
-          return true;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script, timeout: 50},
-        })).data;
-        value.message.should.match(/.+50.+timeout.+/);
-      });
-    });
-
     if (DriverClass === BaseDriver) {
       // only run this test on basedriver, not other drivers which also use these tests, since we
       // don't want them to try and start sessions with these random capabilities that are

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

@@ -1,137 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-require("source-map-support/register");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _bluebird = _interopRequireDefault(require("bluebird"));
-
-var _vm = _interopRequireDefault(require("vm"));
-
-var _logger = _interopRequireDefault(require("../logger"));
-
-var _webdriverio = require("webdriverio");
-
-const W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
-const MJSONWP_ELEMENT_KEY = 'ELEMENT';
-
-async function runScript(driverOpts, script, timeout) {
-  if (!_lodash.default.isNumber(timeout)) {
-    throw new Error('Timeout parameter must be a number');
-  }
-
-  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 = (0, _webdriverio.attach)(driverOpts);
-  const fullScript = buildScript(script);
-
-  const vmCtx = _vm.default.runInNewContext(fullScript, {}, {
-    timeout
-  });
-
-  _logger.default.info('Running driver script in Node vm');
-
-  let result = await vmCtx(driver, consoleFns, _bluebird.default);
-
-  _logger.default.info('Ensuring driver script result is appropriate type for return');
-
-  result = coerceScriptResult(result);
-  return {
-    result,
-    logs
-  };
-}
-
-function buildScript(script) {
-  return `(async function execute (driver, console, Promise) {
-    ${script}
-  })`;
-}
-
-function coerceScriptResult(obj) {
-  try {
-    obj = JSON.parse(JSON.stringify(obj));
-  } catch (e) {
-    _logger.default.warn('Could not convert executeDriverScript to safe response!' + `Result was: ${obj}. Will make it null`);
-
-    return null;
-  }
-
-  let res;
-
-  if (_lodash.default.isPlainObject(obj)) {
-    res = {};
-
-    if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {
-      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;
-    }
-
-    for (const key of Object.keys(obj)) {
-      res[key] = coerceScriptResult(obj[key]);
-    }
-
-    return res;
-  }
-
-  if (_lodash.default.isArray(obj)) {
-    return obj.map(coerceScriptResult);
-  }
-
-  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 _bluebird.default.promisify(process.send, {
-    context: process
-  })(res);
-}
-
-if (require.main === module) {
-  _logger.default.info('Running driver execution in child process');
-
-  process.on('message', ({
-    driverOpts,
-    script,
-    timeout
-  }) => {
-    _logger.default.info('Parameters received from parent process');
-
-    main(driverOpts, script, timeout);
-  });
-}require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/basedriver/commands/execute-child.js"],"names":["W3C_ELEMENT_KEY","MJSONWP_ELEMENT_KEY","runScript","driverOpts","script","timeout","_","isNumber","Error","logLevels","logs","consoleFns","level","logMsgs","push","driver","fullScript","buildScript","vmCtx","vm","runInNewContext","log","info","result","B","coerceScriptResult","obj","JSON","parse","stringify","e","warn","res","isPlainObject","key","Object","keys","isArray","map","main","success","error","message","stack","promisify","process","send","context","require","module","on"],"mappings":";;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAIA,MAAMA,eAAe,GAAG,qCAAxB;AACA,MAAMC,mBAAmB,GAAG,SAA5B;;AAEA,eAAeC,SAAf,CAA0BC,UAA1B,EAAsCC,MAAtC,EAA8CC,OAA9C,EAAuD;AACrD,MAAI,CAACC,gBAAEC,QAAF,CAAWF,OAAX,CAAL,EAA0B;AACxB,UAAM,IAAIG,KAAJ,CAAU,oCAAV,CAAN;AACD;;AAGD,QAAMC,SAAS,GAAG,CAAC,OAAD,EAAU,MAAV,EAAkB,KAAlB,CAAlB;AACA,QAAMC,IAAI,GAAG,EAAb;AACA,QAAMC,UAAU,GAAG,EAAnB;;AACA,OAAK,MAAMC,KAAX,IAAoBH,SAApB,EAA+B;AAC7BC,IAAAA,IAAI,CAACE,KAAD,CAAJ,GAAc,EAAd;;AACAD,IAAAA,UAAU,CAACC,KAAD,CAAV,GAAoB,CAAC,GAAGC,OAAJ,KAAgBH,IAAI,CAACE,KAAD,CAAJ,CAAYE,IAAZ,CAAiB,GAAGD,OAApB,CAApC;AACD;;AAED,QAAME,MAAM,GAAG,yBAAOZ,UAAP,CAAf;AAEA,QAAMa,UAAU,GAAGC,WAAW,CAACb,MAAD,CAA9B;;AAGA,QAAMc,KAAK,GAAGC,YAAGC,eAAH,CAAmBJ,UAAnB,EAA+B,EAA/B,EAAmC;AAACX,IAAAA;AAAD,GAAnC,CAAd;;AAIAgB,kBAAIC,IAAJ,CAAS,kCAAT;;AACA,MAAIC,MAAM,GAAG,MAAML,KAAK,CAACH,MAAD,EAASJ,UAAT,EAAqBa,iBAArB,CAAxB;;AAEAH,kBAAIC,IAAJ,CAAS,8DAAT;;AACAC,EAAAA,MAAM,GAAGE,kBAAkB,CAACF,MAAD,CAA3B;AACA,SAAO;AAACA,IAAAA,MAAD;AAASb,IAAAA;AAAT,GAAP;AACD;;AAUD,SAASO,WAAT,CAAsBb,MAAtB,EAA8B;AAC5B,SAAQ;AACV,MAAMA,MAAO;AACb,KAFE;AAGD;;AAYD,SAASqB,kBAAT,CAA6BC,GAA7B,EAAkC;AAGhC,MAAI;AACFA,IAAAA,GAAG,GAAGC,IAAI,CAACC,KAAL,CAAWD,IAAI,CAACE,SAAL,CAAeH,GAAf,CAAX,CAAN;AACD,GAFD,CAEE,OAAOI,CAAP,EAAU;AACVT,oBAAIU,IAAJ,CAAS,4DACC,eAAcL,GAAI,qBAD5B;;AAEA,WAAO,IAAP;AACD;;AAED,MAAIM,GAAJ;;AAGA,MAAI1B,gBAAE2B,aAAF,CAAgBP,GAAhB,CAAJ,EAA0B;AAIxBM,IAAAA,GAAG,GAAG,EAAN;;AAEA,QAAIN,GAAG,CAACzB,mBAAD,CAAH,IAA4ByB,GAAG,CAAC1B,eAAD,CAAnC,EAAsD;AAGpD,UAAI0B,GAAG,CAACzB,mBAAD,CAAP,EAA8B;AAC5B+B,QAAAA,GAAG,CAAC/B,mBAAD,CAAH,GAA2ByB,GAAG,CAACzB,mBAAD,CAA9B;AACD;;AAED,UAAIyB,GAAG,CAAC1B,eAAD,CAAP,EAA0B;AACxBgC,QAAAA,GAAG,CAAChC,eAAD,CAAH,GAAuB0B,GAAG,CAAC1B,eAAD,CAA1B;AACD;;AACD,aAAOgC,GAAP;AACD;;AAGD,SAAK,MAAME,GAAX,IAAkBC,MAAM,CAACC,IAAP,CAAYV,GAAZ,CAAlB,EAAoC;AAClCM,MAAAA,GAAG,CAACE,GAAD,CAAH,GAAWT,kBAAkB,CAACC,GAAG,CAACQ,GAAD,CAAJ,CAA7B;AACD;;AACD,WAAOF,GAAP;AACD;;AAGD,MAAI1B,gBAAE+B,OAAF,CAAUX,GAAV,CAAJ,EAAoB;AAClB,WAAOA,GAAG,CAACY,GAAJ,CAAQb,kBAAR,CAAP;AACD;;AAGD,SAAOC,GAAP;AACD;;AAED,eAAea,IAAf,CAAqBpC,UAArB,EAAiCC,MAAjC,EAAyCC,OAAzC,EAAkD;AAChD,MAAI2B,GAAJ;;AACA,MAAI;AACFA,IAAAA,GAAG,GAAG;AAACQ,MAAAA,OAAO,EAAE,MAAMtC,SAAS,CAACC,UAAD,EAAaC,MAAb,EAAqBC,OAArB;AAAzB,KAAN;AACD,GAFD,CAEE,OAAOoC,KAAP,EAAc;AACdT,IAAAA,GAAG,GAAG;AAACS,MAAAA,KAAK,EAAE;AAACC,QAAAA,OAAO,EAAED,KAAK,CAACC,OAAhB;AAAyBC,QAAAA,KAAK,EAAEF,KAAK,CAACE;AAAtC;AAAR,KAAN;AACD;;AACD,QAAMnB,kBAAEoB,SAAF,CAAYC,OAAO,CAACC,IAApB,EAA0B;AAACC,IAAAA,OAAO,EAAEF;AAAV,GAA1B,EAA8Cb,GAA9C,CAAN;AACD;;AAED,IAAIgB,OAAO,CAACT,IAAR,KAAiBU,MAArB,EAA6B;AAC3B5B,kBAAIC,IAAJ,CAAS,2CAAT;;AACAuB,EAAAA,OAAO,CAACK,EAAR,CAAW,SAAX,EAAsB,CAAC;AAAC/C,IAAAA,UAAD;AAAaC,IAAAA,MAAb;AAAqBC,IAAAA;AAArB,GAAD,KAAmC;AACvDgB,oBAAIC,IAAJ,CAAS,yCAAT;;AACAiB,IAAAA,IAAI,CAACpC,UAAD,EAAaC,MAAb,EAAqBC,OAArB,CAAJ;AACD,GAHD;AAID","sourcesContent":["import _ from 'lodash';\nimport B from 'bluebird';\nimport vm from 'vm';\nimport log from '../logger';\nimport { attach } from 'webdriverio';\n\n// duplicate defining these keys here so we don't need to re-load a huge appium\n// dependency tree into memory just to run a wdio script\nconst W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';\nconst MJSONWP_ELEMENT_KEY = 'ELEMENT';\n\nasync function runScript (driverOpts, script, timeout) {\n  if (!_.isNumber(timeout)) {\n    throw new Error('Timeout parameter must be a number');\n  }\n\n  // set up fake logger\n  const logLevels = ['error', 'warn', 'log'];\n  const logs = {};\n  const consoleFns = {};\n  for (const level of logLevels) {\n    logs[level] = [];\n    consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);\n  }\n\n  const driver = attach(driverOpts);\n\n  const fullScript = buildScript(script);\n  // the timeout here will not matter really, but set it anyway to be on the\n  // safe side\n  const vmCtx = vm.runInNewContext(fullScript, {}, {timeout});\n\n  // run the driver script, giving user access to the driver object, a fake\n  // console logger, and a promise library\n  log.info('Running driver script in Node vm');\n  let result = await vmCtx(driver, consoleFns, B);\n\n  log.info('Ensuring driver script result is appropriate type for return');\n  result = coerceScriptResult(result);\n  return {result, logs};\n}\n\n/**\n * Embed a user-generated script inside a method which takes only the\n * predetermined objects we specify\n *\n * @param {string} script - the javascript to execute\n *\n * @return {string} - the full script to execute\n */\nfunction buildScript (script) {\n  return `(async function execute (driver, console, Promise) {\n    ${script}\n  })`;\n}\n\n/**\n * We can get any manner of crazy thing back from a vm executing untrusted\n * code. We might also get WebdriverIO objects that aren't suitable for JSON\n * response. So make sure we convert the things we know about to their\n * appropriate response format, and squash other weird things.\n *\n * @param {Object} obj - object to convert and sanitize\n *\n * @return {Object} - safely converted object\n */\nfunction coerceScriptResult (obj) {\n  // first ensure obj is of a type that can be JSON encoded safely. This will\n  // get rid of custom objects, functions, etc... and turn them into POJOs\n  try {\n    obj = JSON.parse(JSON.stringify(obj));\n  } catch (e) {\n    log.warn('Could not convert executeDriverScript to safe response!' +\n             `Result was: ${obj}. Will make it null`);\n    return null;\n  }\n\n  let res;\n\n  // now we begin our recursive case options\n  if (_.isPlainObject(obj)) {\n    // if we have an object, it's either an element object or something else\n    // webdriverio has no monadic object types other than element and driver,\n    // and we don't want to allow special casing return of driver\n    res = {};\n\n    if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {\n      // if it's an element object, clear out anything that's not the key, and\n      // then return the object\n      if (obj[MJSONWP_ELEMENT_KEY]) {\n        res[MJSONWP_ELEMENT_KEY] = obj[MJSONWP_ELEMENT_KEY];\n      }\n\n      if (obj[W3C_ELEMENT_KEY]) {\n        res[W3C_ELEMENT_KEY] = obj[W3C_ELEMENT_KEY];\n      }\n      return res;\n    }\n\n    // otherwise, recurse into the object\n    for (const key of Object.keys(obj)) {\n      res[key] = coerceScriptResult(obj[key]);\n    }\n    return res;\n  }\n\n  // in the cae of an array, just recurse into the items\n  if (_.isArray(obj)) {\n    return obj.map(coerceScriptResult);\n  }\n\n  // base case, if it's not an object or array, return straightaway\n  return obj;\n}\n\nasync function main (driverOpts, script, timeout) {\n  let res;\n  try {\n    res = {success: await runScript(driverOpts, script, timeout)};\n  } catch (error) {\n    res = {error: {message: error.message, stack: error.stack}};\n  }\n  await B.promisify(process.send, {context: process})(res);\n}\n\nif (require.main === module) {\n  log.info('Running driver execution in child process');\n  process.on('message', ({driverOpts, script, timeout}) => {\n    log.info('Parameters received from parent process');\n    main(driverOpts, script, timeout);\n  });\n}\n"],"file":"lib/basedriver/commands/execute-child.js","sourceRoot":"../../../.."}

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/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);
-  });
-}