@appium/base-driver 9.12.1 → 9.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/basedriver/core.d.ts +1 -1
- package/build/lib/basedriver/core.d.ts.map +1 -1
- package/build/lib/basedriver/core.js +39 -10
- package/build/lib/basedriver/core.js.map +1 -1
- package/build/lib/basedriver/device-settings.d.ts +1 -1
- package/build/lib/basedriver/device-settings.d.ts.map +1 -1
- package/build/lib/basedriver/helpers.d.ts +8 -2
- package/build/lib/basedriver/helpers.d.ts.map +1 -1
- package/build/lib/constants.d.ts +5 -6
- package/build/lib/constants.d.ts.map +1 -1
- package/build/lib/constants.js +5 -10
- package/build/lib/constants.js.map +1 -1
- package/build/lib/express/websocket.d.ts.map +1 -1
- package/build/lib/protocol/errors.d.ts +32 -32
- package/build/lib/protocol/errors.d.ts.map +1 -1
- package/build/lib/protocol/protocol.d.ts.map +1 -1
- package/build/lib/protocol/routes.d.ts +1 -1
- package/build/lib/protocol/routes.d.ts.map +1 -1
- package/lib/basedriver/core.ts +33 -4
- package/lib/constants.ts +5 -7
- package/package.json +7 -7
|
@@ -115,7 +115,7 @@ export declare class DriverCore<const C extends Constraints, Settings extends St
|
|
|
115
115
|
* not
|
|
116
116
|
*
|
|
117
117
|
* @param name - name of feature/command
|
|
118
|
-
* @deprecated
|
|
118
|
+
* @deprecated Use {@link assertFeatureEnabled} instead
|
|
119
119
|
*/
|
|
120
120
|
ensureFeatureEnabled(name: string): void;
|
|
121
121
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,MAAM,EACN,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,SAAS,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
17
17
|
}) : function(o, v) {
|
|
18
18
|
o["default"] = v;
|
|
19
19
|
});
|
|
20
|
-
var __importStar = (this && this.__importStar) || function (
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
};
|
|
20
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
21
|
+
var ownKeys = function(o) {
|
|
22
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
23
|
+
var ar = [];
|
|
24
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
25
|
+
return ar;
|
|
26
|
+
};
|
|
27
|
+
return ownKeys(o);
|
|
28
|
+
};
|
|
29
|
+
return function (mod) {
|
|
30
|
+
if (mod && mod.__esModule) return mod;
|
|
31
|
+
var result = {};
|
|
32
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
33
|
+
__setModuleDefault(result, mod);
|
|
34
|
+
return result;
|
|
35
|
+
};
|
|
36
|
+
})();
|
|
27
37
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
28
38
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
29
39
|
};
|
|
@@ -41,6 +51,8 @@ const helpers_1 = __importStar(require("./helpers"));
|
|
|
41
51
|
const bidi_commands_1 = require("../protocol/bidi-commands");
|
|
42
52
|
const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
|
|
43
53
|
const ON_UNEXPECTED_SHUTDOWN_EVENT = 'onUnexpectedShutdown';
|
|
54
|
+
const ALL_DRIVERS_MATCH = '*';
|
|
55
|
+
const FEATURE_NAME_SEPARATOR = ':';
|
|
44
56
|
class DriverCore {
|
|
45
57
|
constructor(opts = {}, shouldValidateCaps = true) {
|
|
46
58
|
this._log = support_1.logger.getLogger(helpers_1.default.generateDriverLogPrefix(this));
|
|
@@ -177,12 +189,29 @@ class DriverCore {
|
|
|
177
189
|
* @param name - name of feature/command
|
|
178
190
|
*/
|
|
179
191
|
isFeatureEnabled(name) {
|
|
192
|
+
// automationName comparison is case-insensitive,
|
|
193
|
+
// while feature name is case-sensitive
|
|
194
|
+
const currentAutomationName = lodash_1.default.toLower(this.opts.automationName);
|
|
195
|
+
const parseFullName = (fullName) => {
|
|
196
|
+
const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
|
|
197
|
+
if (separatorPos < 0) {
|
|
198
|
+
// This should not happen as we preprocess corresponding server arguments in advance
|
|
199
|
+
throw new Error(`The full feature name must include both the driver name/wildcard and the feature ` +
|
|
200
|
+
`name split by a colon, got '${fullName}' instead`);
|
|
201
|
+
}
|
|
202
|
+
return [
|
|
203
|
+
lodash_1.default.toLower(fullName.substring(0, separatorPos)),
|
|
204
|
+
fullName.substring(separatorPos + 1)
|
|
205
|
+
];
|
|
206
|
+
};
|
|
207
|
+
const parseFullNames = (fullNames) => fullNames.map(parseFullName);
|
|
208
|
+
const matches = ([automationName, featureName]) => [currentAutomationName, ALL_DRIVERS_MATCH].includes(automationName) && featureName === name;
|
|
180
209
|
// if we have explicitly denied this feature, return false immediately
|
|
181
|
-
if (this.denyInsecure &&
|
|
210
|
+
if (!lodash_1.default.isEmpty(this.denyInsecure) && parseFullNames(this.denyInsecure).some(matches)) {
|
|
182
211
|
return false;
|
|
183
212
|
}
|
|
184
213
|
// if we specifically have allowed the feature, return true
|
|
185
|
-
if (this.allowInsecure &&
|
|
214
|
+
if (!lodash_1.default.isEmpty(this.allowInsecure) && parseFullNames(this.allowInsecure).some(matches)) {
|
|
186
215
|
return true;
|
|
187
216
|
}
|
|
188
217
|
// otherwise, if we've globally allowed insecure features and not denied
|
|
@@ -198,7 +227,7 @@ class DriverCore {
|
|
|
198
227
|
* not
|
|
199
228
|
*
|
|
200
229
|
* @param name - name of feature/command
|
|
201
|
-
* @deprecated
|
|
230
|
+
* @deprecated Use {@link assertFeatureEnabled} instead
|
|
202
231
|
*/
|
|
203
232
|
ensureFeatureEnabled(name) {
|
|
204
233
|
this.assertFeatureEnabled(name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,kCAAkC
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export class DeviceSettings<T extends StringRecord> implements IDeviceSettings<T
|
|
|
12
12
|
* @param {T} [defaultSettings]
|
|
13
13
|
* @param {import('@appium/types').SettingsUpdateListener<T>} [onSettingsUpdate]
|
|
14
14
|
*/
|
|
15
|
-
constructor(defaultSettings?: T
|
|
15
|
+
constructor(defaultSettings?: T, onSettingsUpdate?: import("@appium/types").SettingsUpdateListener<T>);
|
|
16
16
|
/**
|
|
17
17
|
* @protected
|
|
18
18
|
* @type {T}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-settings.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,uCAAkD;AAElD;;;GAGG;AACH,4BAH4B,CAAC,SAAf,YAAa,aACX,eAAe,CAAC,CAAC;IAe/B;;;;OAIG;IACH
|
|
1
|
+
{"version":3,"file":"device-settings.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,uCAAkD;AAElD;;;GAGG;AACH,4BAH4B,CAAC,SAAf,YAAa,aACX,eAAe,CAAC,CAAC;IAe/B;;;;OAIG;IACH,8BAHW,CAAC,qBACD,OAAO,eAAe,EAAE,sBAAsB,CAAC,CAAC,CAAC,EAK3D;IApBD;;;OAGG;IACH,qBAFU,CAAC,CAED;IAEV;;;OAGG;IACH,6BAFU,OAAO,eAAe,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAEzC;IAYlB;;;OAGG;IACH,oBAFW,CAAC,iBA2BX;IAED,iBAEC;CACF;;2BAKY,OAAO,eAAe,EAAE,YAAY;4BAIpB,CAAC,SAAhB,YAAa,mBACd,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC"}
|
|
@@ -35,9 +35,15 @@ export function parseCapsArray(cap: string | Array<string>): any[];
|
|
|
35
35
|
* This parameter is deprecated and is not used.
|
|
36
36
|
* @returns {string}
|
|
37
37
|
*/
|
|
38
|
-
export function generateDriverLogPrefix(obj: import("@appium/types").Core<any, import("@appium/types").StringRecord>, sessionId?: string | null
|
|
38
|
+
export function generateDriverLogPrefix(obj: import("@appium/types").Core<any, import("@appium/types").StringRecord>, sessionId?: string | null): string;
|
|
39
39
|
export const BASEDRIVER_VER: string;
|
|
40
|
-
declare const _default:
|
|
40
|
+
declare const _default: {
|
|
41
|
+
configureApp: typeof configureApp;
|
|
42
|
+
isPackageOrBundle: typeof isPackageOrBundle;
|
|
43
|
+
duplicateKeys: typeof duplicateKeys;
|
|
44
|
+
parseCapsArray: typeof parseCapsArray;
|
|
45
|
+
generateDriverLogPrefix: typeof generateDriverLogPrefix;
|
|
46
|
+
};
|
|
41
47
|
export default _default;
|
|
42
48
|
export type RemoteAppProps = {
|
|
43
49
|
lastModified: Date | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"AA+DA;;;;GAIG;AACH,kCAHW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,mBAAmB,gBAuQrE;AAED;;;GAGG;AACH,uCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;;;GASG;AACH,qCAJW,GAAC,4CA2BX;AAED;;;;;GAKG;AACH,oCAFW,MAAM,GAAC,KAAK,QAAQ,SAoB9B;AAED;;;;;;;GAOG;AACH,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"AA+DA;;;;GAIG;AACH,kCAHW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,mBAAmB,gBAuQrE;AAED;;;GAGG;AACH,uCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;;;GASG;AACH,qCAJW,GAAC,4CA2BX;AAED;;;;;GAKG;AACH,oCAFW,MAAM,GAAC,KAAK,QAAQ,SAoB9B;AAED;;;;;;;GAOG;AACH,kIAJW,MAAM,OAAC,GAEL,MAAM,CAIlB;;;;;;;;;;;kBAwTa,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"}
|
package/build/lib/constants.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
declare const MAX_LOG_BODY_LENGTH = 1024;
|
|
2
|
-
declare const MJSONWP_ELEMENT_KEY = "ELEMENT";
|
|
3
|
-
declare const W3C_ELEMENT_KEY: "element-6066-11e4-a52e-4f735466cecf";
|
|
4
|
-
declare const PROTOCOLS: {
|
|
1
|
+
export declare const MAX_LOG_BODY_LENGTH = 1024;
|
|
2
|
+
export declare const MJSONWP_ELEMENT_KEY = "ELEMENT";
|
|
3
|
+
export declare const W3C_ELEMENT_KEY: "element-6066-11e4-a52e-4f735466cecf";
|
|
4
|
+
export declare const PROTOCOLS: {
|
|
5
5
|
readonly W3C: "W3C";
|
|
6
6
|
readonly MJSONWP: "MJSONWP";
|
|
7
7
|
};
|
|
8
|
-
declare const DEFAULT_BASE_PATH = "";
|
|
9
|
-
export { MAX_LOG_BODY_LENGTH, MJSONWP_ELEMENT_KEY, W3C_ELEMENT_KEY, PROTOCOLS, DEFAULT_BASE_PATH };
|
|
8
|
+
export declare const DEFAULT_BASE_PATH = "";
|
|
10
9
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AASA,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,uCAAkC,CAAC;AAC/D,eAAO,MAAM,SAAS;;;CAGyB,CAAC;AAGhD,eAAO,MAAM,iBAAiB,KAAK,CAAC"}
|
package/build/lib/constants.js
CHANGED
|
@@ -8,18 +8,13 @@ const support_1 = require("@appium/support");
|
|
|
8
8
|
// server feature. Example rule:
|
|
9
9
|
// {"pattern": "(.{1,150}).*", "flags": "s", "replacer": "$1"}
|
|
10
10
|
// ^ cuts all log records to maximum 150 chars
|
|
11
|
-
|
|
12
|
-
exports.
|
|
13
|
-
|
|
14
|
-
exports.
|
|
15
|
-
const W3C_ELEMENT_KEY = support_1.util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
16
|
-
exports.W3C_ELEMENT_KEY = W3C_ELEMENT_KEY;
|
|
17
|
-
const PROTOCOLS = {
|
|
11
|
+
exports.MAX_LOG_BODY_LENGTH = 1024;
|
|
12
|
+
exports.MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
13
|
+
exports.W3C_ELEMENT_KEY = support_1.util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
14
|
+
exports.PROTOCOLS = {
|
|
18
15
|
W3C: 'W3C',
|
|
19
16
|
MJSONWP: 'MJSONWP',
|
|
20
17
|
};
|
|
21
|
-
exports.PROTOCOLS = PROTOCOLS;
|
|
22
18
|
// Before Appium 2.0, this default value was '/wd/hub' by historical reasons.
|
|
23
|
-
|
|
24
|
-
exports.DEFAULT_BASE_PATH = DEFAULT_BASE_PATH;
|
|
19
|
+
exports.DEFAULT_BASE_PATH = '';
|
|
25
20
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":";;;AAAA,6CAAqC;AAGrC,oDAAoD;AACpD,wCAAwC;AACxC,kEAAkE;AAClE,gCAAgC;AAChC,+DAA+D;AAC/D,8CAA8C;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":";;;AAAA,6CAAqC;AAGrC,oDAAoD;AACpD,wCAAwC;AACxC,kEAAkE;AAClE,gCAAgC;AAChC,+DAA+D;AAC/D,8CAA8C;AACjC,QAAA,mBAAmB,GAAG,IAAI,CAAC;AAC3B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,eAAe,GAAG,cAAI,CAAC,0BAA0B,CAAC;AAClD,QAAA,SAAS,GAAG;IACvB,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,SAAS;CAC2B,CAAC;AAEhD,6EAA6E;AAChE,QAAA,iBAAiB,GAAG,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../lib/express/websocket.js"],"names":[],"mappings":"2BA6Ea,OAAO,eAAe,EAAE,YAAY;;;;;AAzEjD
|
|
1
|
+
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../lib/express/websocket.js"],"names":[],"mappings":"2BA6Ea,OAAO,eAAe,EAAE,YAAY;;;;;AAzEjD,yCAAmC,KAAK,CAAC"}
|
|
@@ -27,7 +27,7 @@ export class NoSuchDriverError extends ProtocolError {
|
|
|
27
27
|
/**
|
|
28
28
|
* @param {string} [message] error message
|
|
29
29
|
*/
|
|
30
|
-
constructor(message?: string
|
|
30
|
+
constructor(message?: string);
|
|
31
31
|
}
|
|
32
32
|
export class NoSuchElementError extends ProtocolError {
|
|
33
33
|
static code(): number;
|
|
@@ -36,7 +36,7 @@ export class NoSuchElementError extends ProtocolError {
|
|
|
36
36
|
/**
|
|
37
37
|
* @param {string} [message] error message
|
|
38
38
|
*/
|
|
39
|
-
constructor(message?: string
|
|
39
|
+
constructor(message?: string);
|
|
40
40
|
}
|
|
41
41
|
export class NoSuchFrameError extends ProtocolError {
|
|
42
42
|
static code(): number;
|
|
@@ -46,7 +46,7 @@ export class NoSuchFrameError extends ProtocolError {
|
|
|
46
46
|
*
|
|
47
47
|
* @param {string} [message]
|
|
48
48
|
*/
|
|
49
|
-
constructor(message?: string
|
|
49
|
+
constructor(message?: string);
|
|
50
50
|
}
|
|
51
51
|
export class UnknownCommandError extends ProtocolError {
|
|
52
52
|
static code(): number;
|
|
@@ -56,7 +56,7 @@ export class UnknownCommandError extends ProtocolError {
|
|
|
56
56
|
*
|
|
57
57
|
* @param {string} [message]
|
|
58
58
|
*/
|
|
59
|
-
constructor(message?: string
|
|
59
|
+
constructor(message?: string);
|
|
60
60
|
}
|
|
61
61
|
export class StaleElementReferenceError extends ProtocolError {
|
|
62
62
|
static code(): number;
|
|
@@ -66,7 +66,7 @@ export class StaleElementReferenceError extends ProtocolError {
|
|
|
66
66
|
*
|
|
67
67
|
* @param {string} [message]
|
|
68
68
|
*/
|
|
69
|
-
constructor(message?: string
|
|
69
|
+
constructor(message?: string);
|
|
70
70
|
}
|
|
71
71
|
export class ElementNotVisibleError extends ProtocolError {
|
|
72
72
|
static code(): number;
|
|
@@ -75,7 +75,7 @@ export class ElementNotVisibleError extends ProtocolError {
|
|
|
75
75
|
/**
|
|
76
76
|
* @param {string} [message] error message
|
|
77
77
|
*/
|
|
78
|
-
constructor(message?: string
|
|
78
|
+
constructor(message?: string);
|
|
79
79
|
}
|
|
80
80
|
export class InvalidElementStateError extends ProtocolError {
|
|
81
81
|
static code(): number;
|
|
@@ -85,7 +85,7 @@ export class InvalidElementStateError extends ProtocolError {
|
|
|
85
85
|
*
|
|
86
86
|
* @param {string} [message]
|
|
87
87
|
*/
|
|
88
|
-
constructor(message?: string
|
|
88
|
+
constructor(message?: string);
|
|
89
89
|
}
|
|
90
90
|
export class UnknownError extends ProtocolError {
|
|
91
91
|
static code(): number;
|
|
@@ -100,7 +100,7 @@ export class UnknownMethodError extends ProtocolError {
|
|
|
100
100
|
/**
|
|
101
101
|
* @param {string} [message] error message
|
|
102
102
|
*/
|
|
103
|
-
constructor(message?: string
|
|
103
|
+
constructor(message?: string);
|
|
104
104
|
}
|
|
105
105
|
export class UnsupportedOperationError extends ProtocolError {
|
|
106
106
|
static code(): number;
|
|
@@ -109,7 +109,7 @@ export class UnsupportedOperationError extends ProtocolError {
|
|
|
109
109
|
/**
|
|
110
110
|
* @param {string} [message] error message
|
|
111
111
|
*/
|
|
112
|
-
constructor(message?: string
|
|
112
|
+
constructor(message?: string);
|
|
113
113
|
}
|
|
114
114
|
export class ElementIsNotSelectableError extends ProtocolError {
|
|
115
115
|
static code(): number;
|
|
@@ -118,7 +118,7 @@ export class ElementIsNotSelectableError extends ProtocolError {
|
|
|
118
118
|
/**
|
|
119
119
|
* @param {string} [message] error message
|
|
120
120
|
*/
|
|
121
|
-
constructor(message?: string
|
|
121
|
+
constructor(message?: string);
|
|
122
122
|
}
|
|
123
123
|
export class ElementClickInterceptedError extends ProtocolError {
|
|
124
124
|
static code(): number;
|
|
@@ -127,7 +127,7 @@ export class ElementClickInterceptedError extends ProtocolError {
|
|
|
127
127
|
/**
|
|
128
128
|
* @param {string} [message] error message
|
|
129
129
|
*/
|
|
130
|
-
constructor(message?: string
|
|
130
|
+
constructor(message?: string);
|
|
131
131
|
}
|
|
132
132
|
export class ElementNotInteractableError extends ProtocolError {
|
|
133
133
|
static code(): number;
|
|
@@ -136,14 +136,14 @@ export class ElementNotInteractableError extends ProtocolError {
|
|
|
136
136
|
/**
|
|
137
137
|
* @param {string} [message] error message
|
|
138
138
|
*/
|
|
139
|
-
constructor(message?: string
|
|
139
|
+
constructor(message?: string);
|
|
140
140
|
}
|
|
141
141
|
export class InsecureCertificateError extends ProtocolError {
|
|
142
142
|
static error(): string;
|
|
143
143
|
/**
|
|
144
144
|
* @param {string} [message] error message
|
|
145
145
|
*/
|
|
146
|
-
constructor(message?: string
|
|
146
|
+
constructor(message?: string);
|
|
147
147
|
}
|
|
148
148
|
export class JavaScriptError extends ProtocolError {
|
|
149
149
|
static code(): number;
|
|
@@ -152,7 +152,7 @@ export class JavaScriptError extends ProtocolError {
|
|
|
152
152
|
/**
|
|
153
153
|
* @param {string} [message] error message
|
|
154
154
|
*/
|
|
155
|
-
constructor(message?: string
|
|
155
|
+
constructor(message?: string);
|
|
156
156
|
}
|
|
157
157
|
export class XPathLookupError extends ProtocolError {
|
|
158
158
|
static code(): number;
|
|
@@ -161,7 +161,7 @@ export class XPathLookupError extends ProtocolError {
|
|
|
161
161
|
/**
|
|
162
162
|
* @param {string} [message] error message
|
|
163
163
|
*/
|
|
164
|
-
constructor(message?: string
|
|
164
|
+
constructor(message?: string);
|
|
165
165
|
}
|
|
166
166
|
export class TimeoutError extends ProtocolError {
|
|
167
167
|
static code(): number;
|
|
@@ -170,7 +170,7 @@ export class TimeoutError extends ProtocolError {
|
|
|
170
170
|
/**
|
|
171
171
|
* @param {string} [message] error message
|
|
172
172
|
*/
|
|
173
|
-
constructor(message?: string
|
|
173
|
+
constructor(message?: string);
|
|
174
174
|
}
|
|
175
175
|
export class NoSuchWindowError extends ProtocolError {
|
|
176
176
|
static code(): number;
|
|
@@ -179,7 +179,7 @@ export class NoSuchWindowError extends ProtocolError {
|
|
|
179
179
|
/**
|
|
180
180
|
* @param {string} [message] error message
|
|
181
181
|
*/
|
|
182
|
-
constructor(message?: string
|
|
182
|
+
constructor(message?: string);
|
|
183
183
|
}
|
|
184
184
|
export class InvalidArgumentError extends ProtocolError {
|
|
185
185
|
static code(): number;
|
|
@@ -188,7 +188,7 @@ export class InvalidArgumentError extends ProtocolError {
|
|
|
188
188
|
/**
|
|
189
189
|
* @param {string} [err] error message
|
|
190
190
|
*/
|
|
191
|
-
constructor(err?: string
|
|
191
|
+
constructor(err?: string);
|
|
192
192
|
}
|
|
193
193
|
export class InvalidCookieDomainError extends ProtocolError {
|
|
194
194
|
static code(): number;
|
|
@@ -197,7 +197,7 @@ export class InvalidCookieDomainError extends ProtocolError {
|
|
|
197
197
|
/**
|
|
198
198
|
* @param {string} [err] error message
|
|
199
199
|
*/
|
|
200
|
-
constructor(err?: string
|
|
200
|
+
constructor(err?: string);
|
|
201
201
|
}
|
|
202
202
|
export class NoSuchCookieError extends ProtocolError {
|
|
203
203
|
static code(): number;
|
|
@@ -206,7 +206,7 @@ export class NoSuchCookieError extends ProtocolError {
|
|
|
206
206
|
/**
|
|
207
207
|
* @param {string} [err] error message
|
|
208
208
|
*/
|
|
209
|
-
constructor(err?: string
|
|
209
|
+
constructor(err?: string);
|
|
210
210
|
}
|
|
211
211
|
export class UnableToSetCookieError extends ProtocolError {
|
|
212
212
|
static code(): number;
|
|
@@ -215,7 +215,7 @@ export class UnableToSetCookieError extends ProtocolError {
|
|
|
215
215
|
/**
|
|
216
216
|
* @param {string} [err] error message
|
|
217
217
|
*/
|
|
218
|
-
constructor(err?: string
|
|
218
|
+
constructor(err?: string);
|
|
219
219
|
}
|
|
220
220
|
export class UnexpectedAlertOpenError extends ProtocolError {
|
|
221
221
|
static code(): number;
|
|
@@ -224,7 +224,7 @@ export class UnexpectedAlertOpenError extends ProtocolError {
|
|
|
224
224
|
/**
|
|
225
225
|
* @param {string} [message] error message
|
|
226
226
|
*/
|
|
227
|
-
constructor(message?: string
|
|
227
|
+
constructor(message?: string);
|
|
228
228
|
}
|
|
229
229
|
export class NoAlertOpenError extends ProtocolError {
|
|
230
230
|
static code(): number;
|
|
@@ -234,7 +234,7 @@ export class NoAlertOpenError extends ProtocolError {
|
|
|
234
234
|
*
|
|
235
235
|
* @param {string} [message]
|
|
236
236
|
*/
|
|
237
|
-
constructor(message?: string
|
|
237
|
+
constructor(message?: string);
|
|
238
238
|
}
|
|
239
239
|
export class NoSuchAlertError extends NoAlertOpenError {
|
|
240
240
|
}
|
|
@@ -245,7 +245,7 @@ export class ScriptTimeoutError extends ProtocolError {
|
|
|
245
245
|
/**
|
|
246
246
|
* @param {string} [err] error message
|
|
247
247
|
*/
|
|
248
|
-
constructor(err?: string
|
|
248
|
+
constructor(err?: string);
|
|
249
249
|
}
|
|
250
250
|
export class InvalidElementCoordinatesError extends ProtocolError {
|
|
251
251
|
static code(): number;
|
|
@@ -254,7 +254,7 @@ export class InvalidElementCoordinatesError extends ProtocolError {
|
|
|
254
254
|
/**
|
|
255
255
|
* @param {string} [err] error message
|
|
256
256
|
*/
|
|
257
|
-
constructor(err?: string
|
|
257
|
+
constructor(err?: string);
|
|
258
258
|
}
|
|
259
259
|
export class InvalidCoordinatesError extends InvalidElementCoordinatesError {
|
|
260
260
|
}
|
|
@@ -265,7 +265,7 @@ export class IMENotAvailableError extends ProtocolError {
|
|
|
265
265
|
/**
|
|
266
266
|
* @param {string} [message] error message
|
|
267
267
|
*/
|
|
268
|
-
constructor(message?: string
|
|
268
|
+
constructor(message?: string);
|
|
269
269
|
}
|
|
270
270
|
export class IMEEngineActivationFailedError extends ProtocolError {
|
|
271
271
|
static code(): number;
|
|
@@ -274,7 +274,7 @@ export class IMEEngineActivationFailedError extends ProtocolError {
|
|
|
274
274
|
/**
|
|
275
275
|
* @param {string} [err] error message
|
|
276
276
|
*/
|
|
277
|
-
constructor(err?: string
|
|
277
|
+
constructor(err?: string);
|
|
278
278
|
}
|
|
279
279
|
export class InvalidSelectorError extends ProtocolError {
|
|
280
280
|
static code(): number;
|
|
@@ -283,7 +283,7 @@ export class InvalidSelectorError extends ProtocolError {
|
|
|
283
283
|
/**
|
|
284
284
|
* @param {string} [err] error message
|
|
285
285
|
*/
|
|
286
|
-
constructor(err?: string
|
|
286
|
+
constructor(err?: string);
|
|
287
287
|
}
|
|
288
288
|
export class SessionNotCreatedError extends ProtocolError {
|
|
289
289
|
static code(): number;
|
|
@@ -298,7 +298,7 @@ export class MoveTargetOutOfBoundsError extends ProtocolError {
|
|
|
298
298
|
/**
|
|
299
299
|
* @param {string} [err] error message
|
|
300
300
|
*/
|
|
301
|
-
constructor(err?: string
|
|
301
|
+
constructor(err?: string);
|
|
302
302
|
}
|
|
303
303
|
export class NoSuchContextError extends ProtocolError {
|
|
304
304
|
static code(): number;
|
|
@@ -306,7 +306,7 @@ export class NoSuchContextError extends ProtocolError {
|
|
|
306
306
|
*
|
|
307
307
|
* @param {string} [message]
|
|
308
308
|
*/
|
|
309
|
-
constructor(message?: string
|
|
309
|
+
constructor(message?: string);
|
|
310
310
|
}
|
|
311
311
|
export class InvalidContextError extends ProtocolError {
|
|
312
312
|
static code(): number;
|
|
@@ -314,7 +314,7 @@ export class InvalidContextError extends ProtocolError {
|
|
|
314
314
|
*
|
|
315
315
|
* @param {string} [message]
|
|
316
316
|
*/
|
|
317
|
-
constructor(message?: string
|
|
317
|
+
constructor(message?: string);
|
|
318
318
|
}
|
|
319
319
|
export class NotYetImplementedError extends UnknownMethodError {
|
|
320
320
|
}
|
|
@@ -327,7 +327,7 @@ export class UnableToCaptureScreen extends ProtocolError {
|
|
|
327
327
|
/**
|
|
328
328
|
* @param {string} [err] error message
|
|
329
329
|
*/
|
|
330
|
-
constructor(err?: string
|
|
330
|
+
constructor(err?: string);
|
|
331
331
|
}
|
|
332
332
|
export class BadParametersError extends BaseError {
|
|
333
333
|
static error(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/protocol/errors.js"],"names":[],"mappings":"AAsCA;IACE,mEASC;IAPC,gBAA4B;IAC5B,WAAuC;IAIvC,eAAyD;IACzD,iBAAuB;IAOzB,2BAEC;IAND,sBAEC;IAMD;;;;;OAKG;IACH,kBAJW,MAAM,GAAC,MAAM;;;;;;MAiBvB;CACF;AAMD;IACE,sBAEC;IAED,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/protocol/errors.js"],"names":[],"mappings":"AAsCA;IACE,mEASC;IAPC,gBAA4B;IAC5B,WAAuC;IAIvC,eAAyD;IACzD,iBAAuB;IAOzB,2BAEC;IAND,sBAEC;IAMD;;;;;OAKG;IACH,kBAJW,MAAM,GAAC,MAAM;;;;;;MAiBvB;CACF;AAMD;IACE,sBAEC;IAED,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAUhB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAYhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD,iCAQC;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAUhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAUhB;CACF;AAED;IACE,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAUhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,uBAEC;IACD,oCAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAWhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAUhB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;CAAyD;AAEzD;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;CAA8E;AAE9E;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,sBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD,0BAYC;CACF;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAED;IACE,sBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAIhB;CACF;AAED;IACE,sBAEC;IACD;;;OAGG;IACH,sBAFW,MAAM,EAOhB;CACF;AAGD;CAOC;AACD;CAOC;AAED;IACE,sBAEC;IACD,oCAEC;IACD,uBAEC;IACD;;OAEG;IACH,kBAFW,MAAM,EAShB;CACF;AAkCD;IACE,uBAEC;IACD,qEAOC;IADC,2BAA4C;CAE/C;AAED;;;;;GAKG;AACH;IACE,2DA2BC;IATC,eAA4C;IAI1C,SAAiC;IAGjC,YAA8B;IAIlC,gCAYC;CACF;6BAyOa,MAAM,GAAG;IAAC,KAAK,EAAE,mBAAmB,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;YAYvD,MAAM;WACN,MAAM,GAAC,MAAM;aACb,MAAM;;AA1sCpB;IACE,8BAwBC;CACF;+CAjC4C,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8hChE;;;;;;GAMG;AACH,4BALqB,CAAC,SAAR,KAAM,OACT,GAAG,QACH,OAAO,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC,GAC9B,GAAG,IAAI,CAAC,CAoBpB;AAjCD,kDAOC;AA4BD;;;;;GAKG;AACH,iDAJW,MAAM,UACN,MAAM,MAAO,GACZ,aAAa,CAYxB;AAED;;;;;;GAMG;AACH,2CALW,MAAM,WACN,MAAM,eACL,MAAM,OAAA,GACN,aAAa,CAaxB;AAWD;;;GAGG;AACH,4CAFW,aAAa,GAAC,YAAY,SAsCpC;AAED;;;GAGG;AACH,+CAFW,aAAa,0JAkCvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../lib/protocol/protocol.js"],"names":[],"mappings":"AAgGA,+EA2DC;AASD,mGAgDC;AAmCD;;;;GAIG;AACH,
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../lib/protocol/protocol.js"],"names":[],"mappings":"AAgGA,+EA2DC;AASD,mGAgDC;AAmCD;;;;GAIG;AACH,2HAFa,OAAO,mBAAmB,EAAE,wBAAwB,CAkChE;AAhPD,wDAEC;AAqdD,qFAmBC;AA7fD,6EAEC;AATD,qCAA+B,eAAe,CAAC;AAC/C,qCAA+B,eAAe,CAAC;AAC/C,iCAA2B,WAAW,CAAC;AAEvC,0BAA0B;AAC1B,uCADW,GAAG,CAAC,MAAM,CAAC,CACqB;AA+L3C,8EA+BC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* @param {string} [basePath=DEFAULT_BASE_PATH]
|
|
6
6
|
* @returns {string|undefined}
|
|
7
7
|
*/
|
|
8
|
-
export function routeToCommandName(endpoint: string, method: import("@appium/types").HTTPMethod, basePath?: string
|
|
8
|
+
export function routeToCommandName(endpoint: string, method: import("@appium/types").HTTPMethod, basePath?: string): string | undefined;
|
|
9
9
|
/**
|
|
10
10
|
* define the routes, mapping of HTTP methods to particular driver commands, and
|
|
11
11
|
* any parameters that are expected in a request parameters can be `required` or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"AA65BA;;;;;;GAMG;AACH,6CALW,MAAM,UACN,OAAO,eAAe,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"AA65BA;;;;;;GAMG;AACH,6CALW,MAAM,UACN,OAAO,eAAe,EAAE,UAAU,aAClC,MAAM,GACJ,MAAM,GAAC,SAAS,CAgC5B;AAj7BD;;;;;GAKG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+3BG;AAGH,iCAEyB;AA0CzB,8CAAoF"}
|
package/lib/basedriver/core.ts
CHANGED
|
@@ -20,7 +20,11 @@ import AsyncLock from 'async-lock';
|
|
|
20
20
|
import _ from 'lodash';
|
|
21
21
|
import {EventEmitter} from 'node:events';
|
|
22
22
|
import os from 'node:os';
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
DEFAULT_BASE_PATH,
|
|
25
|
+
PROTOCOLS,
|
|
26
|
+
MAX_LOG_BODY_LENGTH,
|
|
27
|
+
} from '../constants';
|
|
24
28
|
import {errors} from '../protocol';
|
|
25
29
|
import DeviceSettings from './device-settings';
|
|
26
30
|
import helpers, {BASEDRIVER_VER} from './helpers';
|
|
@@ -30,6 +34,9 @@ const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
|
|
|
30
34
|
|
|
31
35
|
const ON_UNEXPECTED_SHUTDOWN_EVENT = 'onUnexpectedShutdown';
|
|
32
36
|
|
|
37
|
+
const ALL_DRIVERS_MATCH = '*';
|
|
38
|
+
const FEATURE_NAME_SEPARATOR = ':';
|
|
39
|
+
|
|
33
40
|
export class DriverCore<const C extends Constraints, Settings extends StringRecord = StringRecord>
|
|
34
41
|
implements Core<C, Settings>
|
|
35
42
|
{
|
|
@@ -258,13 +265,35 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
|
|
|
258
265
|
* @param name - name of feature/command
|
|
259
266
|
*/
|
|
260
267
|
isFeatureEnabled(name: string): boolean {
|
|
268
|
+
// automationName comparison is case-insensitive,
|
|
269
|
+
// while feature name is case-sensitive
|
|
270
|
+
const currentAutomationName = _.toLower(this.opts.automationName);
|
|
271
|
+
|
|
272
|
+
const parseFullName = (fullName: string) => {
|
|
273
|
+
const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
|
|
274
|
+
if (separatorPos < 0) {
|
|
275
|
+
// This should not happen as we preprocess corresponding server arguments in advance
|
|
276
|
+
throw new Error(
|
|
277
|
+
`The full feature name must include both the driver name/wildcard and the feature ` +
|
|
278
|
+
`name split by a colon, got '${fullName}' instead`
|
|
279
|
+
);
|
|
280
|
+
}
|
|
281
|
+
return [
|
|
282
|
+
_.toLower(fullName.substring(0, separatorPos)),
|
|
283
|
+
fullName.substring(separatorPos + 1)
|
|
284
|
+
];
|
|
285
|
+
};
|
|
286
|
+
const parseFullNames = (fullNames: string[]) => fullNames.map(parseFullName);
|
|
287
|
+
const matches = ([automationName, featureName]: [string, string]) =>
|
|
288
|
+
[currentAutomationName, ALL_DRIVERS_MATCH].includes(automationName) && featureName === name;
|
|
289
|
+
|
|
261
290
|
// if we have explicitly denied this feature, return false immediately
|
|
262
|
-
if (this.denyInsecure &&
|
|
291
|
+
if (!_.isEmpty(this.denyInsecure) && parseFullNames(this.denyInsecure).some(matches)) {
|
|
263
292
|
return false;
|
|
264
293
|
}
|
|
265
294
|
|
|
266
295
|
// if we specifically have allowed the feature, return true
|
|
267
|
-
if (this.allowInsecure &&
|
|
296
|
+
if (!_.isEmpty(this.allowInsecure) && parseFullNames(this.allowInsecure).some(matches)) {
|
|
268
297
|
return true;
|
|
269
298
|
}
|
|
270
299
|
|
|
@@ -283,7 +312,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
|
|
|
283
312
|
* not
|
|
284
313
|
*
|
|
285
314
|
* @param name - name of feature/command
|
|
286
|
-
* @deprecated
|
|
315
|
+
* @deprecated Use {@link assertFeatureEnabled} instead
|
|
287
316
|
*/
|
|
288
317
|
ensureFeatureEnabled(name: string) {
|
|
289
318
|
this.assertFeatureEnabled(name);
|
package/lib/constants.ts
CHANGED
|
@@ -7,15 +7,13 @@ import {Protocol} from '@appium/types';
|
|
|
7
7
|
// server feature. Example rule:
|
|
8
8
|
// {"pattern": "(.{1,150}).*", "flags": "s", "replacer": "$1"}
|
|
9
9
|
// ^ cuts all log records to maximum 150 chars
|
|
10
|
-
const MAX_LOG_BODY_LENGTH = 1024;
|
|
11
|
-
const MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
12
|
-
const W3C_ELEMENT_KEY = util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
13
|
-
const PROTOCOLS = {
|
|
10
|
+
export const MAX_LOG_BODY_LENGTH = 1024;
|
|
11
|
+
export const MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
12
|
+
export const W3C_ELEMENT_KEY = util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
13
|
+
export const PROTOCOLS = {
|
|
14
14
|
W3C: 'W3C',
|
|
15
15
|
MJSONWP: 'MJSONWP',
|
|
16
16
|
} as const satisfies Record<Protocol, Protocol>;
|
|
17
17
|
|
|
18
18
|
// Before Appium 2.0, this default value was '/wd/hub' by historical reasons.
|
|
19
|
-
const DEFAULT_BASE_PATH = '';
|
|
20
|
-
|
|
21
|
-
export {MAX_LOG_BODY_LENGTH, MJSONWP_ELEMENT_KEY, W3C_ELEMENT_KEY, PROTOCOLS, DEFAULT_BASE_PATH};
|
|
19
|
+
export const DEFAULT_BASE_PATH = '';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/base-driver",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.13.0",
|
|
4
4
|
"description": "Base driver class for Appium drivers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -44,18 +44,18 @@
|
|
|
44
44
|
"test:types": "tsd"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@appium/support": "^5.1.
|
|
48
|
-
"@appium/types": "^0.22.
|
|
47
|
+
"@appium/support": "^5.1.8",
|
|
48
|
+
"@appium/types": "^0.22.2",
|
|
49
49
|
"@colors/colors": "1.6.0",
|
|
50
50
|
"@types/async-lock": "1.4.2",
|
|
51
51
|
"@types/bluebird": "3.5.42",
|
|
52
52
|
"@types/express": "5.0.0",
|
|
53
|
-
"@types/lodash": "4.17.
|
|
53
|
+
"@types/lodash": "4.17.13",
|
|
54
54
|
"@types/method-override": "0.0.35",
|
|
55
55
|
"@types/serve-favicon": "2.5.7",
|
|
56
56
|
"async-lock": "1.4.1",
|
|
57
57
|
"asyncbox": "3.0.0",
|
|
58
|
-
"axios": "1.7.
|
|
58
|
+
"axios": "1.7.8",
|
|
59
59
|
"bluebird": "3.7.2",
|
|
60
60
|
"body-parser": "1.20.3",
|
|
61
61
|
"express": "4.21.1",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"path-to-regexp": "8.2.0",
|
|
68
68
|
"serve-favicon": "2.5.0",
|
|
69
69
|
"source-map-support": "0.5.21",
|
|
70
|
-
"type-fest": "4.
|
|
70
|
+
"type-fest": "4.29.1",
|
|
71
71
|
"validate.js": "0.13.1"
|
|
72
72
|
},
|
|
73
73
|
"optionalDependencies": {
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"publishConfig": {
|
|
81
81
|
"access": "public"
|
|
82
82
|
},
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "8daf5e123ac14c8325acf504fb33eb28e1a3dd78",
|
|
84
84
|
"tsd": {
|
|
85
85
|
"directory": "test/types"
|
|
86
86
|
}
|