@appium/execute-driver-plugin 3.0.30 → 3.0.32
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.d.ts +1 -2
- package/build/lib/execute-child.d.ts.map +1 -1
- package/build/lib/execute-child.js +3 -6
- package/build/lib/execute-child.js.map +1 -1
- package/build/lib/plugin.d.ts.map +1 -1
- package/lib/execute-child.js +3 -5
- package/package.json +3 -3
- package/tsconfig.json +1 -2
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
export const W3C_ELEMENT_KEY: "element-6066-11e4-a52e-4f735466cecf";
|
|
2
2
|
export const MJSONWP_ELEMENT_KEY: "ELEMENT";
|
|
3
|
-
export type AttachOptions = import('webdriverio').AttachOptions;
|
|
4
3
|
export type DriverScriptMessageEvent = {
|
|
5
4
|
/**
|
|
6
5
|
* - the driver options
|
|
7
6
|
*/
|
|
8
|
-
driverOpts:
|
|
7
|
+
driverOpts: any;
|
|
9
8
|
/**
|
|
10
9
|
* - the javascript to execute
|
|
11
10
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-child.d.ts","sourceRoot":"","sources":["../../lib/execute-child.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute-child.d.ts","sourceRoot":"","sources":["../../lib/execute-child.js"],"names":[],"mappings":"AAaA,oEAA+D;AAC/D,4CAA6C;;;;;gBA2J/B,GAAG;;;;YACH,MAAM;;;;eACN,MAAM;;;cAKN,GAAG;;;;aAMH,GAAG;WACH,GAAG;;;YAKH,GAAG;UACH,MAAM"}
|
|
@@ -8,7 +8,6 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
8
8
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
9
9
|
const vm2_1 = require("vm2");
|
|
10
10
|
const support_1 = require("appium/support");
|
|
11
|
-
const webdriverio_1 = require("webdriverio");
|
|
12
11
|
const log = support_1.logger.getLogger('ExecuteDriver Child');
|
|
13
12
|
/**
|
|
14
13
|
* @type {(res: ScriptResult) => Promise<void>}
|
|
@@ -40,7 +39,8 @@ async function runScript(eventParams) {
|
|
|
40
39
|
logs[level] = [];
|
|
41
40
|
consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
|
|
42
41
|
}
|
|
43
|
-
const
|
|
42
|
+
const { attach } = await import('webdriverio');
|
|
43
|
+
const driver = await attach(driverOpts);
|
|
44
44
|
const fullScript = buildScript(script);
|
|
45
45
|
log.info('Running driver script in Node vm');
|
|
46
46
|
const vmCtx = new vm2_1.NodeVM({ timeout: timeoutMs });
|
|
@@ -147,12 +147,9 @@ if (require.main === module && lodash_1.default.isFunction(process.send)) {
|
|
|
147
147
|
log.info('Running driver execution in child process');
|
|
148
148
|
process.on('message', main);
|
|
149
149
|
}
|
|
150
|
-
/**
|
|
151
|
-
* @typedef {import('webdriverio').AttachOptions} AttachOptions
|
|
152
|
-
*/
|
|
153
150
|
/**
|
|
154
151
|
* @typedef DriverScriptMessageEvent
|
|
155
|
-
* @property {
|
|
152
|
+
* @property {any} driverOpts - the driver options
|
|
156
153
|
* @property {string} script - the javascript to execute
|
|
157
154
|
* @property {number} timeoutMs - script timeout in milliseconds
|
|
158
155
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-child.js","sourceRoot":"","sources":["../../lib/execute-child.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,wDAAyB;AACzB,6BAA2B;AAC3B,4CAA4C;
|
|
1
|
+
{"version":3,"file":"execute-child.js","sourceRoot":"","sources":["../../lib/execute-child.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,wDAAyB;AACzB,6BAA2B;AAC3B,4CAA4C;AAE5C,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;AACpD;;GAEG;AACH,IAAI,IAAI,CAAC;AAET,+EAA+E;AAC/E,wDAAwD;AAC3C,QAAA,eAAe,GAAG,cAAI,CAAC,0BAA0B,CAAC;AAClD,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAE7C;;;;;GAKG;AACH,KAAK,UAAU,SAAS,CAAC,WAAW;IAClC,MAAM,EAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAC,GAAG,WAAW,CAAC;IACpD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,SAAS,CAAC,oCAAoC,CAAC,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACH,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACjB,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAExC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAG,IAAI,YAAM,CAAC,EAAC,OAAO,EAAE,SAAS,EAAC,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEnC,yEAAyE;IACzE,wCAAwC;IACxC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAC,CAAC,CAAC;IAE/C,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpC,GAAG,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;IACrF,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;AACxB,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,MAAM;IACzB,OAAO;MACH,MAAM;IACR,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,kBAAkB,CAAC,GAAG;IAC7B,2EAA2E;IAC3E,wEAAwE;IACxE,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,IAAI,CACN,yDAAyD;YACvD,eAAe,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAC1D,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,GAAG,CAAC;IAER,0CAA0C;IAC1C,IAAI,gBAAC,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,wEAAwE;QACxE,yEAAyE;QACzE,6DAA6D;QAC7D,GAAG,GAAG,EAAE,CAAC;QAET,IAAI,GAAG,CAAC,2BAAmB,CAAC,IAAI,GAAG,CAAC,uBAAe,CAAC,EAAE,CAAC;YACrD,wFAAwF;YACxF,yFAAyF;YACzF,qFAAqF;YACrF,4FAA4F;YAC5F,QAAQ;YACR,IAAI,GAAG,CAAC,2BAAmB,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,2BAAmB,CAAC,GAAG,GAAG,CAAC,2BAAmB,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,GAAG,CAAC,uBAAe,CAAC,EAAE,CAAC;gBACzB,GAAG,CAAC,uBAAe,CAAC,GAAG,GAAG,CAAC,uBAAe,CAAC,CAAC;YAC9C,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,qCAAqC;QACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,qBAAqB;IACrB,IAAI,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACrC,CAAC;IAED,iEAAiE;IACjE,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,IAAI,CAAC,WAAW;IAC7B;;;OAGG;IACH,IAAI,GAAG,CAAC;IACR,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,GAAG,GAAG,EAAC,OAAO,EAAE,MAAM,SAAS,CAAC,WAAW,CAAC,EAAC,CAAC;QAC9C,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5B,GAAG,GAAG,EAAC,KAAK,EAAE,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAC,EAAC,CAAC;IAC9D,CAAC;IACD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,+CAA+C;AAC/C,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,gBAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1D,IAAI,GAAG,kBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC,CAAC;IACrD,GAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC;AAGD;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;GAIG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAUA;IACE;;;;;;;;;;MAOG;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAUA;IACE;;;;;;;;;;MAOG;;CA8IJ;2BAhKwB,eAAe"}
|
package/lib/execute-child.js
CHANGED
|
@@ -2,7 +2,6 @@ import _ from 'lodash';
|
|
|
2
2
|
import B from 'bluebird';
|
|
3
3
|
import {NodeVM} from 'vm2';
|
|
4
4
|
import {logger, util} from 'appium/support';
|
|
5
|
-
import {attach} from 'webdriverio';
|
|
6
5
|
|
|
7
6
|
const log = logger.getLogger('ExecuteDriver Child');
|
|
8
7
|
/**
|
|
@@ -39,6 +38,8 @@ async function runScript(eventParams) {
|
|
|
39
38
|
consoleFns[level] = (...logMsgs) => logs[level].push(...logMsgs);
|
|
40
39
|
}
|
|
41
40
|
|
|
41
|
+
const {attach} = await import('webdriverio');
|
|
42
|
+
|
|
42
43
|
const driver = await attach(driverOpts);
|
|
43
44
|
|
|
44
45
|
const fullScript = buildScript(script);
|
|
@@ -163,13 +164,10 @@ if (require.main === module && _.isFunction(process.send)) {
|
|
|
163
164
|
process.on('message', main);
|
|
164
165
|
}
|
|
165
166
|
|
|
166
|
-
/**
|
|
167
|
-
* @typedef {import('webdriverio').AttachOptions} AttachOptions
|
|
168
|
-
*/
|
|
169
167
|
|
|
170
168
|
/**
|
|
171
169
|
* @typedef DriverScriptMessageEvent
|
|
172
|
-
* @property {
|
|
170
|
+
* @property {any} driverOpts - the driver options
|
|
173
171
|
* @property {string} script - the javascript to execute
|
|
174
172
|
* @property {number} timeoutMs - script timeout in milliseconds
|
|
175
173
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/execute-driver-plugin",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.32",
|
|
4
4
|
"description": "Plugin for batching and executing driver commands with Appiums",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"lodash": "4.17.21",
|
|
44
44
|
"source-map-support": "0.5.21",
|
|
45
45
|
"vm2": "3.9.19",
|
|
46
|
-
"webdriverio": "8.
|
|
46
|
+
"webdriverio": "8.39.1"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"appium": "^2.0.0-beta.35"
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"pluginName": "execute-driver",
|
|
60
60
|
"mainClass": "ExecuteDriverPlugin"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "74292e229269120a58cc716ed1d8d56c8ff9c079"
|
|
63
63
|
}
|