@appium/base-driver 8.1.2 → 8.2.3
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.
- package/build/lib/basedriver/capabilities.js +3 -1
- package/build/lib/basedriver/commands/index.js +2 -4
- package/build/lib/basedriver/driver.js +8 -10
- package/build/lib/basedriver/helpers.js +140 -82
- package/build/lib/express/express-logging.js +2 -2
- package/build/lib/index.js +126 -0
- package/build/lib/jsonwp-proxy/protocol-converter.js +2 -5
- package/build/lib/jsonwp-proxy/proxy.js +2 -5
- package/build/lib/protocol/errors.js +4 -2
- package/build/lib/protocol/helpers.js +3 -20
- package/build/lib/protocol/index.js +13 -1
- package/build/lib/protocol/protocol.js +26 -25
- package/build/lib/protocol/routes.js +1 -10
- package/build/test/basedriver/capability-specs.js +10 -10
- package/build/test/basedriver/commands/event-specs.js +10 -10
- package/build/test/basedriver/driver-e2e-specs.js +3 -3
- package/build/test/basedriver/driver-e2e-tests.js +6 -223
- package/build/test/basedriver/driver-specs.js +3 -3
- package/build/test/basedriver/driver-tests.js +6 -6
- package/build/test/basedriver/helpers-specs.js +5 -1
- package/build/test/basedriver/timeout-specs.js +7 -7
- package/build/test/basedriver/websockets-e2e-specs.js +5 -5
- package/build/test/express/server-e2e-specs.js +156 -0
- package/build/test/express/server-specs.js +151 -0
- package/build/test/express/static-specs.js +23 -0
- package/build/test/helpers.js +57 -0
- package/build/test/jsonwp-proxy/mock-request.js +93 -0
- package/build/test/jsonwp-proxy/protocol-converter-specs.js +173 -0
- package/build/test/jsonwp-proxy/proxy-e2e-specs.js +61 -0
- package/build/test/jsonwp-proxy/proxy-specs.js +294 -0
- package/build/test/jsonwp-proxy/url-specs.js +167 -0
- package/build/test/jsonwp-status/status-specs.js +36 -0
- package/build/test/protocol/errors-specs.js +388 -0
- package/build/test/protocol/fake-driver.js +168 -0
- package/build/test/protocol/helpers.js +27 -0
- package/build/test/protocol/protocol-e2e-specs.js +1182 -0
- package/build/test/protocol/routes-specs.js +82 -0
- package/build/test/protocol/validator-specs.js +151 -0
- package/index.d.ts +5 -3
- package/index.js +1 -62
- package/lib/basedriver/capabilities.js +3 -0
- package/lib/basedriver/commands/index.js +0 -2
- package/lib/basedriver/driver.js +6 -26
- package/lib/basedriver/helpers.js +202 -85
- package/lib/express/express-logging.js +1 -1
- package/lib/index.js +64 -0
- package/lib/jsonwp-proxy/protocol-converter.js +1 -5
- package/lib/jsonwp-proxy/proxy.js +1 -3
- package/lib/protocol/errors.js +1 -1
- package/lib/protocol/helpers.js +5 -25
- package/lib/protocol/index.js +3 -1
- package/lib/protocol/protocol.js +26 -31
- package/lib/protocol/routes.js +0 -3
- package/package.json +8 -16
- package/test/basedriver/capability-specs.js +1 -1
- package/test/basedriver/commands/event-specs.js +1 -1
- package/test/basedriver/driver-e2e-specs.js +1 -1
- package/test/basedriver/driver-e2e-tests.js +1 -179
- package/test/basedriver/driver-specs.js +1 -1
- package/test/basedriver/driver-tests.js +3 -3
- package/test/basedriver/helpers-specs.js +4 -0
- package/test/basedriver/timeout-specs.js +1 -1
- package/test/basedriver/websockets-e2e-specs.js +1 -1
- package/build/index.js +0 -120
- package/build/lib/basedriver/commands/execute-child.js +0 -137
- package/build/lib/basedriver/commands/execute.js +0 -119
- package/build/test/basedriver/fixtures/custom-element-finder-bad.js +0 -12
- package/build/test/basedriver/fixtures/custom-element-finder.js +0 -36
- package/lib/basedriver/commands/execute-child.js +0 -132
- package/lib/basedriver/commands/execute.js +0 -126
|
@@ -1,137 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
|
-
require("source-map-support/register");
|
|
6
|
-
|
|
7
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
8
|
-
|
|
9
|
-
var _bluebird = _interopRequireDefault(require("bluebird"));
|
|
10
|
-
|
|
11
|
-
var _vm = _interopRequireDefault(require("vm"));
|
|
12
|
-
|
|
13
|
-
var _logger = _interopRequireDefault(require("../logger"));
|
|
14
|
-
|
|
15
|
-
var _webdriverio = require("webdriverio");
|
|
16
|
-
|
|
17
|
-
const W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
|
|
18
|
-
const MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
19
|
-
|
|
20
|
-
async function runScript(driverOpts, script, timeout) {
|
|
21
|
-
if (!_lodash.default.isNumber(timeout)) {
|
|
22
|
-
throw new Error('Timeout parameter must be a number');
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
const logLevels = ['error', 'warn', 'log'];
|
|
26
|
-
const logs = {};
|
|
27
|
-
const consoleFns = {};
|
|
28
|
-
|
|
29
|
-
for (const level of logLevels) {
|
|
30
|
-
logs[level] = [];
|
|
31
|
-
|
|
32
|
-
consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
const driver = (0, _webdriverio.attach)(driverOpts);
|
|
36
|
-
const fullScript = buildScript(script);
|
|
37
|
-
|
|
38
|
-
const vmCtx = _vm.default.runInNewContext(fullScript, {}, {
|
|
39
|
-
timeout
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
_logger.default.info('Running driver script in Node vm');
|
|
43
|
-
|
|
44
|
-
let result = await vmCtx(driver, consoleFns, _bluebird.default);
|
|
45
|
-
|
|
46
|
-
_logger.default.info('Ensuring driver script result is appropriate type for return');
|
|
47
|
-
|
|
48
|
-
result = coerceScriptResult(result);
|
|
49
|
-
return {
|
|
50
|
-
result,
|
|
51
|
-
logs
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
function buildScript(script) {
|
|
56
|
-
return `(async function execute (driver, console, Promise) {
|
|
57
|
-
${script}
|
|
58
|
-
})`;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
function coerceScriptResult(obj) {
|
|
62
|
-
try {
|
|
63
|
-
obj = JSON.parse(JSON.stringify(obj));
|
|
64
|
-
} catch (e) {
|
|
65
|
-
_logger.default.warn('Could not convert executeDriverScript to safe response!' + `Result was: ${obj}. Will make it null`);
|
|
66
|
-
|
|
67
|
-
return null;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
let res;
|
|
71
|
-
|
|
72
|
-
if (_lodash.default.isPlainObject(obj)) {
|
|
73
|
-
res = {};
|
|
74
|
-
|
|
75
|
-
if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {
|
|
76
|
-
if (obj[MJSONWP_ELEMENT_KEY]) {
|
|
77
|
-
res[MJSONWP_ELEMENT_KEY] = obj[MJSONWP_ELEMENT_KEY];
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
if (obj[W3C_ELEMENT_KEY]) {
|
|
81
|
-
res[W3C_ELEMENT_KEY] = obj[W3C_ELEMENT_KEY];
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
return res;
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
for (const key of Object.keys(obj)) {
|
|
88
|
-
res[key] = coerceScriptResult(obj[key]);
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
return res;
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
if (_lodash.default.isArray(obj)) {
|
|
95
|
-
return obj.map(coerceScriptResult);
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
return obj;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
async function main(driverOpts, script, timeout) {
|
|
102
|
-
let res;
|
|
103
|
-
|
|
104
|
-
try {
|
|
105
|
-
res = {
|
|
106
|
-
success: await runScript(driverOpts, script, timeout)
|
|
107
|
-
};
|
|
108
|
-
} catch (error) {
|
|
109
|
-
res = {
|
|
110
|
-
error: {
|
|
111
|
-
message: error.message,
|
|
112
|
-
stack: error.stack
|
|
113
|
-
}
|
|
114
|
-
};
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
await _bluebird.default.promisify(process.send, {
|
|
118
|
-
context: process
|
|
119
|
-
})(res);
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
if (require.main === module) {
|
|
123
|
-
_logger.default.info('Running driver execution in child process');
|
|
124
|
-
|
|
125
|
-
process.on('message', ({
|
|
126
|
-
driverOpts,
|
|
127
|
-
script,
|
|
128
|
-
timeout
|
|
129
|
-
}) => {
|
|
130
|
-
_logger.default.info('Parameters received from parent process');
|
|
131
|
-
|
|
132
|
-
main(driverOpts, script, timeout);
|
|
133
|
-
});
|
|
134
|
-
}require('source-map-support').install();
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
//# 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":"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","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":"../../../.."}
|
|
@@ -1,119 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", {
|
|
6
|
-
value: true
|
|
7
|
-
});
|
|
8
|
-
exports.default = void 0;
|
|
9
|
-
|
|
10
|
-
require("source-map-support/register");
|
|
11
|
-
|
|
12
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
13
|
-
|
|
14
|
-
var _path = _interopRequireDefault(require("path"));
|
|
15
|
-
|
|
16
|
-
var _child_process = _interopRequireDefault(require("child_process"));
|
|
17
|
-
|
|
18
|
-
var _logger = _interopRequireDefault(require("../logger"));
|
|
19
|
-
|
|
20
|
-
var _bluebird = _interopRequireDefault(require("bluebird"));
|
|
21
|
-
|
|
22
|
-
const FEAT_FLAG = 'execute_driver_script';
|
|
23
|
-
const DEFAULT_SCRIPT_TIMEOUT = 1000 * 60 * 60;
|
|
24
|
-
const SCRIPT_TYPE_WDIO = 'webdriverio';
|
|
25
|
-
let commands = {};
|
|
26
|
-
|
|
27
|
-
commands.executeDriverScript = async function (script, scriptType = 'webdriverio', timeout = DEFAULT_SCRIPT_TIMEOUT) {
|
|
28
|
-
if (!this.isFeatureEnabled(FEAT_FLAG)) {
|
|
29
|
-
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}`);
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
if (scriptType !== SCRIPT_TYPE_WDIO) {
|
|
33
|
-
throw new Error(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
if (!this.opts.address || !this.opts.port) {
|
|
37
|
-
throw new Error('Address or port of running server were not defined; this ' + 'is required. This is probably a programming error in the driver');
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
if (!_lodash.default.isNumber(timeout)) {
|
|
41
|
-
throw new Error('Timeout parameter must be a number');
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
const driverOpts = {
|
|
45
|
-
sessionId: this.sessionId,
|
|
46
|
-
protocol: 'http',
|
|
47
|
-
hostname: this.opts.address,
|
|
48
|
-
port: this.opts.port,
|
|
49
|
-
path: this.basePath,
|
|
50
|
-
isW3C: this.isW3CProtocol(),
|
|
51
|
-
isMobile: true,
|
|
52
|
-
capabilities: this.caps
|
|
53
|
-
};
|
|
54
|
-
|
|
55
|
-
_logger.default.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
|
|
56
|
-
|
|
57
|
-
const childScript = _path.default.join(__dirname, 'execute-child.js');
|
|
58
|
-
|
|
59
|
-
_logger.default.info(`Forking process to run webdriver script as child using ${childScript}`);
|
|
60
|
-
|
|
61
|
-
const scriptProc = _child_process.default.fork(childScript);
|
|
62
|
-
|
|
63
|
-
let timeoutCanceled = false;
|
|
64
|
-
|
|
65
|
-
try {
|
|
66
|
-
const timeoutStart = Date.now();
|
|
67
|
-
|
|
68
|
-
const waitForResult = async function () {
|
|
69
|
-
const resPromise = new _bluebird.default(res => {
|
|
70
|
-
scriptProc.on('message', res);
|
|
71
|
-
});
|
|
72
|
-
const res = await resPromise;
|
|
73
|
-
|
|
74
|
-
_logger.default.info('Received execute driver script result from child process, shutting it down');
|
|
75
|
-
|
|
76
|
-
if (res.error) {
|
|
77
|
-
throw new Error(res.error.message);
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
return res.success;
|
|
81
|
-
};
|
|
82
|
-
|
|
83
|
-
const waitForTimeout = async function () {
|
|
84
|
-
while (!timeoutCanceled && Date.now() - timeoutStart < timeout) {
|
|
85
|
-
await _bluebird.default.delay(500);
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
if (timeoutCanceled) {
|
|
89
|
-
return;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
throw new Error(`Execute driver script timed out after ${timeout}ms. ` + `You can adjust this with the 'timeout' parameter.`);
|
|
93
|
-
};
|
|
94
|
-
|
|
95
|
-
_logger.default.info('Sending driver and script data to child');
|
|
96
|
-
|
|
97
|
-
scriptProc.send({
|
|
98
|
-
driverOpts,
|
|
99
|
-
script,
|
|
100
|
-
timeout
|
|
101
|
-
});
|
|
102
|
-
return await _bluebird.default.race([waitForResult(), waitForTimeout()]);
|
|
103
|
-
} catch (err) {
|
|
104
|
-
throw new Error(`Could not execute driver script. Original error was: ${err}`);
|
|
105
|
-
} finally {
|
|
106
|
-
timeoutCanceled = true;
|
|
107
|
-
|
|
108
|
-
_logger.default.info('Disconnecting from and killing driver script child proc');
|
|
109
|
-
|
|
110
|
-
scriptProc.disconnect();
|
|
111
|
-
scriptProc.kill();
|
|
112
|
-
}
|
|
113
|
-
};
|
|
114
|
-
|
|
115
|
-
var _default = commands;
|
|
116
|
-
exports.default = _default;require('source-map-support').install();
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
//# 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":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,MAAMA,SAAS,GAAG,uBAAlB;AACA,MAAMC,sBAAsB,GAAG,OAAO,EAAP,GAAY,EAA3C;AACA,MAAMC,gBAAgB,GAAG,aAAzB;AAGA,IAAIC,QAAQ,GAAG,EAAf;;AAcAA,QAAQ,CAACC,mBAAT,GAA+B,gBAAgBC,MAAhB,EAAwBC,UAAU,GAAG,aAArC,EAC7BC,OAAO,GAAGN,sBADmB,EACK;AAElC,MAAI,CAAC,KAAKO,gBAAL,CAAsBR,SAAtB,CAAL,EAAuC;AACrC,UAAM,IAAIS,KAAJ,CAAW,uDAAD,GACC,2DADD,GAEC,QAAOT,SAAU,kCAAiCA,SAAU,EAFvE,CAAN;AAGD;;AAED,MAAIM,UAAU,KAAKJ,gBAAnB,EAAqC;AACnC,UAAM,IAAIO,KAAJ,CAAW,aAAYP,gBAAiB,sCAAxC,CAAN;AACD;;AAED,MAAI,CAAC,KAAKQ,IAAL,CAAUC,OAAX,IAAsB,CAAC,KAAKD,IAAL,CAAUE,IAArC,EAA2C;AACzC,UAAM,IAAIH,KAAJ,CAAU,8DACA,iEADV,CAAN;AAED;;AAED,MAAI,CAACI,gBAAEC,QAAF,CAAWP,OAAX,CAAL,EAA0B;AACxB,UAAM,IAAIE,KAAJ,CAAU,oCAAV,CAAN;AACD;;AAED,QAAMM,UAAU,GAAG;AACjBC,IAAAA,SAAS,EAAE,KAAKA,SADC;AAEjBC,IAAAA,QAAQ,EAAE,MAFO;AAGjBC,IAAAA,QAAQ,EAAE,KAAKR,IAAL,CAAUC,OAHH;AAIjBC,IAAAA,IAAI,EAAE,KAAKF,IAAL,CAAUE,IAJC;AAKjBO,IAAAA,IAAI,EAAE,KAAKC,QALM;AAMjBC,IAAAA,KAAK,EAAE,KAAKC,aAAL,EANU;AAOjBC,IAAAA,QAAQ,EAAE,IAPO;AAQjBC,IAAAA,YAAY,EAAE,KAAKC;AARF,GAAnB;;AAUAC,kBAAIC,IAAJ,CAAU,uDAAsDZ,UAAU,CAACM,KAAX,GAAmB,IAAnB,GAA0B,KAAM,EAAhG;;AAIA,QAAMO,WAAW,GAAGT,cAAKU,IAAL,CAAUC,SAAV,EAAqB,kBAArB,CAApB;;AACAJ,kBAAIC,IAAJ,CAAU,0DAAyDC,WAAY,EAA/E;;AACA,QAAMG,UAAU,GAAGC,uBAAGC,IAAH,CAAQL,WAAR,CAAnB;;AAIA,MAAIM,eAAe,GAAG,KAAtB;;AAEA,MAAI;AACF,UAAMC,YAAY,GAAGC,IAAI,CAACC,GAAL,EAArB;;AAGA,UAAMC,aAAa,GAAG,kBAAkB;AACtC,YAAMC,UAAU,GAAG,IAAIC,iBAAJ,CAAOC,GAAD,IAAS;AAChCV,QAAAA,UAAU,CAACW,EAAX,CAAc,SAAd,EAAyBD,GAAzB;AACD,OAFkB,CAAnB;AAIA,YAAMA,GAAG,GAAG,MAAMF,UAAlB;;AACAb,sBAAIC,IAAJ,CAAS,4EAAT;;AAEA,UAAIc,GAAG,CAACE,KAAR,EAAe;AACb,cAAM,IAAIlC,KAAJ,CAAUgC,GAAG,CAACE,KAAJ,CAAUC,OAApB,CAAN;AACD;;AAED,aAAOH,GAAG,CAACI,OAAX;AACD,KAbD;;AAkBA,UAAMC,cAAc,GAAG,kBAAkB;AACvC,aAAO,CAACZ,eAAD,IAAqBE,IAAI,CAACC,GAAL,KAAaF,YAAd,GAA8B5B,OAAzD,EAAkE;AAChE,cAAMiC,kBAAEO,KAAF,CAAQ,GAAR,CAAN;AACD;;AAED,UAAIb,eAAJ,EAAqB;AACnB;AACD;;AAED,YAAM,IAAIzB,KAAJ,CAAW,yCAAwCF,OAAQ,MAAjD,GACC,mDADX,CAAN;AAED,KAXD;;AAeAmB,oBAAIC,IAAJ,CAAS,yCAAT;;AACAI,IAAAA,UAAU,CAACiB,IAAX,CAAgB;AAACjC,MAAAA,UAAD;AAAaV,MAAAA,MAAb;AAAqBE,MAAAA;AAArB,KAAhB;AAGA,WAAO,MAAMiC,kBAAES,IAAF,CAAO,CAACX,aAAa,EAAd,EAAkBQ,cAAc,EAAhC,CAAP,CAAb;AACD,GA1CD,CA0CE,OAAOI,GAAP,EAAY;AACZ,UAAM,IAAIzC,KAAJ,CAAW,wDAAuDyC,GAAI,EAAtE,CAAN;AACD,GA5CD,SA4CU;AAGRhB,IAAAA,eAAe,GAAG,IAAlB;;AAEAR,oBAAIC,IAAJ,CAAS,yDAAT;;AACAI,IAAAA,UAAU,CAACoB,UAAX;AACApB,IAAAA,UAAU,CAACqB,IAAX;AACD;AACF,CAjGD;;eAoGejD,Q","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":"../../../.."}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
require("source-map-support/register");
|
|
4
|
-
|
|
5
|
-
module.exports = {
|
|
6
|
-
notFind: function () {
|
|
7
|
-
return [];
|
|
8
|
-
}
|
|
9
|
-
};require('source-map-support').install();
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvYmFzZWRyaXZlci9maXh0dXJlcy9jdXN0b20tZWxlbWVudC1maW5kZXItYmFkLmpzIl0sIm5hbWVzIjpbIm1vZHVsZSIsImV4cG9ydHMiLCJub3RGaW5kIl0sIm1hcHBpbmdzIjoiOzs7O0FBQUFBLE1BQU0sQ0FBQ0MsT0FBUCxHQUFpQjtBQUNmQyxFQUFBQSxPQUFPLEVBQUUsWUFBWTtBQUNuQixXQUFPLEVBQVA7QUFDRDtBQUhjLENBQWpCIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSB7XG4gIG5vdEZpbmQ6IGZ1bmN0aW9uICgpIHsgLy8gZXNsaW50LWRpc2FibGUtbGluZSBvYmplY3Qtc2hvcnRoYW5kXG4gICAgcmV0dXJuIFtdO1xuICB9XG59O1xuIl0sImZpbGUiOiJ0ZXN0L2Jhc2Vkcml2ZXIvZml4dHVyZXMvY3VzdG9tLWVsZW1lbnQtZmluZGVyLWJhZC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLi8uLiJ9
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
require("source-map-support/register");
|
|
4
|
-
|
|
5
|
-
module.exports = {
|
|
6
|
-
find: function (driver, logger, selector, multiple) {
|
|
7
|
-
if (!driver || !driver.opts) {
|
|
8
|
-
throw new Error('Expected driver object');
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
if (!logger || !logger.info) {
|
|
12
|
-
throw new Error('Expected logger object');
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
if (selector === 'foo') {
|
|
16
|
-
return ['bar'];
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if (selector === 'foos') {
|
|
20
|
-
if (multiple) {
|
|
21
|
-
return ['baz1', 'baz2'];
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
return ['bar1', 'bar2'];
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
if (selector === 'error') {
|
|
28
|
-
throw new Error('This is a plugin error');
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
return [];
|
|
32
|
-
}
|
|
33
|
-
};require('source-map-support').install();
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvYmFzZWRyaXZlci9maXh0dXJlcy9jdXN0b20tZWxlbWVudC1maW5kZXIuanMiXSwibmFtZXMiOlsibW9kdWxlIiwiZXhwb3J0cyIsImZpbmQiLCJkcml2ZXIiLCJsb2dnZXIiLCJzZWxlY3RvciIsIm11bHRpcGxlIiwib3B0cyIsIkVycm9yIiwiaW5mbyJdLCJtYXBwaW5ncyI6Ijs7OztBQUFBQSxNQUFNLENBQUNDLE9BQVAsR0FBaUI7QUFDZkMsRUFBQUEsSUFBSSxFQUFFLFVBQVVDLE1BQVYsRUFBa0JDLE1BQWxCLEVBQTBCQyxRQUExQixFQUFvQ0MsUUFBcEMsRUFBOEM7QUFDbEQsUUFBSSxDQUFDSCxNQUFELElBQVcsQ0FBQ0EsTUFBTSxDQUFDSSxJQUF2QixFQUE2QjtBQUMzQixZQUFNLElBQUlDLEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsUUFBSSxDQUFDSixNQUFELElBQVcsQ0FBQ0EsTUFBTSxDQUFDSyxJQUF2QixFQUE2QjtBQUMzQixZQUFNLElBQUlELEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsUUFBSUgsUUFBUSxLQUFLLEtBQWpCLEVBQXdCO0FBQ3RCLGFBQU8sQ0FBQyxLQUFELENBQVA7QUFDRDs7QUFFRCxRQUFJQSxRQUFRLEtBQUssTUFBakIsRUFBeUI7QUFDdkIsVUFBSUMsUUFBSixFQUFjO0FBQ1osZUFBTyxDQUFDLE1BQUQsRUFBUyxNQUFULENBQVA7QUFDRDs7QUFFRCxhQUFPLENBQUMsTUFBRCxFQUFTLE1BQVQsQ0FBUDtBQUNEOztBQUVELFFBQUlELFFBQVEsS0FBSyxPQUFqQixFQUEwQjtBQUN4QixZQUFNLElBQUlHLEtBQUosQ0FBVSx3QkFBVixDQUFOO0FBQ0Q7O0FBRUQsV0FBTyxFQUFQO0FBQ0Q7QUEzQmMsQ0FBakIiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuZXhwb3J0cyA9IHtcbiAgZmluZDogZnVuY3Rpb24gKGRyaXZlciwgbG9nZ2VyLCBzZWxlY3RvciwgbXVsdGlwbGUpIHsgLy8gZXNsaW50LWRpc2FibGUtbGluZSBvYmplY3Qtc2hvcnRoYW5kXG4gICAgaWYgKCFkcml2ZXIgfHwgIWRyaXZlci5vcHRzKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoJ0V4cGVjdGVkIGRyaXZlciBvYmplY3QnKTtcbiAgICB9XG5cbiAgICBpZiAoIWxvZ2dlciB8fCAhbG9nZ2VyLmluZm8pIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignRXhwZWN0ZWQgbG9nZ2VyIG9iamVjdCcpO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2ZvbycpIHtcbiAgICAgIHJldHVybiBbJ2JhciddO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2Zvb3MnKSB7XG4gICAgICBpZiAobXVsdGlwbGUpIHtcbiAgICAgICAgcmV0dXJuIFsnYmF6MScsICdiYXoyJ107XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBbJ2JhcjEnLCAnYmFyMiddO1xuICAgIH1cblxuICAgIGlmIChzZWxlY3RvciA9PT0gJ2Vycm9yJykge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdUaGlzIGlzIGEgcGx1Z2luIGVycm9yJyk7XG4gICAgfVxuXG4gICAgcmV0dXJuIFtdO1xuICB9XG59O1xuIl0sImZpbGUiOiJ0ZXN0L2Jhc2Vkcml2ZXIvZml4dHVyZXMvY3VzdG9tLWVsZW1lbnQtZmluZGVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uLy4uIn0=
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
|
-
import B from 'bluebird';
|
|
3
|
-
import vm from 'vm';
|
|
4
|
-
import log from '../logger';
|
|
5
|
-
import { attach } from 'webdriverio';
|
|
6
|
-
|
|
7
|
-
// duplicate defining these keys here so we don't need to re-load a huge appium
|
|
8
|
-
// dependency tree into memory just to run a wdio script
|
|
9
|
-
const W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
|
|
10
|
-
const MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
11
|
-
|
|
12
|
-
async function runScript (driverOpts, script, timeout) {
|
|
13
|
-
if (!_.isNumber(timeout)) {
|
|
14
|
-
throw new Error('Timeout parameter must be a number');
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
// set up fake logger
|
|
18
|
-
const logLevels = ['error', 'warn', 'log'];
|
|
19
|
-
const logs = {};
|
|
20
|
-
const consoleFns = {};
|
|
21
|
-
for (const level of logLevels) {
|
|
22
|
-
logs[level] = [];
|
|
23
|
-
consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
const driver = attach(driverOpts);
|
|
27
|
-
|
|
28
|
-
const fullScript = buildScript(script);
|
|
29
|
-
// the timeout here will not matter really, but set it anyway to be on the
|
|
30
|
-
// safe side
|
|
31
|
-
const vmCtx = vm.runInNewContext(fullScript, {}, {timeout});
|
|
32
|
-
|
|
33
|
-
// run the driver script, giving user access to the driver object, a fake
|
|
34
|
-
// console logger, and a promise library
|
|
35
|
-
log.info('Running driver script in Node vm');
|
|
36
|
-
let result = await vmCtx(driver, consoleFns, B);
|
|
37
|
-
|
|
38
|
-
log.info('Ensuring driver script result is appropriate type for return');
|
|
39
|
-
result = coerceScriptResult(result);
|
|
40
|
-
return {result, logs};
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
/**
|
|
44
|
-
* Embed a user-generated script inside a method which takes only the
|
|
45
|
-
* predetermined objects we specify
|
|
46
|
-
*
|
|
47
|
-
* @param {string} script - the javascript to execute
|
|
48
|
-
*
|
|
49
|
-
* @return {string} - the full script to execute
|
|
50
|
-
*/
|
|
51
|
-
function buildScript (script) {
|
|
52
|
-
return `(async function execute (driver, console, Promise) {
|
|
53
|
-
${script}
|
|
54
|
-
})`;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
/**
|
|
58
|
-
* We can get any manner of crazy thing back from a vm executing untrusted
|
|
59
|
-
* code. We might also get WebdriverIO objects that aren't suitable for JSON
|
|
60
|
-
* response. So make sure we convert the things we know about to their
|
|
61
|
-
* appropriate response format, and squash other weird things.
|
|
62
|
-
*
|
|
63
|
-
* @param {Object} obj - object to convert and sanitize
|
|
64
|
-
*
|
|
65
|
-
* @return {Object} - safely converted object
|
|
66
|
-
*/
|
|
67
|
-
function coerceScriptResult (obj) {
|
|
68
|
-
// first ensure obj is of a type that can be JSON encoded safely. This will
|
|
69
|
-
// get rid of custom objects, functions, etc... and turn them into POJOs
|
|
70
|
-
try {
|
|
71
|
-
obj = JSON.parse(JSON.stringify(obj));
|
|
72
|
-
} catch (e) {
|
|
73
|
-
log.warn('Could not convert executeDriverScript to safe response!' +
|
|
74
|
-
`Result was: ${obj}. Will make it null`);
|
|
75
|
-
return null;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
let res;
|
|
79
|
-
|
|
80
|
-
// now we begin our recursive case options
|
|
81
|
-
if (_.isPlainObject(obj)) {
|
|
82
|
-
// if we have an object, it's either an element object or something else
|
|
83
|
-
// webdriverio has no monadic object types other than element and driver,
|
|
84
|
-
// and we don't want to allow special casing return of driver
|
|
85
|
-
res = {};
|
|
86
|
-
|
|
87
|
-
if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {
|
|
88
|
-
// if it's an element object, clear out anything that's not the key, and
|
|
89
|
-
// then return the object
|
|
90
|
-
if (obj[MJSONWP_ELEMENT_KEY]) {
|
|
91
|
-
res[MJSONWP_ELEMENT_KEY] = obj[MJSONWP_ELEMENT_KEY];
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
if (obj[W3C_ELEMENT_KEY]) {
|
|
95
|
-
res[W3C_ELEMENT_KEY] = obj[W3C_ELEMENT_KEY];
|
|
96
|
-
}
|
|
97
|
-
return res;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
// otherwise, recurse into the object
|
|
101
|
-
for (const key of Object.keys(obj)) {
|
|
102
|
-
res[key] = coerceScriptResult(obj[key]);
|
|
103
|
-
}
|
|
104
|
-
return res;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
// in the cae of an array, just recurse into the items
|
|
108
|
-
if (_.isArray(obj)) {
|
|
109
|
-
return obj.map(coerceScriptResult);
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
// base case, if it's not an object or array, return straightaway
|
|
113
|
-
return obj;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
async function main (driverOpts, script, timeout) {
|
|
117
|
-
let res;
|
|
118
|
-
try {
|
|
119
|
-
res = {success: await runScript(driverOpts, script, timeout)};
|
|
120
|
-
} catch (error) {
|
|
121
|
-
res = {error: {message: error.message, stack: error.stack}};
|
|
122
|
-
}
|
|
123
|
-
await B.promisify(process.send, {context: process})(res);
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
if (require.main === module) {
|
|
127
|
-
log.info('Running driver execution in child process');
|
|
128
|
-
process.on('message', ({driverOpts, script, timeout}) => {
|
|
129
|
-
log.info('Parameters received from parent process');
|
|
130
|
-
main(driverOpts, script, timeout);
|
|
131
|
-
});
|
|
132
|
-
}
|
|
@@ -1,126 +0,0 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
|
-
import path from 'path';
|
|
3
|
-
import cp from 'child_process';
|
|
4
|
-
import log from '../logger';
|
|
5
|
-
import B from 'bluebird';
|
|
6
|
-
|
|
7
|
-
const FEAT_FLAG = 'execute_driver_script';
|
|
8
|
-
const DEFAULT_SCRIPT_TIMEOUT = 1000 * 60 * 60; // default to 1 hour timeout
|
|
9
|
-
const SCRIPT_TYPE_WDIO = 'webdriverio';
|
|
10
|
-
// TODO add wd script type at some point
|
|
11
|
-
|
|
12
|
-
let commands = {};
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* This method takes a string which is executed as javascript in the context of
|
|
16
|
-
* a new nodejs VM, and which has available a webdriverio driver object, having
|
|
17
|
-
* already been attached to the currently running session.
|
|
18
|
-
*
|
|
19
|
-
* @param {string} script - the string representing the driver script to run
|
|
20
|
-
* @param {string} [scriptType='webdriverio'] - the name of the driver script
|
|
21
|
-
* library (currently only webdriverio is supported)
|
|
22
|
-
*
|
|
23
|
-
* @returns {Object} - a JSONifiable object representing the return value of
|
|
24
|
-
* the script
|
|
25
|
-
*/
|
|
26
|
-
commands.executeDriverScript = async function (script, scriptType = 'webdriverio',
|
|
27
|
-
timeout = DEFAULT_SCRIPT_TIMEOUT) {
|
|
28
|
-
|
|
29
|
-
if (!this.isFeatureEnabled(FEAT_FLAG)) {
|
|
30
|
-
throw new Error(`Execute driver script functionality is not available ` +
|
|
31
|
-
`unless server is started with --allow-insecure including ` +
|
|
32
|
-
`the '${FEAT_FLAG}' flag, e.g., --allow-insecure=${FEAT_FLAG}`);
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
if (scriptType !== SCRIPT_TYPE_WDIO) {
|
|
36
|
-
throw new Error(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
if (!this.opts.address || !this.opts.port) {
|
|
40
|
-
throw new Error('Address or port of running server were not defined; this ' +
|
|
41
|
-
'is required. This is probably a programming error in the driver');
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
if (!_.isNumber(timeout)) {
|
|
45
|
-
throw new Error('Timeout parameter must be a number');
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
const driverOpts = {
|
|
49
|
-
sessionId: this.sessionId,
|
|
50
|
-
protocol: 'http', // Appium won't ever be behind ssl locally
|
|
51
|
-
hostname: this.opts.address,
|
|
52
|
-
port: this.opts.port,
|
|
53
|
-
path: this.basePath,
|
|
54
|
-
isW3C: this.isW3CProtocol(),
|
|
55
|
-
isMobile: true,
|
|
56
|
-
capabilities: this.caps
|
|
57
|
-
};
|
|
58
|
-
log.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
// fork the execution script as a child process
|
|
62
|
-
const childScript = path.join(__dirname, 'execute-child.js');
|
|
63
|
-
log.info(`Forking process to run webdriver script as child using ${childScript}`);
|
|
64
|
-
const scriptProc = cp.fork(childScript);
|
|
65
|
-
|
|
66
|
-
// keep track of whether we have canceled the script timeout, so we can stop
|
|
67
|
-
// waiting for it and allow this process to finish gracefully
|
|
68
|
-
let timeoutCanceled = false;
|
|
69
|
-
|
|
70
|
-
try {
|
|
71
|
-
const timeoutStart = Date.now();
|
|
72
|
-
|
|
73
|
-
// promise that deals with the result from the child process
|
|
74
|
-
const waitForResult = async function () {
|
|
75
|
-
const resPromise = new B((res) => {
|
|
76
|
-
scriptProc.on('message', res); // this is node IPC
|
|
77
|
-
});
|
|
78
|
-
|
|
79
|
-
const res = await resPromise;
|
|
80
|
-
log.info('Received execute driver script result from child process, shutting it down');
|
|
81
|
-
|
|
82
|
-
if (res.error) {
|
|
83
|
-
throw new Error(res.error.message);
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
return res.success;
|
|
87
|
-
};
|
|
88
|
-
|
|
89
|
-
// promise that waits up to the timeout and throws an error if so, or does
|
|
90
|
-
// nothing if the timeout is canceled because we got a result from the
|
|
91
|
-
// child script
|
|
92
|
-
const waitForTimeout = async function () {
|
|
93
|
-
while (!timeoutCanceled && (Date.now() - timeoutStart) < timeout) {
|
|
94
|
-
await B.delay(500);
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
if (timeoutCanceled) {
|
|
98
|
-
return;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
throw new Error(`Execute driver script timed out after ${timeout}ms. ` +
|
|
102
|
-
`You can adjust this with the 'timeout' parameter.`);
|
|
103
|
-
};
|
|
104
|
-
|
|
105
|
-
// now that the child script is alive, send it the data it needs to start
|
|
106
|
-
// running the driver script
|
|
107
|
-
log.info('Sending driver and script data to child');
|
|
108
|
-
scriptProc.send({driverOpts, script, timeout});
|
|
109
|
-
|
|
110
|
-
// and set up a race between the response from the child and the timeout
|
|
111
|
-
return await B.race([waitForResult(), waitForTimeout()]);
|
|
112
|
-
} catch (err) {
|
|
113
|
-
throw new Error(`Could not execute driver script. Original error was: ${err}`);
|
|
114
|
-
} finally {
|
|
115
|
-
// ensure we always cancel the timeout so that the timeout promise stops
|
|
116
|
-
// spinning and allows this process to die gracefully
|
|
117
|
-
timeoutCanceled = true;
|
|
118
|
-
|
|
119
|
-
log.info('Disconnecting from and killing driver script child proc');
|
|
120
|
-
scriptProc.disconnect();
|
|
121
|
-
scriptProc.kill();
|
|
122
|
-
}
|
|
123
|
-
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
export default commands;
|