appium 3.1.2 → 3.2.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/README.md +4 -4
- package/build/lib/appium.d.ts +2 -2
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +5 -7
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.d.ts +1 -1
- package/build/lib/bidi-commands.d.ts.map +1 -1
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +109 -0
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +255 -96
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/parser.d.ts +10 -0
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +20 -2
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/constants.js +3 -3
- package/build/lib/constants.js.map +1 -1
- package/build/lib/extension/extension-config.js +7 -7
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/manifest.js +6 -6
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/extension/package-changed.js +3 -3
- package/build/lib/extension/package-changed.js.map +1 -1
- package/build/lib/inspector-commands.d.ts.map +1 -1
- package/build/lib/logger.d.ts +1 -1
- package/build/lib/logger.d.ts.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +9 -7
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/main.d.ts.map +1 -1
- package/build/lib/main.js +11 -2
- package/build/lib/main.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +5 -0
- package/build/lib/schema/cli-args.js.map +1 -1
- package/build/lib/schema/cli-transformers.js +5 -5
- package/build/lib/schema/cli-transformers.js.map +1 -1
- package/build/lib/schema/schema.js +2 -2
- package/build/lib/schema/schema.js.map +1 -1
- package/build/lib/utils.d.ts +1 -1
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +8 -8
- package/build/lib/utils.js.map +1 -1
- package/build/package.json +99 -0
- package/build/types/cli.d.ts +3 -3
- package/build/types/cli.d.ts.map +1 -1
- package/build/types/index.d.ts +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/manifest/base.d.ts +3 -3
- package/build/types/manifest/base.d.ts.map +1 -1
- package/build/types/manifest/v3.d.ts +3 -3
- package/build/types/manifest/v3.d.ts.map +1 -1
- package/build/types/manifest/v4.d.ts +3 -3
- package/build/types/manifest/v4.d.ts.map +1 -1
- package/index.js +1 -3
- package/lib/appium.js +5 -7
- package/lib/bidi-commands.ts +4 -6
- package/lib/cli/extension-command.js +283 -105
- package/lib/cli/parser.js +21 -2
- package/lib/constants.js +1 -1
- package/lib/extension/extension-config.js +2 -2
- package/lib/extension/manifest.js +1 -1
- package/lib/extension/package-changed.js +1 -1
- package/lib/inspector-commands.ts +1 -1
- package/lib/logsink.js +11 -7
- package/lib/main.js +13 -3
- package/lib/schema/cli-args.js +6 -0
- package/lib/schema/cli-transformers.js +1 -1
- package/lib/schema/schema.js +1 -1
- package/lib/utils.js +3 -3
- package/package.json +22 -24
- package/scripts/autoinstall-extensions.js +7 -10
- package/tsconfig.json +5 -2
- package/types/cli.ts +4 -4
- package/types/index.ts +1 -1
- package/types/manifest/base.ts +3 -3
- package/types/manifest/v3.ts +3 -3
- package/types/manifest/v4.ts +3 -3
|
@@ -17,6 +17,16 @@ export function getParser(debug?: boolean): ArgParser;
|
|
|
17
17
|
* - Handles error conditions, messages, and exit behavior
|
|
18
18
|
*/
|
|
19
19
|
export class ArgParser {
|
|
20
|
+
/**
|
|
21
|
+
* Normalize hyphenated server arg keys (e.g. "log-level") to dest form (e.g. "loglevel").
|
|
22
|
+
* Use when server args come from programmatic init rather than the CLI, so they match
|
|
23
|
+
* the shape produced by parseArgs() / _transformParsedArgs().
|
|
24
|
+
* Mutates the given object.
|
|
25
|
+
*
|
|
26
|
+
* @param {object} obj - Object that may contain server args with schema property names
|
|
27
|
+
* @returns {object} The same object with keys normalized
|
|
28
|
+
*/
|
|
29
|
+
static normalizeServerArgs(obj: object): object;
|
|
20
30
|
/**
|
|
21
31
|
* Given an object full of arguments as returned by `argparser.parse_args`,
|
|
22
32
|
* expand the ones for extensions into a nested object structure and rename
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"AA6BA,yBAA0B,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"AA6BA,yBAA0B,WAAW,CAAC;yBAoWzB,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;AAjB/C;;;;;;GAMG;AACH,kCAHW,OAAO,GACL,SAAS,CAMrB;AAnVD;;;;;;GAMG;AACH;IAgHE;;;;;;;;OAQG;IACH,gCAHW,MAAM,GACJ,MAAM,CAUlB;IAED;;;;;;;;;OASG;IACH,kCAJW,MAAM,gBACN,MAAM,EAAE,GACN,MAAM,CAmBlB;IAED;;;OAGG;IACH,0BAFW,cAAc,QASxB;IAED;;;;OAIG;IACH,qCAHW,OAAO,UAAU,EAAE,SAAS,GAC1B,OAAO,QAAQ,EAAE,mBAAmB,CAkBhD;IAED;;;OAGG;IACH,iDAFW,OAAO,UAAU,EAAE,SAAS,QAoEtC;IAED;;;OAGG;IACH,oCAFW,OAAO,UAAU,EAAE,SAAS,QAgDtC;IA7TD;;OAEG;IACH,oBAFW,OAAO,EAyDjB;IA3CC;;;OAGG;IACH,MAFU,MAAM,CAEA;IAEhB;;;OAGG;IACH,OAFU,OAAO,CAEC;IAElB;;;OAGG;IACH,QAFU,cAAc,CAEJ;IAcpB,8CAAyB;IASzB;;OAEG;IACH,YAFU,SAAS,CAAC,WAAW,CAAC,CAEA;IAGlC;;;;;;;;;OASG;IACH,UAJkD,GAAG,SAAxC,OAAQ,cAAc,EAAE,UAAW,oBACrC,MAAM,EAAE,GACN,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,CAyC5C;CAiNF;+BA9W4B,UAAU"}
|
package/build/lib/cli/parser.js
CHANGED
|
@@ -8,7 +8,7 @@ exports.getParser = getParser;
|
|
|
8
8
|
const support_1 = require("@appium/support");
|
|
9
9
|
const argparse_1 = require("argparse");
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
|
-
const
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
13
|
const schema_1 = require("../schema");
|
|
14
14
|
const config_1 = require("../config");
|
|
@@ -33,7 +33,7 @@ class ArgParser {
|
|
|
33
33
|
* @param {boolean} [debug] - If true, throw instead of exit on error.
|
|
34
34
|
*/
|
|
35
35
|
constructor(debug = false) {
|
|
36
|
-
const prog = process.argv[1] ?
|
|
36
|
+
const prog = process.argv[1] ? node_path_1.default.basename(process.argv[1]) : 'appium';
|
|
37
37
|
const parser = new argparse_1.ArgumentParser({
|
|
38
38
|
add_help: true,
|
|
39
39
|
description: 'A webdriver-compatible server that facilitates automation of web, mobile, and other ' +
|
|
@@ -125,6 +125,24 @@ class ArgParser {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
* Normalize hyphenated server arg keys (e.g. "log-level") to dest form (e.g. "loglevel").
|
|
130
|
+
* Use when server args come from programmatic init rather than the CLI, so they match
|
|
131
|
+
* the shape produced by parseArgs() / _transformParsedArgs().
|
|
132
|
+
* Mutates the given object.
|
|
133
|
+
*
|
|
134
|
+
* @param {object} obj - Object that may contain server args with schema property names
|
|
135
|
+
* @returns {object} The same object with keys normalized
|
|
136
|
+
*/
|
|
137
|
+
static normalizeServerArgs(obj) {
|
|
138
|
+
for (const spec of (0, schema_1.getAllArgSpecs)().values()) {
|
|
139
|
+
if (!spec.extType && obj[spec.name] !== undefined && spec.rawDest !== spec.name) {
|
|
140
|
+
obj[spec.rawDest] = obj[spec.name] ?? obj[spec.rawDest];
|
|
141
|
+
delete obj[spec.name];
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
return obj;
|
|
145
|
+
}
|
|
128
146
|
/**
|
|
129
147
|
* Given an object full of arguments as returned by `argparser.parse_args`,
|
|
130
148
|
* expand the ones for extensions into a nested object structure and rename
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../lib/cli/parser.js"],"names":[],"mappings":"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"}
|
package/build/lib/constants.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SESSION_DISCOVERY_FEATURE = 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
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
/**
|
|
9
9
|
* The name of the extension type for drivers
|
|
10
10
|
*/
|
|
@@ -68,11 +68,11 @@ exports.KNOWN_DRIVERS = Object.freeze(
|
|
|
68
68
|
/**
|
|
69
69
|
* Relative path to directory containing any Appium internal files
|
|
70
70
|
*/
|
|
71
|
-
exports.CACHE_DIR_RELATIVE_PATH =
|
|
71
|
+
exports.CACHE_DIR_RELATIVE_PATH = node_path_1.default.join('node_modules', '.cache', 'appium');
|
|
72
72
|
/**
|
|
73
73
|
* Relative path to hashfile (from `APPIUM_HOME`) of consuming project's `package.json` (if it exists)
|
|
74
74
|
*/
|
|
75
|
-
exports.PKG_HASHFILE_RELATIVE_PATH =
|
|
75
|
+
exports.PKG_HASHFILE_RELATIVE_PATH = node_path_1.default.join(exports.CACHE_DIR_RELATIVE_PATH, 'package.hash');
|
|
76
76
|
exports.EXT_SUBCOMMAND_LIST = 'list';
|
|
77
77
|
exports.EXT_SUBCOMMAND_INSTALL = 'install';
|
|
78
78
|
exports.EXT_SUBCOMMAND_UNINSTALL = 'uninstall';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.js"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAE7B;;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,gBAAgB,EAAE,+BAA+B;IACjD,MAAM,EAAE,uBAAuB;IAC/B,SAAS,EAAE,yBAAyB;IACpC,cAAc,EAAE,6BAA6B;IAC7C,OAAO,EAAE,wBAAwB;IACjC,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,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAErF;;GAEG;AACU,QAAA,0BAA0B,GAAG,mBAAI,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;AAE3C;;GAEG;AACU,QAAA,yBAAyB,GAAG,mBAAmB,CAAC"}
|
|
@@ -8,14 +8,14 @@ exports.resolveEsmEntryPoint = resolveEsmEntryPoint;
|
|
|
8
8
|
const support_1 = require("@appium/support");
|
|
9
9
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
|
-
const
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
12
|
const resolve_from_1 = __importDefault(require("resolve-from"));
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
14
|
const extension_1 = require("../cli/extension");
|
|
15
15
|
const config_1 = require("../config");
|
|
16
16
|
const logger_1 = __importDefault(require("../logger"));
|
|
17
17
|
const schema_1 = require("../schema/schema");
|
|
18
|
-
const
|
|
18
|
+
const node_url_1 = require("node:url");
|
|
19
19
|
const DEFAULT_ENTRY_POINT = 'index.js';
|
|
20
20
|
/**
|
|
21
21
|
* "npm" install type
|
|
@@ -470,7 +470,7 @@ class ExtensionConfig {
|
|
|
470
470
|
*/
|
|
471
471
|
getInstallPath(extName) {
|
|
472
472
|
return (this.installedExtensions[extName]?.installPath ??
|
|
473
|
-
|
|
473
|
+
node_path_1.default.join(this.appiumHome, 'node_modules', this.installedExtensions[extName].pkgName));
|
|
474
474
|
}
|
|
475
475
|
/**
|
|
476
476
|
*
|
|
@@ -480,7 +480,7 @@ class ExtensionConfig {
|
|
|
480
480
|
async _resolveExtension(extName) {
|
|
481
481
|
const { mainClass } = this.installedExtensions[extName];
|
|
482
482
|
const moduleRoot = this.getInstallPath(extName);
|
|
483
|
-
const packageJsonPath =
|
|
483
|
+
const packageJsonPath = node_path_1.default.join(moduleRoot, 'package.json');
|
|
484
484
|
let extensionManifest;
|
|
485
485
|
try {
|
|
486
486
|
extensionManifest = JSON.parse(await support_1.fs.readFile(packageJsonPath, 'utf8'));
|
|
@@ -499,7 +499,7 @@ class ExtensionConfig {
|
|
|
499
499
|
catch (e) {
|
|
500
500
|
throw new ReferenceError(`Could not find the ${this.extensionType} installed at ${moduleRoot}: ${e.message}`);
|
|
501
501
|
}
|
|
502
|
-
const entryPointFullPath =
|
|
502
|
+
const entryPointFullPath = node_path_1.default.resolve(moduleRoot, /** @type {string} */ (entryPointRelativePath));
|
|
503
503
|
if (!await support_1.fs.exists(entryPointFullPath)) {
|
|
504
504
|
throw new ReferenceError(`Cannot find a valid ${this.extensionType} main entry point in '${packageJsonPath}'. ` +
|
|
505
505
|
`Assumed entry point: '${entryPointFullPath}'`);
|
|
@@ -521,7 +521,7 @@ class ExtensionConfig {
|
|
|
521
521
|
const [reqPath, mainClass] = await this._resolveExtension(extName);
|
|
522
522
|
logger_1.default.debug(`Requiring ${this.extensionType} at ${reqPath}`);
|
|
523
523
|
// https://github.com/nodejs/node/issues/31710
|
|
524
|
-
const importPath = support_1.system.isWindows() ? (0,
|
|
524
|
+
const importPath = support_1.system.isWindows() ? (0, node_url_1.pathToFileURL)(reqPath).href : reqPath;
|
|
525
525
|
const MainClass = (await import(importPath))[mainClass];
|
|
526
526
|
if (!MainClass) {
|
|
527
527
|
throw new ReferenceError(`Could not find a class named "${mainClass}" exported by ${this.extensionType} "${extName}"`);
|
|
@@ -552,7 +552,7 @@ class ExtensionConfig {
|
|
|
552
552
|
}
|
|
553
553
|
let moduleObject;
|
|
554
554
|
if (lodash_1.default.isString(argSchemaPath)) {
|
|
555
|
-
const schemaPath = (0, resolve_from_1.default)(appiumHome,
|
|
555
|
+
const schemaPath = (0, resolve_from_1.default)(appiumHome, node_path_1.default.join(pkgName, argSchemaPath));
|
|
556
556
|
moduleObject = require(schemaPath);
|
|
557
557
|
}
|
|
558
558
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ exports.Manifest = void 0;
|
|
|
43
43
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
44
44
|
const support_1 = require("@appium/support");
|
|
45
45
|
const lodash_1 = __importDefault(require("lodash"));
|
|
46
|
-
const
|
|
46
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
47
47
|
const YAML = __importStar(require("yaml"));
|
|
48
48
|
const constants_1 = require("../constants");
|
|
49
49
|
const extension_config_1 = require("./extension-config");
|
|
@@ -210,7 +210,7 @@ class Manifest {
|
|
|
210
210
|
const queue = [
|
|
211
211
|
// look at `package.json` in `APPIUM_HOME` only.
|
|
212
212
|
// this causes extensions in "dev mode" to be automatically found
|
|
213
|
-
onMatch(
|
|
213
|
+
onMatch(node_path_1.default.join(this.#appiumHome, 'package.json'), true),
|
|
214
214
|
];
|
|
215
215
|
// add dependencies to the queue
|
|
216
216
|
const filepaths = await support_1.fs.glob('node_modules/{*,@*/*}/package.json', {
|
|
@@ -250,7 +250,7 @@ class Manifest {
|
|
|
250
250
|
* @returns {boolean} - `true` if this method did anything.
|
|
251
251
|
*/
|
|
252
252
|
addExtensionFromPackage(pkgJson, pkgPath, installType = extension_config_1.INSTALL_TYPE_NPM) {
|
|
253
|
-
const extensionPath =
|
|
253
|
+
const extensionPath = node_path_1.default.dirname(pkgPath);
|
|
254
254
|
/**
|
|
255
255
|
* @type {InternalMetadata}
|
|
256
256
|
*/
|
|
@@ -444,7 +444,7 @@ class Manifest {
|
|
|
444
444
|
if (!this.#manifestPath) {
|
|
445
445
|
this.#manifestPath = await support_1.env.resolveManifestPath(this.#appiumHome);
|
|
446
446
|
/* istanbul ignore if */
|
|
447
|
-
if (
|
|
447
|
+
if (node_path_1.default.relative(this.#appiumHome, this.#manifestPath).startsWith('.')) {
|
|
448
448
|
throw new Error(`Mismatch between location of APPIUM_HOME and manifest file. APPIUM_HOME: ${this.appiumHome}, manifest file: ${this.#manifestPath}`);
|
|
449
449
|
}
|
|
450
450
|
}
|
|
@@ -465,10 +465,10 @@ class Manifest {
|
|
|
465
465
|
this.#writing = (async () => {
|
|
466
466
|
await this.#setManifestPath();
|
|
467
467
|
try {
|
|
468
|
-
await support_1.fs.mkdirp(
|
|
468
|
+
await support_1.fs.mkdirp(node_path_1.default.dirname(this.#manifestPath));
|
|
469
469
|
}
|
|
470
470
|
catch (err) {
|
|
471
|
-
throw new Error(`Appium could not create the directory for the manifest file: ${
|
|
471
|
+
throw new Error(`Appium could not create the directory for the manifest file: ${node_path_1.default.dirname(this.#manifestPath)}. Original error: ${err.message}`);
|
|
472
472
|
}
|
|
473
473
|
try {
|
|
474
474
|
await support_1.fs.writeFile(this.#manifestPath, YAML.stringify(this.#data), 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,wDAAyB;AACzB,6CAAwC;AACxC,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.packageDidChange = packageDidChange;
|
|
7
7
|
const support_1 = require("@appium/support");
|
|
8
8
|
const package_changed_1 = require("package-changed");
|
|
9
|
-
const
|
|
9
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
10
10
|
const constants_1 = require("../constants");
|
|
11
11
|
const logger_1 = __importDefault(require("../logger"));
|
|
12
12
|
/**
|
|
@@ -19,7 +19,7 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
19
19
|
* @returns {Promise<boolean>} `true` if `package.json` `appiumHome` changed
|
|
20
20
|
*/
|
|
21
21
|
async function packageDidChange(appiumHome) {
|
|
22
|
-
const hashFilename =
|
|
22
|
+
const hashFilename = node_path_1.default.join(appiumHome, constants_1.PKG_HASHFILE_RELATIVE_PATH);
|
|
23
23
|
// XXX: the types in `package-changed` seem to be wrong.
|
|
24
24
|
/** @type {boolean} */
|
|
25
25
|
let isChanged;
|
|
@@ -30,7 +30,7 @@ async function packageDidChange(appiumHome) {
|
|
|
30
30
|
/** @type {string|undefined} */
|
|
31
31
|
let oldHash;
|
|
32
32
|
// first mkdirp the target dir.
|
|
33
|
-
const hashFilenameDir =
|
|
33
|
+
const hashFilenameDir = node_path_1.default.dirname(hashFilename);
|
|
34
34
|
logger_1.default.debug(`Creating hash file directory: ${hashFilenameDir}`);
|
|
35
35
|
try {
|
|
36
36
|
await support_1.fs.mkdirp(hashFilenameDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-changed.js","sourceRoot":"","sources":["../../../lib/extension/package-changed.js"],"names":[],"mappings":";;;;;AAeA,4CAgDC;AA/DD,6CAAmC;AACnC,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"package-changed.js","sourceRoot":"","sources":["../../../lib/extension/package-changed.js"],"names":[],"mappings":";;;;;AAeA,4CAgDC;AA/DD,6CAAmC;AACnC,qDAAiD;AACjD,0DAA6B;AAC7B,4CAAwD;AACxD,uDAA4B;AAE5B;;;;;;;;GAQG;AACI,KAAK,UAAU,gBAAgB,CAAC,UAAU;IAC/C,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sCAA0B,CAAC,CAAC;IAEvE,wDAAwD;IAExD,sBAAsB;IACtB,IAAI,SAAS,CAAC;IACd,yBAAyB;IACzB,IAAI,SAAS,CAAC;IACd,qBAAqB;IACrB,IAAI,IAAI,CAAC;IACT,+BAA+B;IAC/B,IAAI,OAAO,CAAC;IAEZ,+BAA+B;IAC/B,MAAM,eAAe,GAAG,mBAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACnD,gBAAG,CAAC,KAAK,CAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,MAAM,YAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,wDAAwD,eAAe,qBAAqB,GAAG,CAAC,OAAO,EAAE,CAC1G,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,CAAC,EAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,IAAA,kCAAgB,EAAC;YAC9D,GAAG,EAAE,UAAU;YACf,YAAY,EAAE,sCAA0B;SACzC,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC;YACH,SAAS,EAAE,CAAC;YACZ,gBAAG,CAAC,KAAK,CACP,mBAAmB,UAAU,uBAAuB,OAAO,IAAI,QAAQ,QAAQ,IAAI,EAAE,CACtF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,qCAAqC,eAAe,qBAAqB,GAAG,CAAC,OAAO,EAAE,CACvF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspector-commands.d.ts","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,oBAAoB,EAKpB,sBAAsB,EASvB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"inspector-commands.d.ts","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,oBAAoB,EAKpB,sBAAsB,EASvB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAG3C,wBAAsB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAsBxG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgB5G"}
|
package/build/lib/logger.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":"AAEA,iCAAkC,QAAQ,CAAC;;AAC3C,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":"AAEA,iCAAkC,QAAQ,CAAC;;AAC3C,sDAA+C"}
|
|
@@ -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":"AA4CA;;;;GAIG;AACH,2BAHW,OAAO,UAAU,EAAE,UAAU,GAC3B,OAAO,CAAC,IAAI,CAAC,CAwDzB;AAED;;GAEG;AACH,yBAFa,IAAI,CAKhB;AAqOD;;;;;GAKG;AACH,sCAHW,MAAM,GACJ,MAAM,CAIlB;;yBAcY,OAAO,cAAc,EAAE,UAAU;4BACjC,OAAO,gBAAgB,EAAE,aAAa;4CACtC,UAAU,CAAC,uBAAuB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC;yCACnD,UAAU,CAAC,oBAAoB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC;yCAChD,UAAU,CAAC,oBAAoB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC;2BA7Wd,SAAS"}
|
package/build/lib/logsink.js
CHANGED
|
@@ -12,10 +12,6 @@ const support_1 = require("@appium/support");
|
|
|
12
12
|
const lodash_1 = __importDefault(require("lodash"));
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
14
|
const lru_cache_1 = require("lru-cache");
|
|
15
|
-
// set up distributed logging before everything else
|
|
16
|
-
global._global_npmlog = logger_1.default;
|
|
17
|
-
// npmlog is used only for emitting, we use winston for output
|
|
18
|
-
logger_1.default.level = 'info';
|
|
19
15
|
const LEVELS_MAP = {
|
|
20
16
|
debug: 4,
|
|
21
17
|
info: 3,
|
|
@@ -47,6 +43,7 @@ const COLORS_CACHE = new lru_cache_1.LRUCache({
|
|
|
47
43
|
ttl: 1000 * 60 * 60 * 24, // expire after 24 hours
|
|
48
44
|
updateAgeOnGet: true,
|
|
49
45
|
});
|
|
46
|
+
// npmlog is used only for emitting, we use winston for output (global is set by support)
|
|
50
47
|
/** @type {import('winston').Logger?} */
|
|
51
48
|
let log = null;
|
|
52
49
|
/**
|
|
@@ -102,6 +99,8 @@ async function init(args) {
|
|
|
102
99
|
}
|
|
103
100
|
}
|
|
104
101
|
});
|
|
102
|
+
// Only Winston produces output; avoid duplicate lines from the logger's default stream
|
|
103
|
+
logger_1.default.stream = null;
|
|
105
104
|
}
|
|
106
105
|
/**
|
|
107
106
|
* @returns {void}
|
|
@@ -191,13 +190,16 @@ async function createTransports(args) {
|
|
|
191
190
|
let consoleLogLevel;
|
|
192
191
|
/** @type {string} */
|
|
193
192
|
let fileLogLevel;
|
|
194
|
-
|
|
193
|
+
// Server args are normalized in main so we only see dest form (`loglevel`).
|
|
194
|
+
// Fall back to schema default so Winston never sees undefined.
|
|
195
|
+
const rawLogLevel = args.loglevel ?? 'debug';
|
|
196
|
+
if (rawLogLevel && rawLogLevel.includes(':')) {
|
|
195
197
|
// --log-level arg can optionally provide diff logging levels for console and file, separated by a colon
|
|
196
|
-
const lvlPair =
|
|
198
|
+
const lvlPair = rawLogLevel.split(':');
|
|
197
199
|
[consoleLogLevel, fileLogLevel] = lvlPair;
|
|
198
200
|
}
|
|
199
201
|
else {
|
|
200
|
-
consoleLogLevel = fileLogLevel =
|
|
202
|
+
consoleLogLevel = fileLogLevel = rawLogLevel;
|
|
201
203
|
}
|
|
202
204
|
transports.push(createConsoleTransport(args, consoleLogLevel));
|
|
203
205
|
if (args.logFile) {
|
package/build/lib/logsink.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":"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"}
|
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":";;yBAsfa,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;;uBAIM,GAAG,SAAf,UAAW,IACZ,GAAG,SAAS,aAAa,GAAG,cAAc,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAAG,oBAAoB;iBAI5F,GAAG,SAAhB,UAAW,aACmB,MAAM,SAApC,sBAAsB,GAAC,IAAK,WAC7B,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;uBAI1B,GAAG,SAAhB,UAAW,aACmB,MAAM,SAApC,sBAAsB,GAAC,IAAK,WAC7B,OAAO,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;AA1L3D;;;;;;;GAOG;AACH,qBAL2B,GAAG,SAAhB,UAAW,aACmB,MAAM,SAApC,sBAAsB,GAAC,IAAK,gBAC/B,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GACf,OAAO,CAAC,GAAG,SAAS,aAAa,GAAG,OAAO,eAAe,EAAE,YAAY,GAAG,IAAI,CAAC,CA4H5F;AA7TD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAV2B,GAAG,SAAhB,UAAW,aACmB,MAAM,SAApC,sBAAsB,GAAC,IAAK,gBAC/B,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GACf,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAqJpC;;cA9Ta,QAAQ"}
|
package/build/lib/main.js
CHANGED
|
@@ -12,7 +12,6 @@ const logsink_1 = require("./logsink"); // this import needs to come first since
|
|
|
12
12
|
const logger_1 = __importDefault(require("./logger")); // logger needs to remain second
|
|
13
13
|
const base_driver_1 = require("@appium/base-driver");
|
|
14
14
|
const support_1 = require("@appium/support");
|
|
15
|
-
const asyncbox_1 = require("asyncbox");
|
|
16
15
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
16
|
const appium_1 = require("./appium");
|
|
18
17
|
const extension_1 = require("./cli/extension");
|
|
@@ -26,6 +25,7 @@ const grid_register_1 = __importDefault(require("./grid-register"));
|
|
|
26
25
|
const schema_1 = require("./schema/schema");
|
|
27
26
|
const utils_1 = require("./utils");
|
|
28
27
|
const node_net_1 = __importDefault(require("node:net"));
|
|
28
|
+
const extension_command_1 = require("./cli/extension-command");
|
|
29
29
|
const { resolveAppiumHome } = support_1.env;
|
|
30
30
|
exports.resolveAppiumHome = resolveAppiumHome;
|
|
31
31
|
/*
|
|
@@ -175,6 +175,8 @@ async function init(args) {
|
|
|
175
175
|
delete args.throwInsteadOfExit;
|
|
176
176
|
}
|
|
177
177
|
preConfigArgs = { ...args, subcommand: args.subcommand ?? constants_1.SERVER_SUBCOMMAND };
|
|
178
|
+
// Normalize hyphenated keys to dest form so programmatic args match CLI shape
|
|
179
|
+
parser_1.ArgParser.normalizeServerArgs(preConfigArgs);
|
|
178
180
|
}
|
|
179
181
|
else {
|
|
180
182
|
// otherwise parse from CLI
|
|
@@ -256,6 +258,13 @@ async function init(args) {
|
|
|
256
258
|
if ((0, utils_1.isPluginCommandArgs)(preConfigArgs)) {
|
|
257
259
|
await (0, extension_1.runExtensionCommand)(preConfigArgs, pluginConfig);
|
|
258
260
|
}
|
|
261
|
+
if ((0, utils_1.isDriverCommandArgs)(preConfigArgs) || (0, utils_1.isPluginCommandArgs)(preConfigArgs)) {
|
|
262
|
+
// @ts-ignore The linter suggest using dot
|
|
263
|
+
const cmd = preConfigArgs.driverCommand || preConfigArgs.pluginCommand;
|
|
264
|
+
if (cmd === 'install') {
|
|
265
|
+
await (0, extension_command_1.injectAppiumSymlinks)(driverConfig, pluginConfig, logger_1.default);
|
|
266
|
+
}
|
|
267
|
+
}
|
|
259
268
|
}
|
|
260
269
|
return /** @type {InitResult<Cmd>} */ ({});
|
|
261
270
|
}
|
|
@@ -387,7 +396,7 @@ async function main(args) {
|
|
|
387
396
|
// (more specifically, `build/lib/main.js`)
|
|
388
397
|
// the executable is now `../index.js`, so that module will typically be `require.main`.
|
|
389
398
|
if (require.main === module) {
|
|
390
|
-
(
|
|
399
|
+
main();
|
|
391
400
|
}
|
|
392
401
|
// everything below here is intended to be a public API.
|
|
393
402
|
var config_file_2 = require("./config-file");
|