appium 3.5.0 → 3.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +43 -45
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.d.ts.map +1 -1
- package/build/lib/bidi-commands.js +34 -29
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/bootstrap/appium-initializer.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-initializer.js +13 -13
- package/build/lib/bootstrap/appium-initializer.js.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.js +2 -2
- package/build/lib/bootstrap/appium-main-runner.js.map +1 -1
- package/build/lib/bootstrap/config-file.d.ts.map +1 -1
- package/build/lib/bootstrap/config-file.js +11 -11
- package/build/lib/bootstrap/config-file.js.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.d.ts.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.js +9 -6
- package/build/lib/bootstrap/grid-v3-register.js.map +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/main-helpers.js +19 -20
- package/build/lib/bootstrap/main-helpers.js.map +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/node-helpers.js +7 -14
- package/build/lib/bootstrap/node-helpers.js.map +1 -1
- package/build/lib/bootstrap/startup-config.d.ts.map +1 -1
- package/build/lib/bootstrap/startup-config.js +32 -30
- package/build/lib/bootstrap/startup-config.js.map +1 -1
- package/build/lib/cli/args.d.ts +3 -2
- package/build/lib/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +2 -5
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts +1 -2
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +7 -8
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +2 -2
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +100 -66
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/extension.d.ts.map +1 -1
- package/build/lib/cli/extension.js.map +1 -1
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +21 -14
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +1 -1
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +5 -5
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/cli/setup-command.d.ts +1 -1
- package/build/lib/cli/setup-command.d.ts.map +1 -1
- package/build/lib/cli/setup-command.js +14 -19
- package/build/lib/cli/setup-command.js.map +1 -1
- package/build/lib/cli/utils.d.ts.map +1 -1
- package/build/lib/cli/utils.js +3 -2
- package/build/lib/cli/utils.js.map +1 -1
- package/build/lib/doctor/doctor.d.ts +0 -1
- package/build/lib/doctor/doctor.d.ts.map +1 -1
- package/build/lib/doctor/doctor.js +12 -17
- package/build/lib/doctor/doctor.js.map +1 -1
- package/build/lib/extension/driver-config.d.ts.map +1 -1
- package/build/lib/extension/driver-config.js +11 -12
- package/build/lib/extension/driver-config.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +28 -27
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/index.d.ts.map +1 -1
- package/build/lib/extension/index.js +13 -16
- package/build/lib/extension/index.js.map +1 -1
- package/build/lib/extension/manifest.d.ts +3 -2
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +19 -22
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/extension/plugin-config.d.ts.map +1 -1
- package/build/lib/extension/plugin-config.js +7 -9
- package/build/lib/extension/plugin-config.js.map +1 -1
- package/build/lib/helpers/build.d.ts +0 -1
- package/build/lib/helpers/build.d.ts.map +1 -1
- package/build/lib/helpers/build.js +2 -4
- package/build/lib/helpers/build.js.map +1 -1
- package/build/lib/helpers/capability.d.ts.map +1 -1
- package/build/lib/helpers/capability.js +27 -22
- package/build/lib/helpers/capability.js.map +1 -1
- package/build/lib/helpers/network.d.ts.map +1 -1
- package/build/lib/helpers/network.js +4 -3
- package/build/lib/helpers/network.js.map +1 -1
- package/build/lib/insecure-features.d.ts.map +1 -1
- package/build/lib/insecure-features.js +9 -13
- package/build/lib/insecure-features.js.map +1 -1
- package/build/lib/inspector-commands.d.ts.map +1 -1
- package/build/lib/inspector-commands.js +29 -28
- package/build/lib/inspector-commands.js.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +8 -7
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/schema/arg-spec.d.ts.map +1 -1
- package/build/lib/schema/arg-spec.js +5 -8
- package/build/lib/schema/arg-spec.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +20 -19
- package/build/lib/schema/cli-args.js.map +1 -1
- package/build/lib/schema/cli-transformers.d.ts.map +1 -1
- package/build/lib/schema/cli-transformers.js.map +1 -1
- package/build/lib/schema/schema.d.ts.map +1 -1
- package/build/lib/schema/schema.js +28 -21
- package/build/lib/schema/schema.js.map +1 -1
- package/build/lib/utils/hash.d.ts +5 -0
- package/build/lib/utils/hash.d.ts.map +1 -0
- package/build/lib/{utils.js → utils/hash.js} +3 -21
- package/build/lib/utils/hash.js.map +1 -0
- package/build/lib/utils/index.d.ts +8 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +31 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/is-package-changed.d.ts +16 -0
- package/build/lib/utils/is-package-changed.d.ts.map +1 -0
- package/build/lib/utils/is-package-changed.js +62 -0
- package/build/lib/utils/is-package-changed.js.map +1 -0
- package/build/lib/utils/object.d.ts +120 -0
- package/build/lib/utils/object.d.ts.map +1 -0
- package/build/lib/utils/object.js +288 -0
- package/build/lib/utils/object.js.map +1 -0
- package/build/lib/{extension → utils}/package-changed.d.ts +0 -1
- package/build/lib/utils/package-changed.d.ts.map +1 -0
- package/build/lib/{extension → utils}/package-changed.js +3 -4
- package/build/lib/utils/package-changed.js.map +1 -0
- package/build/lib/utils/package-json.d.ts +9 -0
- package/build/lib/utils/package-json.d.ts.map +1 -0
- package/build/lib/utils/package-json.js +32 -0
- package/build/lib/utils/package-json.js.map +1 -0
- package/build/lib/utils/resolve-from.d.ts +11 -0
- package/build/lib/utils/resolve-from.d.ts.map +1 -0
- package/build/lib/utils/resolve-from.js +41 -0
- package/build/lib/utils/resolve-from.js.map +1 -0
- package/build/types/cli.d.ts.map +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/manifest/base.d.ts.map +1 -1
- package/build/types/manifest/v3.d.ts.map +1 -1
- package/build/types/manifest/v4.d.ts.map +1 -1
- package/lib/appium.ts +59 -55
- package/lib/bidi-commands.ts +106 -60
- package/lib/bootstrap/appium-initializer.ts +27 -19
- package/lib/bootstrap/appium-main-runner.ts +8 -4
- package/lib/bootstrap/config-file.ts +33 -16
- package/lib/bootstrap/grid-v3-register.ts +26 -19
- package/lib/bootstrap/main-helpers.ts +25 -19
- package/lib/bootstrap/node-helpers.ts +19 -22
- package/lib/bootstrap/startup-config.ts +42 -39
- package/lib/cli/args.ts +3 -4
- package/lib/cli/driver-command.ts +19 -13
- package/lib/cli/extension-command.ts +208 -143
- package/lib/cli/extension.ts +4 -6
- package/lib/cli/parser.ts +32 -30
- package/lib/cli/plugin-command.ts +20 -9
- package/lib/cli/setup-command.ts +54 -39
- package/lib/cli/utils.ts +4 -3
- package/lib/doctor/doctor.ts +15 -17
- package/lib/extension/driver-config.ts +22 -17
- package/lib/extension/extension-config.ts +74 -66
- package/lib/extension/index.ts +42 -25
- package/lib/extension/manifest.ts +34 -31
- package/lib/extension/plugin-config.ts +15 -10
- package/lib/helpers/build.ts +6 -5
- package/lib/helpers/capability.ts +40 -35
- package/lib/helpers/network.ts +6 -5
- package/lib/insecure-features.ts +16 -14
- package/lib/inspector-commands.ts +72 -40
- package/lib/logsink.ts +22 -26
- package/lib/schema/arg-spec.ts +9 -8
- package/lib/schema/cli-args-guards.ts +4 -4
- package/lib/schema/cli-args.ts +25 -21
- package/lib/schema/cli-transformers.ts +6 -2
- package/lib/schema/format-errors.ts +1 -1
- package/lib/schema/schema.ts +52 -38
- package/lib/{utils.ts → utils/hash.ts} +2 -19
- package/lib/utils/index.ts +23 -0
- package/lib/utils/is-package-changed.ts +78 -0
- package/lib/utils/object.ts +312 -0
- package/lib/{extension → utils}/package-changed.ts +6 -7
- package/lib/utils/package-json.ts +36 -0
- package/lib/utils/resolve-from.ts +40 -0
- package/package.json +13 -16
- package/scripts/autoinstall-extensions.js +8 -8
- package/tsconfig.json +8 -2
- package/types/cli.ts +18 -18
- package/types/index.ts +2 -2
- package/types/manifest/base.ts +2 -2
- package/types/manifest/v3.ts +2 -2
- package/types/manifest/v4.ts +2 -2
- package/build/lib/extension/package-changed.d.ts.map +0 -1
- package/build/lib/extension/package-changed.js.map +0 -1
- package/build/lib/utils.d.ts +0 -13
- package/build/lib/utils.d.ts.map +0 -1
- package/build/lib/utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/plugin-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AAGlE,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEzC,qBAAa,YAAa,SAAQ,eAAe,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAyC;IAE3E,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY;IAW/C,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;IAI1D,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAIhC,aAAa,CAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAC/B,EAAC,OAAO,EAAC,EAAE,WAAW,CAAC,UAAU,CAAC,GACjC,MAAM;IAIA,KAAK,CAAC,WAAW,GAAE,OAAO,CAAC,UAAU,CAAC,EAAO,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"plugin-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/plugin-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AAGlE,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEzC,qBAAa,YAAa,SAAQ,eAAe,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAyC;IAE3E,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY;IAW/C,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;IAI1D,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAIhC,aAAa,CAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAC/B,EAAC,OAAO,EAAC,EAAE,WAAW,CAAC,UAAU,CAAC,GACjC,MAAM;IAIA,KAAK,CAAC,WAAW,GAAE,OAAO,CAAC,UAAU,CAAC,EAAO,GAAG,IAAI;CAyB9D"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.PluginConfig = void 0;
|
|
7
|
-
const
|
|
4
|
+
const support_1 = require("@appium/support");
|
|
8
5
|
const constants_1 = require("../constants");
|
|
9
6
|
const logger_1 = require("../logger");
|
|
10
7
|
const extension_config_1 = require("./extension-config");
|
|
@@ -32,16 +29,17 @@ class PluginConfig extends extension_config_1.ExtensionConfig {
|
|
|
32
29
|
}
|
|
33
30
|
print(activeNames = []) {
|
|
34
31
|
const pluginNames = Object.keys(this.installedExtensions);
|
|
35
|
-
if (
|
|
36
|
-
logger_1.log.info(`No plugins have been installed. Use the "appium plugin" ` +
|
|
32
|
+
if (support_1.util.isEmpty(pluginNames)) {
|
|
33
|
+
logger_1.log.info(`No plugins have been installed. Use the "appium plugin" ` +
|
|
34
|
+
'command to install the one(s) you want to use.');
|
|
37
35
|
return;
|
|
38
36
|
}
|
|
39
37
|
logger_1.log.info(`Available plugins:`);
|
|
40
|
-
for (const [pluginName, pluginData] of
|
|
41
|
-
const activeTxt =
|
|
38
|
+
for (const [pluginName, pluginData] of Object.entries(this.installedExtensions)) {
|
|
39
|
+
const activeTxt = activeNames.includes(pluginName) ? ' (ACTIVE)' : '';
|
|
42
40
|
logger_1.log.info(` - ${this.extensionDesc(pluginName, pluginData)}${activeTxt}`);
|
|
43
41
|
}
|
|
44
|
-
if (
|
|
42
|
+
if (support_1.util.isEmpty(activeNames)) {
|
|
45
43
|
logger_1.log.info('No plugins activated. Use the --use-plugins flag with names of plugins to activate');
|
|
46
44
|
}
|
|
47
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../../lib/extension/plugin-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../../lib/extension/plugin-config.ts"],"names":[],"mappings":";;;AAAA,6CAAqC;AAGrC,4CAAyC;AACzC,sCAA8B;AAC9B,yDAAmD;AAGnD,MAAa,YAAa,SAAQ,kCAA2B;IACnD,MAAM,CAAU,UAAU,GAAG,IAAI,OAAO,EAA0B,CAAC;IAE3E,YAAoB,QAAkB;QACpC,KAAK,CAAC,uBAAW,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,QAAkB;QAC9B,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,CAAC,UAAU,6EAA6E,CAC9H,CAAC;QACJ,CAAC;QACD,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,QAAkB;QACnC,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,MAAM,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAW,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEe,aAAa,CAC3B,UAA+B,EAC/B,EAAC,OAAO,EAA0B;QAElC,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC;IAC5C,CAAC;IAEQ,KAAK,CAAC,cAAqC,EAAE;QACpD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAE1D,IAAI,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,YAAG,CAAC,IAAI,CACN,0DAA0D;gBACxD,gDAAgD,CACnD,CAAC;YACF,OAAO;QACT,CAAC;QAED,YAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC/B,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAChF,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAiC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,YAAG,CAAC,IAAI,CACN,OAAO,IAAI,CAAC,aAAa,CAAC,UAAiC,EAAE,UAAU,CAAC,GAAG,SAAS,EAAE,CACvF,CAAC;QACJ,CAAC;QAED,IAAI,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,YAAG,CAAC,IAAI,CACN,oFAAoF,CACrF,CAAC;QACJ,CAAC;IACH,CAAC;;AAzDH,oCA0DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../lib/helpers/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../lib/helpers/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAG5C,eAAO,MAAM,UAAU,QAAqB,CAAC;AAa7C;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,oBAAoB,UAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2BpF;AAoCD;;GAEG;AACH,wBAAsB,eAAe,CAAC,oBAAoB,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUjF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC"}
|
|
@@ -3,20 +3,18 @@ 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.APPIUM_VER = void 0;
|
|
7
7
|
exports.getGitRev = getGitRev;
|
|
8
8
|
exports.updateBuildInfo = updateBuildInfo;
|
|
9
9
|
exports.getBuildInfo = getBuildInfo;
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
10
|
const axios_1 = __importDefault(require("axios"));
|
|
12
11
|
const teen_process_1 = require("teen_process");
|
|
13
12
|
const support_1 = require("@appium/support");
|
|
14
13
|
const utils_1 = require("../utils");
|
|
15
14
|
exports.APPIUM_VER = utils_1.npmPackage.version;
|
|
16
|
-
exports.rootDir = support_1.fs.findRoot(__dirname);
|
|
17
15
|
const GIT_BINARY = `git${support_1.system.isWindows() ? '.exe' : ''}`;
|
|
18
16
|
const GITHUB_API = 'https://api.github.com/repos/appium/appium';
|
|
19
|
-
const getFullGitPath =
|
|
17
|
+
const getFullGitPath = support_1.util.memoize(async function getFullGitPath() {
|
|
20
18
|
try {
|
|
21
19
|
return await support_1.fs.which(GIT_BINARY);
|
|
22
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../lib/helpers/build.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../lib/helpers/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability.d.ts","sourceRoot":"","sources":["../../../lib/helpers/capability.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,EAChB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"capability.d.ts","sourceRoot":"","sources":["../../../lib/helpers/capability.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,EAChB,MAAM,eAAe,CAAC;AASvB,4EAA4E;AAC5E,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,wBAAwB;IAChF,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7B,wBAAwB,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9C;AAED,gEAAgE;AAChE,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,wBAAwB;IAC3E,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,wBAAwB,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;CAC/C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,KAAK,CAK3C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,WAAW,GAAG,wBAAwB,EACtF,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EACnC,WAAW,GAAE,CAAW,EACxB,mBAAmB,GAAE,cAAc,CAAC,CAAC,CAAM,GAC1C,gBAAgB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CA8DtC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,GAAG,wBAAwB,EACnF,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GACpB,cAAc,CAAC,CAAC,CAAC,CAMnB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,GAAG,wBAAwB,EACnF,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GACtB,YAAY,CAAC,CAAC,CAAC,CAIjB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAC/C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqBzB"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.makeNonW3cCapsError = makeNonW3cCapsError;
|
|
7
4
|
exports.parseCapsForInnerDriver = parseCapsForInnerDriver;
|
|
8
5
|
exports.insertAppiumPrefixes = insertAppiumPrefixes;
|
|
9
6
|
exports.removeAppiumPrefixes = removeAppiumPrefixes;
|
|
10
7
|
exports.pullSettings = pullSettings;
|
|
11
|
-
const
|
|
8
|
+
const support_1 = require("@appium/support");
|
|
12
9
|
const logger_1 = require("../logger");
|
|
13
10
|
const base_driver_1 = require("@appium/base-driver");
|
|
11
|
+
const utils_1 = require("../utils");
|
|
14
12
|
const W3C_APPIUM_PREFIX = 'appium';
|
|
15
13
|
const STANDARD_CAPS_LOWERCASE = new Set([...base_driver_1.STANDARD_CAPS].map((cap) => cap.toLowerCase()));
|
|
16
14
|
/**
|
|
@@ -32,27 +30,29 @@ function parseCapsForInnerDriver(w3cCapabilities, constraints = {}, defaultCapab
|
|
|
32
30
|
let desiredCaps = {};
|
|
33
31
|
// eslint-disable-next-line prefer-const -- assigned in success path after try
|
|
34
32
|
let processedW3CCapabilities;
|
|
35
|
-
w3cCapabilities =
|
|
36
|
-
defaultCapabilities =
|
|
37
|
-
if (!
|
|
38
|
-
for (const [defaultCapKey, defaultCapValue] of
|
|
33
|
+
w3cCapabilities = structuredClone(w3cCapabilities);
|
|
34
|
+
defaultCapabilities = structuredClone(defaultCapabilities);
|
|
35
|
+
if (!support_1.util.isEmpty(defaultCapabilities)) {
|
|
36
|
+
for (const [defaultCapKey, defaultCapValue] of Object.entries(defaultCapabilities)) {
|
|
39
37
|
let isCapAlreadySet = false;
|
|
40
38
|
for (const firstMatchEntry of w3cCapabilities.firstMatch ?? []) {
|
|
41
|
-
if (
|
|
42
|
-
|
|
39
|
+
if (support_1.util.isPlainObject(firstMatchEntry) &&
|
|
40
|
+
hasOwnCapability(firstMatchEntry, defaultCapKey)) {
|
|
43
41
|
isCapAlreadySet = true;
|
|
44
42
|
break;
|
|
45
43
|
}
|
|
46
44
|
}
|
|
47
45
|
isCapAlreadySet =
|
|
48
46
|
isCapAlreadySet ||
|
|
49
|
-
(
|
|
50
|
-
|
|
47
|
+
(support_1.util.isPlainObject(w3cCapabilities.alwaysMatch) &&
|
|
48
|
+
hasOwnCapability(w3cCapabilities.alwaysMatch, defaultCapKey));
|
|
51
49
|
if (isCapAlreadySet) {
|
|
52
50
|
continue;
|
|
53
51
|
}
|
|
54
|
-
if (
|
|
55
|
-
w3cCapabilities.firstMatch = [
|
|
52
|
+
if (support_1.util.isEmpty(w3cCapabilities.firstMatch)) {
|
|
53
|
+
w3cCapabilities.firstMatch = [
|
|
54
|
+
{ [defaultCapKey]: defaultCapValue },
|
|
55
|
+
];
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
58
|
w3cCapabilities.firstMatch[0][defaultCapKey] = defaultCapValue;
|
|
@@ -83,15 +83,15 @@ function parseCapsForInnerDriver(w3cCapabilities, constraints = {}, defaultCapab
|
|
|
83
83
|
* Prefixes capability keys with `appium:` where appropriate.
|
|
84
84
|
*/
|
|
85
85
|
function insertAppiumPrefixes(caps) {
|
|
86
|
-
return
|
|
87
|
-
? key
|
|
86
|
+
return (0, utils_1.mapKeys)(caps, (_, key) => STANDARD_CAPS_LOWERCASE.has(String(key).toLowerCase()) || String(key).includes(':')
|
|
87
|
+
? String(key)
|
|
88
88
|
: `${W3C_APPIUM_PREFIX}:${key}`);
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
91
|
* Removes `appium:` prefix from capability keys.
|
|
92
92
|
*/
|
|
93
93
|
function removeAppiumPrefixes(caps) {
|
|
94
|
-
return
|
|
94
|
+
return (0, utils_1.mapKeys)(caps, (_, key) => removeAppiumPrefix(String(key)));
|
|
95
95
|
}
|
|
96
96
|
/**
|
|
97
97
|
* Pulls Appium settings from capabilities (mutates caps). Supports
|
|
@@ -100,14 +100,14 @@ function removeAppiumPrefixes(caps) {
|
|
|
100
100
|
* @returns Parsed settings object; empty if none found.
|
|
101
101
|
*/
|
|
102
102
|
function pullSettings(caps) {
|
|
103
|
-
if (!
|
|
103
|
+
if (!support_1.util.isPlainObject(caps) || support_1.util.isEmpty(caps)) {
|
|
104
104
|
return {};
|
|
105
105
|
}
|
|
106
106
|
const result = {};
|
|
107
107
|
const singleSettings = {};
|
|
108
|
-
for (const [key, value] of
|
|
108
|
+
for (const [key, value] of Object.entries(caps)) {
|
|
109
109
|
let match;
|
|
110
|
-
if (/^(s|appium:s)ettings$/.test(key) &&
|
|
110
|
+
if (/^(s|appium:s)ettings$/.test(key) && support_1.util.isPlainObject(value)) {
|
|
111
111
|
Object.assign(result, value);
|
|
112
112
|
delete caps[key];
|
|
113
113
|
}
|
|
@@ -116,13 +116,18 @@ function pullSettings(caps) {
|
|
|
116
116
|
delete caps[key];
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
if (!
|
|
119
|
+
if (!support_1.util.isEmpty(singleSettings)) {
|
|
120
120
|
Object.assign(result, singleSettings);
|
|
121
121
|
}
|
|
122
122
|
return result;
|
|
123
123
|
}
|
|
124
124
|
function removeAppiumPrefix(key) {
|
|
125
125
|
const prefix = `${W3C_APPIUM_PREFIX}:`;
|
|
126
|
-
return
|
|
126
|
+
return key.startsWith(prefix) ? key.substring(prefix.length) : key;
|
|
127
|
+
}
|
|
128
|
+
/** True when `caps` has an own property matching `capKey` (with or without `appium:` prefix). */
|
|
129
|
+
function hasOwnCapability(caps, capKey) {
|
|
130
|
+
const targetKey = removeAppiumPrefix(capKey);
|
|
131
|
+
return Object.keys(caps).some((key) => removeAppiumPrefix(key) === targetKey);
|
|
127
132
|
}
|
|
128
133
|
//# sourceMappingURL=capability.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability.js","sourceRoot":"","sources":["../../../lib/helpers/capability.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"capability.js","sourceRoot":"","sources":["../../../lib/helpers/capability.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../lib/helpers/network.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../lib/helpers/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,OAAO,CAAC;AAEpC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,GAAE,CAAC,GAAG,CAAC,GAAG,IAAW,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAatF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.V6_BROADCAST_IP = exports.V4_BROADCAST_IP = void 0;
|
|
7
7
|
exports.fetchInterfaces = fetchInterfaces;
|
|
8
8
|
exports.isBroadcastIp = isBroadcastIp;
|
|
9
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const node_os_1 = __importDefault(require("node:os"));
|
|
11
10
|
exports.V4_BROADCAST_IP = '0.0.0.0';
|
|
12
11
|
exports.V6_BROADCAST_IP = '::';
|
|
@@ -23,8 +22,10 @@ function fetchInterfaces(family = null) {
|
|
|
23
22
|
else if (family === 6) {
|
|
24
23
|
familyValue = [6, 'IPv6'];
|
|
25
24
|
}
|
|
26
|
-
const ifaces =
|
|
27
|
-
return
|
|
25
|
+
const ifaces = Object.values(node_os_1.default.networkInterfaces()).filter(Boolean);
|
|
26
|
+
return ifaces
|
|
27
|
+
.flat()
|
|
28
|
+
.filter((info) => !familyValue || familyValue.includes(info.family));
|
|
28
29
|
}
|
|
29
30
|
/**
|
|
30
31
|
* Returns true if the address is a broadcast IP (0.0.0.0 or ::).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../lib/helpers/network.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../lib/helpers/network.ts"],"names":[],"mappings":";;;;;;AAUA,0CAaC;AAKD,sCAEC;AA9BD,sDAAyB;AAEZ,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,eAAe,GAAG,IAAI,CAAC;AAEpC;;;;GAIG;AACH,SAAgB,eAAe,CAAC,SAAuB,IAAI;IACzD,IAAI,WAAW,GAA8B,IAAI,CAAC;IAClD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,WAAW,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;SAAM,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,WAAW,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,MAAM,CACzD,OAAO,CACuB,CAAC;IACjC,OAAO,MAAM;SACV,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAwB,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,OAAe;IAC3C,OAAO,CAAC,uBAAe,EAAE,uBAAe,EAAE,IAAI,uBAAe,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACtF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insecure-features.d.ts","sourceRoot":"","sources":["../../lib/insecure-features.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAKlD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,QAyBzD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"insecure-features.d.ts","sourceRoot":"","sources":["../../lib/insecure-features.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAKlD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,QAyBzD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,QA2BnB"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.configureGlobalFeatures = configureGlobalFeatures;
|
|
7
4
|
exports.configureDriverFeatures = configureDriverFeatures;
|
|
8
|
-
const
|
|
5
|
+
const support_1 = require("@appium/support");
|
|
9
6
|
const logger_1 = require("./logger");
|
|
10
7
|
const ALL_DRIVERS_MATCH = '*';
|
|
11
8
|
const FEATURE_NAME_SEPARATOR = ':';
|
|
@@ -21,20 +18,20 @@ function configureGlobalFeatures() {
|
|
|
21
18
|
`enabled unless explicitly disabled by --deny-insecure`);
|
|
22
19
|
this.relaxedSecurityEnabled = true;
|
|
23
20
|
}
|
|
24
|
-
else if (!
|
|
21
|
+
else if (!support_1.util.isEmpty(this.args.allowInsecure)) {
|
|
25
22
|
this.allowInsecure = validateFeatures(this.args.allowInsecure);
|
|
26
23
|
const globalAllowedFeatures = filterInsecureFeatures(this.allowInsecure);
|
|
27
|
-
if (!
|
|
24
|
+
if (!support_1.util.isEmpty(globalAllowedFeatures)) {
|
|
28
25
|
logger_1.log.info('Explicitly enabling insecure features:');
|
|
29
26
|
globalAllowedFeatures.forEach((a) => logger_1.log.info(` ${a}`));
|
|
30
27
|
}
|
|
31
28
|
}
|
|
32
|
-
if (
|
|
29
|
+
if (support_1.util.isEmpty(this.args.denyInsecure)) {
|
|
33
30
|
return;
|
|
34
31
|
}
|
|
35
32
|
this.denyInsecure = validateFeatures(this.args.denyInsecure);
|
|
36
33
|
const globalDeniedFeatures = filterInsecureFeatures(this.denyInsecure);
|
|
37
|
-
if (
|
|
34
|
+
if (support_1.util.isEmpty(globalDeniedFeatures)) {
|
|
38
35
|
return;
|
|
39
36
|
}
|
|
40
37
|
logger_1.log.info('Explicitly disabling insecure features:');
|
|
@@ -54,18 +51,17 @@ function configureDriverFeatures(driver, driverName) {
|
|
|
54
51
|
driver.relaxedSecurityEnabled = true;
|
|
55
52
|
}
|
|
56
53
|
const allowedDriverFeatures = filterInsecureFeatures(this.allowInsecure, driverName);
|
|
57
|
-
if (!
|
|
54
|
+
if (!support_1.util.isEmpty(allowedDriverFeatures)) {
|
|
58
55
|
this.log.info('Explicitly enabling insecure features for this session ' +
|
|
59
56
|
'as per the server configuration:');
|
|
60
57
|
allowedDriverFeatures.forEach((a) => this.log.info(` ${a}`));
|
|
61
58
|
driver.allowInsecure = allowedDriverFeatures;
|
|
62
59
|
}
|
|
63
60
|
const deniedDriverFeatures = filterInsecureFeatures(this.denyInsecure, driverName);
|
|
64
|
-
if (
|
|
61
|
+
if (support_1.util.isEmpty(deniedDriverFeatures)) {
|
|
65
62
|
return;
|
|
66
63
|
}
|
|
67
|
-
this.log.info('Explicitly disabling insecure features for this session ' +
|
|
68
|
-
'as per the server configuration:');
|
|
64
|
+
this.log.info('Explicitly disabling insecure features for this session ' + 'as per the server configuration:');
|
|
69
65
|
deniedDriverFeatures.forEach((a) => this.log.info(` ${a}`));
|
|
70
66
|
driver.denyInsecure = deniedDriverFeatures;
|
|
71
67
|
}
|
|
@@ -85,7 +81,7 @@ function validateFeatures(features) {
|
|
|
85
81
|
}
|
|
86
82
|
const [automationName, featureName] = [
|
|
87
83
|
fullName.substring(0, separatorPos),
|
|
88
|
-
fullName.substring(separatorPos + 1)
|
|
84
|
+
fullName.substring(separatorPos + 1),
|
|
89
85
|
];
|
|
90
86
|
if (!automationName || !featureName) {
|
|
91
87
|
throw new Error(errMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insecure-features.js","sourceRoot":"","sources":["../../lib/insecure-features.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"insecure-features.js","sourceRoot":"","sources":["../../lib/insecure-features.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAE3C;;GAEG;AACH,wBAAsB,YAAY,
|
|
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;AAE3C;;GAEG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,YAAY,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA6B/B;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,YAAY,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,CAqBjC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.listCommands = listCommands;
|
|
7
4
|
exports.listExtensions = listExtensions;
|
|
8
|
-
const
|
|
5
|
+
const utils_1 = require("./utils");
|
|
9
6
|
const base_driver_1 = require("@appium/base-driver");
|
|
10
7
|
/**
|
|
11
8
|
* Returns available REST and BiDi commands for base, driver and plugins.
|
|
@@ -19,16 +16,17 @@ async function listCommands(sessionId) {
|
|
|
19
16
|
const driverClass = this.driverForSession(sessionId)?.constructor;
|
|
20
17
|
driverRestMethodMap = driverClass?.newMethodMap ?? {};
|
|
21
18
|
driverBiDiCommands = driverClass?.newBidiCommands ?? {};
|
|
22
|
-
const pluginClasses = this.pluginsForSession(sessionId)
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
pluginBiDiCommands = lodash_1.default.fromPairs(pluginClasses.map((c) => [c.name, c.newBidiCommands ?? {}]));
|
|
19
|
+
const pluginClasses = this.pluginsForSession(sessionId).map((p) => p.constructor);
|
|
20
|
+
pluginRestMethodMaps = Object.fromEntries(pluginClasses.map((c) => [c.name, c.newMethodMap ?? {}]));
|
|
21
|
+
pluginBiDiCommands = Object.fromEntries(pluginClasses.map((c) => [c.name, c.newBidiCommands ?? {}]));
|
|
26
22
|
}
|
|
27
23
|
return {
|
|
28
24
|
rest: {
|
|
29
25
|
base: methodMapToRestCommandsInfo(base_driver_1.METHOD_MAP),
|
|
30
26
|
driver: methodMapToRestCommandsInfo(driverRestMethodMap),
|
|
31
|
-
plugins: pluginRestMethodMaps
|
|
27
|
+
plugins: pluginRestMethodMaps
|
|
28
|
+
? (0, utils_1.mapValues)(pluginRestMethodMaps, methodMapToRestCommandsInfo)
|
|
29
|
+
: undefined,
|
|
32
30
|
},
|
|
33
31
|
bidi: toBiDiCommandsMap(base_driver_1.BIDI_COMMANDS, driverBiDiCommands, pluginBiDiCommands),
|
|
34
32
|
};
|
|
@@ -42,14 +40,15 @@ async function listExtensions(sessionId) {
|
|
|
42
40
|
if (sessionId) {
|
|
43
41
|
const driverClass = this.driverForSession(sessionId)?.constructor;
|
|
44
42
|
driverExecuteMethodMap = driverClass?.executeMethodMap ?? {};
|
|
45
|
-
const pluginClasses = this.pluginsForSession(sessionId)
|
|
46
|
-
|
|
47
|
-
pluginExecuteMethodMaps = lodash_1.default.fromPairs(pluginClasses.map((c) => [c.name, c.executeMethodMap ?? {}]));
|
|
43
|
+
const pluginClasses = this.pluginsForSession(sessionId).map((p) => p.constructor);
|
|
44
|
+
pluginExecuteMethodMaps = Object.fromEntries(pluginClasses.map((c) => [c.name, c.executeMethodMap ?? {}]));
|
|
48
45
|
}
|
|
49
46
|
return {
|
|
50
47
|
rest: {
|
|
51
48
|
driver: executeMethodMapToCommandsInfo(driverExecuteMethodMap),
|
|
52
|
-
plugins: pluginExecuteMethodMaps
|
|
49
|
+
plugins: pluginExecuteMethodMaps
|
|
50
|
+
? (0, utils_1.mapValues)(pluginExecuteMethodMaps, executeMethodMapToCommandsInfo)
|
|
51
|
+
: undefined,
|
|
53
52
|
},
|
|
54
53
|
};
|
|
55
54
|
}
|
|
@@ -58,9 +57,9 @@ function toRestCommandParams(params) {
|
|
|
58
57
|
return;
|
|
59
58
|
}
|
|
60
59
|
const toRestCommandItemParam = (x, isRequired) => {
|
|
61
|
-
const isNameAnArray =
|
|
60
|
+
const isNameAnArray = Array.isArray(x);
|
|
62
61
|
const name = isNameAnArray ? x[0] : x;
|
|
63
|
-
if (
|
|
62
|
+
if (typeof name !== 'string') {
|
|
64
63
|
return;
|
|
65
64
|
}
|
|
66
65
|
// If parameter names are arrays then this means
|
|
@@ -74,20 +73,20 @@ function toRestCommandParams(params) {
|
|
|
74
73
|
};
|
|
75
74
|
const requiredParams = (params.required ?? [])
|
|
76
75
|
.map((name) => toRestCommandItemParam(name, true))
|
|
77
|
-
.filter((x) =>
|
|
76
|
+
.filter((x) => x !== undefined);
|
|
78
77
|
const optionalParams = (params.optional ?? [])
|
|
79
78
|
.map((name) => toRestCommandItemParam(name, false))
|
|
80
|
-
.filter((x) =>
|
|
79
|
+
.filter((x) => x !== undefined);
|
|
81
80
|
return requiredParams.length || optionalParams.length
|
|
82
81
|
? [...requiredParams, ...optionalParams]
|
|
83
82
|
: undefined;
|
|
84
83
|
}
|
|
85
84
|
function methodMapToRestCommandsInfo(mm) {
|
|
86
85
|
const res = {};
|
|
87
|
-
for (const [uriPath, methods] of
|
|
86
|
+
for (const [uriPath, methods] of Object.entries(mm)) {
|
|
88
87
|
const methodsMap = {};
|
|
89
|
-
for (const [method, spec] of
|
|
90
|
-
methodsMap[method] = {
|
|
88
|
+
for (const [method, spec] of Object.entries(methods)) {
|
|
89
|
+
methodsMap[String(method)] = {
|
|
91
90
|
command: spec.command,
|
|
92
91
|
deprecated: spec.deprecated,
|
|
93
92
|
info: spec.info,
|
|
@@ -100,7 +99,7 @@ function methodMapToRestCommandsInfo(mm) {
|
|
|
100
99
|
}
|
|
101
100
|
function executeMethodMapToCommandsInfo(emm) {
|
|
102
101
|
const result = {};
|
|
103
|
-
for (const [name, info] of
|
|
102
|
+
for (const [name, info] of Object.entries(emm)) {
|
|
104
103
|
result[name] = {
|
|
105
104
|
command: info.command,
|
|
106
105
|
deprecated: info.deprecated,
|
|
@@ -116,9 +115,9 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
116
115
|
return;
|
|
117
116
|
}
|
|
118
117
|
const toBiDiCommandItemParam = (x, isRequired) => {
|
|
119
|
-
const isNameAnArray =
|
|
118
|
+
const isNameAnArray = Array.isArray(x);
|
|
120
119
|
const name = isNameAnArray ? x[0] : x;
|
|
121
|
-
if (
|
|
120
|
+
if (typeof name !== 'string') {
|
|
122
121
|
return;
|
|
123
122
|
}
|
|
124
123
|
// If parameter names are arrays then this means
|
|
@@ -132,19 +131,19 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
132
131
|
};
|
|
133
132
|
const requiredParams = (params.required ?? [])
|
|
134
133
|
.map((name) => toBiDiCommandItemParam(name, true))
|
|
135
|
-
.filter((x) =>
|
|
134
|
+
.filter((x) => x !== undefined);
|
|
136
135
|
const optionalParams = (params.optional ?? [])
|
|
137
136
|
.map((name) => toBiDiCommandItemParam(name, false))
|
|
138
|
-
.filter((x) =>
|
|
137
|
+
.filter((x) => x !== undefined);
|
|
139
138
|
return requiredParams.length || optionalParams.length
|
|
140
139
|
? [...requiredParams, ...optionalParams]
|
|
141
140
|
: undefined;
|
|
142
141
|
};
|
|
143
142
|
const moduleMapToBiDiCommandsInfo = (mm) => {
|
|
144
143
|
const res = {};
|
|
145
|
-
for (const [domain, commands] of
|
|
144
|
+
for (const [domain, commands] of Object.entries(mm)) {
|
|
146
145
|
const commandsMap = {};
|
|
147
|
-
for (const [name, spec] of
|
|
146
|
+
for (const [name, spec] of Object.entries(commands)) {
|
|
148
147
|
commandsMap[name] = {
|
|
149
148
|
command: spec.command,
|
|
150
149
|
deprecated: spec.deprecated,
|
|
@@ -159,7 +158,9 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
159
158
|
return {
|
|
160
159
|
base: moduleMapToBiDiCommandsInfo(baseModuleMap),
|
|
161
160
|
driver: moduleMapToBiDiCommandsInfo(driverModuleMap),
|
|
162
|
-
plugins: pluginModuleMaps
|
|
161
|
+
plugins: pluginModuleMaps
|
|
162
|
+
? (0, utils_1.mapValues)(pluginModuleMaps, moduleMapToBiDiCommandsInfo)
|
|
163
|
+
: undefined,
|
|
163
164
|
};
|
|
164
165
|
}
|
|
165
166
|
//# sourceMappingURL=inspector-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspector-commands.js","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inspector-commands.js","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AA6C7C;;;;;;GAMG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0D1D;AAED;;;GAGG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAG5B;AA4KD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD"}
|