appium 3.4.0 → 3.5.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/appium.d.ts +3 -0
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +32 -8
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.js +2 -2
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/node-helpers.js +1 -2
- package/build/lib/bootstrap/node-helpers.js.map +1 -1
- package/build/lib/cli/extension-command.js +7 -7
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +2 -3
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/index.js +16 -26
- package/build/lib/extension/index.js.map +1 -1
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +1 -2
- package/build/lib/extension/manifest.js.map +1 -1
- package/lib/appium.ts +40 -9
- package/lib/bidi-commands.ts +2 -2
- package/lib/bootstrap/node-helpers.ts +1 -2
- package/lib/cli/extension-command.ts +7 -7
- package/lib/extension/extension-config.ts +2 -3
- package/lib/extension/index.ts +22 -30
- package/lib/extension/manifest.ts +1 -2
- package/package.json +15 -15
- package/scripts/autoinstall-extensions.js +0 -5
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ExtensionConfig = exports.INSTALL_TYPES = exports.INSTALL_TYPE_DEV = exports.INSTALL_TYPE_GIT = exports.INSTALL_TYPE_GITHUB = exports.INSTALL_TYPE_LOCAL = exports.INSTALL_TYPE_NPM = void 0;
|
|
7
7
|
exports.resolveEsmEntryPoint = resolveEsmEntryPoint;
|
|
8
8
|
const support_1 = require("@appium/support");
|
|
9
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
11
|
const node_url_1 = require("node:url");
|
|
@@ -120,7 +119,7 @@ class ExtensionConfig {
|
|
|
120
119
|
* @param extManifest - Manifest entry for that extension
|
|
121
120
|
*/
|
|
122
121
|
async getWarnings(extName, extManifest) {
|
|
123
|
-
const [genericConfigWarnings, configWarnings] = await
|
|
122
|
+
const [genericConfigWarnings, configWarnings] = await Promise.all([
|
|
124
123
|
this.getGenericConfigWarnings(extManifest, extName),
|
|
125
124
|
this.getConfigWarnings(extManifest, extName),
|
|
126
125
|
]);
|
|
@@ -271,7 +270,7 @@ class ExtensionConfig {
|
|
|
271
270
|
const errorMap = new Map();
|
|
272
271
|
const warningMap = new Map();
|
|
273
272
|
for (const [extName, extManifest] of lodash_1.default.toPairs(exts)) {
|
|
274
|
-
const [errors, warnings] = await
|
|
273
|
+
const [errors, warnings] = await Promise.all([
|
|
275
274
|
this.getProblems(extName, extManifest),
|
|
276
275
|
this.getWarnings(extName, extManifest),
|
|
277
276
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.ts"],"names":[],"mappings":";;;;;;AA8nBA,oDAcC;AAzoBD,6CAAiD;AACjD,oDAAuB;AACvB,0DAA6B;AAC7B,uCAAuC;AACvC,gEAAuC;AACvC,mCAAiC;AACjC,gDAAgD;AAOhD,4CAA4C;AAC5C,sCAA8B;AAC9B,6CAI0B;AAG1B,MAAM,mBAAmB,GAAG,UAAU,CAAC;AACvC;;;;;GAKG;AACU,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACtC;;;GAGG;AACU,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC1C;;;GAGG;AACU,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC5C;;;GAGG;AACU,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACtC;;;GAGG;AACU,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEzB,QAAA,aAAa,GAAG,IAAI,GAAG,CAAc;IAChD,wBAAgB;IAChB,2BAAmB;IACnB,0BAAkB;IAClB,wBAAgB;IAChB,wBAAgB;CACjB,CAAC,CAAC;AAUH;;;GAGG;AACH,MAAsB,eAAe;IAC1B,aAAa,CAAU;IACvB,QAAQ,CAAW;IAC5B,mBAAmB,CAAqB;IACxC,cAAc,CAAqC;IAEnD,YAAsB,aAAsB,EAAE,QAAkB;QAC9D,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,uFAAuF;IACvF,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,sDAAsD;IACtD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CACrB,WAA2B;QAE3B,OAAO,gBAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,gBAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC5E,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACvC,UAAkB,EAClB,OAAU,EACV,OAAe,EACf,WAAqC;QAErC,MAAM,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAC,GAAG,WAAW,CAAC;QACrD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,SAAS,CACjB,8CAA8C,OAAO,IAAI,OAAO,wCAAwC,CACzG,CAAC;QACJ,CAAC;QACD,IAAI,YAAiB,CAAC;QACtB,IAAI,gBAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,IAAA,sBAAW,EAAC,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;YAC9E,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,aAAa,CAAC;QAC/B,CAAC;QACD,kDAAkD;QAClD,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;QAC7E,MAAM,IAAA,uBAAc,EAAC,OAAO,EAAE,OAAO,EAAE,MAAsB,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,WAAiC;QAClE,OAAO;YACL,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC;YACtD,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC;YAC/C,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SACxD,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,WAAiC;QAClE,MAAM,CAAC,qBAAqB,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChE,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC;YACnD,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC;SAC7C,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,qBAAqB,EAAE,GAAG,cAAc,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,4BAA4B,CAC1B,WAA8C,IAAI,GAAG,EAAE,EACvD,aAAoC,IAAI,GAAG,EAAE;QAE7C,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YACD,2DAA2D;YAC3D,cAAc,CAAC,IAAI,CACjB,GAAG,IAAI,CAAC,aAAa,KAAK,OAAO,SAAS,cAAI,CAAC,SAAS,CACtD,OAAO,EACP,QAAQ,CAAC,MAAM,CAChB,6BAA6B,CAC/B,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,cAAc,CAAC,IAAI,CACjB,OAAO,OAAO,CAAC,GAAG,kBAAkB,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CACzE,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YACD,MAAM,WAAW,GAAG,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrD,MAAM,sBAAsB,GAAG,cAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC1F,gBAAgB,CAAC,IAAI,CAAC,GAAG,WAAW,KAAK,OAAO,SAAS,sBAAsB,IAAI,CAAC,CAAC;YACrF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,gBAAgB,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,OAAO,EAAC,cAAc,EAAE,gBAAgB,EAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,WAAiC,EACjC,EAAC,KAAK,GAAG,IAAI,KAAiC,EAAE;QAEhD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACrE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CACnB,OAAyB,EACzB,WAAiC,EACjC,EAAC,KAAK,GAAG,IAAI,KAAiC,EAAE;QAEhD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,OAAiB,EAAE;YAChE,GAAG,QAAQ;YACX,GAAG,WAAW;SACf,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CACnB,OAAyB,EACzB,EAAC,KAAK,GAAG,IAAI,KAAiC,EAAE;QAEhD,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAiC;QACrC,KAAK,YAAY,CAAC;QAClB,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACxC,YAAG,CAAC,IAAI,CACN,MAAM,IAAI,CAAC,aAAa,4BAA4B,IAAI,CAAC,UAAU,qBAAqB,IAAI,CAAC,aAAa,IAAI;gBAC5G,gDAAgD,CACnD,CAAC;YACF,OAAO;QACT,CAAC;QAED,YAAG,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC;QAC9C,KAAK,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAEtE,EAAE,CAAC;YACF,YAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,OAA0C;QACvD,OAAO,CACL,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,WAAW;YAC9C,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CACtF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAC,OAAyB;QAC1C,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACnE,YAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,aAAa,OAAO,OAAO,EAAE,CAAC,CAAC;QAC3D,8CAA8C;QAC9C,MAAM,UAAU,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9E,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAsC,CAAC;QAC5E,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,cAAc,CACtB,iCAAiC,SAAS,iBAAiB,IAAI,CAAC,aAAa,KAAK,OAAO,GAAG,CAC7F,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,oEAAoE;IACpE,WAAW,CAAC,OAAe;QACzB,OAAO,OAAO,IAAI,IAAI,CAAC,mBAAmB,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,mBAAmB,CACvB,OAAe,EACf,WAA2C;QAE3C,OAAO,MAAM,eAAe,CAAC,oBAAoB,CAC/C,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,aAAa,EAClB,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,2FAA2F;IACjF,KAAK,CAAC,iBAAiB,CAC/B,YAAkC,EAClC,QAAgB;QAEhB,KAAK,YAAY,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,SAAS,CAAC,IAAwB;QAChD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAE/C,KAAK,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC3C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC;gBACtC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC;aACvC,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;YACD,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC9B,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,EAAC,cAAc,EAAE,gBAAgB,EAAC,GAAG,IAAI,CAAC,4BAA4B,CAC1E,QAAQ,EACR,UAAU,CACX,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,YAAG,CAAC,KAAK,CACP,sBAAsB,cAAI,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,qBAChE,IAAI,CAAC,aACP,uBAAuB,IAAI,CAAC,YAAY,EAAE,CAC3C,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;gBACrC,YAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACxC,gDAAgD;YAChD,YAAG,CAAC,IAAI,CACN,sBAAsB,cAAI,CAAC,SAAS,CAClC,SAAS,EACT,UAAU,CAAC,IAAI,EACf,IAAI,CACL,qBAAqB,IAAI,CAAC,aAAa,uBAAuB,IAAI,CAAC,YAAY,EAAE,CACnF,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;gBACvC,YAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,WAAW;QACzB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,cAAc,CAAC;QAC7B,CAAC;QACD,MAAM,YAAY,GAAG,0BAAc,CAAC,IAAI,CAAC,aAAa,CAAwB,CAAC;QAC/E,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,EAAC,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;QAC/B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,wBAAwB,CACtC,WAAiC,EACjC,OAAe;QAEf,MAAM,EAAC,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAC,GAAG,WAAW,CAAC;QACvE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,qBAAa,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,WAAW,GAAG,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAErD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,4BAA4B,GAAG,cAAI,CAAC,SAAS,CACjD,0BAA0B,EAC1B,aAAa,CAAC,MAAM,EACpB,IAAI,CACL,CAAC;YACF,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEhF,QAAQ,CAAC,IAAI,CACX,GAAG,WAAW,KAAK,OAAO,gBAAgB,OAAO,WAAW,4BAA4B,KAAK,iBAAiB,4BAA4B;gBAC1I,oGAAoG,IAAI,CAAC,aAAa,aAAa;gBACnI,GAAG,OAAO,mBAAmB,IAAI,CAAC,aAAa,YAAY,OAAO,sBAAsB,CACzF,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAU,EAAE,CACnD,GAAG,WAAW,KAAK,OAAO,gBAAgB,OAAO,gEAAgE,kBAAU,YAAY,MAAM,EAAE,CAAC;QAElJ,IAAI,gBAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,kBAAS,EAAC,kBAAU,EAAE,aAAa,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAA2C,CAAC;YAChF,IAAI,WAAW,EAAE,SAAS,EAAE,CAAC;gBAC3B,MAAM,EAAC,aAAa,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC;gBAC9C,IAAI,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC;oBAC/B,QAAQ,CAAC,IAAI,CACX,iBAAiB,CACf,iCAAiC,aAAa,sBAAsB,OAAO,UAAU,aAAa,YAAY,CAC/G,CACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,CACX,iBAAiB,CACf,iCAAiC,aAAa,gDAAgD,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CACxH,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAoD,CAAC;YACzF,IAAI,CAAC,WAAW,EAAE,QAAQ,IAAI,WAAW,EAAE,aAAa,EAAE,CAAC;gBACzD,QAAQ,CAAC,IAAI,CACX,iBAAiB,CACf,yEAAyE,OAAO,mBAAmB;oBACnG,8BAA8B,OAAO,SAAS,WAAW,CAAC,aAAa,YAAY,CACpF,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CACX,iBAAiB,CACf,mDAAmD;oBACnD,iCAAiC,OAAO,4CAA4C,kBAAU,KAAK,CACpG,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,sGAAsG;IAC5F,KAAK,CAAC,iBAAiB,CAC/B,WAAiC,EACjC,OAAe;QAEf,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAC1C,MAAM,EAAC,MAAM,EAAE,aAAa,EAAC,GAAG,WAAW,CAAC;QAC5C,IAAI,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YAClD,IAAI,gBAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC9B,IAAI,IAAA,qCAA4B,EAAC,aAAa,CAAC,EAAE,CAAC;oBAChD,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;oBACvD,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,QAAQ,CAAC,IAAI,CAAC;4BACZ,GAAG,EAAE,qCAAqC,aAAa,KAAK,GAAG,CAAC,OAAO,EAAE;4BACzE,GAAG,EAAE,aAAa;yBACnB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,CAAC;wBACZ,GAAG,EAAE,mDAAmD;4BACtD,GAAG,kCAAyB;yBAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;wBACd,GAAG,EAAE,aAAa;qBACnB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,IAAI,gBAAC,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACvD,CAAC;gBAAC,OAAO,GAAQ,EAAE,CAAC;oBAClB,QAAQ,CAAC,IAAI,CAAC;wBACZ,GAAG,EAAE,uCAAuC,GAAG,CAAC,OAAO,EAAE;wBACzD,GAAG,EAAE,aAAa;qBACnB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC;oBACZ,GAAG,EAAE,yFAAyF;oBAC9F,GAAG,EAAE,aAAa;iBACnB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,iHAAiH;IACvG,wBAAwB,CAChC,WAAiC,EACjC,OAAe;QAEf,KAAK,OAAO,CAAC;QACb,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAC,GAAG,WAAW,CAAC;QAClD,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAE1C,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,2GAA2G;gBAChH,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,wGAAwG;gBAC7G,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,2IAA2I;gBAChJ,GAAG,EAAE,SAAS;aACf,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,0FAA0F;IAChF,iBAAiB,CACzB,YAAkC,EAClC,QAAgB;QAEhB,KAAK,YAAY,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAyB;QACvD,MAAM,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAC9D,IAAI,iBAAsC,CAAC;QAC3C,IAAI,CAAC;YACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,YAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,cAAc,CACtB,sBAAsB,IAAI,CAAC,aAAa,gBAAgB,eAAe,KAAK,CAAC,CAAC,OAAO,EAAE,EACvF,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;QACJ,CAAC;QACD,IAAI,sBAA0C,CAAC;QAC/C,IAAI,CAAC;YACH,IAAI,iBAAiB,CAAC,IAAI,KAAK,QAAQ,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBACrE,sBAAsB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC3E,CAAC;YACD,sBAAsB,GAAG,sBAAsB,IAAI,iBAAiB,CAAC,IAAI,IAAI,mBAAmB,CAAC;QACnG,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,cAAc,CACtB,sBAAsB,IAAI,CAAC,aAAa,iBAAiB,UAAU,KAAK,CAAC,CAAC,OAAO,EAAE,EACnF,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;QACJ,CAAC;QACD,MAAM,kBAAkB,GAAG,mBAAI,CAAC,OAAO,CAAC,UAAU,EAAE,sBAAgC,CAAC,CAAC;QACtF,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,cAAc,CACtB,uBAAuB,IAAI,CAAC,aAAa,yBAAyB,eAAe,KAAK;gBACtF,yBAAyB,kBAAkB,GAAG,CAC/C,CAAC;QACJ,CAAC;QACD,8CAA8C;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC9E,YAAG,CAAC,KAAK,CAAC,YAAY,kBAAkB,qBAAqB,CAAC,CAAC;YAC/D,OAAO,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC;CAUF;AA7iBD,0CA6iBC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,YAAqB;IACxD,IAAI,gBAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7C,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,gBAAC,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,YAAuC,CAAC;IACpD,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAU,EAAE,CAAC;QAC3C,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACb,OAAO,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -7,7 +7,7 @@ exports.loadExtensions = loadExtensions;
|
|
|
7
7
|
exports.getActivePlugins = getActivePlugins;
|
|
8
8
|
exports.getActiveDrivers = getActiveDrivers;
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
|
-
const
|
|
10
|
+
const asyncbox_1 = require("asyncbox");
|
|
11
11
|
const constants_1 = require("../constants");
|
|
12
12
|
const logger_1 = require("../logger");
|
|
13
13
|
const driver_config_1 = require("./driver-config");
|
|
@@ -28,7 +28,7 @@ async function loadExtensions(appiumHome) {
|
|
|
28
28
|
await manifest.read();
|
|
29
29
|
const driverConfig = driver_config_1.DriverConfig.getInstance(manifest) ?? driver_config_1.DriverConfig.create(manifest);
|
|
30
30
|
const pluginConfig = plugin_config_1.PluginConfig.getInstance(manifest) ?? plugin_config_1.PluginConfig.create(manifest);
|
|
31
|
-
await
|
|
31
|
+
await Promise.all([driverConfig.validate(), pluginConfig.validate()]);
|
|
32
32
|
return { driverConfig, pluginConfig };
|
|
33
33
|
}
|
|
34
34
|
/**
|
|
@@ -93,30 +93,20 @@ async function getActiveDrivers(driverConfig, maxParallelImports, useDrivers = [
|
|
|
93
93
|
return new Map(pairs);
|
|
94
94
|
}
|
|
95
95
|
async function importExtensions(extType, config, extNames, asyncImportChunkSize) {
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
const extClasses = await (0, asyncbox_1.asyncmap)(extNames, async (extName) => {
|
|
97
|
+
logger_1.log.info(`Attempting to load ${extType} ${extName}...`);
|
|
98
|
+
const timer = new support_1.timing.Timer().start();
|
|
99
|
+
try {
|
|
100
|
+
const extClass = await config.requireAsync(extName);
|
|
101
|
+
logger_1.log.debug(`${extClass.name} has been successfully loaded in ${timer.getDuration().asSeconds.toFixed(3)}s`);
|
|
102
|
+
return extClass;
|
|
102
103
|
}
|
|
103
|
-
|
|
104
|
-
logger_1.log.
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
catch (err) {
|
|
112
|
-
logger_1.log.error(`Could not load ${extType} '${extName}', so it will not be available. Error ` +
|
|
113
|
-
`in loading the ${extType} was: ${err.message}`);
|
|
114
|
-
logger_1.log.debug(err.stack);
|
|
115
|
-
}
|
|
116
|
-
})());
|
|
117
|
-
activePromisesChunk.push(promise);
|
|
118
|
-
allPromises.push(promise);
|
|
119
|
-
}
|
|
120
|
-
return lodash_1.default.zip(await bluebird_1.default.all(allPromises), extNames).filter(([extClass]) => Boolean(extClass));
|
|
104
|
+
catch (err) {
|
|
105
|
+
logger_1.log.error(`Could not load ${extType} '${extName}', so it will not be available. Error ` +
|
|
106
|
+
`in loading the ${extType} was: ${err.message}`);
|
|
107
|
+
logger_1.log.debug(err.stack);
|
|
108
|
+
}
|
|
109
|
+
}, { concurrency: asyncImportChunkSize });
|
|
110
|
+
return lodash_1.default.zip(extClasses, extNames).filter(([extClass]) => Boolean(extClass));
|
|
121
111
|
}
|
|
122
112
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/extension/index.ts"],"names":[],"mappings":";;;;;AA4BA,wCAQC;AAQD,4CA6BC;AAOD,4CAuBC;AAvGD,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/extension/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,KAAK,EAAa,aAAa,EAAa,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAE,cAAc,EAAE,SAAS,EAAoB,YAAY,EAAC,MAAM,cAAc,CAAC;AAEzG,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAatE;;;;GAIG;AACH,qBAAa,QAAQ;;IACnB;;;;OAIG;IACH,MAAM,CAAC,WAAW,gBAA0B,MAAM,KAAG,QAAQ,uBAA8B;IAQ3F,OAAO;IAKP,wDAAwD;IACxD,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;OAGG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,8EAA8E;IAC9E,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,OAAO,SAAS,aAAa,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAKrF;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC;IAqDnC;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAmC/B;;;;;OAKG;IACG,2BAA2B,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAiChF;;;;;;;;OAQG;IACH,uBAAuB,CACrB,OAAO,EAAE,cAAc,CAAC,aAAa,CAAC,EACtC,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,OAAO,gBAAgB,GAAG,OAAO,gBAAmC,GAChF,OAAO;IAyCV;;;;;;;OAOG;IACH,YAAY,CAAC,OAAO,SAAS,aAAa,EACxC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,GAC5B,WAAW,CAAC,OAAO,CAAC;IAUvB;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI/B;;;;;OAKG;IACH,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAwB/D"}
|
|
@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.Manifest = void 0;
|
|
40
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
41
40
|
const support_1 = require("@appium/support");
|
|
42
41
|
const lodash_1 = __importDefault(require("lodash"));
|
|
43
42
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -228,7 +227,7 @@ class Manifest {
|
|
|
228
227
|
for (const filepath of filepaths) {
|
|
229
228
|
queue.push(onMatch(filepath));
|
|
230
229
|
}
|
|
231
|
-
await
|
|
230
|
+
await Promise.all(queue);
|
|
232
231
|
return didChange;
|
|
233
232
|
}
|
|
234
233
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,oDAAuB;AACvB,0DAA6B;AAC7B,2CAA6B;AAG7B,4CAA0E;AAC1E,yDAAsE;AACtE,uDAAmD;AACnD,+DAA8C;AAE9C,MAAM,sBAAsB,GAAG,GAAG,uBAAW,GAAY,CAAC;AAC1D,MAAM,sBAAsB,GAAG,GAAG,uBAAW,GAAY,CAAC;AAE1D,MAAM,qBAAqB,GAA2B,MAAM,CAAC,MAAM,CAAC;IAClE,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3C,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3C,SAAS,EAAE,8BAAkB;CAC9B,CAA2B,CAAC;AAE7B;;;;GAIG;AACH,MAAa,QAAQ;IACnB;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAG,gBAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAE3F,KAAK,CAAgB;IACZ,WAAW,CAAS;IAC7B,aAAa,GAAuB,SAAS,CAAC;IAC9C,QAAQ,CAA+B;IACvC,QAAQ,CAA4B;IAEpC,YAAoB,UAAkB;QACpC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,gBAAC,CAAC,SAAS,CAAC,qBAAqB,CAAiB,CAAC;IAClE,CAAC;IAED,wDAAwD;IACxD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,8EAA8E;IAC9E,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAgC,OAAgB;QAC9D,MAAM,MAAM,GAAG,OAAO,KAAK,uBAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QACjF,OAAO,MAA4B,CAAC;IACtC,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,IAAY;QACpB,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,IAAY;QACpB,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC;YACpB,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,IAAI,IAAkB,CAAC;YACvB,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3D,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;gBAC7D,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAiB,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC1B,IAAI,GAAG,gBAAC,CAAC,SAAS,CAAC,qBAAqB,CAAiB,CAAC;oBAC1D,WAAW,GAAG,IAAI,CAAC;gBACrB,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CACb,wDAAwD;wBACtD,eAAe,oBAAoB,8CACjC,GAAG,CAAC,OACN,EAAE,EACJ,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAElB,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,8BAAkB,EAAE,CAAC;gBAC/D,WAAW,GAAG,MAAM,IAAA,6BAAO,EAAC,IAAI,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,mBAAmB,GAAG,MAAM,aAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE3E,IAAI,WAAW,IAAI,CAAC,mBAAmB,IAAI,CAAC,MAAM,IAAA,kCAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtF,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,mBAAmB,CAAC,CAAC,IAAI,WAAW,CAAC;YAC7F,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC;YACpB,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3D,IAAI,CAAC;gBACH,MAAM,YAAE,CAAC,MAAM,CAAC,mBAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACtD,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,gEAAgE,mBAAI,CAAC,OAAO,CAC1E,oBAAoB,CACrB,qBAAqB,GAAG,CAAC,OAAO,EAAE,EACnC,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;YACJ,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,YAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC7E,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,yCAAyC,oBAAoB,sBAC3D,IAAI,CAAC,WACP,mDAAmD,GAAG,CAAC,OAAO,EAAE,EAChE,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,2BAA2B,CAAC,mBAAmB,GAAG,KAAK;QAC3D,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,MAAM,OAAO,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAO,GAAG,KAAK,EAAiB,EAAE;YACzE,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAY,CAAC;gBACvE,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrB,MAAM,WAAW,GAAG,OAAO,IAAI,mBAAmB,CAAC,CAAC,CAAC,mCAAgB,CAAC,CAAC,CAAC,mCAAgB,CAAC;oBACzF,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;oBACzE,SAAS,GAAG,SAAS,IAAI,OAAO,CAAC;gBACnC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,8BAA8B;YAChC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,KAAK,GAAoB;YAC7B,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC;SAC3D,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,oCAAoC,EAAE;YACpE,GAAG,EAAE,IAAI,CAAC,WAAW;YACrB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;OAQG;IACH,uBAAuB,CACrB,OAAsC,EACtC,OAAe,EACf,cAAiE,mCAAgB;QAEjF,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAqB;YACjC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,gBAAgB,EAAE,MAAM;YAC/C,WAAW;YACX,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE;YACjD,WAAW,EAAE,aAAa;SAC3B,CAAC;QAEF,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7C,MAAM,KAAK,GAAG;gBACZ,GAAG,gBAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC;gBACvC,GAAG,QAAQ;aACZ,CAAC;YACF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,YAAY,CAAC,uBAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7C,MAAM,KAAK,GAAG;gBACZ,GAAG,gBAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC;gBACvC,GAAG,QAAQ;aACZ,CAAC;YACF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,YAAY,CAAC,uBAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,IAAI,SAAS,CACjB,oBAAoB,aAAa,uBAAuB,uBAAW,gBAAgB,uBAAW,GAAG,CAClG,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,YAAY,CACV,OAAgB,EAChB,OAAe,EACf,OAA6B;QAE7B,MAAM,IAAI,GAAG,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAyB,CAAC;QAC1D,IAAI,OAAO,KAAK,uBAAW,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAA0C,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAA0C,CAAC;QAC3E,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,GAAW;QACtB,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAAsB,EAAE,OAAe;QACrD,IAAI,OAAO,KAAK,uBAAW,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACjE,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;YAE9B,IAAI,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,KAAK,CACb,4EACE,IAAI,CAAC,UACP,oBAAoB,QAAQ,EAAE,CAC/B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;;AA/TH,4BAgUC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,CACL,gBAAC,CAAC,aAAa,CAAC,KAAK,CAAC;QACtB,gBAAC,CAAC,aAAa,CAAE,KAA4B,CAAC,MAAM,CAAC;QACrD,gBAAC,CAAC,QAAQ,CAAE,KAA0B,CAAC,IAAI,CAAC;QAC5C,gBAAC,CAAC,QAAQ,CAAE,KAA6B,CAAC,OAAO,CAAC,CACnD,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,CACL,WAAW,CAAC,KAAK,CAAC;QAClB,YAAY,IAAI,KAAK,CAAC,MAAM;QAC5B,gBAAC,CAAC,QAAQ,CAAE,KAAK,CAAC,MAAiC,CAAC,UAAU,CAAC,CAChE,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,CACL,WAAW,CAAC,KAAK,CAAC;QAClB,YAAY,IAAI,KAAK,CAAC,MAAM;QAC5B,gBAAC,CAAC,QAAQ,CAAE,KAAK,CAAC,MAAiC,CAAC,UAAU,CAAC,CAChE,CAAC;AACJ,CAAC"}
|
package/lib/appium.ts
CHANGED
|
@@ -11,6 +11,7 @@ import type {
|
|
|
11
11
|
PluginCommand,
|
|
12
12
|
Protocol,
|
|
13
13
|
RouteMatcher,
|
|
14
|
+
IAppiumIpc,
|
|
14
15
|
StringRecord,
|
|
15
16
|
TimestampedMultiSessionData,
|
|
16
17
|
W3CDriverCaps,
|
|
@@ -46,6 +47,7 @@ import * as bidiCommands from './bidi-commands';
|
|
|
46
47
|
import * as insecureFeatures from './insecure-features';
|
|
47
48
|
import * as inspectorCommands from './inspector-commands';
|
|
48
49
|
import type {DriverConfig} from './extension/driver-config';
|
|
50
|
+
import {AppiumIpc} from '@appium/base-driver';
|
|
49
51
|
|
|
50
52
|
const desiredCapabilityConstraints = {
|
|
51
53
|
automationName: {
|
|
@@ -74,6 +76,11 @@ type SessionHandlerCreateResult = SessionHandlerResult<
|
|
|
74
76
|
|
|
75
77
|
type SessionHandlerDeleteResult = SessionHandlerResult<void>;
|
|
76
78
|
|
|
79
|
+
/** @internal Not part of {@link ExternalDriver}; used only when wiring session IPC. */
|
|
80
|
+
type IpcAssignable = {
|
|
81
|
+
assignIpc?: (ipc: IAppiumIpc) => Promise<void>;
|
|
82
|
+
};
|
|
83
|
+
|
|
77
84
|
/**
|
|
78
85
|
* Umbrella driver: owns the session table, loads platform drivers and plugins, and routes
|
|
79
86
|
* commands to the right session driver or plugin chain.
|
|
@@ -93,6 +100,8 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
93
100
|
|
|
94
101
|
readonly sessionPlugins: Record<string, Plugin[]> = {};
|
|
95
102
|
|
|
103
|
+
readonly sessionIpcs: Record<string, AppiumIpc> = {};
|
|
104
|
+
|
|
96
105
|
sessionlessPlugins: Plugin[] = [];
|
|
97
106
|
|
|
98
107
|
/** Set during server init before listen; tests may assign a mock after construction. */
|
|
@@ -361,6 +370,17 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
361
370
|
[...runningDriversData, ...otherPendingDriversData]
|
|
362
371
|
)) as [string, DriverCaps<AppiumDriverConstraints> & {webSocketUrl?: string | boolean}];
|
|
363
372
|
this.sessions[innerSessionId] = driverInstance;
|
|
373
|
+
// create an IPC channel for the driver and all plugins on this session
|
|
374
|
+
this.sessionIpcs[innerSessionId] = new AppiumIpc({
|
|
375
|
+
maxObjSize: this.args.maxIpcDataSize,
|
|
376
|
+
maxTopics: this.args.maxIpcTopics,
|
|
377
|
+
log: driverInstance.log,
|
|
378
|
+
});
|
|
379
|
+
const extDriver = driverInstance as unknown as IpcAssignable;
|
|
380
|
+
if (_.isFunction(extDriver.assignIpc)) {
|
|
381
|
+
// TODO remove this existence guard as a breaking change in Appium 3
|
|
382
|
+
await extDriver.assignIpc(this.sessionIpcs[innerSessionId]);
|
|
383
|
+
}
|
|
364
384
|
} finally {
|
|
365
385
|
_.pull(this.pendingDrivers[InnerDriver.name], driverInstance);
|
|
366
386
|
}
|
|
@@ -442,8 +462,7 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
442
462
|
}
|
|
443
463
|
|
|
444
464
|
this.log.info(`Removing session '${innerSessionId}' from our master session list`);
|
|
445
|
-
|
|
446
|
-
delete this.sessionPlugins[innerSessionId];
|
|
465
|
+
this.deleteLinkedSessionObjects(innerSessionId);
|
|
447
466
|
};
|
|
448
467
|
|
|
449
468
|
if (_.isFunction(driver.onUnexpectedShutdown)) {
|
|
@@ -496,13 +515,6 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
496
515
|
.map(([, value]) => value.driverData);
|
|
497
516
|
dstSession = this.sessions[sessionId];
|
|
498
517
|
protocol = dstSession.protocol;
|
|
499
|
-
this.log.info(`Removing session ${sessionId} from our master session list`);
|
|
500
|
-
// regardless of whether the deleteSession completes successfully or not
|
|
501
|
-
// make the session unavailable, because who knows what state it might
|
|
502
|
-
// be in otherwise
|
|
503
|
-
delete this.sessions[sessionId];
|
|
504
|
-
delete this.sessionPlugins[sessionId];
|
|
505
|
-
|
|
506
518
|
this.cleanupBidiSockets(sessionId);
|
|
507
519
|
}
|
|
508
520
|
// this may not be correct, but if `dstSession` was falsy, the call to `deleteSession()` would
|
|
@@ -510,6 +522,7 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
510
522
|
if (!dstSession) {
|
|
511
523
|
throw new Error('Session not found');
|
|
512
524
|
}
|
|
525
|
+
|
|
513
526
|
return {
|
|
514
527
|
protocol,
|
|
515
528
|
value: await dstSession.deleteSession(sessionId, otherSessionsData),
|
|
@@ -521,6 +534,12 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
521
534
|
protocol,
|
|
522
535
|
error: e instanceof Error ? e : new Error(msg),
|
|
523
536
|
};
|
|
537
|
+
} finally {
|
|
538
|
+
// regardless of whether the deleteSession completes successfully or not
|
|
539
|
+
// make the session unavailable, because who knows what state it might
|
|
540
|
+
// be in otherwise
|
|
541
|
+
this.log.info(`Removing session ${sessionId} from our master session list`);
|
|
542
|
+
this.deleteLinkedSessionObjects(sessionId);
|
|
524
543
|
}
|
|
525
544
|
}
|
|
526
545
|
|
|
@@ -767,6 +786,12 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
767
786
|
`${generateDriverLogPrefix(p)} <${generateDriverLogPrefix(this.sessions[newSessionId])}>`
|
|
768
787
|
);
|
|
769
788
|
}
|
|
789
|
+
// we also want to assign the IPC channel for this session to the plugins
|
|
790
|
+
const extPlugin = p as unknown as IpcAssignable;
|
|
791
|
+
if (_.isFunction(extPlugin.assignIpc)) {
|
|
792
|
+
// TODO remove this existence guard as a breaking change in Appium 4
|
|
793
|
+
await extPlugin.assignIpc(this.sessionIpcs[newSessionId]);
|
|
794
|
+
}
|
|
770
795
|
}
|
|
771
796
|
this.sessionlessPlugins = [];
|
|
772
797
|
}
|
|
@@ -902,6 +927,12 @@ export class AppiumDriver extends DriverCore<AppiumDriverConstraints> {
|
|
|
902
927
|
return _.isFunction(dstSession?.canProxy) && dstSession.canProxy(sessionId);
|
|
903
928
|
}
|
|
904
929
|
|
|
930
|
+
private deleteLinkedSessionObjects(sessionId: string): void {
|
|
931
|
+
delete this.sessions[sessionId];
|
|
932
|
+
delete this.sessionPlugins[sessionId];
|
|
933
|
+
delete this.sessionIpcs[sessionId];
|
|
934
|
+
}
|
|
935
|
+
|
|
905
936
|
}
|
|
906
937
|
|
|
907
938
|
/**
|
package/lib/bidi-commands.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
|
-
import
|
|
2
|
+
import {promisify} from 'node:util';
|
|
3
3
|
import type {ExtensionCore} from '@appium/base-driver';
|
|
4
4
|
import {errors} from '@appium/base-driver';
|
|
5
5
|
import {BIDI_BASE_PATH, BIDI_EVENT_NAME} from './constants';
|
|
@@ -287,7 +287,7 @@ function initBidiSocket(this: AppiumDriver, ws: WebSocket, req: IncomingMessage)
|
|
|
287
287
|
// 1. Make it async-await friendly
|
|
288
288
|
// 2. Do some logging if there's a send error
|
|
289
289
|
const sendFactory = (socket: WebSocket) => {
|
|
290
|
-
const socketSend =
|
|
290
|
+
const socketSend = promisify(socket.send.bind(socket)) as (data: string | Buffer) => Promise<void>;
|
|
291
291
|
return async (data: string | Buffer) => {
|
|
292
292
|
try {
|
|
293
293
|
await assertIsOpen(socket);
|
|
@@ -3,7 +3,6 @@ import _ from 'lodash';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import os from 'node:os';
|
|
5
5
|
import * as semver from 'semver';
|
|
6
|
-
import B from 'bluebird';
|
|
7
6
|
import {system, fs, npm} from '@appium/support';
|
|
8
7
|
import {log as logger} from '../logger';
|
|
9
8
|
import {getAppiumModuleRoot, npmPackage} from '../utils';
|
|
@@ -90,7 +89,7 @@ export async function showDebugInfo({driverConfig, pluginConfig, appiumHome}: De
|
|
|
90
89
|
const findNpmLocation = async (): Promise<string> =>
|
|
91
90
|
await fs.which(system.isWindows() ? 'npm.cmd' : 'npm');
|
|
92
91
|
|
|
93
|
-
const [npmVersion, npmLocation] = await
|
|
92
|
+
const [npmVersion, npmLocation] = await Promise.all([
|
|
94
93
|
...[getNpmVersion, findNpmLocation].map((f) => getSafeResult(f, 'unknown')),
|
|
95
94
|
updateBuildInfo() as Promise<unknown>,
|
|
96
95
|
]);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {asyncfilter, asyncmap} from 'asyncbox';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import type {AppiumLogger, ExtensionType, IDoctorCheck} from '@appium/types';
|
|
@@ -381,7 +381,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
381
381
|
// so that's why it's being removed here.
|
|
382
382
|
const extManifest = receiptToManifest(receipt);
|
|
383
383
|
|
|
384
|
-
const [errors, warnings] = await
|
|
384
|
+
const [errors, warnings] = await Promise.all([
|
|
385
385
|
this.config.getProblems(extName, extManifest as any),
|
|
386
386
|
this.config.getWarnings(extName, extManifest as any),
|
|
387
387
|
]);
|
|
@@ -634,7 +634,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
634
634
|
}
|
|
635
635
|
const isDoctorCheck = (x) =>
|
|
636
636
|
['diagnose', 'fix', 'hasAutofix', 'isOptional'].every((method) => _.isFunction(x?.[method]));
|
|
637
|
-
const checks: IDoctorCheck[] = _.flatMap((await
|
|
637
|
+
const checks: IDoctorCheck[] = _.flatMap((await Promise.all(loadChecksPromises)).filter(Boolean).map(_.toPairs))
|
|
638
638
|
.map(([, value]) => value)
|
|
639
639
|
.filter(isDoctorCheck) as IDoctorCheck[];
|
|
640
640
|
if (_.isEmpty(checks)) {
|
|
@@ -692,7 +692,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
692
692
|
if (!scriptName) {
|
|
693
693
|
const allScripts = _.toPairs(extScripts as Record<string, string>);
|
|
694
694
|
const root = this.config.getInstallPath(installSpec);
|
|
695
|
-
const existingScripts = await
|
|
695
|
+
const existingScripts = await asyncfilter(
|
|
696
696
|
allScripts,
|
|
697
697
|
async ([, p]) => await fs.exists(path.join(root, p))
|
|
698
698
|
);
|
|
@@ -747,7 +747,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
747
747
|
}
|
|
748
748
|
|
|
749
749
|
try {
|
|
750
|
-
await new
|
|
750
|
+
await new Promise<void>((resolve, reject) => {
|
|
751
751
|
this._runUnbuffered(moduleRoot, scriptPath, extraArgs)
|
|
752
752
|
.once('error', (err) => {
|
|
753
753
|
// generally this is of the "I can't find the script" variety.
|
|
@@ -957,7 +957,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
957
957
|
([, data]) => data.installed && data.installType === INSTALL_TYPE_NPM
|
|
958
958
|
);
|
|
959
959
|
|
|
960
|
-
await
|
|
960
|
+
await asyncmap(
|
|
961
961
|
extensionsToCheck,
|
|
962
962
|
async ([ext, data]) => {
|
|
963
963
|
try {
|
|
@@ -980,7 +980,7 @@ abstract class ExtensionCliCommand<ExtType extends ExtensionType = ExtensionType
|
|
|
980
980
|
*/
|
|
981
981
|
private async _addRepositoryUrlsToListData(listData: ExtensionList): Promise<void> {
|
|
982
982
|
await spinWith(this.isJsonOutput, 'Fetching repository information', async () => {
|
|
983
|
-
await
|
|
983
|
+
await asyncmap(
|
|
984
984
|
_.values(listData),
|
|
985
985
|
async (data) => {
|
|
986
986
|
const repoUrl = await this._getRepositoryUrl(data);
|
|
@@ -2,7 +2,6 @@ import type {ExtensionType} from '@appium/types';
|
|
|
2
2
|
import type {ExtClass, ExtManifest, ExtName, ExtRecord, InstallType} from 'appium/types';
|
|
3
3
|
import type {SchemaObject} from 'ajv';
|
|
4
4
|
import {util, fs, system} from '@appium/support';
|
|
5
|
-
import B from 'bluebird';
|
|
6
5
|
import _ from 'lodash';
|
|
7
6
|
import path from 'node:path';
|
|
8
7
|
import {pathToFileURL} from 'node:url';
|
|
@@ -153,7 +152,7 @@ export abstract class ExtensionConfig<ExtType extends ExtensionType> {
|
|
|
153
152
|
* @param extManifest - Manifest entry for that extension
|
|
154
153
|
*/
|
|
155
154
|
async getWarnings(extName: string, extManifest: ExtManifest<ExtType>): Promise<string[]> {
|
|
156
|
-
const [genericConfigWarnings, configWarnings] = await
|
|
155
|
+
const [genericConfigWarnings, configWarnings] = await Promise.all([
|
|
157
156
|
this.getGenericConfigWarnings(extManifest, extName),
|
|
158
157
|
this.getConfigWarnings(extManifest, extName),
|
|
159
158
|
]);
|
|
@@ -359,7 +358,7 @@ export abstract class ExtensionConfig<ExtType extends ExtensionType> {
|
|
|
359
358
|
const warningMap = new Map<string, string[]>();
|
|
360
359
|
|
|
361
360
|
for (const [extName, extManifest] of _.toPairs(exts)) {
|
|
362
|
-
const [errors, warnings] = await
|
|
361
|
+
const [errors, warnings] = await Promise.all([
|
|
363
362
|
this.getProblems(extName, extManifest),
|
|
364
363
|
this.getWarnings(extName, extManifest),
|
|
365
364
|
]);
|
package/lib/extension/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
|
-
import
|
|
2
|
+
import {asyncmap} from 'asyncbox';
|
|
3
3
|
import type {DriverClass, ExtensionType, PluginClass} from '@appium/types';
|
|
4
4
|
import type {ExtClass} from 'appium/types';
|
|
5
5
|
import {USE_ALL_PLUGINS} from '../constants';
|
|
@@ -32,7 +32,7 @@ export async function loadExtensions(appiumHome: string): Promise<ExtensionConfi
|
|
|
32
32
|
const driverConfig = DriverConfig.getInstance(manifest) ?? DriverConfig.create(manifest);
|
|
33
33
|
const pluginConfig = PluginConfig.getInstance(manifest) ?? PluginConfig.create(manifest);
|
|
34
34
|
|
|
35
|
-
await
|
|
35
|
+
await Promise.all([driverConfig.validate(), pluginConfig.validate()]);
|
|
36
36
|
return {driverConfig, pluginConfig};
|
|
37
37
|
}
|
|
38
38
|
|
|
@@ -110,34 +110,26 @@ async function importExtensions(
|
|
|
110
110
|
extNames: string[],
|
|
111
111
|
asyncImportChunkSize: number
|
|
112
112
|
): Promise<Array<[ExtClass<ExtensionType>, string]>> {
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
log.debug(err.stack);
|
|
134
|
-
}
|
|
135
|
-
})()
|
|
136
|
-
);
|
|
137
|
-
activePromisesChunk.push(promise);
|
|
138
|
-
allPromises.push(promise);
|
|
139
|
-
}
|
|
140
|
-
return _.zip(await B.all(allPromises), extNames).filter(([extClass]) => Boolean(extClass)) as Array<
|
|
113
|
+
const extClasses = await asyncmap(
|
|
114
|
+
extNames,
|
|
115
|
+
async (extName) => {
|
|
116
|
+
log.info(`Attempting to load ${extType} ${extName}...`);
|
|
117
|
+
const timer = new timing.Timer().start();
|
|
118
|
+
try {
|
|
119
|
+
const extClass = await config.requireAsync(extName as never);
|
|
120
|
+
log.debug(`${extClass.name} has been successfully loaded in ${timer.getDuration().asSeconds.toFixed(3)}s`);
|
|
121
|
+
return extClass as ExtClass<ExtensionType>;
|
|
122
|
+
} catch (err: any) {
|
|
123
|
+
log.error(
|
|
124
|
+
`Could not load ${extType} '${extName}', so it will not be available. Error ` +
|
|
125
|
+
`in loading the ${extType} was: ${err.message}`
|
|
126
|
+
);
|
|
127
|
+
log.debug(err.stack);
|
|
128
|
+
}
|
|
129
|
+
},
|
|
130
|
+
{concurrency: asyncImportChunkSize}
|
|
131
|
+
);
|
|
132
|
+
return _.zip(extClasses, extNames).filter(([extClass]) => Boolean(extClass)) as Array<
|
|
141
133
|
[ExtClass<ExtensionType>, string]
|
|
142
134
|
>;
|
|
143
135
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import B from 'bluebird';
|
|
2
1
|
import {env, fs} from '@appium/support';
|
|
3
2
|
import _ from 'lodash';
|
|
4
3
|
import path from 'node:path';
|
|
@@ -224,7 +223,7 @@ export class Manifest {
|
|
|
224
223
|
queue.push(onMatch(filepath));
|
|
225
224
|
}
|
|
226
225
|
|
|
227
|
-
await
|
|
226
|
+
await Promise.all(queue);
|
|
228
227
|
|
|
229
228
|
return didChange;
|
|
230
229
|
}
|