appium 3.5.0 → 3.5.1
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.map +1 -1
- package/build/lib/appium.js +43 -45
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.d.ts.map +1 -1
- package/build/lib/bidi-commands.js +34 -29
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/bootstrap/appium-initializer.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-initializer.js +13 -13
- package/build/lib/bootstrap/appium-initializer.js.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.js +2 -2
- package/build/lib/bootstrap/appium-main-runner.js.map +1 -1
- package/build/lib/bootstrap/config-file.d.ts.map +1 -1
- package/build/lib/bootstrap/config-file.js +11 -11
- package/build/lib/bootstrap/config-file.js.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.d.ts.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.js +9 -6
- package/build/lib/bootstrap/grid-v3-register.js.map +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/main-helpers.js +19 -20
- package/build/lib/bootstrap/main-helpers.js.map +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/node-helpers.js +7 -14
- package/build/lib/bootstrap/node-helpers.js.map +1 -1
- package/build/lib/bootstrap/startup-config.d.ts.map +1 -1
- package/build/lib/bootstrap/startup-config.js +32 -30
- package/build/lib/bootstrap/startup-config.js.map +1 -1
- package/build/lib/cli/args.d.ts +3 -2
- package/build/lib/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +2 -5
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts +1 -2
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +7 -8
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +2 -2
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +100 -66
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/extension.d.ts.map +1 -1
- package/build/lib/cli/extension.js.map +1 -1
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +21 -14
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +1 -1
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +5 -5
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/cli/setup-command.d.ts +1 -1
- package/build/lib/cli/setup-command.d.ts.map +1 -1
- package/build/lib/cli/setup-command.js +14 -19
- package/build/lib/cli/setup-command.js.map +1 -1
- package/build/lib/cli/utils.d.ts.map +1 -1
- package/build/lib/cli/utils.js +3 -2
- package/build/lib/cli/utils.js.map +1 -1
- package/build/lib/doctor/doctor.d.ts +0 -1
- package/build/lib/doctor/doctor.d.ts.map +1 -1
- package/build/lib/doctor/doctor.js +12 -17
- package/build/lib/doctor/doctor.js.map +1 -1
- package/build/lib/extension/driver-config.d.ts.map +1 -1
- package/build/lib/extension/driver-config.js +11 -12
- package/build/lib/extension/driver-config.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +28 -27
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/index.d.ts.map +1 -1
- package/build/lib/extension/index.js +13 -16
- package/build/lib/extension/index.js.map +1 -1
- package/build/lib/extension/manifest.d.ts +3 -2
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +19 -22
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/extension/plugin-config.d.ts.map +1 -1
- package/build/lib/extension/plugin-config.js +7 -9
- package/build/lib/extension/plugin-config.js.map +1 -1
- package/build/lib/helpers/build.d.ts +0 -1
- package/build/lib/helpers/build.d.ts.map +1 -1
- package/build/lib/helpers/build.js +2 -4
- package/build/lib/helpers/build.js.map +1 -1
- package/build/lib/helpers/capability.d.ts.map +1 -1
- package/build/lib/helpers/capability.js +27 -22
- package/build/lib/helpers/capability.js.map +1 -1
- package/build/lib/helpers/network.d.ts.map +1 -1
- package/build/lib/helpers/network.js +4 -3
- package/build/lib/helpers/network.js.map +1 -1
- package/build/lib/insecure-features.d.ts.map +1 -1
- package/build/lib/insecure-features.js +9 -13
- package/build/lib/insecure-features.js.map +1 -1
- package/build/lib/inspector-commands.d.ts.map +1 -1
- package/build/lib/inspector-commands.js +29 -28
- package/build/lib/inspector-commands.js.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +8 -7
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/schema/arg-spec.d.ts.map +1 -1
- package/build/lib/schema/arg-spec.js +5 -8
- package/build/lib/schema/arg-spec.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +20 -19
- package/build/lib/schema/cli-args.js.map +1 -1
- package/build/lib/schema/cli-transformers.d.ts.map +1 -1
- package/build/lib/schema/cli-transformers.js.map +1 -1
- package/build/lib/schema/schema.d.ts.map +1 -1
- package/build/lib/schema/schema.js +28 -21
- package/build/lib/schema/schema.js.map +1 -1
- package/build/lib/utils/hash.d.ts +5 -0
- package/build/lib/utils/hash.d.ts.map +1 -0
- package/build/lib/{utils.js → utils/hash.js} +3 -21
- package/build/lib/utils/hash.js.map +1 -0
- package/build/lib/utils/index.d.ts +8 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +31 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/is-package-changed.d.ts +16 -0
- package/build/lib/utils/is-package-changed.d.ts.map +1 -0
- package/build/lib/utils/is-package-changed.js +62 -0
- package/build/lib/utils/is-package-changed.js.map +1 -0
- package/build/lib/utils/object.d.ts +120 -0
- package/build/lib/utils/object.d.ts.map +1 -0
- package/build/lib/utils/object.js +288 -0
- package/build/lib/utils/object.js.map +1 -0
- package/build/lib/{extension → utils}/package-changed.d.ts +0 -1
- package/build/lib/utils/package-changed.d.ts.map +1 -0
- package/build/lib/{extension → utils}/package-changed.js +3 -4
- package/build/lib/utils/package-changed.js.map +1 -0
- package/build/lib/utils/package-json.d.ts +9 -0
- package/build/lib/utils/package-json.d.ts.map +1 -0
- package/build/lib/utils/package-json.js +32 -0
- package/build/lib/utils/package-json.js.map +1 -0
- package/build/lib/utils/resolve-from.d.ts +11 -0
- package/build/lib/utils/resolve-from.d.ts.map +1 -0
- package/build/lib/utils/resolve-from.js +41 -0
- package/build/lib/utils/resolve-from.js.map +1 -0
- package/build/types/cli.d.ts.map +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/manifest/base.d.ts.map +1 -1
- package/build/types/manifest/v3.d.ts.map +1 -1
- package/build/types/manifest/v4.d.ts.map +1 -1
- package/lib/appium.ts +59 -55
- package/lib/bidi-commands.ts +106 -60
- package/lib/bootstrap/appium-initializer.ts +27 -19
- package/lib/bootstrap/appium-main-runner.ts +8 -4
- package/lib/bootstrap/config-file.ts +33 -16
- package/lib/bootstrap/grid-v3-register.ts +26 -19
- package/lib/bootstrap/main-helpers.ts +25 -19
- package/lib/bootstrap/node-helpers.ts +19 -22
- package/lib/bootstrap/startup-config.ts +42 -39
- package/lib/cli/args.ts +3 -4
- package/lib/cli/driver-command.ts +19 -13
- package/lib/cli/extension-command.ts +208 -143
- package/lib/cli/extension.ts +4 -6
- package/lib/cli/parser.ts +32 -30
- package/lib/cli/plugin-command.ts +20 -9
- package/lib/cli/setup-command.ts +54 -39
- package/lib/cli/utils.ts +4 -3
- package/lib/doctor/doctor.ts +15 -17
- package/lib/extension/driver-config.ts +22 -17
- package/lib/extension/extension-config.ts +74 -66
- package/lib/extension/index.ts +42 -25
- package/lib/extension/manifest.ts +34 -31
- package/lib/extension/plugin-config.ts +15 -10
- package/lib/helpers/build.ts +6 -5
- package/lib/helpers/capability.ts +40 -35
- package/lib/helpers/network.ts +6 -5
- package/lib/insecure-features.ts +16 -14
- package/lib/inspector-commands.ts +72 -40
- package/lib/logsink.ts +22 -26
- package/lib/schema/arg-spec.ts +9 -8
- package/lib/schema/cli-args-guards.ts +4 -4
- package/lib/schema/cli-args.ts +25 -21
- package/lib/schema/cli-transformers.ts +6 -2
- package/lib/schema/format-errors.ts +1 -1
- package/lib/schema/schema.ts +52 -38
- package/lib/{utils.ts → utils/hash.ts} +2 -19
- package/lib/utils/index.ts +23 -0
- package/lib/utils/is-package-changed.ts +78 -0
- package/lib/utils/object.ts +312 -0
- package/lib/{extension → utils}/package-changed.ts +6 -7
- package/lib/utils/package-json.ts +36 -0
- package/lib/utils/resolve-from.ts +40 -0
- package/package.json +13 -16
- package/scripts/autoinstall-extensions.js +8 -8
- package/tsconfig.json +8 -2
- package/types/cli.ts +18 -18
- package/types/index.ts +2 -2
- package/types/manifest/base.ts +2 -2
- package/types/manifest/v3.ts +2 -2
- package/types/manifest/v4.ts +2 -2
- package/build/lib/extension/package-changed.d.ts.map +0 -1
- package/build/lib/extension/package-changed.js.map +0 -1
- package/build/lib/utils.d.ts +0 -13
- package/build/lib/utils.d.ts.map +0 -1
- package/build/lib/utils.js.map +0 -1
package/build/lib/cli/parser.js
CHANGED
|
@@ -5,10 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ArgParser = exports.EXTRA_ARGS = void 0;
|
|
7
7
|
exports.getParser = getParser;
|
|
8
|
-
const support_1 = require("@appium/support");
|
|
9
8
|
const argparse_1 = require("argparse");
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
|
+
const utils_1 = require("../utils");
|
|
12
11
|
const constants_1 = require("../constants");
|
|
13
12
|
const schema_1 = require("../schema");
|
|
14
13
|
const build_1 = require("../helpers/build");
|
|
@@ -19,8 +18,16 @@ exports.EXTRA_ARGS = 'extraArgs';
|
|
|
19
18
|
* If the parsed args do not contain any of these values, then we
|
|
20
19
|
* will automatically inject the `server` subcommand.
|
|
21
20
|
*/
|
|
22
|
-
const NON_SERVER_ARGS = Object.freeze(new Set([
|
|
23
|
-
|
|
21
|
+
const NON_SERVER_ARGS = Object.freeze(new Set([
|
|
22
|
+
constants_1.SETUP_SUBCOMMAND,
|
|
23
|
+
constants_1.DRIVER_TYPE,
|
|
24
|
+
constants_1.PLUGIN_TYPE,
|
|
25
|
+
constants_1.SERVER_SUBCOMMAND,
|
|
26
|
+
'-h',
|
|
27
|
+
'--help',
|
|
28
|
+
'-v',
|
|
29
|
+
'--version',
|
|
30
|
+
]));
|
|
24
31
|
/**
|
|
25
32
|
* A wrapper around `argparse`
|
|
26
33
|
*
|
|
@@ -51,7 +58,7 @@ class ArgParser {
|
|
|
51
58
|
this.parser = parser;
|
|
52
59
|
parser.add_argument('-v', '--version', {
|
|
53
60
|
action: 'version',
|
|
54
|
-
version,
|
|
61
|
+
version: build_1.APPIUM_VER,
|
|
55
62
|
});
|
|
56
63
|
const subParsers = parser.add_subparsers({ dest: 'subcommand' });
|
|
57
64
|
// add the 'server' subcommand, and store the raw arguments on the parser
|
|
@@ -89,14 +96,14 @@ class ArgParser {
|
|
|
89
96
|
* E.g., `{'driver-foo-bar': baz}` becomes `{driver: {foo: {bar: 'baz'}}}`
|
|
90
97
|
*/
|
|
91
98
|
static _transformParsedArgs(args, unknownArgs = []) {
|
|
92
|
-
const result =
|
|
99
|
+
const result = Object.entries(args).reduce((unpacked, [key, value]) => {
|
|
93
100
|
const spec = (0, schema_1.hasArgSpec)(key) ? (0, schema_1.getArgSpec)(key) : undefined;
|
|
94
|
-
if (
|
|
101
|
+
if (value !== undefined && spec) {
|
|
95
102
|
const { dest } = spec;
|
|
96
|
-
|
|
103
|
+
(0, utils_1.setPath)(unpacked, dest, value);
|
|
97
104
|
}
|
|
98
105
|
else {
|
|
99
|
-
// this could be anything that
|
|
106
|
+
// this could be anything that isn't a server arg
|
|
100
107
|
unpacked[key] = value;
|
|
101
108
|
}
|
|
102
109
|
return unpacked;
|
|
@@ -215,21 +222,21 @@ class ArgParser {
|
|
|
215
222
|
{
|
|
216
223
|
command: setup_command_1.SUBCOMMAND_MOBILE,
|
|
217
224
|
help: `The preset for mobile devices ` +
|
|
218
|
-
`(drivers: ${
|
|
225
|
+
`(drivers: ${(0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_MOBILE).join(',')}; plugins: ${setup_command_1.DEFAULT_PLUGINS})`,
|
|
219
226
|
},
|
|
220
227
|
{
|
|
221
228
|
command: setup_command_1.SUBCOMMAND_BROWSER,
|
|
222
229
|
help: `The preset for desktop browsers ` +
|
|
223
|
-
`(drivers: ${
|
|
230
|
+
`(drivers: ${(0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_BROWSER).join(',')}; plugins: ${setup_command_1.DEFAULT_PLUGINS})`,
|
|
224
231
|
},
|
|
225
232
|
{
|
|
226
233
|
command: setup_command_1.SUBCOMMAND_DESKTOP,
|
|
227
234
|
help: `The preset for desktop applications ` +
|
|
228
|
-
`(drivers: ${
|
|
235
|
+
`(drivers: ${(0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_DESKTOP).join(',')}; plugins: ${setup_command_1.DEFAULT_PLUGINS})`,
|
|
229
236
|
},
|
|
230
237
|
{
|
|
231
238
|
command: setup_command_1.SUBCOMMAND_RESET,
|
|
232
|
-
help: 'Remove all installed drivers and plugins'
|
|
239
|
+
help: 'Remove all installed drivers and plugins',
|
|
233
240
|
},
|
|
234
241
|
];
|
|
235
242
|
for (const { command, help } of parserSpecs) {
|
|
@@ -277,7 +284,7 @@ class ArgParser {
|
|
|
277
284
|
// eslint-disable-next-line no-console
|
|
278
285
|
console.error(); // need an extra space since argparse prints usage.
|
|
279
286
|
// eslint-disable-next-line no-console
|
|
280
|
-
console.error(err.message);
|
|
287
|
+
console.error(err instanceof Error ? err.message : String(err));
|
|
281
288
|
process.exit(1);
|
|
282
289
|
}
|
|
283
290
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ export default class PluginCliCommand extends ExtensionCliCommand<'plugin'> {
|
|
|
28
28
|
*
|
|
29
29
|
* @param opts - install options
|
|
30
30
|
*/
|
|
31
|
-
install({ plugin, installType, packageName }: PluginInstallOpts): Promise<ExtRecord<'plugin'>>;
|
|
31
|
+
install({ plugin, installType, packageName, }: PluginInstallOpts): Promise<ExtRecord<'plugin'>>;
|
|
32
32
|
/**
|
|
33
33
|
* Uninstall a plugin
|
|
34
34
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,mBAAmB,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,SAAS,EACV,MAAM,qBAAqB,CAAC;AAI7B,KAAK,iBAAiB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAC1F,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAC5C,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,CAAC;AAC1D,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC;AACnF,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,mBAAmB,CAAC,QAAQ,CAAC;gBAC7D,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC;IAK7D;;;;OAIG;IACG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,mBAAmB,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,SAAS,EACV,MAAM,qBAAqB,CAAC;AAI7B,KAAK,iBAAiB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAC1F,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAC5C,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,CAAC;AAC1D,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC;AACnF,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,mBAAmB,CAAC,QAAQ,CAAC;gBAC7D,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC;IAK7D;;;;OAIG;IACG,OAAO,CAAC,EACZ,MAAM,EACN,WAAW,EACX,WAAW,GACZ,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAQnD;;;;OAIG;IACG,SAAS,CAAC,EAAC,MAAM,EAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAI5E;;;;OAIG;IACG,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF;;;;;OAKG;IACG,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;IAShF;;;;;;OAMG;IACG,MAAM,CAAC,EAAC,MAAM,EAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAM5D;;;;;OAKG;IACM,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,eAAe;IAOzF;;;;;;;;OAQG;IACM,uBAAuB,CAC9B,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,EACrC,WAAW,EAAE,MAAM,GAClB,IAAI;CAcR"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const support_1 = require("@appium/support");
|
|
7
7
|
const extension_command_1 = __importDefault(require("./extension-command"));
|
|
8
8
|
const constants_1 = require("../constants");
|
|
9
9
|
const REQ_PLUGIN_FIELDS = ['pluginName', 'mainClass'];
|
|
@@ -17,7 +17,7 @@ class PluginCliCommand extends extension_command_1.default {
|
|
|
17
17
|
*
|
|
18
18
|
* @param opts - install options
|
|
19
19
|
*/
|
|
20
|
-
async install({ plugin, installType, packageName }) {
|
|
20
|
+
async install({ plugin, installType, packageName, }) {
|
|
21
21
|
return await super._install({
|
|
22
22
|
installSpec: plugin,
|
|
23
23
|
installType,
|
|
@@ -73,7 +73,7 @@ class PluginCliCommand extends extension_command_1.default {
|
|
|
73
73
|
* @returns formatted success text
|
|
74
74
|
*/
|
|
75
75
|
getPostInstallText({ extName, extData }) {
|
|
76
|
-
return `Plugin ${extName}@${extData.version} successfully installed
|
|
76
|
+
return support_1.console.styleText('green', `Plugin ${extName}@${extData.version} successfully installed`);
|
|
77
77
|
}
|
|
78
78
|
/**
|
|
79
79
|
* Validates fields in `appium` field of `pluginMetadata`
|
|
@@ -85,8 +85,8 @@ class PluginCliCommand extends extension_command_1.default {
|
|
|
85
85
|
* @param installSpec - install spec from CLI
|
|
86
86
|
*/
|
|
87
87
|
validateExtensionFields(pluginMetadata, installSpec) {
|
|
88
|
-
const missingFields = REQ_PLUGIN_FIELDS.reduce((acc, field) =>
|
|
89
|
-
if (!
|
|
88
|
+
const missingFields = REQ_PLUGIN_FIELDS.reduce((acc, field) => pluginMetadata[field] ? acc : [...acc, field], []);
|
|
89
|
+
if (!support_1.util.isEmpty(missingFields)) {
|
|
90
90
|
throw new Error(`Installed plugin "${installSpec}" did not expose correct fields for compatibility ` +
|
|
91
91
|
`with Appium. Missing fields: ${JSON.stringify(missingFields)}`);
|
|
92
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.ts"],"names":[],"mappings":";;;;;AAAA,6CAA8C;AAE9C,4EAAsD;AAQtD,4CAA2C;AAE3C,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAOtD,MAAqB,gBAAiB,SAAQ,2BAA6B;IACzE,YAAY,EAAC,MAAM,EAAE,IAAI,EAAoC;QAC3D,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAC,EACZ,MAAM,EACN,WAAW,EACX,WAAW,GACO;QAClB,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAsB;QAC3C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAmB;QAC7C,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAmB;QACzD,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,UAAU;YACV,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAsB;QACxC,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACM,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAA0B;QACrE,OAAO,iBAAO,CAAC,SAAS,CACtB,OAAO,EACP,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,yBAAyB,CAC9D,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACM,uBAAuB,CAC9B,cAAqC,EACrC,WAAmB;QAEnB,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CACb,cAAc,CAAC,KAAoC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,EAC9E,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,WAAW,oDAAoD;gBAClF,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA5GD,mCA4GC"}
|
|
@@ -16,7 +16,7 @@ type PluginConfig = ExtensionConfig<'plugin'>;
|
|
|
16
16
|
/**
|
|
17
17
|
* Return a list of drivers available for current host platform.
|
|
18
18
|
*/
|
|
19
|
-
export declare function getPresetDrivers(presetName: CliCommandSetupSubcommand): string[];
|
|
19
|
+
export declare function getPresetDrivers(presetName: Exclude<CliCommandSetupSubcommand, 'reset'>): string[];
|
|
20
20
|
/**
|
|
21
21
|
* Return desktop platform name for setup command description.
|
|
22
22
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/setup-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/setup-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,eAAe,EACf,yBAAyB,EAG1B,MAAM,cAAc,CAAC;AAKtB,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,gBAAgB,UAAU,CAAC;AAexC;;GAEG;AACH,eAAO,MAAM,eAAe,UAA0B,CAAC;AAEvD,KAAK,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAC9C,KAAK,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAG9C;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,OAAO,CAAC,yBAAyB,EAAE,OAAO,CAAC,GACtD,MAAM,EAAE,CAYV;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,EACpC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAkBf"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.DEFAULT_PLUGINS = exports.SUBCOMMAND_RESET = exports.SUBCOMMAND_BROWSER = exports.SUBCOMMAND_DESKTOP = exports.SUBCOMMAND_MOBILE = void 0;
|
|
7
4
|
exports.getPresetDrivers = getPresetDrivers;
|
|
8
5
|
exports.determinePlatformName = determinePlatformName;
|
|
9
6
|
exports.runSetupCommand = runSetupCommand;
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
7
|
const constants_1 = require("../constants");
|
|
12
8
|
const extension_1 = require("./extension");
|
|
13
9
|
const support_1 = require("@appium/support");
|
|
@@ -24,9 +20,9 @@ exports.SUBCOMMAND_RESET = 'reset';
|
|
|
24
20
|
* Driver names listed in KNOWN_DRIVERS to install by default
|
|
25
21
|
*/
|
|
26
22
|
const PRESET_PAIRS = Object.freeze({
|
|
27
|
-
mobile:
|
|
28
|
-
desktop:
|
|
29
|
-
browser:
|
|
23
|
+
mobile: Object.keys(constants_1.MOBILE_DRIVERS),
|
|
24
|
+
desktop: Object.keys(constants_1.DESKTOP_DRIVERS),
|
|
25
|
+
browser: Object.keys(constants_1.DESKTOP_BROWSERS),
|
|
30
26
|
});
|
|
31
27
|
const DRIVERS_ONLY_MACOS = ['xcuitest', 'safari', 'mac2'];
|
|
32
28
|
const DRIVERS_ONLY_WINDOWS = ['windows'];
|
|
@@ -38,11 +34,11 @@ exports.DEFAULT_PLUGINS = ['images', 'inspector'];
|
|
|
38
34
|
* Return a list of drivers available for current host platform.
|
|
39
35
|
*/
|
|
40
36
|
function getPresetDrivers(presetName) {
|
|
41
|
-
return
|
|
42
|
-
if (
|
|
37
|
+
return PRESET_PAIRS[presetName].filter((driver) => {
|
|
38
|
+
if (DRIVERS_ONLY_MACOS.includes(driver)) {
|
|
43
39
|
return support_1.system.isMac();
|
|
44
40
|
}
|
|
45
|
-
if (
|
|
41
|
+
if (DRIVERS_ONLY_WINDOWS.includes(driver)) {
|
|
46
42
|
return support_1.system.isWindows();
|
|
47
43
|
}
|
|
48
44
|
return true;
|
|
@@ -85,7 +81,6 @@ async function runSetupCommand(preConfigArgs, driverConfig, pluginConfig) {
|
|
|
85
81
|
break;
|
|
86
82
|
}
|
|
87
83
|
}
|
|
88
|
-
;
|
|
89
84
|
/**
|
|
90
85
|
* Resets all installed drivers and extensions
|
|
91
86
|
*/
|
|
@@ -95,17 +90,17 @@ async function resetAllExtensions(driverConfig, pluginConfig) {
|
|
|
95
90
|
['plugin', pluginConfig],
|
|
96
91
|
];
|
|
97
92
|
for (const [command, config] of commandConfigs) {
|
|
98
|
-
for (const extensionName of
|
|
93
|
+
for (const extensionName of Object.keys(config.installedExtensions)) {
|
|
99
94
|
try {
|
|
100
95
|
await uninstallExtension(extensionName, extensionCommandArgs(command, extensionName, 'uninstall'), config);
|
|
101
96
|
}
|
|
102
97
|
catch (e) {
|
|
103
98
|
logger_1.log.warn(`${extensionName} ${command} cannot be uninstalled. Will delete the manifest anyway. ` +
|
|
104
|
-
`Original error: ${e.stack}`);
|
|
99
|
+
`Original error: ${e instanceof Error ? e.stack : String(e)}`);
|
|
105
100
|
}
|
|
106
101
|
}
|
|
107
102
|
const manifestPath = config.manifestPath;
|
|
108
|
-
if (!manifestPath || !await support_1.fs.exists(manifestPath)) {
|
|
103
|
+
if (!manifestPath || !(await support_1.fs.exists(manifestPath))) {
|
|
109
104
|
continue;
|
|
110
105
|
}
|
|
111
106
|
await support_1.fs.rimraf(manifestPath);
|
|
@@ -155,7 +150,7 @@ async function setupDefaultPlugins(pluginConfig) {
|
|
|
155
150
|
* Run the given extensionConfigArgs command after checking if the given extensionName was already installed.
|
|
156
151
|
*/
|
|
157
152
|
async function installExtension(extensionName, extensionConfigArgs, extensionConfig) {
|
|
158
|
-
if (
|
|
153
|
+
if (Object.keys(extensionConfig.installedExtensions).includes(extensionName)) {
|
|
159
154
|
logger_1.log.info(`${extensionName} (${extensionConfig.installedExtensions[extensionName].version}) is already installed. ` +
|
|
160
155
|
`Skipping the installation.`);
|
|
161
156
|
return;
|
|
@@ -166,7 +161,7 @@ async function installExtension(extensionName, extensionConfigArgs, extensionCon
|
|
|
166
161
|
* Run the given extensionConfigArgs command after checking if the given extensionName was already installed.
|
|
167
162
|
*/
|
|
168
163
|
async function uninstallExtension(extensionName, extensionConfigArgs, extensionConfig) {
|
|
169
|
-
if (!
|
|
164
|
+
if (!Object.keys(extensionConfig.installedExtensions).includes(extensionName)) {
|
|
170
165
|
logger_1.log.info(`${extensionName} (${extensionConfig.installedExtensions[extensionName].version}) is not installed. ` +
|
|
171
166
|
`Skipping its uninstall.`);
|
|
172
167
|
return;
|
|
@@ -177,8 +172,8 @@ async function uninstallExtension(extensionName, extensionConfigArgs, extensionC
|
|
|
177
172
|
* Return the command config for driver or plugin.
|
|
178
173
|
*/
|
|
179
174
|
function extensionCommandArgs(extensionCommand, extensionName, command) {
|
|
180
|
-
return
|
|
181
|
-
? {
|
|
182
|
-
: {
|
|
175
|
+
return extensionCommand === 'plugin'
|
|
176
|
+
? { subcommand: 'plugin', pluginCommand: command, plugin: extensionName }
|
|
177
|
+
: { subcommand: 'driver', driverCommand: command, driver: extensionName };
|
|
183
178
|
}
|
|
184
179
|
//# sourceMappingURL=setup-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-command.js","sourceRoot":"","sources":["../../../lib/cli/setup-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup-command.js","sourceRoot":"","sources":["../../../lib/cli/setup-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,IAAI,CAAC;AAI7B,qBAAa,UAAU,CAAC,CAAC,GAAG,GAAG;IAC7B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;gBAEtB,IAAI,SAAK;IAIrB;;OAEG;IACH,OAAO,IAAI,CAAC,EAAE;IAId;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAOtB;;OAEG;IACH,OAAO,IAAI,IAAI;CAGhB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,GAAG,KAAK,CAU7D;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAIpD;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,CAAC,CAAC,CAaZ"}
|
package/build/lib/cli/utils.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.RingBuffer = exports.JSON_SPACES = void 0;
|
|
|
8
8
|
exports.errAndQuit = errAndQuit;
|
|
9
9
|
exports.log = log;
|
|
10
10
|
exports.spinWith = spinWith;
|
|
11
|
+
const support_1 = require("@appium/support");
|
|
11
12
|
const ora_1 = __importDefault(require("ora"));
|
|
12
13
|
exports.JSON_SPACES = 4;
|
|
13
14
|
class RingBuffer {
|
|
@@ -50,9 +51,9 @@ function errAndQuit(json, msg) {
|
|
|
50
51
|
console.log(JSON.stringify({ error: String(msg) }, null, exports.JSON_SPACES));
|
|
51
52
|
}
|
|
52
53
|
else {
|
|
53
|
-
console.error(String(msg)
|
|
54
|
+
console.error(support_1.console.styleText('red', String(msg)));
|
|
54
55
|
if (msg?.stderr) {
|
|
55
|
-
console.error(String(msg.stderr)
|
|
56
|
+
console.error(support_1.console.styleText('red', String(msg.stderr)));
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;;AAgD/B,gCAUC;AAQD,kBAIC;AAUD,4BAiBC;AA/FD,6CAA0D;AAC1D,8CAAsB;AAET,QAAA,WAAW,GAAG,CAAC,CAAC;AAI7B,MAAa,UAAU;IACJ,IAAI,CAAS;IACb,MAAM,GAAQ,EAAE,CAAC;IAElC,YAAY,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAO;QACb,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AA/BD,gCA+BC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,IAAa,EAAE,GAAY;IACpD,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAC,EAAE,IAAI,EAAE,mBAAW,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,iBAAc,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAK,GAAiB,EAAE,MAAM,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,iBAAc,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAE,GAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,GAAG,CAAC,IAAa,EAAE,GAAW;IAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAC5B,IAAa,EACb,GAAW,EACX,EAAwB;IAExB,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,SAAS;;;EAGX,CAAC;AAEZ,uDAAuD;AACvD,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,GAAE,YAAY,EAAO;IAWvC,OAAO,KAAK,mBAAmB,GAE9B;IAED,OAAO,KAAK,mBAAmB,GAE9B;IAED;;;;;OAKG;IACG,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;IAcpC;;OAEG;YACW,QAAQ;YAcR,kBAAkB;YAuDlB,UAAU;YA0BV,YAAY;IAkB1B,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,aAAa;CAQtB"}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.Doctor = exports.EXIT_CODE = void 0;
|
|
7
|
-
require("@colors/colors");
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
4
|
const support_1 = require("@appium/support");
|
|
10
5
|
/**
|
|
11
6
|
* Process exit codes returned by {@link Doctor.run}.
|
|
@@ -22,7 +17,7 @@ class Doctor {
|
|
|
22
17
|
this.log = support_1.logger.getLogger('Doctor');
|
|
23
18
|
this.checks = checks;
|
|
24
19
|
this.checks
|
|
25
|
-
.filter((c) =>
|
|
20
|
+
.filter((c) => !support_1.util.hasValue(c.log))
|
|
26
21
|
.forEach((c) => {
|
|
27
22
|
c.log = this.log;
|
|
28
23
|
});
|
|
@@ -70,10 +65,10 @@ class Doctor {
|
|
|
70
65
|
this.log.info('');
|
|
71
66
|
}
|
|
72
67
|
async reportManualIssues() {
|
|
73
|
-
const manualIssues =
|
|
74
|
-
const manualIssuesOptional =
|
|
68
|
+
const manualIssues = this.issuesRequiredToFix.filter((f) => !f.check.hasAutofix());
|
|
69
|
+
const manualIssuesOptional = this.issuesOptionalToFix.filter((f) => !f.check.hasAutofix());
|
|
75
70
|
const handleIssues = async (headerLogs, issues) => {
|
|
76
|
-
if (
|
|
71
|
+
if (support_1.util.isEmpty(issues)) {
|
|
77
72
|
return;
|
|
78
73
|
}
|
|
79
74
|
for (const logMsg of headerLogs) {
|
|
@@ -92,7 +87,7 @@ class Doctor {
|
|
|
92
87
|
fixMessages.push(message);
|
|
93
88
|
}
|
|
94
89
|
}
|
|
95
|
-
for (const m of
|
|
90
|
+
for (const m of support_1.util.uniq(fixMessages)) {
|
|
96
91
|
this.log.warn(` \u279C ${m}`);
|
|
97
92
|
}
|
|
98
93
|
this.log.info('');
|
|
@@ -134,21 +129,21 @@ class Doctor {
|
|
|
134
129
|
const res = await f.check.diagnose();
|
|
135
130
|
if (res.ok) {
|
|
136
131
|
f.fixed = true;
|
|
137
|
-
this.log.info(` ${'\u2714'
|
|
132
|
+
this.log.info(` ${support_1.console.styleText('green', '\u2714')} ${res.message}`);
|
|
138
133
|
this.log.info(`### Fix was successfully applied ###`);
|
|
139
134
|
}
|
|
140
135
|
else {
|
|
141
|
-
this.log.info(` ${'\u2716'
|
|
136
|
+
this.log.info(` ${support_1.console.styleText('red', '\u2716')} ${res.message}`);
|
|
142
137
|
this.log.info(`### Fix was applied but issue remains ###`);
|
|
143
138
|
}
|
|
144
139
|
}
|
|
145
140
|
async runAutoFixes() {
|
|
146
|
-
const autoFixes =
|
|
141
|
+
const autoFixes = this.foundIssues.filter((f) => f.check.hasAutofix());
|
|
147
142
|
for (const f of autoFixes) {
|
|
148
143
|
await this.runAutoFix(f);
|
|
149
144
|
this.log.info('');
|
|
150
145
|
}
|
|
151
|
-
if (
|
|
146
|
+
if (autoFixes.find((f) => !f.fixed)) {
|
|
152
147
|
// a few issues remain.
|
|
153
148
|
this.log.info('Bye! A few issues remain, fix manually and/or rerun doctor!');
|
|
154
149
|
this.log.info('');
|
|
@@ -161,12 +156,12 @@ class Doctor {
|
|
|
161
156
|
}
|
|
162
157
|
toIssue(result, check) {
|
|
163
158
|
if (result.ok) {
|
|
164
|
-
this.log.info(` ${'\u2714'
|
|
159
|
+
this.log.info(` ${support_1.console.styleText('green', '\u2714')} ${result.message}`);
|
|
165
160
|
return null;
|
|
166
161
|
}
|
|
167
162
|
const errorMessage = result.optional
|
|
168
|
-
? ` ${'\u2716'
|
|
169
|
-
: ` ${'\u2716'
|
|
163
|
+
? ` ${support_1.console.styleText('yellow', '\u2716')} ${result.message}`
|
|
164
|
+
: ` ${support_1.console.styleText('red', '\u2716')} ${result.message}`;
|
|
170
165
|
this.log.warn(errorMessage);
|
|
171
166
|
return {
|
|
172
167
|
error: errorMessage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":";;;AAAA,6CAA8D;AAG9D;;GAEG;AACU,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,GAAG;CACb,CAAC,CAAC;AAiBZ,MAAa,MAAM;IACA,GAAG,CAAe;IAClB,MAAM,CAAiB;IAChC,WAAW,CAAgB;IAEnC,YAAY,SAAyB,EAAE;QACrC,IAAI,CAAC,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM;aACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACpC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,iBAAS,CAAC,OAAO,CAAC;QAC3B,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACpC,OAAO,iBAAS,CAAC,gBAAgB,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAS,CAAC,gBAAgB,CAAC;QACpC,CAAC;QACD,OAAO,iBAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACvC,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QACnF,MAAM,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QAE3F,MAAM,YAAY,GAAG,KAAK,EAAE,UAAoB,EAAE,MAAqB,EAAiB,EAAE;YACxF,IAAI,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YACD,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,OAAsB,CAAC;gBAC3B,IAAI,CAAC;oBACH,OAAO,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBACpC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,GAAI,CAAW,CAAC,OAAO,CAAC;gBACjC,CAAC;gBACD,IAAI,OAAO,EAAE,CAAC;oBACZ,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,cAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC,CAAC;QAEF,MAAM,YAAY,CAChB;YACE,6BAA6B;YAC7B,iFAAiF;SAClF,EACD,YAAY,CACb,CAAC;QACF,MAAM,YAAY,CAChB;YACE,+BAA+B;YAC/B,iEAAiE;SAClE,EACD,oBAAoB,CACrB,CAAC;QAEF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YAChF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,CAAc;QACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,gBAAM,CAAC,eAAe,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACrC,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,iBAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,iBAAO,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QACvE,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,uBAAuB;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAC7E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,uBAAuB;QACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,OAAO,CAAC,MAAyB,EAAE,KAAmB;QAC5D,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,iBAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ;YAClC,CAAC,CAAC,IAAI,iBAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE;YAC/D,CAAC,CAAC,IAAI,iBAAO,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5B,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,KAAK;SACN,CAAC;IACJ,CAAC;IAEO,eAAe;QACrB,OAAO,CACL,GAAG,cAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW;YACnF,GAAG,cAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CACpF,CAAC;IACJ,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/LD,wBA+LC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/driver-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AAGlE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,YAAa,SAAQ,eAAe,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAyC;IAC3E,OAAO,CAAC,oBAAoB,CAAqB;IAEjD,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY;IAW/C,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;IAI1D,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAKhC,aAAa,CAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAC/B,EAAC,OAAO,EAAE,cAAc,EAAC,EAAE,WAAW,CAAC,UAAU,CAAC,GACjD,MAAM;IAIH,kBAAkB,CAAC,CAAC,SAAS,YAAY,EAAE,EAC/C,cAAc,EACd,YAAY,GACb,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"driver-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/driver-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AAGlE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,YAAa,SAAQ,eAAe,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAyC;IAC3E,OAAO,CAAC,oBAAoB,CAAqB;IAEjD,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY;IAW/C,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;IAI1D,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAKhC,aAAa,CAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAC/B,EAAC,OAAO,EAAE,cAAc,EAAC,EAAE,WAAW,CAAC,UAAU,CAAC,GACjD,MAAM;IAIH,kBAAkB,CAAC,CAAC,SAAS,YAAY,EAAE,EAC/C,cAAc,EACd,YAAY,GACb,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;cAuCV,iBAAiB,CAClC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,EACpC,OAAO,EAAE,MAAM,GACd,kBAAkB,EAAE;IA6CvB,OAAO,CAAC,mBAAmB;CA6B5B"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.DriverConfig = void 0;
|
|
7
|
-
const
|
|
4
|
+
const support_1 = require("@appium/support");
|
|
8
5
|
const constants_1 = require("../constants");
|
|
9
6
|
const logger_1 = require("../logger");
|
|
10
7
|
const extension_config_1 = require("./extension-config");
|
|
@@ -33,10 +30,10 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
|
|
|
33
30
|
return `${String(driverName)}@${version} (automationName '${automationName}')`;
|
|
34
31
|
}
|
|
35
32
|
async findMatchingDriver({ automationName, platformName, }) {
|
|
36
|
-
if (
|
|
33
|
+
if (typeof platformName !== 'string') {
|
|
37
34
|
throw new Error('You must include a platformName capability');
|
|
38
35
|
}
|
|
39
|
-
if (
|
|
36
|
+
if (typeof automationName !== 'string') {
|
|
40
37
|
throw new Error('You must include an automationName capability');
|
|
41
38
|
}
|
|
42
39
|
logger_1.log.info(`Attempting to find matching driver for automationName ` +
|
|
@@ -64,13 +61,13 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
|
|
|
64
61
|
void extName;
|
|
65
62
|
const problems = [];
|
|
66
63
|
const { platformNames, automationName } = extManifest;
|
|
67
|
-
if (!
|
|
64
|
+
if (!Array.isArray(platformNames)) {
|
|
68
65
|
problems.push({
|
|
69
66
|
err: 'Missing or incorrect supported platformNames list.',
|
|
70
67
|
val: platformNames,
|
|
71
68
|
});
|
|
72
69
|
}
|
|
73
|
-
else if (
|
|
70
|
+
else if (support_1.util.isEmpty(platformNames)) {
|
|
74
71
|
problems.push({
|
|
75
72
|
err: 'Empty platformNames list.',
|
|
76
73
|
val: platformNames,
|
|
@@ -78,7 +75,7 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
|
|
|
78
75
|
}
|
|
79
76
|
else {
|
|
80
77
|
for (const pName of platformNames) {
|
|
81
|
-
if (
|
|
78
|
+
if (typeof pName !== 'string') {
|
|
82
79
|
problems.push({
|
|
83
80
|
err: 'Incorrectly formatted platformName.',
|
|
84
81
|
val: pName,
|
|
@@ -86,7 +83,7 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
|
|
|
86
83
|
}
|
|
87
84
|
}
|
|
88
85
|
}
|
|
89
|
-
if (
|
|
86
|
+
if (typeof automationName !== 'string') {
|
|
90
87
|
problems.push({
|
|
91
88
|
err: 'Missing or incorrect automationName',
|
|
92
89
|
val: automationName,
|
|
@@ -103,10 +100,12 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
|
|
|
103
100
|
}
|
|
104
101
|
_getDriverBySupport(matchAutomationName, matchPlatformName) {
|
|
105
102
|
const drivers = this.installedExtensions;
|
|
106
|
-
for (const [driverName, driverData] of
|
|
103
|
+
for (const [driverName, driverData] of Object.entries(drivers)) {
|
|
107
104
|
const { automationName, platformNames } = driverData;
|
|
108
105
|
const aNameMatches = automationName.toLowerCase() === matchAutomationName.toLowerCase();
|
|
109
|
-
const pNameMatches =
|
|
106
|
+
const pNameMatches = platformNames
|
|
107
|
+
.map((p) => p.toLowerCase())
|
|
108
|
+
.includes(matchPlatformName.toLowerCase());
|
|
110
109
|
if (aNameMatches && pNameMatches) {
|
|
111
110
|
return { driverName, ...driverData };
|
|
112
111
|
}
|