@appium/base-driver 9.17.0 → 10.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/basedriver/capabilities.d.ts.map +1 -1
- package/build/lib/basedriver/capabilities.js +2 -4
- package/build/lib/basedriver/capabilities.js.map +1 -1
- package/build/lib/basedriver/commands/timeout.js +7 -25
- package/build/lib/basedriver/commands/timeout.js.map +1 -1
- package/build/lib/basedriver/core.d.ts +0 -8
- package/build/lib/basedriver/core.d.ts.map +1 -1
- package/build/lib/basedriver/core.js +8 -18
- package/build/lib/basedriver/core.js.map +1 -1
- package/build/lib/basedriver/driver.js +2 -2
- package/build/lib/basedriver/driver.js.map +1 -1
- package/build/lib/basedriver/helpers.d.ts +9 -1
- package/build/lib/basedriver/helpers.d.ts.map +1 -1
- package/build/lib/basedriver/helpers.js +56 -142
- package/build/lib/basedriver/helpers.js.map +1 -1
- package/build/lib/basedriver/validation.d.ts +7 -0
- package/build/lib/basedriver/validation.d.ts.map +1 -0
- package/build/lib/basedriver/validation.js +130 -0
- package/build/lib/basedriver/validation.js.map +1 -0
- package/build/lib/express/middleware.d.ts +0 -6
- package/build/lib/express/middleware.d.ts.map +1 -1
- package/build/lib/express/middleware.js +12 -64
- package/build/lib/express/middleware.js.map +1 -1
- package/build/lib/express/server.d.ts.map +1 -1
- package/build/lib/express/server.js +1 -2
- package/build/lib/express/server.js.map +1 -1
- package/build/lib/helpers/capabilities.d.ts +13 -6
- package/build/lib/helpers/capabilities.d.ts.map +1 -1
- package/build/lib/helpers/capabilities.js +7 -0
- package/build/lib/helpers/capabilities.js.map +1 -1
- package/build/lib/index.d.ts +1 -0
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +3 -1
- package/build/lib/index.js.map +1 -1
- package/build/lib/jsonwp-proxy/proxy.d.ts +0 -8
- package/build/lib/jsonwp-proxy/proxy.d.ts.map +1 -1
- package/build/lib/jsonwp-proxy/proxy.js +1 -29
- package/build/lib/jsonwp-proxy/proxy.js.map +1 -1
- package/build/lib/protocol/errors.d.ts +171 -277
- package/build/lib/protocol/errors.d.ts.map +1 -1
- package/build/lib/protocol/errors.js +201 -421
- package/build/lib/protocol/errors.js.map +1 -1
- package/build/lib/protocol/helpers.d.ts +6 -6
- package/build/lib/protocol/helpers.d.ts.map +1 -1
- package/build/lib/protocol/helpers.js +11 -7
- package/build/lib/protocol/helpers.js.map +1 -1
- package/build/lib/protocol/protocol.d.ts +5 -0
- package/build/lib/protocol/protocol.d.ts.map +1 -1
- package/build/lib/protocol/protocol.js +23 -23
- package/build/lib/protocol/protocol.js.map +1 -1
- package/build/lib/protocol/routes.d.ts +6 -715
- package/build/lib/protocol/routes.d.ts.map +1 -1
- package/build/lib/protocol/routes.js +16 -481
- package/build/lib/protocol/routes.js.map +1 -1
- package/build/lib/protocol/validators.d.ts +4 -7
- package/build/lib/protocol/validators.d.ts.map +1 -1
- package/build/lib/protocol/validators.js +4 -24
- package/build/lib/protocol/validators.js.map +1 -1
- package/lib/basedriver/capabilities.ts +2 -4
- package/lib/basedriver/commands/timeout.ts +11 -34
- package/lib/basedriver/core.ts +10 -19
- package/lib/basedriver/driver.ts +3 -3
- package/lib/basedriver/helpers.js +61 -167
- package/lib/basedriver/validation.ts +145 -0
- package/lib/express/middleware.js +16 -75
- package/lib/express/server.js +1 -3
- package/lib/helpers/capabilities.js +9 -4
- package/lib/index.js +2 -0
- package/lib/jsonwp-proxy/proxy.js +2 -33
- package/lib/protocol/{errors.js → errors.ts} +322 -436
- package/lib/protocol/helpers.js +12 -8
- package/lib/protocol/protocol.js +25 -23
- package/lib/protocol/routes.js +18 -491
- package/lib/protocol/validators.ts +19 -0
- package/package.json +10 -10
- package/build/lib/basedriver/desired-caps.d.ts +0 -5
- package/build/lib/basedriver/desired-caps.d.ts.map +0 -1
- package/build/lib/basedriver/desired-caps.js +0 -92
- package/build/lib/basedriver/desired-caps.js.map +0 -1
- package/lib/basedriver/desired-caps.js +0 -103
- package/lib/protocol/validators.js +0 -41
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,eAAe,EACf,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,WAAW,CAAC;AAOnB,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,wBAAwB,mBAAmC,CAAC;AAEzE,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,WAAW,IAAI;IAC9C,iBAAiB,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACvC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAChC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,4CAA4C;IAC5C,sBAAsB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9C,CAAA;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,WAAW,EACrB,CAAC,SAAS,WAAW,EACrB,OAAO,SAAS,YAAY,CAAC,CAAC,CAAC,EAC/B,SAAS,SAAS,YAAY,CAAC,CAAC,CAAC,EAEjC,OAAO,GAAE,OAAO,GAAG,SAAyB,EAC5C,SAAS,GAAE,SAAS,GAAG,SAA2B,GACjD,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAkBpC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,EAChD,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EACrB,WAAW,GAAE,CAAC,GAAG,SAAmB,EACpC,IAAI,GAAE,gBAAgB,GAAG,SAAc,GACtC,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,eAAe,EACf,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,WAAW,CAAC;AAOnB,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,wBAAwB,mBAAmC,CAAC;AAEzE,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,WAAW,IAAI;IAC9C,iBAAiB,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACvC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAChC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,4CAA4C;IAC5C,sBAAsB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9C,CAAA;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,WAAW,EACrB,CAAC,SAAS,WAAW,EACrB,OAAO,SAAS,YAAY,CAAC,CAAC,CAAC,EAC/B,SAAS,SAAS,YAAY,CAAC,CAAC,CAAC,EAEjC,OAAO,GAAE,OAAO,GAAG,SAAyB,EAC5C,SAAS,GAAE,SAAS,GAAG,SAA2B,GACjD,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAkBpC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,EAChD,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EACrB,WAAW,GAAE,CAAC,GAAG,SAAmB,EACpC,IAAI,GAAE,gBAAgB,GAAG,SAAc,GACtC,YAAY,CAAC,CAAC,CAAC,CAsCjB;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,2CAezB,CAAC;AAIF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAElD;AAiDD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,WAAW,EACvD,EACE,WAAgB,EAChB,UAAe,EAChB,EAAE,eAAe,CAAC,CAAC,CAAC,GACpB,MAAM,EAAE,CAWV;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,EAC7C,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EACxB,WAAW,GAAE,CAAC,GAAG,SAAmB,EACpC,kBAAkB,GAAE,OAAO,GAAG,SAAgB,GAC7C,UAAU,CAAC,CAAC,CAAC,CA8Ff;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,CAAC,SAAS,WAAW,EACrB,OAAO,SAAS,eAAe,CAAC,CAAC,CAAC,EAElC,OAAO,EAAE,OAAO,EAChB,WAAW,GAAE,CAAC,GAAG,SAAmB,EACpC,kBAAkB,GAAE,OAAO,GAAG,SAAgB,GAC7C,YAAY,CAAC,CAAC,CAAC,CAmBjB;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAoD9G;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAchH"}
|
|
@@ -14,7 +14,7 @@ exports.processCapabilities = processCapabilities;
|
|
|
14
14
|
exports.promoteAppiumOptionsForObject = promoteAppiumOptionsForObject;
|
|
15
15
|
exports.promoteAppiumOptions = promoteAppiumOptions;
|
|
16
16
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
|
-
const
|
|
17
|
+
const validation_1 = require("./validation");
|
|
18
18
|
const support_1 = require("@appium/support");
|
|
19
19
|
const logger_1 = __importDefault(require("./logger"));
|
|
20
20
|
const errors_1 = require("../protocol/errors");
|
|
@@ -57,9 +57,7 @@ function validateCaps(caps, constraints = {}, opts = {}) {
|
|
|
57
57
|
}
|
|
58
58
|
return constraint;
|
|
59
59
|
}));
|
|
60
|
-
const validationErrors =
|
|
61
|
-
fullMessages: false,
|
|
62
|
-
});
|
|
60
|
+
const validationErrors = validation_1.validator.validate(lodash_1.default.pickBy(caps, support_1.util.hasValue), constraints);
|
|
63
61
|
if (validationErrors) {
|
|
64
62
|
const message = [];
|
|
65
63
|
for (const [attribute, reasons] of lodash_1.default.toPairs(validationErrors)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.ts"],"names":[],"mappings":";;;;;;AAqCA,8BA0BC;AAKD,
|
|
1
|
+
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,23 +11,19 @@ const mixin_1 = require("./mixin");
|
|
|
11
11
|
const MIN_TIMEOUT = 0;
|
|
12
12
|
const TimeoutCommands = {
|
|
13
13
|
async timeouts(type, ms, script, pageLoad, implicit) {
|
|
14
|
-
if (
|
|
15
|
-
this.log.debug(`
|
|
14
|
+
if (type && support_1.util.hasValue(ms)) {
|
|
15
|
+
this.log.debug(`Timeout arguments: ${JSON.stringify({ type, ms })}}`);
|
|
16
16
|
switch (type) {
|
|
17
17
|
case 'command':
|
|
18
|
-
await this.newCommandTimeout(ms);
|
|
19
|
-
return;
|
|
18
|
+
return void (await this.newCommandTimeout(ms));
|
|
20
19
|
case 'implicit':
|
|
21
|
-
await this.
|
|
22
|
-
return;
|
|
20
|
+
return void (await this.implicitWaitW3C(ms));
|
|
23
21
|
case 'page load':
|
|
24
|
-
await this.
|
|
25
|
-
return;
|
|
22
|
+
return void (await this.pageLoadTimeoutW3C(ms));
|
|
26
23
|
case 'script':
|
|
27
|
-
await this.
|
|
28
|
-
return;
|
|
24
|
+
return void (await this.scriptTimeoutW3C(ms));
|
|
29
25
|
default:
|
|
30
|
-
throw new Error(`'${type}' type is not supported for
|
|
26
|
+
throw new Error(`'${type}' type is not supported for the timeout API`);
|
|
31
27
|
}
|
|
32
28
|
}
|
|
33
29
|
// Otherwise assume it is W3C protocol
|
|
@@ -54,12 +50,6 @@ const TimeoutCommands = {
|
|
|
54
50
|
},
|
|
55
51
|
// implicit
|
|
56
52
|
async implicitWaitW3C(ms) {
|
|
57
|
-
await this.implicitWait(ms);
|
|
58
|
-
},
|
|
59
|
-
async implicitWaitMJSONWP(ms) {
|
|
60
|
-
await this.implicitWait(ms);
|
|
61
|
-
},
|
|
62
|
-
async implicitWait(ms) {
|
|
63
53
|
this.setImplicitWait(this.parseTimeoutArgument(ms));
|
|
64
54
|
},
|
|
65
55
|
// pageLoad
|
|
@@ -67,19 +57,11 @@ const TimeoutCommands = {
|
|
|
67
57
|
async pageLoadTimeoutW3C(ms) {
|
|
68
58
|
throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
|
|
69
59
|
},
|
|
70
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
71
|
-
async pageLoadTimeoutMJSONWP(ms) {
|
|
72
|
-
throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
|
|
73
|
-
},
|
|
74
60
|
// script
|
|
75
61
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
76
62
|
async scriptTimeoutW3C(ms) {
|
|
77
63
|
throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
|
|
78
64
|
},
|
|
79
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
80
|
-
async scriptTimeoutMJSONWP(ms) {
|
|
81
|
-
throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
|
|
82
|
-
},
|
|
83
65
|
// command
|
|
84
66
|
async newCommandTimeout(ms) {
|
|
85
67
|
this.setNewCommandTimeout(this.parseTimeoutArgument(ms));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":";;;;;AAAA,uCAA0C;AAC1C,oDAAuB;AACvB,6CAAqC;AACrC,6CAAsC;AAGtC,mCAA8B;AAO9B,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB,MAAM,eAAe,GAAqB;IACxC,KAAK,CAAC,QAAQ,CAA6C,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;QAC7F,IAAI,
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,14 +107,6 @@ export declare class DriverCore<const C extends Constraints, Settings extends St
|
|
|
107
107
|
* @param name - name of feature/command
|
|
108
108
|
*/
|
|
109
109
|
isFeatureEnabled(name: string): boolean;
|
|
110
|
-
/**
|
|
111
|
-
* Assert that a given feature is enabled and throw a helpful error if it's
|
|
112
|
-
* not
|
|
113
|
-
*
|
|
114
|
-
* @param name - name of feature/command
|
|
115
|
-
* @deprecated Use {@link assertFeatureEnabled} instead
|
|
116
|
-
*/
|
|
117
|
-
ensureFeatureEnabled(name: string): void;
|
|
118
110
|
/**
|
|
119
111
|
* Assert that a given feature is enabled and throw a helpful error if it's
|
|
120
112
|
* not
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,MAAM,EACN,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,SAAS,MAAM,YAAY,CAAC;AAQnC,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAS/C,qBAAa,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,SAAS,YAAY,GAAG,YAAY,CAC/F,SAAQ,aAAc,YAAW,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC;IAElD;;;OAGG;IACH,MAAM,CAAC,WAAW,SAA0B;IAE5C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAEpB,WAAW,EAAE,WAAW,CAAC;IAEzB,OAAO,EAAE,OAAO,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB,sBAAsB,EAAE,OAAO,CAAC;IAEhC,aAAa,EAAE,MAAM,EAAE,CAAC;IAExB,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,cAAc,EAAE,MAAM,CAAC;IAEvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAE5B,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAE/B,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB,cAAc,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAEtC,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC;IAEtC;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC;IAE7B,oBAAoB,EAAE,OAAO,CAAC;IAE9B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEnC,QAAQ,CAAC,EAAE,QAAQ,CAAC;gBAER,IAAI,GAAE,WAA6B,EAAE,kBAAkB,UAAO;IAoC1E;;;;;;;;OAQG;IACH,oBAAoB,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAItD;;;;;OAKG;IACH,IAAI,UAAU,OAEb;IAED;;;;;;;;;;OAUG;IACH,IAAI,sBAAsB,IAAI,OAAO,CAEpC;IAMD,IAAI,YAAY,iBAEf;IAED;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM;IAgB1B;;;OAGG;IACG,SAAS;IAIf;;;OAGG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAKzC;;;OAGG;IAEH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI;IAI7D,iBAAiB;IAIjB,aAAa;IAIb,kBAAkB;IAIlB,cAAc;IAId;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -186,14 +186,14 @@ class DriverCore extends extension_core_1.ExtensionCore {
|
|
|
186
186
|
const currentAutomationName = lodash_1.default.toLower(this.opts.automationName);
|
|
187
187
|
const parseFullName = (fullName) => {
|
|
188
188
|
const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
|
|
189
|
-
if (separatorPos
|
|
190
|
-
//
|
|
191
|
-
//
|
|
192
|
-
//
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
189
|
+
if (separatorPos <= 0) {
|
|
190
|
+
// we do not expect this to happen as
|
|
191
|
+
// arguments are validated upon server startup,
|
|
192
|
+
// but better be safe than sorry
|
|
193
|
+
throw new Error(`The full feature name must include both the automation name ` +
|
|
194
|
+
`'${this.opts.automationName}' or the '${ALL_DRIVERS_MATCH}' ` +
|
|
195
|
+
`wildcard to apply the feature to all installed drivers, and ` +
|
|
196
|
+
`the feature name split by a colon. Got '${fullName}' instead`);
|
|
197
197
|
}
|
|
198
198
|
return [
|
|
199
199
|
lodash_1.default.toLower(fullName.substring(0, separatorPos)),
|
|
@@ -218,16 +218,6 @@ class DriverCore extends extension_core_1.ExtensionCore {
|
|
|
218
218
|
// if we haven't allowed anything insecure, then reject
|
|
219
219
|
return false;
|
|
220
220
|
}
|
|
221
|
-
/**
|
|
222
|
-
* Assert that a given feature is enabled and throw a helpful error if it's
|
|
223
|
-
* not
|
|
224
|
-
*
|
|
225
|
-
* @param name - name of feature/command
|
|
226
|
-
* @deprecated Use {@link assertFeatureEnabled} instead
|
|
227
|
-
*/
|
|
228
|
-
ensureFeatureEnabled(name) {
|
|
229
|
-
this.assertFeatureEnabled(name);
|
|
230
|
-
}
|
|
231
221
|
/**
|
|
232
222
|
* Assert that a given feature is enabled and throw a helpful error if it's
|
|
233
223
|
* not
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -348,8 +348,8 @@ class BaseDriver extends core_1.DriverCore {
|
|
|
348
348
|
(0, capabilities_2.validateCaps)(caps, this._desiredCapConstraints);
|
|
349
349
|
}
|
|
350
350
|
catch (e) {
|
|
351
|
-
throw this.log.errorWithException(new protocol_1.errors.SessionNotCreatedError(`
|
|
352
|
-
`following reason(s): ${e.message}
|
|
351
|
+
throw this.log.errorWithException(new protocol_1.errors.SessionNotCreatedError(`Session capabilities were not valid for the ` +
|
|
352
|
+
`following reason(s): ${e.message}`, e));
|
|
353
353
|
}
|
|
354
354
|
this.logExtraCaps(caps);
|
|
355
355
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../lib/basedriver/driver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAqC;AACrC,yCAkBuB;AACvB,wDAAyB;AACzB,oDAAuB;AACvB,0DAA2D;AAC3D,gDAAiD;AACjD,0CAA8E;AAC9E,iDAAiE;AACjE,iCAAkC;AAClC,mDAAqC;AAErC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;AACjD,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAChD,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AACxD,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,4BAA4B,GAAG,sBAAsB,CAAC;AAE5D,MAAa,UAQX,SAAQ,iBAAuB;IAY/B,YAAY,IAAiB,EAAE,kBAAkB,GAAG,IAAI;QACtD,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEhC,IAAI,CAAC,IAAI,GAAG,EAAmB,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,EAAwB,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACH,IAAc,sBAAsB;QAClC,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAC,CAAC,KAAK,CAAC,EAAE,EAAE,oCAA4B,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAc,GAAW,EAAE,GAAG,IAAW;QAC3D,4DAA4D;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE7B,IAAI,GAAG,KAAK,eAAe,EAAE,CAAC;YAC5B,mGAAmG;YACnG,IAAI,CAAC,QAAQ,GAAG,IAAA,4BAAiB,EAAC,IAAI,CAAC,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,GAAG,KAAK,iCAAsB,EAAE,CAAC;YAC1C,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC1C,CAAC;QAED,sEAAsE;QACtE,8CAA8C;QAC9C,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,MAAM,IAAI,iBAAM,CAAC,iBAAiB,CAAC,wCAAwC,CAAC,CAAC;QAC/E,CAAC;QAED,4DAA4D;QAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpC,MAAM,IAAI,iBAAM,CAAC,sBAAsB,EAAE,CAAC;QAC5C,CAAC;QAED,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;YACnC,IAAI,0BAA0B,GAAmC,IAAI,CAAC;YACtE,IAAI,0BAA0B,GAAmC,IAAI,CAAC;YACtE,IAAI,8BAA8B,GAAG,KAAK,CAAC;YAC3C,MAAM,oBAAoB,GAAG,CAAC,CAAQ,EAAE,EAAE;gBACxC,8BAA8B,GAAG,IAAI,CAAC;gBACtC,0BAA0B,EAAE,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC,CAAC;YACF,IAAI,CAAC;gBACH,OAAO,MAAM,kBAAC,CAAC,IAAI,CAAC;oBAClB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;oBAClB,4DAA4D;oBAC5D,uDAAuD;oBACvD,IAAI,kBAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBACxB,0BAA0B,GAAG,OAAO,CAAC;wBACrC,0BAA0B,GAAG,MAAM,CAAC;wBACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,4BAA4B,EAAE,oBAAoB,CAAC,CAAC;oBAC7E,CAAC,CAAC;iBACH,CAAC,CAAC;YACL,CAAC;oBAAS,CAAC;gBACT,IAAI,0BAA0B,IAAI,0BAA0B,EAAE,CAAC;oBAC7D,yCAAyC;oBACzC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,4BAA4B,EAAE,oBAAoB,CAAC,CAAC;oBACrF,0BAA0B,GAAG,IAAI,CAAC;oBAClC,+CAA+C;oBAC/C,0BAA0B,EAAE,EAAE,CAAC;oBAC/B,0BAA0B,GAAG,IAAI,CAAC;gBACpC,CAAC;gBAED,uEAAuE;gBACvE,sEAAsE;gBACtE,yEAAyE;gBACzE,0EAA0E;gBAC1E,uEAAuE;gBACvE,gBAAgB;gBAChB,IAAI,CAAC,8BAA8B,IAAI,IAAI,CAAC,sBAAsB,IAAI,GAAG,KAAK,iCAAsB,EAAE,CAAC;oBACrG,6BAA6B;oBAC7B,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC;QAC3C,wCAAwC;QACxC,MAAM,gBAAgB,GAAW,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;QACtG,IAAI,IAAI,CAAC,sBAAsB,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,mBAAmB,GAAG,oBAAoB,IAAI,CAAC,WAAW,CAAC,IAAI,mBAAmB;gBAClF,GAAG,cAAI,CAAC,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE,IAAI,CAAC,IAAI,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;gBACnG,gCAAgC,CACjC,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB;YACrC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;YAC9E,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC;QAE9B,4CAA4C;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;QAC5D,IAAI,GAAG,KAAK,eAAe,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,GAAG,KAAK,iCAAsB,EAAE,CAAC;YAC1C,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,MAAa,IAAI,iBAAM,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;QAEnF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC,CAAC,kCAAkC;QAC7F,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACpC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,wCAAwC;QACxC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAEpC,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,mBAAmB;YAAE,OAAO,CAAC,4BAA4B;QAEnE,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,kCAAkC;gBAChC,GAAG,IAAI,CAAC,mBAAmB,GAAG,MAAM,wBAAwB,CAC/D,CAAC;YACF,MAAM,YAAY,GAChB,yBAAyB;gBACzB,GAAG,IAAI,CAAC,mBAAmB,GAAG,MAAM,WAAW;gBAC/C,iDAAiD;gBACjD,wCAAwC,CAAC;YAC3C,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC9D,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,MAAoB,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY;QACzE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAE7C,mBAAmB;QACnB,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,QAAQ,IAAI;YACrB,gBAAgB;YAChB,qBAAqB;YACrB,WAAW;YACX,2BAA2B;SAC5B,EAAE,CAAC;YACF,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC;gBAAS,CAAC;YACT,wBAAwB;YACxB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpB,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CACjB,gBAAkC,EAClC,gBAAmC,EACnC,eAAkC;IAClC,6DAA6D;IAC7D,UAAyB;QAEzB,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,IAAI,iBAAM,CAAC,sBAAsB,CACrC,sDAAsD,CACvD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAEjB,MAAM,YAAY,GAAG,gBAAC,CAAC,SAAS,CAC9B,CAAC,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,IAAI,CAAC,wBAAS,CAAC,CACtE,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,iBAAM,CAAC,sBAAsB,CACrC,qDAAqD;gBACnD,yFAAyF,CAC5F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2CAA2C,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACnF,CAAC;QAEF,IAAI,IAAmB,CAAC;QACxB,IAAI,CAAC;YACH,IAAI,GAAG,IAAA,kCAAmB,EACxB,YAAY,EACZ,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,kBAAkB,CACP,CAAC;YACnB,IAAI,GAAG,IAAA,sBAAO,EAAC,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,IAAI,CAAC,GAAG,CAAkB,CAAC;QAC/E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,iBAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,SAAS,GAAG,cAAI,CAAC,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,oEAAoE;QACpE,IAAI,CAAC,IAAI,GAAG,EAAC,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAC,CAAC;QAE7D,mBAAmB;QACnB,uEAAuE;QACvE,yEAAyE;QACzE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,0DAA0D;gBACxD,oDAAoD;gBACpD,mDAAmD,CACtD,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACjE,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAEnE,oEAAoE;QACpE,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,CAAC;QAED,IAAI,CAAC,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,mBAAmB,GAAI,IAAI,CAAC,IAAI,CAAC,iBAA4B,GAAG,IAAI,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC;YAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,gBAAgB,EAAE,IAAA,uBAAa,EAAC,IAAI,CAAC,SAAS,CAAC;SAChD,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAEpE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAiB,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,WAAW;QACf,MAAM,GAAG,GAA0B,EAAE,CAAC;QAEtC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC;gBACP,EAAE,EAAE,IAAI,CAAC,SAAS;gBAClB,YAAY,EAAE,IAAI,CAAC,IAAI;aACxB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU;QACd,OAAO,CACL,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAC,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CACxC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,4BAA4B;QAChC,OAAO,EAAC,YAAY,EAAE,IAAI,CAAC,IAAI,EAAC,CAAC;IACnC,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,aAAa,CAAC,SAAyB;QAC3C,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;YACpE,wDAAwD;YACxD,+BAA+B;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;YAC9C,KAAK,MAAM,GAAG,IAAI,gBAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,IAAqB;QAChC,MAAM,SAAS,GAAG,gBAAC,CAAC,UAAU,CAAC,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAClF,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;YACzF,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,IAAS;QAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,IAAA,2BAAY,EAAC,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,IAAI,iBAAM,CAAC,sBAAsB,CAC/B,uDAAuD;gBACrD,wBAAwB,CAAC,CAAC,OAAO,EAAE,CACtC,CACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAqB;QACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,mDAAmD,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,gDAAgD,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;CACF;AAjZD,gCAiZC;AAED,6CAA2B;AAE3B,kBAAe,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../lib/basedriver/driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
|
+
* Perform inital application package configuration
|
|
3
|
+
* to prepare it for the further consumption by a driver:
|
|
4
|
+
*
|
|
5
|
+
* - Manages caching logic
|
|
6
|
+
* - Downloads the app from a remote URL to the local filesystem
|
|
7
|
+
* - Determines package name
|
|
8
|
+
* - Checks basic requiremenets on the application package
|
|
2
9
|
*
|
|
3
10
|
* @param {string} app
|
|
4
11
|
* @param {string|string[]|import('@appium/types').ConfigureAppOptions} options
|
|
12
|
+
* @returns {Promise<string>}
|
|
5
13
|
*/
|
|
6
|
-
export function configureApp(app: string, options?: string | string[] | import("@appium/types").ConfigureAppOptions): Promise<
|
|
14
|
+
export function configureApp(app: string, options?: string | string[] | import("@appium/types").ConfigureAppOptions): Promise<string>;
|
|
7
15
|
/**
|
|
8
16
|
* @param {string} app
|
|
9
17
|
* @returns {boolean}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"AA4DA;;;;;;;;;;;;GAYG;AACH,kCAJW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,mBAAmB,GACzD,OAAO,CAAC,MAAM,CAAC,CA4L3B;AAED;;;GAGG;AACH,uCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;;;GASG;AACH,qCAJW,GAAC,4CA2BX;AAED;;;;;;GAMG;AACH,yCAHW,MAAM,GAAC,MAAM,EAAE,GACb,MAAM,EAAE,CAuBpB;AAED;;;;;;;GAOG;AAEH,6CANW,MAAM,cACN,MAAM,OAAC,GAEL,MAAM,CAKlB;;;;;;;;;;;kBAoRa,IAAI,OAAC;eACL,OAAO;YACP,MAAM,OAAC;UACP,MAAM,OAAC;;;;;;;;;YAKP,MAAM;;;;YACN,OAAO,QAAQ,EAAE,QAAQ;;;;aACzB,OAAO,OAAO,EAAE,uBAAuB,GAAG,OAAO,OAAO,EAAE,oBAAoB"}
|
|
@@ -20,9 +20,6 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
20
20
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
21
21
|
// for compat with running tests transpiled and in-place
|
|
22
22
|
exports.BASEDRIVER_VER = support_1.fs.readPackageJsonFrom(__dirname).version;
|
|
23
|
-
const IPA_EXT = '.ipa';
|
|
24
|
-
const ZIP_EXTS = new Set(['.zip', IPA_EXT]);
|
|
25
|
-
const ZIP_MIME_TYPES = ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip'];
|
|
26
23
|
const CACHED_APPS_MAX_AGE_MS = 1000 * 60 * toNaturalNumber(60 * 24, 'APPIUM_APPS_CACHE_MAX_AGE');
|
|
27
24
|
const MAX_CACHED_APPS = toNaturalNumber(1024, 'APPIUM_APPS_CACHE_MAX_ITEMS');
|
|
28
25
|
const HTTP_STATUS_NOT_MODIFIED = 304;
|
|
@@ -66,15 +63,24 @@ process.on('exit', () => {
|
|
|
66
63
|
}
|
|
67
64
|
});
|
|
68
65
|
/**
|
|
66
|
+
* Perform inital application package configuration
|
|
67
|
+
* to prepare it for the further consumption by a driver:
|
|
68
|
+
*
|
|
69
|
+
* - Manages caching logic
|
|
70
|
+
* - Downloads the app from a remote URL to the local filesystem
|
|
71
|
+
* - Determines package name
|
|
72
|
+
* - Checks basic requiremenets on the application package
|
|
69
73
|
*
|
|
70
74
|
* @param {string} app
|
|
71
75
|
* @param {string|string[]|import('@appium/types').ConfigureAppOptions} options
|
|
76
|
+
* @returns {Promise<string>}
|
|
72
77
|
*/
|
|
73
78
|
async function configureApp(app, options = /** @type {import('@appium/types').ConfigureAppOptions} */ ({})) {
|
|
74
79
|
if (!lodash_1.default.isString(app)) {
|
|
75
80
|
// immediately shortcircuit if not given an app
|
|
76
|
-
return;
|
|
81
|
+
return '';
|
|
77
82
|
}
|
|
83
|
+
/** @type {string[]} */
|
|
78
84
|
let supportedAppExtensions;
|
|
79
85
|
const onPostProcess = !lodash_1.default.isString(options) && !lodash_1.default.isArray(options) ? options.onPostProcess : undefined;
|
|
80
86
|
const onDownload = !lodash_1.default.isString(options) && !lodash_1.default.isArray(options) ? options.onDownload : undefined;
|
|
@@ -87,12 +93,12 @@ async function configureApp(app, options = /** @type {import('@appium/types').Co
|
|
|
87
93
|
else if (lodash_1.default.isPlainObject(options)) {
|
|
88
94
|
supportedAppExtensions = options.supportedExtensions;
|
|
89
95
|
}
|
|
96
|
+
// @ts-ignore this is OK
|
|
90
97
|
if (lodash_1.default.isEmpty(supportedAppExtensions)) {
|
|
91
98
|
throw new Error(`One or more supported app extensions must be provided`);
|
|
92
99
|
}
|
|
93
100
|
let newApp = app;
|
|
94
101
|
const originalAppLink = app;
|
|
95
|
-
let shouldUnzipApp = false;
|
|
96
102
|
let packageHash = null;
|
|
97
103
|
/** @type {import('axios').AxiosResponse['headers']|undefined} */
|
|
98
104
|
let headers = undefined;
|
|
@@ -164,61 +170,20 @@ async function configureApp(app, options = /** @type {import('@appium/types').Co
|
|
|
164
170
|
}
|
|
165
171
|
({ stream, headers, status } = await queryAppLink(newApp, { ...DEFAULT_REQ_HEADERS }));
|
|
166
172
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
replacement: SANITIZE_REPLACEMENT,
|
|
170
|
-
});
|
|
171
|
-
const extname = path_1.default.extname(basename);
|
|
172
|
-
// to determine if we need to unzip the app, we have a number of places
|
|
173
|
-
// to look: content type, content disposition, or the file extension
|
|
174
|
-
if (ZIP_EXTS.has(extname)) {
|
|
175
|
-
fileName = basename;
|
|
176
|
-
shouldUnzipApp = true;
|
|
177
|
-
}
|
|
178
|
-
if (headers['content-type']) {
|
|
179
|
-
const ct = headers['content-type'];
|
|
180
|
-
logger_1.default.debug(`Content-Type: ${ct}`);
|
|
181
|
-
// the filetype may not be obvious for certain urls, so check the mime type too
|
|
182
|
-
if (ZIP_MIME_TYPES.some((mimeType) => new RegExp(`\\b${lodash_1.default.escapeRegExp(mimeType)}\\b`).test(ct))) {
|
|
183
|
-
if (!fileName) {
|
|
184
|
-
fileName = `${DEFAULT_BASENAME}.zip`;
|
|
185
|
-
}
|
|
186
|
-
shouldUnzipApp = true;
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
if (headers['content-disposition'] && /^attachment/i.test(headers['content-disposition'])) {
|
|
190
|
-
logger_1.default.debug(`Content-Disposition: ${headers['content-disposition']}`);
|
|
191
|
-
const match = /filename="([^"]+)/i.exec(headers['content-disposition']);
|
|
192
|
-
if (match) {
|
|
193
|
-
fileName = support_1.fs.sanitizeName(match[1], {
|
|
194
|
-
replacement: SANITIZE_REPLACEMENT,
|
|
195
|
-
});
|
|
196
|
-
shouldUnzipApp = shouldUnzipApp || ZIP_EXTS.has(path_1.default.extname(fileName));
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
if (!fileName) {
|
|
200
|
-
// assign the default file name and the extension if none has been detected
|
|
201
|
-
const resultingName = basename
|
|
202
|
-
? basename.substring(0, basename.length - extname.length)
|
|
203
|
-
: DEFAULT_BASENAME;
|
|
204
|
-
let resultingExt = extname;
|
|
205
|
-
if (!supportedAppExtensions.includes(resultingExt)) {
|
|
206
|
-
logger_1.default.info(`The current file extension '${resultingExt}' is not supported. ` +
|
|
207
|
-
`Defaulting to '${lodash_1.default.first(supportedAppExtensions)}'`);
|
|
208
|
-
resultingExt = /** @type {string} */ (lodash_1.default.first(supportedAppExtensions));
|
|
209
|
-
}
|
|
210
|
-
fileName = `${resultingName}${resultingExt}`;
|
|
211
|
-
}
|
|
212
|
-
newApp = onDownload
|
|
213
|
-
? await onDownload({
|
|
173
|
+
if (onDownload) {
|
|
174
|
+
newApp = await onDownload({
|
|
214
175
|
url: originalAppLink,
|
|
215
176
|
headers: /** @type {import('@appium/types').HTTPHeaders} */ (lodash_1.default.clone(headers)),
|
|
216
177
|
stream,
|
|
217
|
-
})
|
|
218
|
-
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
const fileName = determineFilename(headers, pathname, supportedAppExtensions);
|
|
182
|
+
newApp = await fetchApp(stream, await support_1.tempDir.path({
|
|
219
183
|
prefix: fileName,
|
|
220
184
|
suffix: '',
|
|
221
185
|
}));
|
|
186
|
+
}
|
|
222
187
|
}
|
|
223
188
|
finally {
|
|
224
189
|
if (!stream.closed) {
|
|
@@ -229,7 +194,6 @@ async function configureApp(app, options = /** @type {import('@appium/types').Co
|
|
|
229
194
|
else if (await support_1.fs.exists(newApp)) {
|
|
230
195
|
// Use the local app
|
|
231
196
|
logger_1.default.info(`Using local app '${newApp}'`);
|
|
232
|
-
shouldUnzipApp = ZIP_EXTS.has(path_1.default.extname(newApp));
|
|
233
197
|
}
|
|
234
198
|
else {
|
|
235
199
|
let errorMessage = `The application at '${newApp}' does not exist or is not accessible`;
|
|
@@ -245,32 +209,7 @@ async function configureApp(app, options = /** @type {import('@appium/types').Co
|
|
|
245
209
|
if (isPackageAFile) {
|
|
246
210
|
packageHash = await calculateFileIntegrity(newApp);
|
|
247
211
|
}
|
|
248
|
-
|
|
249
|
-
const archivePath = newApp;
|
|
250
|
-
if (packageHash === cachedAppInfo?.packageHash) {
|
|
251
|
-
const fullPath = cachedAppInfo?.fullPath;
|
|
252
|
-
if (await isAppIntegrityOk(/** @type {string} */ (fullPath), cachedAppInfo?.integrity)) {
|
|
253
|
-
if (archivePath !== app) {
|
|
254
|
-
await support_1.fs.rimraf(archivePath);
|
|
255
|
-
}
|
|
256
|
-
logger_1.default.info(`Will reuse previously cached application at '${fullPath}'`);
|
|
257
|
-
return verifyAppExtension(/** @type {string} */ (fullPath), supportedAppExtensions);
|
|
258
|
-
}
|
|
259
|
-
logger_1.default.info(`The application at '${fullPath}' does not exist anymore ` +
|
|
260
|
-
`or its integrity has been damaged. Deleting it from the cache`);
|
|
261
|
-
APPLICATIONS_CACHE.delete(appCacheKey);
|
|
262
|
-
}
|
|
263
|
-
const tmpRoot = await support_1.tempDir.openDir();
|
|
264
|
-
try {
|
|
265
|
-
newApp = await unzipApp(archivePath, tmpRoot, supportedAppExtensions);
|
|
266
|
-
}
|
|
267
|
-
finally {
|
|
268
|
-
if (newApp !== archivePath && archivePath !== app) {
|
|
269
|
-
await support_1.fs.rimraf(archivePath);
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
logger_1.default.info(`Unzipped local app to '${newApp}'`);
|
|
273
|
-
}
|
|
212
|
+
/** @type {(appPathToCache: string) => Promise<string>} */
|
|
274
213
|
const storeAppInCache = async (appPathToCache) => {
|
|
275
214
|
const cachedFullPath = cachedAppInfo?.fullPath;
|
|
276
215
|
if (cachedFullPath && cachedFullPath !== appPathToCache) {
|
|
@@ -467,67 +406,6 @@ async function fetchApp(srcStream, dstPath) {
|
|
|
467
406
|
}
|
|
468
407
|
return dstPath;
|
|
469
408
|
}
|
|
470
|
-
/**
|
|
471
|
-
* Extracts the bundle from an archive into the given folder
|
|
472
|
-
*
|
|
473
|
-
* @param {string} zipPath Full path to the archive containing the bundle
|
|
474
|
-
* @param {string} dstRoot Full path to the folder where the extracted bundle
|
|
475
|
-
* should be placed
|
|
476
|
-
* @param {Array<string>|string} supportedAppExtensions The list of extensions
|
|
477
|
-
* the target application bundle supports, for example ['.apk', '.apks'] for
|
|
478
|
-
* Android packages
|
|
479
|
-
* @returns {Promise<string>} Full path to the bundle in the destination folder
|
|
480
|
-
* @throws {Error} If the given archive is invalid or no application bundles
|
|
481
|
-
* have been found inside
|
|
482
|
-
*/
|
|
483
|
-
async function unzipApp(zipPath, dstRoot, supportedAppExtensions) {
|
|
484
|
-
await support_1.zip.assertValidZip(zipPath);
|
|
485
|
-
if (!lodash_1.default.isArray(supportedAppExtensions)) {
|
|
486
|
-
supportedAppExtensions = [supportedAppExtensions];
|
|
487
|
-
}
|
|
488
|
-
const tmpRoot = await support_1.tempDir.openDir();
|
|
489
|
-
try {
|
|
490
|
-
logger_1.default.debug(`Unzipping '${zipPath}'`);
|
|
491
|
-
const timer = new support_1.timing.Timer().start();
|
|
492
|
-
const useSystemUnzip = isEnvOptionEnabled('APPIUM_PREFER_SYSTEM_UNZIP', true);
|
|
493
|
-
/**
|
|
494
|
-
* Attempt to use use the system `unzip` (e.g., `/usr/bin/unzip`) due
|
|
495
|
-
* to the significant performance improvement it provides over the native
|
|
496
|
-
* JS "unzip" implementation.
|
|
497
|
-
* @type {import('@appium/support/lib/zip').ExtractAllOptions}
|
|
498
|
-
*/
|
|
499
|
-
const extractionOpts = { useSystemUnzip };
|
|
500
|
-
// https://github.com/appium/appium/issues/14100
|
|
501
|
-
if (path_1.default.extname(zipPath) === IPA_EXT) {
|
|
502
|
-
logger_1.default.debug(`Enforcing UTF-8 encoding on the extracted file names for '${path_1.default.basename(zipPath)}'`);
|
|
503
|
-
extractionOpts.fileNamesEncoding = 'utf8';
|
|
504
|
-
}
|
|
505
|
-
await support_1.zip.extractAllTo(zipPath, tmpRoot, extractionOpts);
|
|
506
|
-
const globPattern = `**/*.+(${supportedAppExtensions
|
|
507
|
-
.map((ext) => ext.replace(/^\./, ''))
|
|
508
|
-
.join('|')})`;
|
|
509
|
-
const sortedBundleItems = (await support_1.fs.glob(globPattern, {
|
|
510
|
-
cwd: tmpRoot,
|
|
511
|
-
// Get the top level match
|
|
512
|
-
})).sort((a, b) => a.split(path_1.default.sep).length - b.split(path_1.default.sep).length);
|
|
513
|
-
if (lodash_1.default.isEmpty(sortedBundleItems)) {
|
|
514
|
-
throw logger_1.default.errorWithException(`App unzipped OK, but we could not find any '${supportedAppExtensions}' ` +
|
|
515
|
-
support_1.util.pluralize('bundle', supportedAppExtensions.length, false) +
|
|
516
|
-
` in it. Make sure your archive contains at least one package having ` +
|
|
517
|
-
`'${supportedAppExtensions}' ${support_1.util.pluralize('extension', supportedAppExtensions.length, false)}`);
|
|
518
|
-
}
|
|
519
|
-
logger_1.default.debug(`Extracted ${support_1.util.pluralize('bundle item', sortedBundleItems.length, true)} ` +
|
|
520
|
-
`from '${zipPath}' in ${Math.round(timer.getDuration().asMilliSeconds)}ms: ${sortedBundleItems}`);
|
|
521
|
-
const matchedBundle = /** @type {string} */ (lodash_1.default.first(sortedBundleItems));
|
|
522
|
-
logger_1.default.info(`Assuming '${matchedBundle}' is the correct bundle`);
|
|
523
|
-
const dstPath = path_1.default.resolve(dstRoot, path_1.default.basename(matchedBundle));
|
|
524
|
-
await support_1.fs.mv(path_1.default.resolve(tmpRoot, matchedBundle), dstPath, { mkdirp: true });
|
|
525
|
-
return dstPath;
|
|
526
|
-
}
|
|
527
|
-
finally {
|
|
528
|
-
await support_1.fs.rimraf(tmpRoot);
|
|
529
|
-
}
|
|
530
|
-
}
|
|
531
409
|
/**
|
|
532
410
|
* Transforms the given app link to the cache key.
|
|
533
411
|
* This is necessary to properly cache apps
|
|
@@ -569,6 +447,42 @@ function parseAppLink(appLink) {
|
|
|
569
447
|
return {};
|
|
570
448
|
}
|
|
571
449
|
}
|
|
450
|
+
/**
|
|
451
|
+
* Tries to determine the file name of the payload that is going
|
|
452
|
+
* to be downloaded from an URL
|
|
453
|
+
*
|
|
454
|
+
* @param {import('axios').RawAxiosRequestHeaders} headers
|
|
455
|
+
* @param {string} pathname
|
|
456
|
+
* @param {string[]} supportedAppExtensions
|
|
457
|
+
* @returns {string}
|
|
458
|
+
*/
|
|
459
|
+
function determineFilename(headers, pathname, supportedAppExtensions) {
|
|
460
|
+
const basename = support_1.fs.sanitizeName(path_1.default.basename(decodeURIComponent(pathname ?? '')), {
|
|
461
|
+
replacement: SANITIZE_REPLACEMENT,
|
|
462
|
+
});
|
|
463
|
+
const extname = path_1.default.extname(basename);
|
|
464
|
+
if (headers['content-disposition'] && /^attachment/i.test(
|
|
465
|
+
/** @type {string} */ (headers['content-disposition']))) {
|
|
466
|
+
logger_1.default.debug(`Content-Disposition: ${headers['content-disposition']}`);
|
|
467
|
+
const match = /filename="([^"]+)/i.exec(/** @type {string} */ (headers['content-disposition']));
|
|
468
|
+
if (match) {
|
|
469
|
+
return support_1.fs.sanitizeName(match[1], {
|
|
470
|
+
replacement: SANITIZE_REPLACEMENT,
|
|
471
|
+
});
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
// assign the default file name and the extension if none has been detected
|
|
475
|
+
const resultingName = basename
|
|
476
|
+
? basename.substring(0, basename.length - extname.length)
|
|
477
|
+
: DEFAULT_BASENAME;
|
|
478
|
+
let resultingExt = extname;
|
|
479
|
+
if (!supportedAppExtensions.map(lodash_1.default.toLower).includes(lodash_1.default.toLower(resultingExt))) {
|
|
480
|
+
logger_1.default.info(`The current file extension '${resultingExt}' is not supported. ` +
|
|
481
|
+
`Defaulting to '${lodash_1.default.first(supportedAppExtensions)}'`);
|
|
482
|
+
resultingExt = /** @type {string} */ (lodash_1.default.first(supportedAppExtensions));
|
|
483
|
+
}
|
|
484
|
+
return `${resultingName}${resultingExt}`;
|
|
485
|
+
}
|
|
572
486
|
/**
|
|
573
487
|
* Checks whether we can threat the given app link
|
|
574
488
|
* as a URL,
|