appium 2.5.4 → 2.7.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/README.md +23 -0
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +12 -1
- package/build/lib/appium.js.map +1 -1
- 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 +32 -14
- 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 +13 -3
- 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/appium.js +15 -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 +31 -12
- package/lib/main.js +17 -1
- package/lib/utils.js +15 -3
- package/package.json +14 -15
- package/types/cli.ts +33 -8
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":";;;;;;AAAA,+BAA+B;AAC/B,oDAAuB;AACvB,6CAAgD;AAChD,kDAA0B;AAC1B,+CAAkC;AAClC,oDAA4B;AAC5B,sDAAyB;AACzB,mCAAmC;AACnC,wDAAyB;AACzB,4CAAqE;AAExD,QAAA,UAAU,GAAG,kBAAU,CAAC,OAAO,CAAC;AAC7C,MAAM,OAAO,GAAG,oCAAoC,CAAC,CAAC,kBAAU,CAAC,OAAO,CAAC,CAAC;AAC1E,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;AACzB,QAAA,OAAO,GAAG,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE9C,MAAM,UAAU,GAAG,MAAM,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC5D,MAAM,UAAU,GAAG,4CAA4C,CAAC;AAEhE;;GAEG;AACH,MAAM,UAAU,GAAG;IACjB,OAAO,EAAE,kBAAU;CACpB,CAAC;AAEF,SAAS,cAAc;IACrB,OAAO,sCAAsC,CAAC,CAAC,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACjF,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,eAAe,CAAC,oBAAoB,GAAG,KAAK;IAChE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;IACT,CAAC;IACD,UAAU,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;IACxE,IAAI,cAAc,EAAE,CAAC;QACnB,UAAU,CAAC,KAAK,GAAG,cAAc,CAAC;IACpC,CAAC;AACH,CAAC;AAVD,0CAUC;AAED,qCAAqC;AACrC,MAAM,cAAc,GAAG,gBAAC,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc;IAC5D,IAAI,CAAC;QACH,OAAO,MAAM,YAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;;;;;;;;GASG;AACI,KAAK,UAAU,aAAa,CAAC,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAC;IAC1E,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAC/B,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,aAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAC,CAAC,CAAC;QACvE,OAAO,gBAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE,CAAC,MAAM,YAAE,CAAC,KAAK,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3F,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,MAAM,kBAAC,CAAC,GAAG,CAAC;QAC5C,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7E,kBAAkB,CAAC,CAAC,eAAe,EAAE,CAAC;KACvC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE;YACF,QAAQ,EAAE,iBAAE,CAAC,QAAQ,EAAE;YACvB,OAAO,EAAE,iBAAE,CAAC,OAAO,EAAE;YACrB,IAAI,EAAE,iBAAE,CAAC,IAAI,EAAE;YACf,OAAO,EAAE,iBAAE,CAAC,OAAO,EAAE;YACrB,QAAQ,EAAE,iBAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ;SACjC;QACD,IAAI,EAAE;YACJ,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE;gBACH,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE,UAAU;aACpB;SACF;QACD,MAAM,EAAE;YACN,QAAQ,EAAE,eAAO;YACjB,OAAO,EAAE,UAAU;YACnB,KAAK,EAAE,YAAY,EAAE;YACrB,OAAO,EAAE,YAAY,CAAC,mBAAmB;YACzC,OAAO,EAAE,YAAY,CAAC,mBAAmB;SAC1C;KACF,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAtCD,sCAsCC;AAED;;;GAGG;AACI,KAAK,UAAU,SAAS,CAAC,oBAAoB,GAAG,KAAK;IAC1D,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAC3C,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;gBAC9D,GAAG,EAAE,SAAS;aACf,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sDAAsD;IACtD,oDAAoD;IACpD,IAAI,CAAC;QACH,OAAO,CACL,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,UAAU,yBAAyB,kBAAU,EAAE,EAAE;YAClE,OAAO,EAAE;gBACP,YAAY,EAAE,UAAU,kBAAU,EAAE;aACrC;SACF,CAAC,CACH,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,8BA2BC;AAED;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,SAAS,EAAE,oBAAoB,GAAG,KAAK;IACpE,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAC3C,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,WAAW,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE;gBAClF,GAAG,EAAE,SAAS;aACf,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,OAAO,CACL,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,UAAU,aAAa,SAAS,EAAE,EAAE;YACrD,OAAO,EAAE;gBACP,YAAY,EAAE,UAAU,kBAAU,EAAE;aACrC;SACF,CAAC,CACH,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY;IAC1B,OAAO,UAAU,CAAC;AACpB,CAAC;AAFD,oCAEC;AAED;;;GAGG;AACH,SAAgB,WAAW;IACzB,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,IAAI,CAAC,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CACb,iCAAiC,gBAAgB,gBAAgB,OAAO,CAAC,OAAO,EAAE,CACnF,CAAC;IACJ,CAAC;AACH,CAAC;AAPD,kCAOC;AAEM,KAAK,UAAU,aAAa;IACjC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,iCAAiC;AAChF,CAAC;AAHD,sCAGC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,UAAU;IAChD;;;;;OAKG;IACH,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAA,uBAAc,GAAE,CAAC;QAClC,MAAM,SAAS,GAAG,gBAAC,CAAC,MAAM,CACxB,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EACtB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACf,IAAI,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAC,KAAK,EAAE,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAC,CAAC;YAClE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,+DAA+D,CAAC,CAAC,EAAE,CAAC,CACrE,CAAC;QAEF,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAEjC,wDAAwD;IACxD,MAAM,WAAW,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAE9D,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/D,gBAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtC,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IAE3F,MAAM,YAAY,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CACxD,gBAAC,CAAC,EAAE,CAAC,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CACxD,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAEhD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5D,CAAC,gBAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,6EAA6E;IAE7E,MAAM,8BAA8B,GAAG,gBAAC,CAAC,QAAQ,CAAC,CAAC,gBAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAE9F,MAAM,mCAAmC,GAAG,gBAAC,CAAC,SAAS,CAAC;QACtD,gBAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC7B,YAAY;KACb,CAAC,CAAC;IAEH;;;;;;;;;;;OAWG;IACH,MAAM,YAAY,GAAG,gBAAC,CAAC,SAAS,CAAC;QAC/B,gBAAgB;QAChB,gBAAC,CAAC,QAAQ,CAAC;YACT,WAAW;YACX,gBAAC,CAAC,SAAS,CAAC,CAAC,mBAAmB,EAAE,8BAA8B,CAAC,CAAC;YAClE,mCAAmC;SACpC,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IAEtD,OAAO,gBAAC,CAAC,MAAM,CACb,gBAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9C,qDAAqD;IACrD,CAAC,GAAG,EAAE,EAAC,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;IAC1D,mBAAmB,CAAC,CAAC,EAAE,CAAC,CACzB,CAAC;AACJ,CAAC;AAjFD,0DAiFC;AAED;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,gBAAC,CAAC,OAAO,CAC7B,gBAAC,CAAC,MAAM,EACR,gBAAC,EACD,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CACb,GAAG,KAAK,YAAY,IAAI,gBAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAC1F,CAAC;AAEF;;;;;;;;;;GAUG;AACH,SAAgB,UAAU,CAAC,6BAA6B,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU;IAC1F,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrC,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,yBAAyB,YAAY,CAAC,QAAQ,KAAK,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,gCAAgC,GAAG,aAAa,CAAC,6BAA6B,CAAC,CAAC;IACtF,IAAI,gBAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,EAAE,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;AACzC,CAAC;AAnBD,gCAmBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAAE,WAAW,GAAG,aAAa;IACzF,IAAI,IAAI,CAAC;IACT,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC;gBACH,MAAM,YAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;gBACxC,OAAO;YACT,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,OAAO,WAAW,KAAK,IAAI,uCAAuC,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,OAAO,WAAW,KAAK,IAAI,6BAA6B,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,EAAE,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,OAAO,WAAW,KAAK,IAAI,YAAY;gBACvC,2CAA2C,iBAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,GAAG,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AA1BD,gCA0BC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,aAAa,CAAC,CAAC,EAAE,YAAY;IAC1C,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,EAAE,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AAED;;;;GAIG"}
|
package/build/lib/constants.d.ts
CHANGED
|
@@ -10,6 +10,10 @@ export const PLUGIN_TYPE: "plugin";
|
|
|
10
10
|
* The `server` command of the `appium` CLI
|
|
11
11
|
*/
|
|
12
12
|
export const SERVER_SUBCOMMAND: "server";
|
|
13
|
+
/**
|
|
14
|
+
* The `setup` command of the `appium` CLI
|
|
15
|
+
*/
|
|
16
|
+
export const SETUP_SUBCOMMAND: "setup";
|
|
13
17
|
/**
|
|
14
18
|
* The value of `--use-plugins` if _all_ plugins should be loaded
|
|
15
19
|
*/
|
|
@@ -20,14 +24,29 @@ export const KNOWN_PLUGINS: Readonly<{
|
|
|
20
24
|
readonly 'relaxed-caps': "@appium/relaxed-caps-plugin";
|
|
21
25
|
readonly 'universal-xml': "@appium/universal-xml-plugin";
|
|
22
26
|
}>;
|
|
23
|
-
export const
|
|
27
|
+
export const MOBILE_DRIVERS: Readonly<{
|
|
24
28
|
readonly uiautomator2: "appium-uiautomator2-driver";
|
|
25
29
|
readonly xcuitest: "appium-xcuitest-driver";
|
|
26
|
-
readonly mac2: "appium-mac2-driver";
|
|
27
30
|
readonly espresso: "appium-espresso-driver";
|
|
31
|
+
}>;
|
|
32
|
+
export const DESKTOP_DRIVERS: Readonly<{
|
|
33
|
+
readonly mac2: "appium-mac2-driver";
|
|
34
|
+
readonly windows: "appium-windows-driver";
|
|
35
|
+
}>;
|
|
36
|
+
export const DESKTOP_BROWSERS: Readonly<{
|
|
37
|
+
readonly safari: "appium-safari-driver";
|
|
38
|
+
readonly gecko: "appium-geckodriver";
|
|
39
|
+
readonly chromium: "appium-chromium-driver";
|
|
40
|
+
}>;
|
|
41
|
+
export const KNOWN_DRIVERS: Readonly<{
|
|
28
42
|
readonly safari: "appium-safari-driver";
|
|
29
43
|
readonly gecko: "appium-geckodriver";
|
|
30
44
|
readonly chromium: "appium-chromium-driver";
|
|
45
|
+
readonly mac2: "appium-mac2-driver";
|
|
46
|
+
readonly windows: "appium-windows-driver";
|
|
47
|
+
readonly uiautomator2: "appium-uiautomator2-driver";
|
|
48
|
+
readonly xcuitest: "appium-xcuitest-driver";
|
|
49
|
+
readonly espresso: "appium-espresso-driver";
|
|
31
50
|
}>;
|
|
32
51
|
/**
|
|
33
52
|
* Relative path to directory containing any Appium internal files
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,mCAAoC;AAEpC;;GAEG;AACH,mCAAoC;AAEpC;;GAEG;AACH,yCAA0C;AAE1C;;GAEG;AACH,oCAAqC;AAMrC;;;;;GAOE;AAMF
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,mCAAoC;AAEpC;;GAEG;AACH,mCAAoC;AAEpC;;GAEG;AACH,yCAA0C;AAE1C;;GAEG;AACH,uCAAwC;AAGxC;;GAEG;AACH,oCAAqC;AAMrC;;;;;GAOE;AAEF;;;;GAME;AAEF;;;GAKE;AAEF;;;;GAME;AAMF;;;;;;;;;GAME;AAEF;;GAEG;AACH,6CAAqF;AAErF;;GAEG;AACH,gDAA6F;AAE7F,yCAA0C;AAC1C,+CAAgD;AAChD,mDAAoD;AACpD,6CAA8C;AAC9C,uCAAwC;AACxC,6CAA8C;AAE9C;;GAEG;AACH,mCAAoC;AAEpC;;;;;GAKG;AACH,wCAAyC;AAEzC;;GAEG;AACH,qCAAsC;AAEtC;;;GAGG;AACH,0CAA2C"}
|
package/build/lib/constants.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.BIDI_EVENT_NAME = exports.BIDI_BASE_PATH = exports.LONG_STACKTRACE_LIMIT = exports.CURRENT_SCHEMA_REV = exports.EXT_SUBCOMMAND_DOCTOR = exports.EXT_SUBCOMMAND_RUN = exports.EXT_SUBCOMMAND_UPDATE = exports.EXT_SUBCOMMAND_UNINSTALL = exports.EXT_SUBCOMMAND_INSTALL = exports.EXT_SUBCOMMAND_LIST = exports.PKG_HASHFILE_RELATIVE_PATH = exports.CACHE_DIR_RELATIVE_PATH = exports.KNOWN_DRIVERS = exports.KNOWN_PLUGINS = exports.USE_ALL_PLUGINS = exports.SERVER_SUBCOMMAND = exports.PLUGIN_TYPE = exports.DRIVER_TYPE = void 0;
|
|
6
|
+
exports.BIDI_EVENT_NAME = exports.BIDI_BASE_PATH = exports.LONG_STACKTRACE_LIMIT = exports.CURRENT_SCHEMA_REV = exports.EXT_SUBCOMMAND_DOCTOR = exports.EXT_SUBCOMMAND_RUN = exports.EXT_SUBCOMMAND_UPDATE = exports.EXT_SUBCOMMAND_UNINSTALL = exports.EXT_SUBCOMMAND_INSTALL = exports.EXT_SUBCOMMAND_LIST = exports.PKG_HASHFILE_RELATIVE_PATH = exports.CACHE_DIR_RELATIVE_PATH = exports.KNOWN_DRIVERS = exports.DESKTOP_BROWSERS = exports.DESKTOP_DRIVERS = exports.MOBILE_DRIVERS = exports.KNOWN_PLUGINS = exports.USE_ALL_PLUGINS = exports.SETUP_SUBCOMMAND = exports.SERVER_SUBCOMMAND = exports.PLUGIN_TYPE = exports.DRIVER_TYPE = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
/**
|
|
9
9
|
* The name of the extension type for drivers
|
|
@@ -17,6 +17,10 @@ exports.PLUGIN_TYPE = 'plugin';
|
|
|
17
17
|
* The `server` command of the `appium` CLI
|
|
18
18
|
*/
|
|
19
19
|
exports.SERVER_SUBCOMMAND = 'server';
|
|
20
|
+
/**
|
|
21
|
+
* The `setup` command of the `appium` CLI
|
|
22
|
+
*/
|
|
23
|
+
exports.SETUP_SUBCOMMAND = 'setup';
|
|
20
24
|
/**
|
|
21
25
|
* The value of `--use-plugins` if _all_ plugins should be loaded
|
|
22
26
|
*/
|
|
@@ -32,20 +36,33 @@ exports.KNOWN_PLUGINS = Object.freeze(
|
|
|
32
36
|
'relaxed-caps': '@appium/relaxed-caps-plugin',
|
|
33
37
|
'universal-xml': '@appium/universal-xml-plugin',
|
|
34
38
|
}));
|
|
35
|
-
|
|
36
|
-
// The drivers in this list will be available to the CLI so users can just
|
|
37
|
-
// type 'appium driver install 'name'', rather than having to specify the full
|
|
38
|
-
// npm package. I.e., these are the officially recognized drivers.
|
|
39
|
-
exports.KNOWN_DRIVERS = Object.freeze(
|
|
39
|
+
exports.MOBILE_DRIVERS = Object.freeze(
|
|
40
40
|
/** @type {const} */ ({
|
|
41
41
|
uiautomator2: 'appium-uiautomator2-driver',
|
|
42
42
|
xcuitest: 'appium-xcuitest-driver',
|
|
43
|
-
mac2: 'appium-mac2-driver',
|
|
44
43
|
espresso: 'appium-espresso-driver',
|
|
44
|
+
}));
|
|
45
|
+
exports.DESKTOP_DRIVERS = Object.freeze(
|
|
46
|
+
/** @type {const} */ ({
|
|
47
|
+
mac2: 'appium-mac2-driver',
|
|
48
|
+
windows: 'appium-windows-driver',
|
|
49
|
+
}));
|
|
50
|
+
exports.DESKTOP_BROWSERS = Object.freeze(
|
|
51
|
+
/** @type {const} */ ({
|
|
45
52
|
safari: 'appium-safari-driver',
|
|
46
53
|
gecko: 'appium-geckodriver',
|
|
47
54
|
chromium: 'appium-chromium-driver',
|
|
48
55
|
}));
|
|
56
|
+
// This is a map of driver names to npm packages representing those drivers.
|
|
57
|
+
// The drivers in this list will be available to the CLI so users can just
|
|
58
|
+
// type 'appium driver install 'name'', rather than having to specify the full
|
|
59
|
+
// npm package. I.e., these are the officially recognized drivers.
|
|
60
|
+
exports.KNOWN_DRIVERS = Object.freeze(
|
|
61
|
+
/** @type {const} */ ({
|
|
62
|
+
...exports.MOBILE_DRIVERS,
|
|
63
|
+
...exports.DESKTOP_DRIVERS,
|
|
64
|
+
...exports.DESKTOP_BROWSERS,
|
|
65
|
+
}));
|
|
49
66
|
/**
|
|
50
67
|
* Relative path to directory containing any Appium internal files
|
|
51
68
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACU,QAAA,eAAe,GAAG,KAAK,CAAC;AAErC,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,uBAAuB;IAC/B,gBAAgB,EAAE,+BAA+B;IACjD,cAAc,EAAE,6BAA6B;IAC7C,eAAe,EAAE,8BAA8B;CAChD,CAAC,CACH,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC;;GAEG;AACU,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACU,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAGxC;;GAEG;AACU,QAAA,eAAe,GAAG,KAAK,CAAC;AAErC,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,uBAAuB;IAC/B,gBAAgB,EAAE,+BAA+B;IACjD,cAAc,EAAE,6BAA6B;IAC7C,eAAe,EAAE,8BAA8B;CAChD,CAAC,CACH,CAAC;AAEW,QAAA,cAAc,GAAG,MAAM,CAAC,MAAM;AACzC,oBAAoB,CAAC,CAAC;IACpB,YAAY,EAAE,4BAA4B;IAC1C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEW,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM;AAC1C,oBAAoB,CAAC,CAAC;IACpB,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,uBAAuB;CACjC,CAAC,CACH,CAAC;AAEW,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM;AAC3C,oBAAoB,CAAC,CAAC;IACpB,MAAM,EAAE,sBAAsB;IAC9B,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,wBAAwB;CACnC,CAAC,CACH,CAAC;AAEF,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,kEAAkE;AACrD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM;AACxC,oBAAoB,CAAC,CAAC;IACpB,GAAG,sBAAc;IACjB,GAAG,uBAAe;IAClB,GAAG,wBAAgB;CACpB,CAAC,CACH,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAErF;;GAEG;AACU,QAAA,0BAA0B,GAAG,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,cAAc,CAAC,CAAC;AAEhF,QAAA,mBAAmB,GAAG,MAAM,CAAC;AAC7B,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,wBAAwB,GAAG,WAAW,CAAC;AACvC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,KAAK,CAAC;AAC3B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAE9C;;GAEG;AACU,QAAA,kBAAkB,GAAG,CAAC,CAAC;AAEpC;;;;;GAKG;AACU,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAEzC;;GAEG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC;AAEtC;;;GAGG;AACU,QAAA,eAAe,GAAG,WAAW,CAAC"}
|
|
@@ -54,13 +54,13 @@ function postRequest(configHolder, addr, port, basePath) {
|
|
|
54
54
|
// Move Selenium 3 configuration properties to configuration object
|
|
55
55
|
if (!lodash_1.default.has(configHolder, 'configuration')) {
|
|
56
56
|
let configuration = {};
|
|
57
|
-
for (const property in configHolder) {
|
|
57
|
+
for (const property in /** @type {import('@appium/types').StringRecord} */ (configHolder)) {
|
|
58
58
|
if (lodash_1.default.has(configHolder, property) && property !== 'capabilities') {
|
|
59
59
|
configuration[property] = configHolder[property];
|
|
60
60
|
delete configHolder[property];
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
configHolder.configuration = configuration;
|
|
63
|
+
/** @type {import('@appium/types').StringRecord} */ (configHolder).configuration = configuration;
|
|
64
64
|
}
|
|
65
65
|
// if the node config does not have the appium/webdriver url, host, and port,
|
|
66
66
|
// automatically add it based on how appium was initialized
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid-register.js","sourceRoot":"","sources":["../../lib/grid-register.js"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,6CAAmC;AACnC,sDAA8B;AAC9B,oDAAuB;AAEvB,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE;IACxB,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;IAC9C,OAAO,GAAG,QAAQ,MAAM,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,KAAK,UAAU,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;IACpD,IAAI,cAAc,CAAC;IACnB,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,cAAc,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,gBAAM,CAAC,KAAK,CACV,0CAA0C,cAAc,2BAA2B,GAAG,CAAC,OAAO,EAAE,CACjG,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,gBAAM,CAAC,kBAAkB,CAC7B,2CAA2C,cAAc,KAAK,GAAG,CAAC,OAAO,EAAE,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,WAAW,EAAE,YAAY;IACrD,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,eAAK,EAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,gBAAM,CAAC,KAAK,CACV,sDAAsD,GAAG,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAC5F,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gBAAM,CAAC,KAAK,CAAC,0DAA0D,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;IACrD,mEAAmE;IACnE,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE,CAAC;QAC1C,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"grid-register.js","sourceRoot":"","sources":["../../lib/grid-register.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";AAuMA,+CA4CC;AAED,8BAOC"}
|
package/build/lib/logsink.js
CHANGED
|
@@ -4,16 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.clear = exports.init = void 0;
|
|
7
|
-
const
|
|
7
|
+
const logger_1 = __importDefault(require("@appium/logger"));
|
|
8
8
|
const winston_1 = require("winston");
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
10
|
-
const
|
|
10
|
+
const logger_2 = require("./logger");
|
|
11
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
12
12
|
// set up distributed logging before everything else
|
|
13
|
-
support_1.logger.patchLogger(
|
|
14
|
-
global._global_npmlog =
|
|
13
|
+
support_1.logger.patchLogger(logger_1.default);
|
|
14
|
+
global._global_npmlog = logger_1.default;
|
|
15
15
|
// npmlog is used only for emitting, we use winston for output
|
|
16
|
-
|
|
16
|
+
logger_1.default.level = 'info';
|
|
17
17
|
const levels = {
|
|
18
18
|
debug: 4,
|
|
19
19
|
info: 3,
|
|
@@ -111,8 +111,13 @@ function createHttpTransport(args, logLvl) {
|
|
|
111
111
|
})),
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
*
|
|
116
|
+
* @param {import('@appium/types').StringRecord} args
|
|
117
|
+
* @returns {Promise<import('winston-transport')[]>}
|
|
118
|
+
*/
|
|
114
119
|
async function createTransports(args) {
|
|
115
|
-
|
|
120
|
+
const transports = [];
|
|
116
121
|
let consoleLogLevel = null;
|
|
117
122
|
let fileLogLevel = null;
|
|
118
123
|
if (args.loglevel && args.loglevel.match(':')) {
|
|
@@ -164,29 +169,42 @@ function getColorizedPrefix(prefix) {
|
|
|
164
169
|
return `\x1b[38;5;${colorNumber % 256}m${prefix}\x1b[0m`;
|
|
165
170
|
}
|
|
166
171
|
async function init(args) {
|
|
167
|
-
|
|
172
|
+
logger_1.default.level = 'silent';
|
|
168
173
|
// set de facto param passed to timestamp function
|
|
169
174
|
useLocalTimeZone = args.localTimezone;
|
|
170
175
|
// clean up in case we have initiated before since npmlog is a global object
|
|
171
176
|
clear();
|
|
177
|
+
const transports = await createTransports(args);
|
|
178
|
+
const transportNames = new Set(transports.map((tr) => tr.constructor.name));
|
|
172
179
|
log = (0, winston_1.createLogger)({
|
|
173
|
-
transports
|
|
180
|
+
transports,
|
|
174
181
|
levels,
|
|
175
182
|
});
|
|
183
|
+
const reportedLoggerErrors = new Set();
|
|
176
184
|
// Capture logs emitted via npmlog and pass them through winston
|
|
177
|
-
|
|
185
|
+
logger_1.default.on('log', ({ level, message, prefix }) => {
|
|
178
186
|
const winstonLevel = npmToWinstonLevels[level] || 'info';
|
|
179
187
|
let msg = message;
|
|
180
188
|
if (prefix) {
|
|
181
189
|
const decoratedPrefix = `[${prefix}]`;
|
|
182
|
-
const toColorizedDecoratedPrefix = () => prefix ===
|
|
190
|
+
const toColorizedDecoratedPrefix = () => prefix === logger_2.APPIUM_LOGGER_NAME
|
|
183
191
|
? decoratedPrefix.magenta
|
|
184
192
|
: getColorizedPrefix(decoratedPrefix);
|
|
185
193
|
msg = `${args.logNoColors ? decoratedPrefix : toColorizedDecoratedPrefix()} ${msg}`;
|
|
186
194
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
args.logHandler
|
|
195
|
+
try {
|
|
196
|
+
log[winstonLevel](msg);
|
|
197
|
+
if (lodash_1.default.isFunction(args.logHandler)) {
|
|
198
|
+
args.logHandler(level, msg);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
catch (e) {
|
|
202
|
+
if (!reportedLoggerErrors.has(e.message) && process.stderr.writable) {
|
|
203
|
+
// eslint-disable-next-line no-console
|
|
204
|
+
console.error(`The log message '${lodash_1.default.truncate(msg, { length: 30 })}' cannot be written into ` +
|
|
205
|
+
`one or more requested destinations: ${transportNames}. Original error: ${e.message}`);
|
|
206
|
+
reportedLoggerErrors.add(e.message);
|
|
207
|
+
}
|
|
190
208
|
}
|
|
191
209
|
});
|
|
192
210
|
}
|
|
@@ -197,7 +215,7 @@ function clear() {
|
|
|
197
215
|
log.remove(transport);
|
|
198
216
|
}
|
|
199
217
|
}
|
|
200
|
-
|
|
218
|
+
logger_1.default.removeAllListeners('log');
|
|
201
219
|
}
|
|
202
220
|
exports.clear = clear;
|
|
203
221
|
exports.default = init;
|
package/build/lib/logsink.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";;;;;;AAAA,4DAAuC;AACvC,qCAAyD;AACzD,6CAA2C;AAC3C,qCAA8C;AAC9C,oDAAuB;AAEvB,oDAAoD;AACpD,gBAAM,CAAC,WAAW,CAAC,gBAAS,CAAC,CAAC;AAC9B,MAAM,CAAC,cAAc,GAAG,gBAAS,CAAC;AAElC,8DAA8D;AAC9D,gBAAS,CAAC,KAAK,GAAG,MAAM,CAAC;AACzB,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,KAAK;CACb,CAAC;AAEF,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,IAAI,GAAG,GAAG,IAAI,CAAC;AACf,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAE7B,iEAAiE;AACjE,MAAM,eAAe,GAAG,gBAAM,CAAC,SAAS,CAAC;IACvC,MAAM;QACJ,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,KAAK,CAAC,CAAC;QACrE,CAAC;QACD,0DAA0D;QAC1D,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7E,CAAC;CACF,CAAC,CAAC;AAEH,wBAAwB;AACxB,MAAM,cAAc,GAAG,gBAAM,CAAC,QAAQ,CAAC;IACrC,MAAM;CACP,CAAC,CAAC;AAEH,0CAA0C;AAC1C,MAAM,gBAAgB,GAAG,IAAA,gBAAM,EAAC,SAAS,UAAU,CAAC,IAAI;IACtD,MAAM,IAAI,GAAG,yBAAyB,CAAC,CAAC,uCAAuC;IAC/E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC,EAAE,CAAC;AAEL,SAAS,sBAAsB,CAAC,IAAI,EAAE,MAAM;IAC1C,OAAO,IAAI,oBAAU,CAAC,OAAO,CAAC;QAC5B,oDAAoD;QACpD,IAAI,EAAE,SAAS;QACf,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,eAAe,EACf,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,EACpD,gBAAM,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,IAAI;YACnC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7E,CAAC,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAI,EAAE,MAAM;IACvC,OAAO,IAAI,oBAAU,CAAC,IAAI,CAAC;QACzB,oDAAoD;QACpD,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO;QACtB,QAAQ,EAAE,CAAC;QACX,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,gBAAgB,EAChB,eAAe,EACf,gBAAM,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,IAAI;YACnC,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7C,CAAC,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAI,EAAE,MAAM;IACvC,IAAI,IAAI,GAAG,WAAW,CAAC;IACvB,IAAI,IAAI,GAAG,IAAI,CAAC;IAEhB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,IAAI,oBAAU,CAAC,IAAI,CAAC;QACzB,oDAAoD;QACpD,IAAI,EAAE,MAAM;QACZ,IAAI;QACJ,IAAI;QACJ,IAAI,EAAE,GAAG;QACT,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,gBAAgB,EAChB,gBAAM,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,IAAI;YACnC,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7C,CAAC,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,gBAAgB,CAAC,IAAI;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,IAAI,eAAe,GAAG,IAAI,CAAC;IAC3B,IAAI,YAAY,GAAG,IAAI,CAAC;IAExB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,wGAAwG;QACxG,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC;QAChD,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,eAAe,GAAG,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;IACjD,CAAC;IAED,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAE/D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,iGAAiG;YACjG,+FAA+F;YAC/F,gFAAgF;YAChF,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;YAED,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,GAAG,CACT,oCAAoC,IAAI,CAAC,OAAO,iBAAiB,GAAG,aAAa,CAAC,CAAC,OAAO,EAAE,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,GAAG,CACT,sCAAsC,IAAI,CAAC,OAAO,OAAO;gBACvD,sBAAsB,CAAC,CAAC,OAAO,EAAE,CACpC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAM;IAChC,IAAI,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IACD,8DAA8D;IAC9D,MAAM,WAAW,GAAG,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC/D,8CAA8C;IAC9C,OAAO,aAAa,WAAW,GAAG,GAAG,IAAI,MAAM,SAAS,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAI;IACtB,gBAAS,CAAC,KAAK,GAAG,QAAQ,CAAC;IAE3B,kDAAkD;IAClD,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC;IAEtC,4EAA4E;IAC5E,KAAK,EAAE,CAAC;IAER,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,GAAG,GAAG,IAAA,sBAAY,EAAC;QACjB,UAAU;QACV,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;IACvC,gEAAgE;IAChE,gBAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAC,EAAE,EAAE;QAC/C,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC;QACzD,IAAI,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,eAAe,GAAG,IAAI,MAAM,GAAG,CAAC;YACtC,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAAC,MAAM,KAAK,2BAAkB;gBACpE,CAAC,CAAC,eAAe,CAAC,OAAO;gBACzB,CAAC,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YACxC,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,0BAA0B,EAAE,IAAI,GAAG,EAAE,CAAC;QACtF,CAAC;QACD,IAAI,CAAC;YACH,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;YACvB,IAAI,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpE,sCAAsC;gBACtC,OAAO,CAAC,KAAK,CACX,oBAAoB,gBAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,EAAE,EAAC,CAAC,2BAA2B;oBAC5E,uCAAuC,cAAc,qBAAqB,CAAC,CAAC,OAAO,EAAE,CACtF,CAAC;gBACF,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAWO,oBAAI;AATZ,SAAS,KAAK;IACZ,IAAI,GAAG,EAAE,CAAC;QACR,KAAK,IAAI,SAAS,IAAI,gBAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,gBAAS,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC;AAEa,sBAAK;AACnB,kBAAe,IAAI,CAAC"}
|
package/build/lib/main.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export type CliExtensionCommand = import('appium/types').CliExtensionCommand;
|
|
|
10
10
|
export type ServerCommand = import('appium/types').CliCommandServer;
|
|
11
11
|
export type DriverCommand = import('appium/types').CliCommandDriver;
|
|
12
12
|
export type PluginCommand = import('appium/types').CliCommandPlugin;
|
|
13
|
+
export type SetupCommand = import('appium/types').CliCommandSetup;
|
|
13
14
|
export type DriverNameMap = import('./extension').DriverNameMap;
|
|
14
15
|
export type PluginNameMap = import('./extension').PluginNameMap;
|
|
15
16
|
/**
|
package/build/lib/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;yBAwda,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;0BACnC,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,cAAc,EAAE,UAAU;qCACjC,OAAO,cAAc,EAAE,sBAAsB;kCAC7C,OAAO,cAAc,EAAE,mBAAmB;4BAC1C,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;2BACvC,OAAO,cAAc,EAAE,eAAe;4BACtC,OAAO,aAAa,EAAE,aAAa;4BACnC,OAAO,aAAa,EAAE,aAAa;;;;mCAKlC,EAAE;;;;;kBAKF,OAAO,UAAU,EAAE,YAAY;;;;gBAC/B,OAAO,cAAc,EAAE,UAAU;;;;gBACjC,MAAM;;wEAKP,GAAG,SAAS,aAAa,GAAG,cAAc,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAAG,oBAAoB;yJAM1G,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;+JAMxC,OAAO,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;AAlL3D;;;;;;;GAOG;AACH,qSAkHC;AAvSD;;;;;;;;;;;;;;;;GAgBG;AACH,kPAgIC;;cAvSa,QAAQ"}
|
package/build/lib/main.js
CHANGED
|
@@ -14,6 +14,7 @@ const asyncbox_1 = require("asyncbox");
|
|
|
14
14
|
const lodash_1 = __importDefault(require("lodash"));
|
|
15
15
|
const appium_1 = require("./appium");
|
|
16
16
|
const extension_1 = require("./cli/extension");
|
|
17
|
+
const setup_command_1 = require("./cli/setup-command");
|
|
17
18
|
const parser_1 = require("./cli/parser");
|
|
18
19
|
const config_1 = require("./config");
|
|
19
20
|
const config_file_1 = require("./config-file");
|
|
@@ -174,7 +175,7 @@ async function init(args) {
|
|
|
174
175
|
throw new Error(`Errors in config file ${configResult.filepath}:\n ${configResult.reason ?? configResult.errors}`);
|
|
175
176
|
}
|
|
176
177
|
// merge config and apply defaults.
|
|
177
|
-
// the order of
|
|
178
|
+
// the order of precedence is:
|
|
178
179
|
// 1. command line args
|
|
179
180
|
// 2. config file
|
|
180
181
|
// 3. defaults from config file.
|
|
@@ -186,6 +187,14 @@ async function init(args) {
|
|
|
186
187
|
(0, config_1.showConfig)((0, config_1.getNonDefaultServerArgs)(preConfigArgs), configResult, defaults, serverArgs);
|
|
187
188
|
return /** @type {InitResult<Cmd>} */ ({});
|
|
188
189
|
}
|
|
190
|
+
if (preConfigArgs.showDebugInfo) {
|
|
191
|
+
await (0, config_1.showDebugInfo)({
|
|
192
|
+
driverConfig,
|
|
193
|
+
pluginConfig,
|
|
194
|
+
appiumHome,
|
|
195
|
+
});
|
|
196
|
+
return /** @type {InitResult<Cmd>} */ ({});
|
|
197
|
+
}
|
|
189
198
|
await (0, logsink_1.init)(serverArgs);
|
|
190
199
|
if (serverArgs.logFilters) {
|
|
191
200
|
const { issues, rules } = await support_1.logger.loadSecureValuesPreprocessingRules(serverArgs.logFilters);
|
|
@@ -218,6 +227,10 @@ async function init(args) {
|
|
|
218
227
|
appiumHome,
|
|
219
228
|
});
|
|
220
229
|
}
|
|
230
|
+
else if ((0, utils_1.isSetupCommandArgs)(preConfigArgs)) {
|
|
231
|
+
await (0, setup_command_1.runSetupCommand)(appiumHome, preConfigArgs, driverConfig, pluginConfig);
|
|
232
|
+
return /** @type {InitResult<Cmd>} */ ({});
|
|
233
|
+
}
|
|
221
234
|
else {
|
|
222
235
|
await (0, config_1.requireDir)(appiumHome, true, appiumHomeSourceName);
|
|
223
236
|
if ((0, utils_1.isExtensionCommandArgs)(preConfigArgs)) {
|
|
@@ -375,6 +388,7 @@ Object.defineProperty(exports, "validate", { enumerable: true, get: function ()
|
|
|
375
388
|
* @typedef {import('appium/types').CliCommandServer} ServerCommand
|
|
376
389
|
* @typedef {import('appium/types').CliCommandDriver} DriverCommand
|
|
377
390
|
* @typedef {import('appium/types').CliCommandPlugin} PluginCommand
|
|
391
|
+
* @typedef {import('appium/types').CliCommandSetup} SetupCommand
|
|
378
392
|
* @typedef {import('./extension').DriverNameMap} DriverNameMap
|
|
379
393
|
* @typedef {import('./extension').PluginNameMap} PluginNameMap
|
|
380
394
|
*/
|