appium 2.5.3 → 2.6.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/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +10 -0
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/parser.d.ts +5 -0
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +38 -1
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/cli/setup-command.d.ts +37 -0
- package/build/lib/cli/setup-command.d.ts.map +1 -0
- package/build/lib/cli/setup-command.js +173 -0
- package/build/lib/cli/setup-command.js.map +1 -0
- package/build/lib/config.d.ts +38 -18
- package/build/lib/config.d.ts.map +1 -1
- package/build/lib/config.js +75 -3
- package/build/lib/config.js.map +1 -1
- package/build/lib/constants.d.ts +21 -2
- package/build/lib/constants.d.ts.map +1 -1
- package/build/lib/constants.js +24 -7
- package/build/lib/constants.js.map +1 -1
- package/build/lib/grid-register.js +2 -2
- package/build/lib/grid-register.js.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +23 -5
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/main.d.ts +1 -0
- package/build/lib/main.d.ts.map +1 -1
- package/build/lib/main.js +15 -1
- package/build/lib/main.js.map +1 -1
- package/build/lib/utils.d.ts +12 -2
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +15 -3
- package/build/lib/utils.js.map +1 -1
- package/build/types/cli.d.ts +23 -6
- package/build/types/cli.d.ts.map +1 -1
- package/lib/cli/args.js +10 -0
- package/lib/cli/parser.js +52 -2
- package/lib/cli/setup-command.js +185 -0
- package/lib/config.js +81 -20
- package/lib/constants.js +31 -6
- package/lib/grid-register.js +2 -2
- package/lib/logsink.js +24 -5
- package/lib/main.js +17 -1
- package/lib/utils.js +15 -3
- package/package.json +14 -14
- package/types/cli.ts +33 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../lib/cli/args.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../lib/cli/args.js"],"names":[],"mappings":"4BAsUa,OAAO,eAAe,EAAE,aAAa;;;;kCAKrC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAC,OAAO,UAAU,EAAE,eAAe,CAAC;AAzEjG;;;;GAIG;AACH,qDAEC;AAjOD;;GAEG;AACH,sLAeG;cA1DW,QAAQ"}
|
package/build/lib/cli/args.js
CHANGED
|
@@ -266,6 +266,16 @@ const serverArgsDisallowedInConfig = new Map([
|
|
|
266
266
|
help: 'Show info about the Appium build and exit',
|
|
267
267
|
},
|
|
268
268
|
],
|
|
269
|
+
[
|
|
270
|
+
['--show-debug-info'],
|
|
271
|
+
{
|
|
272
|
+
dest: 'showDebugInfo',
|
|
273
|
+
action: 'store_const',
|
|
274
|
+
const: true,
|
|
275
|
+
required: false,
|
|
276
|
+
help: 'Show debug info about the current Appium deployment and exit',
|
|
277
|
+
},
|
|
278
|
+
],
|
|
269
279
|
[
|
|
270
280
|
['--show-config'],
|
|
271
281
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,4CASsB;AACtB,oEAA4D;AAC5D,iDAAgD;AAChD,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,cAAc,GAAG,eAAe,CAAC;AAEvC;;;GAGG;AACH,MAAM,mBAAmB,GAAG,CAAC,GAAG,gCAAa,CAAC,CAAC;AAE/C,iCAAiC;AACjC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,uBAAW,EAAE,uBAAW,CAAC,CAAC,CAAC;AAE5D,qEAAqE;AACrE,kCAAkC;AAClC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC;QACE,CAAC,QAAQ,CAAC;QACV;YACE,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,YAAY;YACpB,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,MAAM;SACb;KACF;CACF,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,gBAAgB,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,gBAAgB;IAC1D,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,GAAG;YACpB,CAAC,+BAAmB,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC;YACzC,CAAC,kCAAsB,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC;YAC/C,CAAC,oCAAwB,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC;YACnD,CAAC,iCAAqB,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC;YAC7C,CAAC,8BAAkB,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC;YACvC,CAAC,iCAAqB,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC;SAC9C,CAAC;IACJ,CAAC;IACD,OAAO,+GAA+G,CAAC,CACrH,aAAa,CACd,CAAC;AACJ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.js"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,11 @@ export class ArgParser {
|
|
|
44
44
|
* @param {import('argparse').SubParser} subParsers
|
|
45
45
|
*/
|
|
46
46
|
static _addExtensionCommandsToParser(subParsers: import('argparse').SubParser): void;
|
|
47
|
+
/**
|
|
48
|
+
* Add subcommand and sub-sub commands for 'setup' subcommand.
|
|
49
|
+
* @param {import('argparse').SubParser} subParser
|
|
50
|
+
*/
|
|
51
|
+
static _addSetupToParser(subParser: import('argparse').SubParser): void;
|
|
47
52
|
/**
|
|
48
53
|
* @param {boolean} [debug] - If true, throw instead of exit on error.
|
|
49
54
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"AA2BA,qCAAsC;yBAmUzB,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;AAjB/C;;;;;;GAMG;AACH,wDAFa,SAAS,CAMrB;AAlTD;;;;;;GAMG;AACH;IA+GE;;;;;;;;;OASG;IACH,kCAJW,MAAM,uCAEJ,MAAM,CAmBlB;IAED;;;OAGG;IACH,0BAFW,cAAc,QASxB;IAED;;;;OAIG;IACH,qCAHW,OAAO,UAAU,EAAE,SAAS,GAC1B,OAAO,QAAQ,EAAE,mBAAmB,CAiBhD;IAED;;;OAGG;IACH,iDAFW,OAAO,UAAU,EAAE,SAAS,QAqEtC;IAED;;;OAGG;IACH,oCAFW,OAAO,UAAU,EAAE,SAAS,QAmCtC;IA5RD;;OAEG;IACH,yCAsDC;IA3CC;;;OAGG;IACH,MAFU,MAAM,CAEA;IAEhB;;;OAGG;IACH,OAFU,OAAO,CAEC;IAElB;;;OAGG;IACH,QAFU,cAAc,CAEJ;IAiBpB,8CAAyB;IAMzB;;OAEG;IACH,YAFU,SAAS,CAAC,WAAW,CAAC,CAEA;IAGlC;;;;;;;;;OASG;IACH,yIAuCC;CAiLF;+BA3U4B,UAAU"}
|
package/build/lib/cli/parser.js
CHANGED
|
@@ -12,12 +12,13 @@ const constants_1 = require("../constants");
|
|
|
12
12
|
const schema_1 = require("../schema");
|
|
13
13
|
const config_1 = require("../config");
|
|
14
14
|
const args_1 = require("./args");
|
|
15
|
+
const setup_command_1 = require("./setup-command");
|
|
15
16
|
exports.EXTRA_ARGS = 'extraArgs';
|
|
16
17
|
/**
|
|
17
18
|
* If the parsed args do not contain any of these values, then we
|
|
18
19
|
* will automatially inject the `server` subcommand.
|
|
19
20
|
*/
|
|
20
|
-
const NON_SERVER_ARGS = Object.freeze(new Set([constants_1.DRIVER_TYPE, constants_1.PLUGIN_TYPE, constants_1.SERVER_SUBCOMMAND, '-h', '--help', '-v', '--version']));
|
|
21
|
+
const NON_SERVER_ARGS = Object.freeze(new Set([constants_1.SETUP_SUBCOMMAND, constants_1.DRIVER_TYPE, constants_1.PLUGIN_TYPE, constants_1.SERVER_SUBCOMMAND, '-h', '--help', '-v', '--version']));
|
|
21
22
|
const version = support_1.fs.readPackageJsonFrom(config_1.rootDir).version;
|
|
22
23
|
/**
|
|
23
24
|
* A wrapper around `argparse`
|
|
@@ -58,6 +59,8 @@ class ArgParser {
|
|
|
58
59
|
version,
|
|
59
60
|
});
|
|
60
61
|
const subParsers = parser.add_subparsers({ dest: 'subcommand' });
|
|
62
|
+
// add the 'setup' command
|
|
63
|
+
ArgParser._addSetupToParser(subParsers);
|
|
61
64
|
// add the 'server' subcommand, and store the raw arguments on the parser
|
|
62
65
|
// object as a way for other parts of the code to work with the arguments
|
|
63
66
|
// conceptually rather than just through argparse
|
|
@@ -242,6 +245,40 @@ class ArgParser {
|
|
|
242
245
|
}
|
|
243
246
|
}
|
|
244
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* Add subcommand and sub-sub commands for 'setup' subcommand.
|
|
250
|
+
* @param {import('argparse').SubParser} subParser
|
|
251
|
+
*/
|
|
252
|
+
static _addSetupToParser(subParser) {
|
|
253
|
+
const setupParser = subParser.add_parser('setup', {
|
|
254
|
+
add_help: true,
|
|
255
|
+
help: `Select a preset of official drivers/plugins to install ` +
|
|
256
|
+
`compatible with '${(0, setup_command_1.determinePlatformName)()}' host platform. ` +
|
|
257
|
+
`Existing drivers/plugins will remain. The default preset is 'mobile'.`,
|
|
258
|
+
});
|
|
259
|
+
ArgParser._patchExit(setupParser);
|
|
260
|
+
const extSubParsers = setupParser.add_subparsers({
|
|
261
|
+
dest: `setupCommand`,
|
|
262
|
+
});
|
|
263
|
+
const parserSpecs = [
|
|
264
|
+
{
|
|
265
|
+
command: setup_command_1.SUBCOMMAND_MOBILE,
|
|
266
|
+
help: `The preset for mobile devices: ${lodash_1.default.join((0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_MOBILE), ',')}`
|
|
267
|
+
},
|
|
268
|
+
{
|
|
269
|
+
command: setup_command_1.SUBCOMMAND_BROWSER,
|
|
270
|
+
help: `The preset for desktop browser drivers: ${lodash_1.default.join((0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_BROWSER), ',')}`
|
|
271
|
+
},
|
|
272
|
+
{
|
|
273
|
+
command: setup_command_1.SUBCOMMAND_DESKTOP,
|
|
274
|
+
help: `The preset for desktop application drivers: ${lodash_1.default.join((0, setup_command_1.getPresetDrivers)(setup_command_1.SUBCOMMAND_DESKTOP), ',')}`
|
|
275
|
+
},
|
|
276
|
+
];
|
|
277
|
+
for (const { command, help } of parserSpecs) {
|
|
278
|
+
const parser = extSubParsers.add_parser(command, { help });
|
|
279
|
+
ArgParser._patchExit(parser);
|
|
280
|
+
}
|
|
281
|
+
}
|
|
245
282
|
}
|
|
246
283
|
exports.ArgParser = ArgParser;
|
|
247
284
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":";;;;;;AAAA,6CAAmC;AACnC,uCAAwC;AACxC,oDAAuB;AACvB,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Return a list of drivers available for current host platform.
|
|
3
|
+
* @param {import('appium/types').CliCommandSetupSubcommand} presetName
|
|
4
|
+
* @returns {Array<string>}
|
|
5
|
+
*/
|
|
6
|
+
export function getPresetDrivers(presetName: import('appium/types').CliCommandSetupSubcommand): Array<string>;
|
|
7
|
+
/**
|
|
8
|
+
* Return desktop platform name for setup command description.
|
|
9
|
+
* @returns {string}
|
|
10
|
+
*/
|
|
11
|
+
export function determinePlatformName(): string;
|
|
12
|
+
/**
|
|
13
|
+
* Run 'setup' command to install drivers/plugins into the given appium home.
|
|
14
|
+
* @template {import('appium/types').CliCommandSetup} SetupCmd
|
|
15
|
+
* @param {import('appium/types').Args<SetupCmd>} preConfigArgs
|
|
16
|
+
* @param {string} appiumHome
|
|
17
|
+
* @param {DriverConfig} driverConfig
|
|
18
|
+
* @param {PluginConfig} pluginConfig
|
|
19
|
+
* @returns {Promise<void>}
|
|
20
|
+
*/
|
|
21
|
+
export function runSetupCommand<SetupCmd extends "setup">(appiumHome: string, preConfigArgs: import("appium/types").Args<SetupCmd, void>, driverConfig: import("../extension/extension-config").ExtensionConfig<import("appium/types").CliExtensionCommand>, pluginConfig: import("../extension/extension-config").ExtensionConfig<import("appium/types").CliExtensionCommand>): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* Subcommands of preset for setup
|
|
24
|
+
*/
|
|
25
|
+
export const SUBCOMMAND_MOBILE: "mobile";
|
|
26
|
+
export const SUBCOMMAND_DESKTOP: "desktop";
|
|
27
|
+
export const SUBCOMMAND_BROWSER: "browser";
|
|
28
|
+
/**
|
|
29
|
+
* Plugin names listed in KNOWN_PLUGINS to install by default.
|
|
30
|
+
*/
|
|
31
|
+
export const DEFAULT_PLUGINS: string[];
|
|
32
|
+
export type CliExtensionCommand = import('appium/types').CliExtensionCommand;
|
|
33
|
+
export type CliExtensionSubcommand = import('appium/types').CliExtensionSubcommand;
|
|
34
|
+
export type PluginConfig = import('../extension/extension-config').ExtensionConfig<CliExtensionCommand>;
|
|
35
|
+
export type DriverConfig = import('../extension/extension-config').ExtensionConfig<CliExtensionCommand>;
|
|
36
|
+
export type Args = import('appium/types').Args<CliExtensionCommand, CliExtensionSubcommand>;
|
|
37
|
+
//# sourceMappingURL=setup-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/setup-command.js"],"names":[],"mappings":"AAqCA;;;;GAIG;AACH,6CAHW,OAAO,cAAc,EAAE,yBAAyB,GAC9C,MAAM,MAAM,CAAC,CAezB;AAED;;;GAGG;AACH,yCAFa,MAAM,CASlB;AAED;;;;;;;;GAQG;AACH,sEALW,MAAM,qSAGJ,QAAQ,IAAI,CAAC,CAiBzB;AApFD;;GAEG;AACH,yCAA0C;AAC1C,2CAA4C;AAC5C,2CAA4C;AAiB5C;;GAEG;AACH,uCAA0C;kCA6I7B,OAAO,cAAc,EAAE,mBAAmB;qCAC1C,OAAO,cAAc,EAAE,sBAAsB;2BAC7C,OAAO,+BAA+B,EAAE,eAAe,CAAC,mBAAmB,CAAC;2BAC5E,OAAO,+BAA+B,EAAE,eAAe,CAAC,mBAAmB,CAAC;mBAI5E,OAAO,cAAc,EAAE,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC"}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.runSetupCommand = exports.determinePlatformName = exports.getPresetDrivers = exports.DEFAULT_PLUGINS = exports.SUBCOMMAND_BROWSER = exports.SUBCOMMAND_DESKTOP = exports.SUBCOMMAND_MOBILE = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const constants_1 = require("../constants");
|
|
9
|
+
const extension_1 = require("./extension");
|
|
10
|
+
const support_1 = require("@appium/support");
|
|
11
|
+
const logger_1 = __importDefault(require("../logger"));
|
|
12
|
+
/**
|
|
13
|
+
* Subcommands of preset for setup
|
|
14
|
+
*/
|
|
15
|
+
exports.SUBCOMMAND_MOBILE = 'mobile';
|
|
16
|
+
exports.SUBCOMMAND_DESKTOP = 'desktop';
|
|
17
|
+
exports.SUBCOMMAND_BROWSER = 'browser';
|
|
18
|
+
/**
|
|
19
|
+
* Pairs of preset subcommand and driver candidates.
|
|
20
|
+
* Driver names listed in KNOWN_DRIVERS to install by default
|
|
21
|
+
*/
|
|
22
|
+
const PRESET_PAIRS = Object.freeze(
|
|
23
|
+
/** @type {const} */ ({
|
|
24
|
+
mobile: lodash_1.default.keys(constants_1.MOBILE_DRIVERS),
|
|
25
|
+
desktop: lodash_1.default.keys(constants_1.DESKTOP_DRIVERS),
|
|
26
|
+
browser: lodash_1.default.keys(constants_1.DESKTOP_BROWSERS)
|
|
27
|
+
}));
|
|
28
|
+
const DRIVERS_ONLY_MACOS = ['xcuitest', 'safari', 'mac2'];
|
|
29
|
+
const DRIVERS_ONLY_WINDOWS = ['windows'];
|
|
30
|
+
/**
|
|
31
|
+
* Plugin names listed in KNOWN_PLUGINS to install by default.
|
|
32
|
+
*/
|
|
33
|
+
exports.DEFAULT_PLUGINS = ['images'];
|
|
34
|
+
/**
|
|
35
|
+
* Return a list of drivers available for current host platform.
|
|
36
|
+
* @param {import('appium/types').CliCommandSetupSubcommand} presetName
|
|
37
|
+
* @returns {Array<string>}
|
|
38
|
+
*/
|
|
39
|
+
function getPresetDrivers(presetName) {
|
|
40
|
+
return lodash_1.default.filter(PRESET_PAIRS[presetName], (driver) => {
|
|
41
|
+
if (lodash_1.default.includes(DRIVERS_ONLY_MACOS, driver)) {
|
|
42
|
+
return support_1.system.isMac();
|
|
43
|
+
}
|
|
44
|
+
if (lodash_1.default.includes(DRIVERS_ONLY_WINDOWS, driver)) {
|
|
45
|
+
return support_1.system.isWindows();
|
|
46
|
+
}
|
|
47
|
+
return true;
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
exports.getPresetDrivers = getPresetDrivers;
|
|
51
|
+
/**
|
|
52
|
+
* Return desktop platform name for setup command description.
|
|
53
|
+
* @returns {string}
|
|
54
|
+
*/
|
|
55
|
+
function determinePlatformName() {
|
|
56
|
+
if (support_1.system.isMac()) {
|
|
57
|
+
return 'macOS';
|
|
58
|
+
}
|
|
59
|
+
else if (support_1.system.isWindows()) {
|
|
60
|
+
return 'Windows';
|
|
61
|
+
}
|
|
62
|
+
return 'Linux';
|
|
63
|
+
}
|
|
64
|
+
exports.determinePlatformName = determinePlatformName;
|
|
65
|
+
/**
|
|
66
|
+
* Run 'setup' command to install drivers/plugins into the given appium home.
|
|
67
|
+
* @template {import('appium/types').CliCommandSetup} SetupCmd
|
|
68
|
+
* @param {import('appium/types').Args<SetupCmd>} preConfigArgs
|
|
69
|
+
* @param {string} appiumHome
|
|
70
|
+
* @param {DriverConfig} driverConfig
|
|
71
|
+
* @param {PluginConfig} pluginConfig
|
|
72
|
+
* @returns {Promise<void>}
|
|
73
|
+
*/
|
|
74
|
+
async function runSetupCommand(appiumHome, preConfigArgs, driverConfig, pluginConfig) {
|
|
75
|
+
switch (preConfigArgs.setupCommand) {
|
|
76
|
+
case exports.SUBCOMMAND_DESKTOP:
|
|
77
|
+
await setupDesktopAppDrivers(driverConfig);
|
|
78
|
+
await setupDefaultPlugins(pluginConfig);
|
|
79
|
+
break;
|
|
80
|
+
case exports.SUBCOMMAND_BROWSER:
|
|
81
|
+
await setupBrowserDrivers(driverConfig);
|
|
82
|
+
await setupDefaultPlugins(pluginConfig);
|
|
83
|
+
break;
|
|
84
|
+
default:
|
|
85
|
+
await setupMobileDrivers(driverConfig);
|
|
86
|
+
await setupDefaultPlugins(pluginConfig);
|
|
87
|
+
break;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
exports.runSetupCommand = runSetupCommand;
|
|
91
|
+
;
|
|
92
|
+
/**
|
|
93
|
+
* Install drivers listed in DEFAULT_DRIVERS.
|
|
94
|
+
* @param {DriverConfig} driverConfig
|
|
95
|
+
* @returns {Promise<void>}
|
|
96
|
+
*/
|
|
97
|
+
async function setupMobileDrivers(driverConfig) {
|
|
98
|
+
await installDrivers(exports.SUBCOMMAND_MOBILE, driverConfig);
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Install all of known drivers listed in BROWSER_DRIVERS.
|
|
102
|
+
* @param {DriverConfig} driverConfig
|
|
103
|
+
* @returns {Promise<void>}
|
|
104
|
+
*/
|
|
105
|
+
async function setupBrowserDrivers(driverConfig) {
|
|
106
|
+
await installDrivers(exports.SUBCOMMAND_BROWSER, driverConfig);
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Install all of known drivers listed in DESKTOP_APP_DRIVERS.
|
|
110
|
+
* @param {DriverConfig} driverConfig
|
|
111
|
+
* @returns {Promise<void>}
|
|
112
|
+
*/
|
|
113
|
+
async function setupDesktopAppDrivers(driverConfig) {
|
|
114
|
+
await installDrivers(exports.SUBCOMMAND_DESKTOP, driverConfig);
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Install the given driver name. It skips the installation if the given driver name was already installed.
|
|
118
|
+
* @param {import('appium/types').CliCommandSetupSubcommand} subcommand
|
|
119
|
+
* @param {DriverConfig} driverConfig
|
|
120
|
+
* @returns {Promise<void>}
|
|
121
|
+
*/
|
|
122
|
+
async function installDrivers(subcommand, driverConfig) {
|
|
123
|
+
for (const driverName of getPresetDrivers(subcommand)) {
|
|
124
|
+
await installExtension(driverName, extensionCommandArgs('driver', driverName, 'install'), driverConfig);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Install plugins listed in DEFAULT_PLUGINS.
|
|
129
|
+
* @param {PluginConfig} pluginConfig
|
|
130
|
+
* @returns {Promise<void>}
|
|
131
|
+
*/
|
|
132
|
+
async function setupDefaultPlugins(pluginConfig) {
|
|
133
|
+
for (const pluginName of exports.DEFAULT_PLUGINS) {
|
|
134
|
+
await installExtension(pluginName, extensionCommandArgs('plugin', pluginName, 'install'), pluginConfig);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Run the given extensionConfigArgs command after checking if the given extensionName was already installed.
|
|
139
|
+
* @param {string} extensionName
|
|
140
|
+
* @param {Args} extensionConfigArgs
|
|
141
|
+
* @param {DriverConfig|PluginConfig} extensionConfig
|
|
142
|
+
* @returns
|
|
143
|
+
*/
|
|
144
|
+
async function installExtension(extensionName, extensionConfigArgs, extensionConfig) {
|
|
145
|
+
if (lodash_1.default.keys(extensionConfig.installedExtensions).includes(extensionName)) {
|
|
146
|
+
logger_1.default.info(`${extensionName} (${extensionConfig.installedExtensions[extensionName].version}) is already installed. ` +
|
|
147
|
+
`Skipping the installation.`);
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
await (0, extension_1.runExtensionCommand)(extensionConfigArgs, extensionConfig);
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Return the command config for driver or plugin.
|
|
154
|
+
* @param {CliExtensionCommand} extensionCommand
|
|
155
|
+
* @param {string} extensionName
|
|
156
|
+
* @param {CliExtensionSubcommand} command
|
|
157
|
+
* @returns {Args}
|
|
158
|
+
*/
|
|
159
|
+
function extensionCommandArgs(extensionCommand, extensionName, command) {
|
|
160
|
+
return (extensionCommand === 'plugin')
|
|
161
|
+
? { 'subcommand': 'plugin', 'pluginCommand': command, 'plugin': extensionName }
|
|
162
|
+
: { 'subcommand': 'driver', 'driverCommand': command, 'driver': extensionName };
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* @typedef {import('appium/types').CliExtensionCommand} CliExtensionCommand
|
|
166
|
+
* @typedef {import('appium/types').CliExtensionSubcommand} CliExtensionSubcommand
|
|
167
|
+
* @typedef {import('../extension/extension-config').ExtensionConfig<CliExtensionCommand>} PluginConfig
|
|
168
|
+
* @typedef {import('../extension/extension-config').ExtensionConfig<CliExtensionCommand>} DriverConfig
|
|
169
|
+
*/
|
|
170
|
+
/**
|
|
171
|
+
* @typedef {import('appium/types').Args<CliExtensionCommand, CliExtensionSubcommand>} Args
|
|
172
|
+
*/
|
|
173
|
+
//# sourceMappingURL=setup-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup-command.js","sourceRoot":"","sources":["../../../lib/cli/setup-command.js"],"names":[],"mappings":"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"}
|
package/build/lib/config.d.ts
CHANGED
|
@@ -1,14 +1,28 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @param {
|
|
3
|
-
* @
|
|
4
|
-
* @param {string} [displayName='folder path']
|
|
5
|
-
* @throws {Error}
|
|
2
|
+
* @param {boolean} [useGithubApiFallback]
|
|
3
|
+
* @returns {Promise<void>}
|
|
6
4
|
*/
|
|
7
|
-
export function
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
5
|
+
export function updateBuildInfo(useGithubApiFallback?: boolean | undefined): Promise<void>;
|
|
6
|
+
/**
|
|
7
|
+
* Prints server debug into into the console.
|
|
8
|
+
*
|
|
9
|
+
* @param {{
|
|
10
|
+
* driverConfig: import('./extension/driver-config').DriverConfig,
|
|
11
|
+
* pluginConfig: import('./extension/plugin-config').PluginConfig,
|
|
12
|
+
* appiumHome: string
|
|
13
|
+
* }} info
|
|
14
|
+
* @returns {Promise<void>}
|
|
15
|
+
*/
|
|
16
|
+
export function showDebugInfo({ driverConfig, pluginConfig, appiumHome }: {
|
|
17
|
+
driverConfig: import('./extension/driver-config').DriverConfig;
|
|
18
|
+
pluginConfig: import('./extension/plugin-config').PluginConfig;
|
|
19
|
+
appiumHome: string;
|
|
20
|
+
}): Promise<void>;
|
|
21
|
+
/**
|
|
22
|
+
* @param {boolean} [useGithubApiFallback]
|
|
23
|
+
* @returns {Promise<string?>}
|
|
24
|
+
*/
|
|
25
|
+
export function getGitRev(useGithubApiFallback?: boolean | undefined): Promise<string | null>;
|
|
12
26
|
/**
|
|
13
27
|
* Mutable object containing Appium build information. By default it
|
|
14
28
|
* only contains the Appium version, but is updated with the build timestamp
|
|
@@ -17,6 +31,10 @@ export type ArgSpec = import("./schema/arg-spec").ArgSpec<any>;
|
|
|
17
31
|
* @returns {import('appium/types').BuildInfo}
|
|
18
32
|
*/
|
|
19
33
|
export function getBuildInfo(): import('appium/types').BuildInfo;
|
|
34
|
+
/**
|
|
35
|
+
* @returns {void}
|
|
36
|
+
* @throws {Error} If Node version is outside of the supported range
|
|
37
|
+
*/
|
|
20
38
|
export function checkNodeOk(): void;
|
|
21
39
|
export function showBuildInfo(): Promise<void>;
|
|
22
40
|
/**
|
|
@@ -25,15 +43,6 @@ export function showBuildInfo(): Promise<void>;
|
|
|
25
43
|
* @returns {Args}
|
|
26
44
|
*/
|
|
27
45
|
export function getNonDefaultServerArgs(parsedArgs: Args): Args;
|
|
28
|
-
/**
|
|
29
|
-
* @param {boolean} [useGithubApiFallback]
|
|
30
|
-
* @returns {Promise<string?>}
|
|
31
|
-
*/
|
|
32
|
-
export function getGitRev(useGithubApiFallback?: boolean | undefined): Promise<string | null>;
|
|
33
|
-
/**
|
|
34
|
-
* @param {boolean} [useGithubApiFallback]
|
|
35
|
-
*/
|
|
36
|
-
export function updateBuildInfo(useGithubApiFallback?: boolean | undefined): Promise<void>;
|
|
37
46
|
/**
|
|
38
47
|
* Shows a breakdown of the current config after CLI params, config file loaded & defaults applied.
|
|
39
48
|
*
|
|
@@ -46,5 +55,16 @@ export function updateBuildInfo(useGithubApiFallback?: boolean | undefined): Pro
|
|
|
46
55
|
* @param {ParsedArgs} parsedArgs - Entire parsed args object
|
|
47
56
|
*/
|
|
48
57
|
export function showConfig(nonDefaultPreConfigParsedArgs: Partial<ParsedArgs>, configResult: import('./config-file').ReadConfigFileResult, defaults: Partial<ParsedArgs>, parsedArgs: ParsedArgs): void;
|
|
58
|
+
/**
|
|
59
|
+
* @param {string} root
|
|
60
|
+
* @param {boolean} [requireWriteable=true]
|
|
61
|
+
* @param {string} [displayName='folder path']
|
|
62
|
+
* @throws {Error}
|
|
63
|
+
*/
|
|
64
|
+
export function requireDir(root: string, requireWriteable?: boolean | undefined, displayName?: string | undefined): Promise<void>;
|
|
65
|
+
export const APPIUM_VER: string;
|
|
49
66
|
export const rootDir: string;
|
|
67
|
+
export type ParsedArgs = import('appium/types').ParsedArgs;
|
|
68
|
+
export type Args = import('appium/types').Args;
|
|
69
|
+
export type ArgSpec = import("./schema/arg-spec").ArgSpec<any>;
|
|
50
70
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"AA8BA;;;GAGG;AACH,6EAFa,QAAQ,IAAI,CAAC,CAYzB;AAWD;;;;;;;;;GASG;AACH,0EAPW;IACV,YAAc,EAAE,OAAO,2BAA2B,EAAE,YAAY,CAAC;IACjE,YAAc,EAAE,OAAO,2BAA2B,EAAE,YAAY,CAAC;IACjE,UAAY,EAAE,MAAM,CAAA;CACjB,GACS,QAAQ,IAAI,CAAC,CAwCzB;AAED;;;GAGG;AACH,uEAFa,QAAQ,MAAM,QAAE,CA6B5B;AAkCD;;;;;;GAMG;AACH,gCAFa,OAAO,cAAc,EAAE,SAAS,CAI5C;AAED;;;GAGG;AACH,+BAHa,IAAI,CAUhB;AAED,+CAGC;AAED;;;;GAIG;AACH,oDAHW,IAAI,GACF,IAAI,CAmFhB;AAgBD;;;;;;;;;;GAUG;AACH,0DALW,QAAQ,UAAU,CAAC,gBACnB,OAAO,eAAe,EAAE,oBAAoB,YAC5C,QAAQ,UAAU,CAAC,cACnB,UAAU,QAqBpB;AAED;;;;;GAKG;AACH,iCALW,MAAM,2FA+BhB;AAlWD,gCAA6C;AAG7C,6BAA8C;yBAmXjC,OAAO,cAAc,EAAE,UAAU;mBACjC,OAAO,cAAc,EAAE,IAAI"}
|
package/build/lib/config.js
CHANGED
|
@@ -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
|
-
exports.
|
|
6
|
+
exports.requireDir = exports.showConfig = exports.getNonDefaultServerArgs = exports.showBuildInfo = exports.checkNodeOk = exports.getBuildInfo = exports.getGitRev = exports.showDebugInfo = exports.updateBuildInfo = exports.rootDir = exports.APPIUM_VER = void 0;
|
|
7
7
|
/* eslint-disable no-console */
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
@@ -12,10 +12,12 @@ const teen_process_1 = require("teen_process");
|
|
|
12
12
|
const semver_1 = __importDefault(require("semver"));
|
|
13
13
|
const node_os_1 = __importDefault(require("node:os"));
|
|
14
14
|
const utils_1 = require("./utils");
|
|
15
|
+
const bluebird_1 = __importDefault(require("bluebird"));
|
|
15
16
|
const schema_1 = require("./schema/schema");
|
|
16
17
|
exports.APPIUM_VER = utils_1.npmPackage.version;
|
|
17
18
|
const ENGINES = /** @type {Record<string,string>} */ (utils_1.npmPackage.engines);
|
|
18
19
|
const MIN_NODE_VERSION = ENGINES.node;
|
|
20
|
+
exports.rootDir = support_1.fs.findRoot(__dirname);
|
|
19
21
|
const GIT_BINARY = `git${support_1.system.isWindows() ? '.exe' : ''}`;
|
|
20
22
|
const GITHUB_API = 'https://api.github.com/repos/appium/appium';
|
|
21
23
|
/**
|
|
@@ -29,6 +31,7 @@ function getNodeVersion() {
|
|
|
29
31
|
}
|
|
30
32
|
/**
|
|
31
33
|
* @param {boolean} [useGithubApiFallback]
|
|
34
|
+
* @returns {Promise<void>}
|
|
32
35
|
*/
|
|
33
36
|
async function updateBuildInfo(useGithubApiFallback = false) {
|
|
34
37
|
const sha = await getGitRev(useGithubApiFallback);
|
|
@@ -51,6 +54,56 @@ const getFullGitPath = lodash_1.default.memoize(async function getFullGitPath()
|
|
|
51
54
|
return null;
|
|
52
55
|
}
|
|
53
56
|
});
|
|
57
|
+
/**
|
|
58
|
+
* Prints server debug into into the console.
|
|
59
|
+
*
|
|
60
|
+
* @param {{
|
|
61
|
+
* driverConfig: import('./extension/driver-config').DriverConfig,
|
|
62
|
+
* pluginConfig: import('./extension/plugin-config').PluginConfig,
|
|
63
|
+
* appiumHome: string
|
|
64
|
+
* }} info
|
|
65
|
+
* @returns {Promise<void>}
|
|
66
|
+
*/
|
|
67
|
+
async function showDebugInfo({ driverConfig, pluginConfig, appiumHome }) {
|
|
68
|
+
const getNpmVersion = async () => {
|
|
69
|
+
const { stdout } = await support_1.npm.exec('--version', [], { cwd: process.cwd() });
|
|
70
|
+
return lodash_1.default.trim(stdout);
|
|
71
|
+
};
|
|
72
|
+
const findNpmLocation = async () => await support_1.fs.which(support_1.system.isWindows() ? 'npm.cmd' : 'npm');
|
|
73
|
+
const [npmVersion, npmLocation] = await bluebird_1.default.all([
|
|
74
|
+
...([getNpmVersion, findNpmLocation].map((f) => getSafeResult(f, 'unknown'))),
|
|
75
|
+
/** @type {any} */ (updateBuildInfo()),
|
|
76
|
+
]);
|
|
77
|
+
const debugInfo = {
|
|
78
|
+
os: {
|
|
79
|
+
platform: node_os_1.default.platform(),
|
|
80
|
+
release: node_os_1.default.release(),
|
|
81
|
+
arch: node_os_1.default.arch(),
|
|
82
|
+
homedir: node_os_1.default.homedir(),
|
|
83
|
+
username: node_os_1.default.userInfo().username,
|
|
84
|
+
},
|
|
85
|
+
node: {
|
|
86
|
+
version: process.version,
|
|
87
|
+
arch: process.arch,
|
|
88
|
+
cwd: process.cwd(),
|
|
89
|
+
argv: process.argv,
|
|
90
|
+
env: process.env,
|
|
91
|
+
npm: {
|
|
92
|
+
location: npmLocation,
|
|
93
|
+
version: npmVersion,
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
appium: {
|
|
97
|
+
location: exports.rootDir,
|
|
98
|
+
homedir: appiumHome,
|
|
99
|
+
build: getBuildInfo(),
|
|
100
|
+
drivers: driverConfig.installedExtensions,
|
|
101
|
+
plugins: pluginConfig.installedExtensions,
|
|
102
|
+
},
|
|
103
|
+
};
|
|
104
|
+
console.log(JSON.stringify(debugInfo, null, 2));
|
|
105
|
+
}
|
|
106
|
+
exports.showDebugInfo = showDebugInfo;
|
|
54
107
|
/**
|
|
55
108
|
* @param {boolean} [useGithubApiFallback]
|
|
56
109
|
* @returns {Promise<string?>}
|
|
@@ -122,6 +175,10 @@ function getBuildInfo() {
|
|
|
122
175
|
return BUILD_INFO;
|
|
123
176
|
}
|
|
124
177
|
exports.getBuildInfo = getBuildInfo;
|
|
178
|
+
/**
|
|
179
|
+
* @returns {void}
|
|
180
|
+
* @throws {Error} If Node version is outside of the supported range
|
|
181
|
+
*/
|
|
125
182
|
function checkNodeOk() {
|
|
126
183
|
const version = getNodeVersion();
|
|
127
184
|
if (!semver_1.default.satisfies(version, MIN_NODE_VERSION)) {
|
|
@@ -275,8 +332,23 @@ async function requireDir(root, requireWriteable = true, displayName = 'folder p
|
|
|
275
332
|
}
|
|
276
333
|
}
|
|
277
334
|
exports.requireDir = requireDir;
|
|
278
|
-
|
|
279
|
-
|
|
335
|
+
/**
|
|
336
|
+
* Calculates the result of the given function and return its value
|
|
337
|
+
* or the default one if there was an exception.
|
|
338
|
+
*
|
|
339
|
+
* @template T
|
|
340
|
+
* @param {() => Promise<T>} f
|
|
341
|
+
* @param {T} defaultValue
|
|
342
|
+
* @returns {Promise<T>}
|
|
343
|
+
*/
|
|
344
|
+
async function getSafeResult(f, defaultValue) {
|
|
345
|
+
try {
|
|
346
|
+
return await f();
|
|
347
|
+
}
|
|
348
|
+
catch {
|
|
349
|
+
return defaultValue;
|
|
350
|
+
}
|
|
351
|
+
}
|
|
280
352
|
/**
|
|
281
353
|
* @typedef {import('appium/types').ParsedArgs} ParsedArgs
|
|
282
354
|
* @typedef {import('appium/types').Args} Args
|
package/build/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"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"}
|