@appium/execute-driver-plugin 2.0.6 → 3.0.0
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/execute-child.js +114 -124
- package/build/lib/execute-child.js.map +1 -1
- package/build/lib/plugin.d.ts +6 -6
- package/build/lib/plugin.d.ts.map +1 -1
- package/build/lib/plugin.js +123 -125
- package/build/lib/plugin.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/plugin.js +2 -2
- package/package.json +6 -11
|
@@ -1,139 +1,129 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
});
|
|
6
|
-
exports.
|
|
7
|
-
|
|
8
|
-
require("
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
var _vm = require("vm2");
|
|
15
|
-
|
|
16
|
-
var _support = require("appium/support");
|
|
17
|
-
|
|
18
|
-
var _webdriverio = require("webdriverio");
|
|
19
|
-
|
|
20
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
|
-
|
|
22
|
-
const log = _support.logger.getLogger('ExecuteDriver Child');
|
|
23
|
-
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MJSONWP_ELEMENT_KEY = exports.W3C_ELEMENT_KEY = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const bluebird_1 = __importDefault(require("bluebird"));
|
|
9
|
+
const vm2_1 = require("vm2");
|
|
10
|
+
const support_1 = require("appium/support");
|
|
11
|
+
const webdriverio_1 = require("webdriverio");
|
|
12
|
+
const log = support_1.logger.getLogger('ExecuteDriver Child');
|
|
24
13
|
let send;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
exports.MJSONWP_ELEMENT_KEY =
|
|
29
|
-
|
|
14
|
+
// duplicate defining these keys here so we don't need to re-load a huge appium
|
|
15
|
+
// dependency tree into memory just to run a wdio script
|
|
16
|
+
exports.W3C_ELEMENT_KEY = support_1.util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
17
|
+
exports.MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
30
18
|
async function runScript(driverOpts, script, timeoutMs) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
result = coerceScriptResult(result);
|
|
54
|
-
log.info('Successfully ensured driver script result is appropriate type for return');
|
|
55
|
-
return {
|
|
56
|
-
result,
|
|
57
|
-
logs
|
|
58
|
-
};
|
|
19
|
+
if (!lodash_1.default.isNumber(timeoutMs)) {
|
|
20
|
+
throw new TypeError('Timeout parameter must be a number');
|
|
21
|
+
}
|
|
22
|
+
// set up fake logger
|
|
23
|
+
const logLevels = ['error', 'warn', 'log'];
|
|
24
|
+
const logs = {};
|
|
25
|
+
const consoleFns = {};
|
|
26
|
+
for (const level of logLevels) {
|
|
27
|
+
logs[level] = [];
|
|
28
|
+
consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
|
|
29
|
+
}
|
|
30
|
+
const driver = await (0, webdriverio_1.attach)(driverOpts);
|
|
31
|
+
const fullScript = buildScript(script);
|
|
32
|
+
log.info('Running driver script in Node vm');
|
|
33
|
+
const vmCtx = new vm2_1.NodeVM({ timeout: timeoutMs });
|
|
34
|
+
const vmFn = vmCtx.run(fullScript);
|
|
35
|
+
// run the driver script, giving user access to the driver object, a fake
|
|
36
|
+
// console logger, and a promise library
|
|
37
|
+
let result = await vmFn(driver, consoleFns, bluebird_1.default);
|
|
38
|
+
result = coerceScriptResult(result);
|
|
39
|
+
log.info('Successfully ensured driver script result is appropriate type for return');
|
|
40
|
+
return { result, logs };
|
|
59
41
|
}
|
|
60
|
-
|
|
42
|
+
/**
|
|
43
|
+
* Embed a user-generated script inside a method which takes only the
|
|
44
|
+
* predetermined objects we specify
|
|
45
|
+
*
|
|
46
|
+
* @param {string} script - the javascript to execute
|
|
47
|
+
*
|
|
48
|
+
* @return {string} - the full script to execute
|
|
49
|
+
*/
|
|
61
50
|
function buildScript(script) {
|
|
62
|
-
|
|
51
|
+
return `module.exports = async function execute (driver, console, Promise) {
|
|
63
52
|
${script}
|
|
64
53
|
}`;
|
|
65
54
|
}
|
|
66
|
-
|
|
55
|
+
/**
|
|
56
|
+
* We can get any manner of crazy thing back from a vm executing untrusted
|
|
57
|
+
* code. We might also get WebdriverIO objects that aren't suitable for JSON
|
|
58
|
+
* response. So make sure we convert the things we know about to their
|
|
59
|
+
* appropriate response format, and squash other weird things.
|
|
60
|
+
*
|
|
61
|
+
* @param {Object} obj - object to convert and sanitize
|
|
62
|
+
*
|
|
63
|
+
* @return {Object} - safely converted object
|
|
64
|
+
*/
|
|
67
65
|
function coerceScriptResult(obj) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
if (_lodash.default.isPlainObject(obj)) {
|
|
78
|
-
res = {};
|
|
79
|
-
|
|
80
|
-
if (obj[MJSONWP_ELEMENT_KEY] || obj[W3C_ELEMENT_KEY]) {
|
|
81
|
-
if (obj[MJSONWP_ELEMENT_KEY]) {
|
|
82
|
-
res[MJSONWP_ELEMENT_KEY] = obj[MJSONWP_ELEMENT_KEY];
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
if (obj[W3C_ELEMENT_KEY]) {
|
|
86
|
-
res[W3C_ELEMENT_KEY] = obj[W3C_ELEMENT_KEY];
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
return res;
|
|
66
|
+
// first ensure obj is of a type that can be JSON encoded safely. This will
|
|
67
|
+
// get rid of custom objects, functions, etc... and turn them into POJOs
|
|
68
|
+
try {
|
|
69
|
+
obj = JSON.parse(JSON.stringify(obj));
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
log.warn('Could not convert executeDriverScript to safe response!' +
|
|
73
|
+
`Result was: ${JSON.stringify(obj)}. Will make it null`);
|
|
74
|
+
return null;
|
|
90
75
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
76
|
+
let res;
|
|
77
|
+
// now we begin our recursive case options
|
|
78
|
+
if (lodash_1.default.isPlainObject(obj)) {
|
|
79
|
+
// if we have an object, it's either an element object or something else
|
|
80
|
+
// webdriverio has no monadic object types other than element and driver,
|
|
81
|
+
// and we don't want to allow special casing return of driver
|
|
82
|
+
res = {};
|
|
83
|
+
if (obj[exports.MJSONWP_ELEMENT_KEY] || obj[exports.W3C_ELEMENT_KEY]) {
|
|
84
|
+
// if it's an element object, clear out anything that's not the key, and then return the
|
|
85
|
+
// object. Note that if the element object contains only one element key type (MJSONWP or
|
|
86
|
+
// W3C), keep it that way in our response. But if the element contains both key types
|
|
87
|
+
// (because the client is being backwards compatible) then keep both keys in our response as
|
|
88
|
+
// well.
|
|
89
|
+
if (obj[exports.MJSONWP_ELEMENT_KEY]) {
|
|
90
|
+
res[exports.MJSONWP_ELEMENT_KEY] = obj[exports.MJSONWP_ELEMENT_KEY];
|
|
91
|
+
}
|
|
92
|
+
if (obj[exports.W3C_ELEMENT_KEY]) {
|
|
93
|
+
res[exports.W3C_ELEMENT_KEY] = obj[exports.W3C_ELEMENT_KEY];
|
|
94
|
+
}
|
|
95
|
+
return res;
|
|
96
|
+
}
|
|
97
|
+
// otherwise, recurse into the object
|
|
98
|
+
for (const key of Object.keys(obj)) {
|
|
99
|
+
res[key] = coerceScriptResult(obj[key]);
|
|
100
|
+
}
|
|
101
|
+
return res;
|
|
94
102
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
return obj
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
return obj;
|
|
103
|
+
// also handle arrays
|
|
104
|
+
if (lodash_1.default.isArray(obj)) {
|
|
105
|
+
return obj.map(coerceScriptResult);
|
|
106
|
+
}
|
|
107
|
+
// base case, if it's not an object or array, return straightaway
|
|
108
|
+
return obj;
|
|
104
109
|
}
|
|
105
|
-
|
|
106
110
|
async function main(driverOpts, script, timeoutMs) {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
res
|
|
115
|
-
error: {
|
|
116
|
-
message: error.message,
|
|
117
|
-
stack: error.stack
|
|
118
|
-
}
|
|
119
|
-
};
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
await send(res);
|
|
111
|
+
let res;
|
|
112
|
+
try {
|
|
113
|
+
res = { success: await runScript(driverOpts, script, timeoutMs) };
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
res = { error: { message: error.message, stack: error.stack } };
|
|
117
|
+
}
|
|
118
|
+
await send(res);
|
|
123
119
|
}
|
|
124
|
-
|
|
125
|
-
if (require.main === module &&
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
script,
|
|
133
|
-
timeoutMs
|
|
134
|
-
}) => {
|
|
135
|
-
log.info('Parameters received from parent process');
|
|
136
|
-
main(driverOpts, script, timeoutMs);
|
|
137
|
-
});
|
|
120
|
+
// ensure we're running this script in IPC mode
|
|
121
|
+
if (require.main === module && lodash_1.default.isFunction(process.send)) {
|
|
122
|
+
send = bluebird_1.default.promisify(process.send, { context: process });
|
|
123
|
+
log.info('Running driver execution in child process');
|
|
124
|
+
process.on('message', ({ driverOpts, script, timeoutMs }) => {
|
|
125
|
+
log.info('Parameters received from parent process');
|
|
126
|
+
main(driverOpts, script, timeoutMs);
|
|
127
|
+
});
|
|
138
128
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["log","logger","getLogger","send","W3C_ELEMENT_KEY","util","W3C_WEB_ELEMENT_IDENTIFIER","MJSONWP_ELEMENT_KEY","runScript","driverOpts","script","timeoutMs","_","isNumber","TypeError","logLevels","logs","consoleFns","level","logMsgs","push","driver","attach","fullScript","buildScript","info","vmCtx","NodeVM","timeout","vmFn","run","result","B","coerceScriptResult","obj","JSON","parse","stringify","e","warn","res","isPlainObject","key","Object","keys","isArray","map","main","success","error","message","stack","require","module","isFunction","process","promisify","context","on"],"sources":["../../lib/execute-child.js"],"sourcesContent":["import _ from 'lodash';\nimport B from 'bluebird';\nimport {NodeVM} from 'vm2';\nimport {logger, util} from 'appium/support';\nimport {attach} from 'webdriverio';\n\nconst log = logger.getLogger('ExecuteDriver Child');\nlet send;\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\nexport const W3C_ELEMENT_KEY = util.W3C_WEB_ELEMENT_IDENTIFIER;\nexport const MJSONWP_ELEMENT_KEY = 'ELEMENT';\n\nasync function runScript(driverOpts, script, timeoutMs) {\n  if (!_.isNumber(timeoutMs)) {\n    throw new TypeError('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 = await attach(driverOpts);\n\n  const fullScript = buildScript(script);\n\n  log.info('Running driver script in Node vm');\n\n  const vmCtx = new NodeVM({timeout: timeoutMs});\n  const vmFn = vmCtx.run(fullScript);\n\n  // run the driver script, giving user access to the driver object, a fake\n  // console logger, and a promise library\n  let result = await vmFn(driver, consoleFns, B);\n\n  result = coerceScriptResult(result);\n  log.info('Successfully ensured driver script result is appropriate type for return');\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 `module.exports = 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(\n      'Could not convert executeDriverScript to safe response!' +\n        `Result was: ${JSON.stringify(obj)}. Will make it null`\n    );\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 then return the\n      // object. Note that if the element object contains only one element key type (MJSONWP or\n      // W3C), keep it that way in our response. But if the element contains both key types\n      // (because the client is being backwards compatible) then keep both keys in our response as\n      // well.\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  // also handle arrays\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, timeoutMs) {\n  let res;\n  try {\n    res = {success: await runScript(driverOpts, script, timeoutMs)};\n  } catch (error) {\n    res = {error: {message: error.message, stack: error.stack}};\n  }\n  await send(res);\n}\n\n// ensure we're running this script in IPC mode\nif (require.main === module && _.isFunction(process.send)) {\n  send = B.promisify(process.send, {context: process});\n  log.info('Running driver execution in child process');\n  process.on('message', ({driverOpts, script, timeoutMs}) => {\n    log.info('Parameters received from parent process');\n    main(driverOpts, script, timeoutMs);\n  });\n}\n"],"mappings":"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"}
|
|
129
|
+
//# sourceMappingURL=execute-child.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-child.js","
|
|
1
|
+
{"version":3,"file":"execute-child.js","sourceRoot":"","sources":["../../lib/execute-child.js"],"names":[],"mappings":"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"}
|
package/build/lib/plugin.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export default class ExecuteDriverPlugin extends BasePlugin {
|
|
2
2
|
static newMethodMap: {
|
|
3
|
-
'/session/:sessionId/appium/execute_driver': {
|
|
4
|
-
POST: {
|
|
5
|
-
command:
|
|
6
|
-
payloadParams: {
|
|
7
|
-
required:
|
|
8
|
-
optional:
|
|
3
|
+
readonly '/session/:sessionId/appium/execute_driver': {
|
|
4
|
+
readonly POST: {
|
|
5
|
+
readonly command: "executeDriverScript";
|
|
6
|
+
readonly payloadParams: {
|
|
7
|
+
readonly required: readonly ["script"];
|
|
8
|
+
readonly optional: readonly ["type", "timeout"];
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAUA;IACE;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAUA;IACE;;;;;;;;;;MAOG;IAEH;;;;;;;;;;;;;;OAcG;IACH,gEARW,MAAM,wEAgIhB;CACF"}
|
package/build/lib/plugin.js
CHANGED
|
@@ -1,134 +1,132 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
});
|
|
6
|
-
exports.
|
|
7
|
-
|
|
8
|
-
require("
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
13
|
-
|
|
14
|
-
var _child_process = _interopRequireDefault(require("child_process"));
|
|
15
|
-
|
|
16
|
-
var _support = require("appium/support");
|
|
17
|
-
|
|
18
|
-
var _bluebird = _interopRequireDefault(require("bluebird"));
|
|
19
|
-
|
|
20
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
|
-
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ExecuteDriverPlugin = void 0;
|
|
7
|
+
const plugin_1 = require("appium/plugin");
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const child_process_1 = __importDefault(require("child_process"));
|
|
10
|
+
const support_1 = require("appium/support");
|
|
11
|
+
const bluebird_1 = __importDefault(require("bluebird"));
|
|
22
12
|
const FEAT_FLAG = 'execute_driver_script';
|
|
23
|
-
const DEFAULT_SCRIPT_TIMEOUT_MS = 1000 * 60 * 60;
|
|
13
|
+
const DEFAULT_SCRIPT_TIMEOUT_MS = 1000 * 60 * 60; // default to 1 hour timeout
|
|
24
14
|
const SCRIPT_TYPE_WDIO = 'webdriverio';
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
15
|
+
class ExecuteDriverPlugin extends plugin_1.BasePlugin {
|
|
16
|
+
/**
|
|
17
|
+
* This method takes a string which is executed as javascript in the context of
|
|
18
|
+
* a new nodejs VM, and which has available a webdriverio driver object, having
|
|
19
|
+
* already been attached to the currently running session.
|
|
20
|
+
*
|
|
21
|
+
* @param {function} next - standard behaviour for executeDriverScript
|
|
22
|
+
* @param {BaseDriver} driver - Appium driver handling this command
|
|
23
|
+
* @param {string} script - the string representing the driver script to run
|
|
24
|
+
* @param {string} [scriptType='webdriverio'] - the name of the driver script
|
|
25
|
+
* library (currently only webdriverio is supported)
|
|
26
|
+
* @param {number} [timeoutMs=3600000] - timeout for the script process
|
|
27
|
+
*
|
|
28
|
+
* @returns {Object} - a JSONifiable object representing the return value of
|
|
29
|
+
* the script
|
|
30
|
+
*/
|
|
31
|
+
async executeDriverScript(next, driver, script, scriptType = 'webdriverio', timeoutMs = DEFAULT_SCRIPT_TIMEOUT_MS) {
|
|
32
|
+
if (!driver.isFeatureEnabled(FEAT_FLAG)) {
|
|
33
|
+
throw new Error(`Execute driver script functionality is not available ` +
|
|
34
|
+
`unless server is started with --allow-insecure including ` +
|
|
35
|
+
`the '${FEAT_FLAG}' flag, e.g., --allow-insecure=${FEAT_FLAG}`);
|
|
34
36
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
if (scriptType !== SCRIPT_TYPE_WDIO) {
|
|
45
|
-
throw new TypeError(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
if (!driver.serverHost || !driver.serverPort) {
|
|
49
|
-
throw new Error('Address or port of running server were not defined; this ' + 'is required. This is probably a programming error in the driver');
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
if (!_lodash.default.isNumber(timeoutMs)) {
|
|
53
|
-
throw new TypeError('Timeout parameter must be a number');
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
const driverOpts = {
|
|
57
|
-
sessionId: driver.sessionId,
|
|
58
|
-
protocol: 'http',
|
|
59
|
-
hostname: driver.serverHost,
|
|
60
|
-
port: driver.serverPort,
|
|
61
|
-
path: driver.serverPath,
|
|
62
|
-
isW3C: true,
|
|
63
|
-
isMobile: true,
|
|
64
|
-
capabilities: driver.caps
|
|
65
|
-
};
|
|
66
|
-
this.logger.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
|
|
67
|
-
|
|
68
|
-
const childScript = require.resolve('./execute-child.js');
|
|
69
|
-
|
|
70
|
-
this.logger.info(`Forking process to run webdriver script as child using ${childScript}`);
|
|
71
|
-
|
|
72
|
-
const scriptProc = _child_process.default.fork(childScript);
|
|
73
|
-
|
|
74
|
-
let timeoutCanceled = false;
|
|
75
|
-
|
|
76
|
-
try {
|
|
77
|
-
const timer = new _support.timing.Timer();
|
|
78
|
-
timer.start();
|
|
79
|
-
|
|
80
|
-
const waitForResult = async () => {
|
|
81
|
-
const res = await new _bluebird.default(res => {
|
|
82
|
-
scriptProc.on('message', res);
|
|
83
|
-
});
|
|
84
|
-
this.logger.info('Received execute driver script result from child process, shutting it down');
|
|
85
|
-
|
|
86
|
-
if (res.error) {
|
|
87
|
-
throw new Error(res.error.message);
|
|
37
|
+
if (scriptType !== SCRIPT_TYPE_WDIO) {
|
|
38
|
+
throw new TypeError(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);
|
|
39
|
+
}
|
|
40
|
+
if (!driver.serverHost || !driver.serverPort) {
|
|
41
|
+
throw new Error('Address or port of running server were not defined; this ' +
|
|
42
|
+
'is required. This is probably a programming error in the driver');
|
|
43
|
+
}
|
|
44
|
+
if (!lodash_1.default.isNumber(timeoutMs)) {
|
|
45
|
+
throw new TypeError('Timeout parameter must be a number');
|
|
88
46
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
47
|
+
const driverOpts = {
|
|
48
|
+
sessionId: driver.sessionId,
|
|
49
|
+
// Appium probably won't be behind ssl locally; if it ever is, might need to update this to
|
|
50
|
+
// provide a user configurable parameter
|
|
51
|
+
protocol: 'http',
|
|
52
|
+
hostname: driver.serverHost,
|
|
53
|
+
port: driver.serverPort,
|
|
54
|
+
path: driver.serverPath,
|
|
55
|
+
isW3C: true,
|
|
56
|
+
isMobile: true,
|
|
57
|
+
capabilities: driver.caps,
|
|
58
|
+
};
|
|
59
|
+
this.logger.info(`Constructed webdriverio driver options; W3C mode is ${driverOpts.isW3C ? 'on' : 'off'}`);
|
|
60
|
+
// fork the execution script as a child process
|
|
61
|
+
const childScript = require.resolve('./execute-child.js');
|
|
62
|
+
this.logger.info(`Forking process to run webdriver script as child using ${childScript}`);
|
|
63
|
+
const scriptProc = child_process_1.default.fork(childScript);
|
|
64
|
+
// keep track of whether we have canceled the script timeout, so we can stop
|
|
65
|
+
// waiting for it and allow this process to finish gracefully
|
|
66
|
+
let timeoutCanceled = false;
|
|
67
|
+
try {
|
|
68
|
+
const timer = new support_1.timing.Timer();
|
|
69
|
+
timer.start();
|
|
70
|
+
// promise that deals with the result from the child process
|
|
71
|
+
const waitForResult = async () => {
|
|
72
|
+
const res = await new bluebird_1.default((res) => {
|
|
73
|
+
scriptProc.on('message', res); // this is node IPC
|
|
74
|
+
});
|
|
75
|
+
this.logger.info('Received execute driver script result from child process, shutting it down');
|
|
76
|
+
if (res.error) {
|
|
77
|
+
throw new Error(res.error.message);
|
|
78
|
+
}
|
|
79
|
+
return res.success;
|
|
80
|
+
};
|
|
81
|
+
// promise that waits up to the timeout and throws an error if so, or does
|
|
82
|
+
// nothing if the timeout is canceled because we got a result from the
|
|
83
|
+
// child script
|
|
84
|
+
const waitForTimeout = async () => {
|
|
85
|
+
while (!timeoutCanceled && timer.getDuration().asMilliSeconds < timeoutMs) {
|
|
86
|
+
await bluebird_1.default.delay(500);
|
|
87
|
+
}
|
|
88
|
+
if (timeoutCanceled) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
throw new Error(`Execute driver script timed out after ${timeoutMs}ms. ` +
|
|
92
|
+
`You can adjust this with the 'timeout' parameter.`);
|
|
93
|
+
};
|
|
94
|
+
// now that the child script is alive, send it the data it needs to start
|
|
95
|
+
// running the driver script
|
|
96
|
+
this.logger.info('Sending driver and script data to child');
|
|
97
|
+
scriptProc.send({ driverOpts, script, timeoutMs });
|
|
98
|
+
// and set up a race between the response from the child and the timeout
|
|
99
|
+
return await bluebird_1.default.race([waitForResult(), waitForTimeout()]);
|
|
96
100
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
101
|
+
catch (err) {
|
|
102
|
+
throw new Error(`Could not execute driver script. Original error was: ${err}`);
|
|
103
|
+
}
|
|
104
|
+
finally {
|
|
105
|
+
// ensure we always cancel the timeout so that the timeout promise stops
|
|
106
|
+
// spinning and allows this process to die gracefully
|
|
107
|
+
timeoutCanceled = true;
|
|
108
|
+
if (scriptProc.connected) {
|
|
109
|
+
this.logger.info('Disconnecting from child proc');
|
|
110
|
+
scriptProc.disconnect();
|
|
111
|
+
}
|
|
112
|
+
if (scriptProc.exitCode === null) {
|
|
113
|
+
this.logger.info('Disconnecting from and killing driver script child proc');
|
|
114
|
+
scriptProc.kill();
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
this.logger.info('Script already ended on its own, no need to kill it');
|
|
118
|
+
}
|
|
100
119
|
}
|
|
101
|
-
|
|
102
|
-
throw new Error(`Execute driver script timed out after ${timeoutMs}ms. ` + `You can adjust this with the 'timeout' parameter.`);
|
|
103
|
-
};
|
|
104
|
-
|
|
105
|
-
this.logger.info('Sending driver and script data to child');
|
|
106
|
-
scriptProc.send({
|
|
107
|
-
driverOpts,
|
|
108
|
-
script,
|
|
109
|
-
timeoutMs
|
|
110
|
-
});
|
|
111
|
-
return await _bluebird.default.race([waitForResult(), waitForTimeout()]);
|
|
112
|
-
} catch (err) {
|
|
113
|
-
throw new Error(`Could not execute driver script. Original error was: ${err}`);
|
|
114
|
-
} finally {
|
|
115
|
-
timeoutCanceled = true;
|
|
116
|
-
|
|
117
|
-
if (scriptProc.connected) {
|
|
118
|
-
this.logger.info('Disconnecting from child proc');
|
|
119
|
-
scriptProc.disconnect();
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
if (scriptProc.exitCode === null) {
|
|
123
|
-
this.logger.info('Disconnecting from and killing driver script child proc');
|
|
124
|
-
scriptProc.kill();
|
|
125
|
-
} else {
|
|
126
|
-
this.logger.info('Script already ended on its own, no need to kill it');
|
|
127
|
-
}
|
|
128
120
|
}
|
|
129
|
-
}
|
|
130
|
-
|
|
131
121
|
}
|
|
132
|
-
|
|
133
|
-
exports.ExecuteDriverPlugin =
|
|
134
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["FEAT_FLAG","DEFAULT_SCRIPT_TIMEOUT_MS","SCRIPT_TYPE_WDIO","ExecuteDriverPlugin","BasePlugin","newMethodMap","POST","command","payloadParams","required","optional","executeDriverScript","next","driver","script","scriptType","timeoutMs","isFeatureEnabled","Error","TypeError","serverHost","serverPort","_","isNumber","driverOpts","sessionId","protocol","hostname","port","path","serverPath","isW3C","isMobile","capabilities","caps","logger","info","childScript","require","resolve","scriptProc","cp","fork","timeoutCanceled","timer","timing","Timer","start","waitForResult","res","B","on","error","message","success","waitForTimeout","getDuration","asMilliSeconds","delay","send","race","err","connected","disconnect","exitCode","kill"],"sources":["../../lib/plugin.js"],"sourcesContent":["import {BasePlugin} from 'appium/plugin';\nimport _ from 'lodash';\nimport cp from 'child_process';\nimport {timing} from 'appium/support';\nimport B from 'bluebird';\n\nconst FEAT_FLAG = 'execute_driver_script';\nconst DEFAULT_SCRIPT_TIMEOUT_MS = 1000 * 60 * 60; // default to 1 hour timeout\nconst SCRIPT_TYPE_WDIO = 'webdriverio';\n\nexport default class ExecuteDriverPlugin extends BasePlugin {\n  static newMethodMap = {\n    '/session/:sessionId/appium/execute_driver': {\n      POST: {\n        command: 'executeDriverScript',\n        payloadParams: {required: ['script'], optional: ['type', 'timeout']},\n      },\n    },\n  };\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 {function} next - standard behaviour for executeDriverScript\n   * @param {BaseDriver} driver - Appium driver handling this command\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   * @param {number} [timeoutMs=3600000] - timeout for the script process\n   *\n   * @returns {Object} - a JSONifiable object representing the return value of\n   * the script\n   */\n  async executeDriverScript(\n    next,\n    driver,\n    script,\n    scriptType = 'webdriverio',\n    timeoutMs = DEFAULT_SCRIPT_TIMEOUT_MS\n  ) {\n    if (!driver.isFeatureEnabled(FEAT_FLAG)) {\n      throw new Error(\n        `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\n    if (scriptType !== SCRIPT_TYPE_WDIO) {\n      throw new TypeError(`Only the '${SCRIPT_TYPE_WDIO}' script type is currently supported`);\n    }\n\n    if (!driver.serverHost || !driver.serverPort) {\n      throw new Error(\n        '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\n    if (!_.isNumber(timeoutMs)) {\n      throw new TypeError('Timeout parameter must be a number');\n    }\n\n    const driverOpts = {\n      sessionId: driver.sessionId,\n      // Appium probably won't be behind ssl locally; if it ever is, might need to update this to\n      // provide a user configurable parameter\n      protocol: 'http',\n      hostname: driver.serverHost,\n      port: driver.serverPort,\n      path: driver.serverPath,\n      isW3C: true,\n      isMobile: true,\n      capabilities: driver.caps,\n    };\n    this.logger.info(\n      `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 = require.resolve('./execute-child.js');\n    this.logger.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 timer = new timing.Timer();\n      timer.start();\n\n      // promise that deals with the result from the child process\n      const waitForResult = async () => {\n        const res = await new B((res) => {\n          scriptProc.on('message', res); // this is node IPC\n        });\n\n        this.logger.info(\n          'Received execute driver script result from child process, shutting it down'\n        );\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 () => {\n        while (!timeoutCanceled && timer.getDuration().asMilliSeconds < timeoutMs) {\n          await B.delay(500);\n        }\n\n        if (timeoutCanceled) {\n          return;\n        }\n\n        throw new Error(\n          `Execute driver script timed out after ${timeoutMs}ms. ` +\n            `You can adjust this with the 'timeout' parameter.`\n        );\n      };\n\n      // now that the child script is alive, send it the data it needs to start\n      // running the driver script\n      this.logger.info('Sending driver and script data to child');\n      scriptProc.send({driverOpts, script, timeoutMs});\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      if (scriptProc.connected) {\n        this.logger.info('Disconnecting from child proc');\n        scriptProc.disconnect();\n      }\n\n      if (scriptProc.exitCode === null) {\n        this.logger.info('Disconnecting from and killing driver script child proc');\n        scriptProc.kill();\n      } else {\n        this.logger.info('Script already ended on its own, no need to kill it');\n      }\n    }\n  }\n}\n\nexport {ExecuteDriverPlugin};\n"],"mappings":"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"}
|
|
122
|
+
exports.default = ExecuteDriverPlugin;
|
|
123
|
+
exports.ExecuteDriverPlugin = ExecuteDriverPlugin;
|
|
124
|
+
ExecuteDriverPlugin.newMethodMap = ({
|
|
125
|
+
'/session/:sessionId/appium/execute_driver': {
|
|
126
|
+
POST: {
|
|
127
|
+
command: 'executeDriverScript',
|
|
128
|
+
payloadParams: { required: ['script'], optional: ['type', 'timeout'] },
|
|
129
|
+
},
|
|
130
|
+
},
|
|
131
|
+
});
|
|
132
|
+
//# sourceMappingURL=plugin.js.map
|