@appium/base-driver 9.3.1 → 9.3.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/basedriver/capabilities.d.ts +10 -0
- package/build/lib/basedriver/capabilities.d.ts.map +1 -1
- package/build/lib/basedriver/capabilities.js +57 -44
- package/build/lib/basedriver/capabilities.js.map +1 -1
- package/build/lib/basedriver/commands/session.js +7 -0
- package/build/lib/basedriver/commands/session.js.map +1 -1
- package/build/lib/basedriver/core.d.ts +10 -1
- package/build/lib/basedriver/core.d.ts.map +1 -1
- package/build/lib/basedriver/core.js +10 -43
- package/build/lib/basedriver/core.js.map +1 -1
- package/build/lib/basedriver/driver.d.ts.map +1 -1
- package/build/lib/basedriver/driver.js.map +1 -1
- package/build/lib/basedriver/helpers.d.ts.map +1 -1
- package/build/lib/basedriver/helpers.js +9 -3
- package/build/lib/basedriver/helpers.js.map +1 -1
- package/build/lib/index.d.ts +1 -1
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +2 -1
- package/build/lib/index.js.map +1 -1
- package/lib/basedriver/capabilities.js +68 -54
- package/lib/basedriver/core.js +41 -17
- package/lib/basedriver/driver.js +1 -1
- package/lib/basedriver/helpers.js +9 -3
- package/lib/index.js +1 -0
- package/package.json +8 -8
|
@@ -7,6 +7,7 @@ export type Constraints = import('@appium/types').Constraints;
|
|
|
7
7
|
export type Constraint = import('@appium/types').Constraint;
|
|
8
8
|
export type StringRecord = import('@appium/types').StringRecord;
|
|
9
9
|
export type BaseDriverCapConstraints = import('@appium/types').BaseDriverCapConstraints;
|
|
10
|
+
export type ConstraintsToCaps<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').ConstraintsToCaps<C>;
|
|
10
11
|
export type ValidateCapsOpts = {
|
|
11
12
|
/**
|
|
12
13
|
* - if true, skip the presence constraint
|
|
@@ -89,5 +90,14 @@ export function stripAppiumPrefixes<C extends Readonly<Record<string, import("@a
|
|
|
89
90
|
* @return {import('@appium/types').W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
90
91
|
*/
|
|
91
92
|
export function promoteAppiumOptions<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(originalCaps: import("@appium/types").W3CCapabilities<C, void>): import("@appium/types").W3CCapabilities<C, void>;
|
|
93
|
+
/**
|
|
94
|
+
* Return a copy of a "bare" (single-level, non-W3C) capabilities object which has taken everything
|
|
95
|
+
* within the 'appium:options' capability and promoted it to the top level.
|
|
96
|
+
*
|
|
97
|
+
* @template {Constraints} C
|
|
98
|
+
* @param {NSCapabilities<C>} obj
|
|
99
|
+
* @return {NSCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
100
|
+
*/
|
|
101
|
+
export function promoteAppiumOptionsForObject<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(obj: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>): Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>;
|
|
92
102
|
export const PREFIXED_APPIUM_OPTS_CAP: string;
|
|
93
103
|
//# sourceMappingURL=capabilities.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"AA0FA;;;GAGG;AACH,8FAeE;
|
|
1
|
+
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"AA0FA;;;GAGG;AACH,8FAeE;0BAuUW,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;wGAKhD,OAAO,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;;;;qOAW5C,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC;mOAMhD,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC;sOAM9C,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC;0BAKjD,OAAO,WAAW,EAAE,KAAK,CAAC,CAAC,EAAC,CAAC,CAAC;6BAI9B,OAAO,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AA3R/C;;;;;;;GAOG;AACH;;;;;;EAmGC;AAGD;;;;;;GAMG;AACH,4SAuBC;AApSD;;;;;;GAMG;AACH,8SAwCC;AA7ED;;;;;;;;GAQG;AACH,62NAkBC;AA9BD,6CAAuC;AAuKvC;;;;GAIG;AACH,0MAWC;AA9ED;;;GAGG;AACH,mCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;GAOG;AACH,mSA4CC;AAgOD;;;;;;;GAOG;AACH,+NAcC;AApFD;;;;;;;GAOG;AACH,uVAoDC;AAlYD,8CAAkE"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.PREFIXED_APPIUM_OPTS_CAP = exports.promoteAppiumOptions = exports.stripAppiumPrefixes = exports.isStandardCap = exports.findNonPrefixedCaps = exports.APPIUM_VENDOR_PREFIX = exports.mergeCaps = exports.validateCaps = exports.processCapabilities = exports.parseCaps = exports.STANDARD_CAPS = void 0;
|
|
7
|
+
exports.PREFIXED_APPIUM_OPTS_CAP = exports.promoteAppiumOptionsForObject = exports.promoteAppiumOptions = exports.stripAppiumPrefixes = exports.isStandardCap = exports.findNonPrefixedCaps = exports.APPIUM_VENDOR_PREFIX = exports.mergeCaps = exports.validateCaps = exports.processCapabilities = exports.parseCaps = exports.STANDARD_CAPS = void 0;
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const desired_caps_1 = require("./desired-caps");
|
|
10
10
|
const support_1 = require("@appium/support");
|
|
@@ -270,6 +270,55 @@ function processCapabilities(w3cCaps, constraints = /** @type {C} */ ({}), shoul
|
|
|
270
270
|
return /** @type {Capabilities<C>} */ (matchedCaps ?? {});
|
|
271
271
|
}
|
|
272
272
|
exports.processCapabilities = processCapabilities;
|
|
273
|
+
/**
|
|
274
|
+
* Return a copy of a "bare" (single-level, non-W3C) capabilities object which has taken everything
|
|
275
|
+
* within the 'appium:options' capability and promoted it to the top level.
|
|
276
|
+
*
|
|
277
|
+
* @template {Constraints} C
|
|
278
|
+
* @param {NSCapabilities<C>} obj
|
|
279
|
+
* @return {NSCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
280
|
+
*/
|
|
281
|
+
function promoteAppiumOptionsForObject(obj) {
|
|
282
|
+
const appiumOptions = obj[PREFIXED_APPIUM_OPTS_CAP];
|
|
283
|
+
if (!appiumOptions) {
|
|
284
|
+
return obj;
|
|
285
|
+
}
|
|
286
|
+
if (!lodash_1.default.isPlainObject(appiumOptions)) {
|
|
287
|
+
throw new errors_1.errors.SessionNotCreatedError(`The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`);
|
|
288
|
+
}
|
|
289
|
+
if (lodash_1.default.isEmpty(appiumOptions)) {
|
|
290
|
+
return obj;
|
|
291
|
+
}
|
|
292
|
+
logger_1.default.debug(`Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`);
|
|
293
|
+
/**
|
|
294
|
+
* @param {string} capName
|
|
295
|
+
*/
|
|
296
|
+
const shouldAddVendorPrefix = (capName) => !capName.startsWith(APPIUM_VENDOR_PREFIX);
|
|
297
|
+
const verifyIfAcceptable = (/** @type {string} */ capName) => {
|
|
298
|
+
if (!lodash_1.default.isString(capName)) {
|
|
299
|
+
throw new errors_1.errors.SessionNotCreatedError(`Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`);
|
|
300
|
+
}
|
|
301
|
+
if (isStandardCap(capName)) {
|
|
302
|
+
throw new errors_1.errors.SessionNotCreatedError(`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilties. '${capName}' is unexpected`);
|
|
303
|
+
}
|
|
304
|
+
return capName;
|
|
305
|
+
};
|
|
306
|
+
const preprocessedOptions = (0, lodash_1.default)(appiumOptions)
|
|
307
|
+
.mapKeys((value, /** @type {string} */ key) => verifyIfAcceptable(key))
|
|
308
|
+
.mapKeys((value, key) => (shouldAddVendorPrefix(key) ? `${APPIUM_VENDOR_PREFIX}${key}` : key))
|
|
309
|
+
.value();
|
|
310
|
+
// warn if we are going to overwrite any keys on the base caps object
|
|
311
|
+
const overwrittenKeys = lodash_1.default.intersection(Object.keys(obj), Object.keys(preprocessedOptions));
|
|
312
|
+
if (overwrittenKeys.length > 0) {
|
|
313
|
+
logger_1.default.warn(`Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
|
|
314
|
+
`capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`);
|
|
315
|
+
}
|
|
316
|
+
return lodash_1.default.cloneDeep({
|
|
317
|
+
... /** @type {NSCapabilities<C>} */(lodash_1.default.omit(obj, PREFIXED_APPIUM_OPTS_CAP)),
|
|
318
|
+
...preprocessedOptions,
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
exports.promoteAppiumOptionsForObject = promoteAppiumOptionsForObject;
|
|
273
322
|
/**
|
|
274
323
|
* Return a copy of a capabilities object which has taken everything within the 'options'
|
|
275
324
|
* capability and promoted it to the top level.
|
|
@@ -279,56 +328,16 @@ exports.processCapabilities = processCapabilities;
|
|
|
279
328
|
* @return {import('@appium/types').W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
280
329
|
*/
|
|
281
330
|
function promoteAppiumOptions(originalCaps) {
|
|
282
|
-
const promoteForObject = (obj) => {
|
|
283
|
-
const appiumOptions = obj[PREFIXED_APPIUM_OPTS_CAP];
|
|
284
|
-
if (!appiumOptions) {
|
|
285
|
-
return obj;
|
|
286
|
-
}
|
|
287
|
-
if (!lodash_1.default.isPlainObject(appiumOptions)) {
|
|
288
|
-
throw new errors_1.errors.SessionNotCreatedError(`The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`);
|
|
289
|
-
}
|
|
290
|
-
if (lodash_1.default.isEmpty(appiumOptions)) {
|
|
291
|
-
return obj;
|
|
292
|
-
}
|
|
293
|
-
logger_1.default.debug(`Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`);
|
|
294
|
-
/**
|
|
295
|
-
* @param {string} capName
|
|
296
|
-
*/
|
|
297
|
-
const shouldAddVendorPrefix = (capName) => !capName.startsWith(APPIUM_VENDOR_PREFIX);
|
|
298
|
-
const verifyIfAcceptable = (capName) => {
|
|
299
|
-
if (!lodash_1.default.isString(capName)) {
|
|
300
|
-
throw new errors_1.errors.SessionNotCreatedError(`Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`);
|
|
301
|
-
}
|
|
302
|
-
if (isStandardCap(capName)) {
|
|
303
|
-
throw new errors_1.errors.SessionNotCreatedError(`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilties. '${capName}' is unexpected`);
|
|
304
|
-
}
|
|
305
|
-
return capName;
|
|
306
|
-
};
|
|
307
|
-
const preprocessedOptions = (0, lodash_1.default)(appiumOptions)
|
|
308
|
-
.mapKeys((value, key) => verifyIfAcceptable(key))
|
|
309
|
-
.mapKeys((value, key) => (shouldAddVendorPrefix(key) ? `${APPIUM_VENDOR_PREFIX}${key}` : key))
|
|
310
|
-
.value();
|
|
311
|
-
// warn if we are going to overwrite any keys on the base caps object
|
|
312
|
-
const overwrittenKeys = lodash_1.default.intersection(Object.keys(obj), Object.keys(preprocessedOptions));
|
|
313
|
-
if (overwrittenKeys.length > 0) {
|
|
314
|
-
logger_1.default.warn(`Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
|
|
315
|
-
`capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`);
|
|
316
|
-
}
|
|
317
|
-
return lodash_1.default.cloneDeep({
|
|
318
|
-
...lodash_1.default.omit(obj, PREFIXED_APPIUM_OPTS_CAP),
|
|
319
|
-
...preprocessedOptions,
|
|
320
|
-
});
|
|
321
|
-
};
|
|
322
|
-
const { alwaysMatch, firstMatch } = originalCaps;
|
|
323
331
|
const result = {};
|
|
332
|
+
const { alwaysMatch, firstMatch } = originalCaps;
|
|
324
333
|
if (lodash_1.default.isPlainObject(alwaysMatch)) {
|
|
325
|
-
result.alwaysMatch =
|
|
334
|
+
result.alwaysMatch = promoteAppiumOptionsForObject(alwaysMatch);
|
|
326
335
|
}
|
|
327
336
|
else if ('alwaysMatch' in originalCaps) {
|
|
328
337
|
result.alwaysMatch = alwaysMatch;
|
|
329
338
|
}
|
|
330
339
|
if (lodash_1.default.isArray(firstMatch)) {
|
|
331
|
-
result.firstMatch = firstMatch.map(
|
|
340
|
+
result.firstMatch = firstMatch.map(promoteAppiumOptionsForObject);
|
|
332
341
|
}
|
|
333
342
|
else if ('firstMatch' in originalCaps) {
|
|
334
343
|
result.firstMatch = firstMatch;
|
|
@@ -342,6 +351,10 @@ exports.promoteAppiumOptions = promoteAppiumOptions;
|
|
|
342
351
|
* @typedef {import('@appium/types').StringRecord} StringRecord
|
|
343
352
|
* @typedef {import('@appium/types').BaseDriverCapConstraints} BaseDriverCapConstraints
|
|
344
353
|
*/
|
|
354
|
+
/**
|
|
355
|
+
* @template {Constraints} C
|
|
356
|
+
* @typedef {import('@appium/types').ConstraintsToCaps<C>} ConstraintsToCaps
|
|
357
|
+
*/
|
|
345
358
|
/**
|
|
346
359
|
* @typedef ValidateCapsOpts
|
|
347
360
|
* @property {boolean} [skipPresenceConstraint] - if true, skip the presence constraint
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":";AAAA,YAAY;;;;;;AAEZ,oDAAuB;AACvB,iDAAyC;AACzC,6CAAqC;AACrC,sDAA2B;AAC3B,+CAA0C;AAE1C,MAAM,oBAAoB,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.SessionMixin = void 0;
|
|
7
|
+
/* eslint-disable no-unused-vars */
|
|
8
|
+
/* eslint-disable require-await */
|
|
9
|
+
// @ts-check
|
|
10
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
4
11
|
/**
|
|
5
12
|
* @template {Constraints} C
|
|
6
13
|
* @param {import('./settings').SettingsBase<C>} Base
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.js"],"names":[],"mappings":";;;;;;AAAA,mCAAmC;AACnC,kCAAkC;AAClC,YAAY;AACZ,oDAAuB;AAEvB;;;;GAIG;AACH,SAAgB,YAAY,CAAC,IAAI;IAC/B;;OAEG;IACH,MAAM,eAAgB,SAAQ,IAAI;QAChC;;WAEG;QACH,KAAK,CAAC,WAAW;YACf,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,GAAG,CAAC,IAAI,CAAC;oBACP,EAAE,EAAE,IAAI,CAAC,SAAS;oBAClB,YAAY,EAAE,IAAI,CAAC,IAAI;iBACxB,CAAC,CAAC;aACJ;YAED,OAAO,GAAG,CAAC;QACb,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,UAAU;YACd,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBAC1B,OAAO,EAAC,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAC,CAAC;aAClD;YACD,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAlCD,oCAkCC;AAED;;;;;GAKG;AAEH;;;GAGG"}
|
|
@@ -38,7 +38,8 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
38
38
|
* @type {ServerArgs}
|
|
39
39
|
*/
|
|
40
40
|
initialOpts: ServerArgs;
|
|
41
|
-
helpers
|
|
41
|
+
/** @type {typeof helpers} */
|
|
42
|
+
helpers: typeof helpers;
|
|
42
43
|
/**
|
|
43
44
|
* basePath is used for several purposes, for example in setting up
|
|
44
45
|
* proxying to other drivers, since we need to know what the base path
|
|
@@ -46,14 +47,18 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
46
47
|
* initially but it is automatically updated during any actual program
|
|
47
48
|
* execution by the routeConfiguringFunction, which is necessarily run as
|
|
48
49
|
* the entrypoint for any Appium server
|
|
50
|
+
* @type {string}
|
|
49
51
|
*/
|
|
50
52
|
basePath: string;
|
|
53
|
+
/** @type {boolean} */
|
|
51
54
|
relaxedSecurityEnabled: boolean;
|
|
52
55
|
/** @type {string[]} */
|
|
53
56
|
allowInsecure: string[];
|
|
54
57
|
/** @type {string[]} */
|
|
55
58
|
denyInsecure: string[];
|
|
59
|
+
/** @type {number} */
|
|
56
60
|
newCommandTimeoutMs: number;
|
|
61
|
+
/** @type {number} */
|
|
57
62
|
implicitWaitMs: number;
|
|
58
63
|
/** @type {string[]} */
|
|
59
64
|
locatorStrategies: string[];
|
|
@@ -73,6 +78,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
73
78
|
_log: AppiumLogger;
|
|
74
79
|
/**
|
|
75
80
|
* @protected
|
|
81
|
+
* @type {boolean}
|
|
76
82
|
*/
|
|
77
83
|
protected shutdownUnexpectedly: boolean;
|
|
78
84
|
/**
|
|
@@ -81,6 +87,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
81
87
|
shouldValidateCaps: boolean;
|
|
82
88
|
/**
|
|
83
89
|
* @protected
|
|
90
|
+
* @type {AsyncLock}
|
|
84
91
|
*/
|
|
85
92
|
protected commandsQueueGuard: AsyncLock;
|
|
86
93
|
/**
|
|
@@ -88,6 +95,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
88
95
|
* we set it to an empty DeviceSettings instance here to make sure that the
|
|
89
96
|
* default settings are applied even if an extending driver doesn't utilize
|
|
90
97
|
* the settings functionality itself
|
|
98
|
+
* @type {DeviceSettings}
|
|
91
99
|
*/
|
|
92
100
|
settings: DeviceSettings<any>;
|
|
93
101
|
get log(): import("@appium/types").AppiumLogger;
|
|
@@ -221,6 +229,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
221
229
|
getManagedDrivers(): import("@appium/types").Driver<typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, import("@appium/types").StringRecord, any>[];
|
|
222
230
|
clearNewCommandTimeout(): Promise<void>;
|
|
223
231
|
}
|
|
232
|
+
import helpers from "./helpers";
|
|
224
233
|
import { EventEmitter } from "events";
|
|
225
234
|
import AsyncLock from "async-lock";
|
|
226
235
|
import DeviceSettings from "./device-settings";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"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"}
|
|
@@ -29,66 +29,33 @@ class DriverCore {
|
|
|
29
29
|
* @param {boolean} [shouldValidateCaps]
|
|
30
30
|
*/
|
|
31
31
|
constructor(opts = /** @type {DriverOpts<C>} */ ({}), shouldValidateCaps = true) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
this._log = support_1.logger.getLogger(helpers_1.default.generateDriverLogPrefix(this));
|
|
33
|
+
// setup state
|
|
34
|
+
this.opts = opts;
|
|
35
|
+
// use a custom tmp dir to avoid losing data and app when computer is
|
|
36
|
+
// restarted
|
|
37
|
+
this.opts.tmpDir = this.opts.tmpDir || process.env.APPIUM_TMP_DIR || os_1.default.tmpdir();
|
|
38
|
+
// base-driver internals
|
|
39
|
+
this.shouldValidateCaps = shouldValidateCaps;
|
|
40
|
+
// keeping track of initial opts
|
|
41
|
+
this.initialOpts = lodash_1.default.cloneDeep(opts);
|
|
35
42
|
this.sessionId = null;
|
|
36
43
|
this.helpers = helpers_1.default;
|
|
37
|
-
/**
|
|
38
|
-
* basePath is used for several purposes, for example in setting up
|
|
39
|
-
* proxying to other drivers, since we need to know what the base path
|
|
40
|
-
* of any incoming request might look like. We set it to the default
|
|
41
|
-
* initially but it is automatically updated during any actual program
|
|
42
|
-
* execution by the routeConfiguringFunction, which is necessarily run as
|
|
43
|
-
* the entrypoint for any Appium server
|
|
44
|
-
*/
|
|
45
44
|
this.basePath = constants_1.DEFAULT_BASE_PATH;
|
|
46
45
|
this.relaxedSecurityEnabled = false;
|
|
47
|
-
/** @type {string[]} */
|
|
48
46
|
this.allowInsecure = [];
|
|
49
|
-
/** @type {string[]} */
|
|
50
47
|
this.denyInsecure = [];
|
|
51
48
|
this.newCommandTimeoutMs = NEW_COMMAND_TIMEOUT_MS;
|
|
52
49
|
this.implicitWaitMs = 0;
|
|
53
|
-
/** @type {string[]} */
|
|
54
50
|
this.locatorStrategies = [];
|
|
55
|
-
/** @type {string[]} */
|
|
56
51
|
this.webLocatorStrategies = [];
|
|
57
|
-
/** @type {Driver[]} */
|
|
58
52
|
this.managedDrivers = [];
|
|
59
|
-
/** @type {NodeJS.Timeout?} */
|
|
60
53
|
this.noCommandTimer = null;
|
|
61
|
-
/** @type {EventHistory} */
|
|
62
54
|
this._eventHistory = { commands: [] };
|
|
63
|
-
// used to handle driver events
|
|
64
|
-
/** @type {NodeJS.EventEmitter} */
|
|
65
55
|
this.eventEmitter = new events_1.EventEmitter();
|
|
66
|
-
/**
|
|
67
|
-
* @protected
|
|
68
|
-
*/
|
|
69
56
|
this.shutdownUnexpectedly = false;
|
|
70
|
-
/**
|
|
71
|
-
* @protected
|
|
72
|
-
*/
|
|
73
57
|
this.commandsQueueGuard = new async_lock_1.default();
|
|
74
|
-
/**
|
|
75
|
-
* settings should be instantiated by drivers which extend BaseDriver, but
|
|
76
|
-
* we set it to an empty DeviceSettings instance here to make sure that the
|
|
77
|
-
* default settings are applied even if an extending driver doesn't utilize
|
|
78
|
-
* the settings functionality itself
|
|
79
|
-
*/
|
|
80
58
|
this.settings = new device_settings_1.default();
|
|
81
|
-
this._log = support_1.logger.getLogger(helpers_1.default.generateDriverLogPrefix(this));
|
|
82
|
-
// setup state
|
|
83
|
-
this.opts = opts;
|
|
84
|
-
// use a custom tmp dir to avoid losing data and app when computer is
|
|
85
|
-
// restarted
|
|
86
|
-
this.opts.tmpDir = this.opts.tmpDir || process.env.APPIUM_TMP_DIR || os_1.default.tmpdir();
|
|
87
|
-
// base-driver internals
|
|
88
|
-
this.shouldValidateCaps = shouldValidateCaps;
|
|
89
|
-
// keeping track of initial opts
|
|
90
|
-
this.initialOpts = lodash_1.default.cloneDeep(opts);
|
|
91
|
-
this.sessionId = null;
|
|
92
59
|
}
|
|
93
60
|
get log() {
|
|
94
61
|
return this._log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,kCAAkC;;;;;;AAElC,6CAA2C;AAC3C,4DAAmC;AACnC,mCAAoC;AACpC,oDAAuB;AACvB,4CAAoB;AACpB,4CAA0D;AAC1D,0CAAmC;AACnC,wEAA+C;AAC/C,wDAAgC;AAEhC,wDAAwD;AACxD,MAAM,EAAC,OAAO,EAAE,cAAc,EAAC,GAAG,YAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;AAEpE,MAAM,sBAAsB,GAAG,EAAE,GAAG,IAAI,CAAC;AAEzC,MAAM,4BAA4B,GAAG,sBAAsB,CAAC;AAE5D;;;GAGG;AACH,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/driver.js"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,+OAL+B,CAAC;IA+B9B;;;;OAIG;IACH,mBAHW,WAAW,CAAC,CAAC,uBACb,OAAO,EAcjB;IA1CD;;OAEG;IACH,SAFU,KAAK,GAAG,UAAU,CAEpB;IAER;;OAEG;IACH,MAFU,aAAa,CAAC,CAAC,CAEpB;IAEL;;OAEG;IACH,cAFU,gBAAgB,CAAC,CAAC,CAEf;IAEb;;OAEG;IACH,uBAFU,CAAC,CAEW;IAEtB;;OAEG;IACH,MAFU,WAAW,CAAC,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAEzD;IAqBL;;;;;;;;OAQG;IACH,0FAEC;IAMD;;;;OAIG;IACH,oBAJW,MAAM,WACF,GAAG,KACL,QAAQ,GAAG,CAAC,CAsExB;IAED;;;OAGG;IACH,8BAFW,KAAK,GAAC,OAAO,oBAAoB,EAAE,iBAAiB,iBAc9D;IAED,wCAmBC;IAED;;;;;;OAMG;IACH,qBALW,OAAO,eAAe,EAAE,YAAY,QACpC,MAAM,QACN,MAAM,QACN,MAAM,QAOhB;IAJC,yDAAoB;IACpB,+BAAsB;IACtB,+BAAsB;IACtB,+BAAsB;IAOxB,uBA+BC;IAfC,oDAAyC;IAiB3C;;;;;;;;;;;OAWG;IACH,gCANW,gBAAgB,CAAC,CAAC,mLAIhB,QAAQ,CAAC,MAAM,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAiF7C;IAED;;;;;OAKG;IACH,8GAFa,QAAQ,IAAI,CAAC,CAczB;IAED;;;OAGG;IACH,mBAFW,aAAa,CAAC,CAAC,QAYzB;IAED;;;;OAIG;IACH,0BAHW,aAAa,CAAC,CAAC,GACb,OAAO,CAqBnB;CACF;;AAED;;;;GAIG;AACH,+IAFuB,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/driver.js"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,+OAL+B,CAAC;IA+B9B;;;;OAIG;IACH,mBAHW,WAAW,CAAC,CAAC,uBACb,OAAO,EAcjB;IA1CD;;OAEG;IACH,SAFU,KAAK,GAAG,UAAU,CAEpB;IAER;;OAEG;IACH,MAFU,aAAa,CAAC,CAAC,CAEpB;IAEL;;OAEG;IACH,cAFU,gBAAgB,CAAC,CAAC,CAEf;IAEb;;OAEG;IACH,uBAFU,CAAC,CAEW;IAEtB;;OAEG;IACH,MAFU,WAAW,CAAC,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAEzD;IAqBL;;;;;;;;OAQG;IACH,0FAEC;IAMD;;;;OAIG;IACH,oBAJW,MAAM,WACF,GAAG,KACL,QAAQ,GAAG,CAAC,CAsExB;IAED;;;OAGG;IACH,8BAFW,KAAK,GAAC,OAAO,oBAAoB,EAAE,iBAAiB,iBAc9D;IAED,wCAmBC;IAED;;;;;;OAMG;IACH,qBALW,OAAO,eAAe,EAAE,YAAY,QACpC,MAAM,QACN,MAAM,QACN,MAAM,QAOhB;IAJC,yDAAoB;IACpB,+BAAsB;IACtB,+BAAsB;IACtB,+BAAsB;IAOxB,uBA+BC;IAfC,oDAAyC;IAiB3C;;;;;;;;;;;OAWG;IACH,gCANW,gBAAgB,CAAC,CAAC,mLAIhB,QAAQ,CAAC,MAAM,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAiF7C;IAED;;;;;OAKG;IACH,8GAFa,QAAQ,IAAI,CAAC,CAczB;IAED;;;OAGG;IACH,mBAFW,aAAa,CAAC,CAAC,QAYzB;IAED;;;;OAIG;IACH,0BAHW,aAAa,CAAC,CAAC,GACb,OAAO,CAqBnB;CACF;;AAED;;;;GAIG;AACH,+IAFuB,CAAC;IAlZF,kCACf;CAmZiE;;yBAI3D,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;yBAChD,OAAO,eAAe,EAAE,UAAU;yCAKpC,OAAO,SAAS,EAAE,OAAO,cACzB,OAAO,eAAe,EAAE,YAAY,KAClC,OAAO,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC;;;;8HAQpC,OAAO,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,EAAC,4CAAuC,MAAM,CAAC;2IAKtG,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC,IAAI,EAAE,CAAC,CAAC;2MAMhE,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC;8MAM9C,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC;8NAMjD,OAAO,eAAe,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;qGAKxC,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;iGAKzC,OAAO,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../lib/basedriver/driver.js"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,mCAAmC;;;;;;AAEnC,
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../lib/basedriver/driver.js"],"names":[],"mappings":"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"}
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;WA8Kc,OAAO;;;;;;;;;;aAGP,MAAM;;;;;;;aAMN,MAAM;;;;;;;;;;;;2BAMA,kBAAkB,KAAK,CAAC,QAAQ,iBAAiB,GAAC,SAAS,CAAC,GAAC,iBAAiB,GAAC,SAAS,CAAC;;;;;yBAQ/F,MAAM,EAAE;;;kBA+ZR,IAAI;eACJ,OAAO;YACP,MAAM;;AArcpB;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;;;;GASG;AACH,kCAJW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,mBAAmB,gBA6N7C;AA8FD,qDAEC;AAED;;;;;;;;;GASG;AACH,oFAuBC;AAED;;;;;GAKG;AACH,oCAFW,MAAM,GAAC,aAAa,SAoB9B;AAED;;;;;;GAMG;AACH,6CAJW,OAAO,eAAe,EAAE,IAAI,cAC5B,MAAM,UACJ,MAAM,CAKlB"}
|
|
@@ -51,16 +51,21 @@ process.on('exit', () => {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
|
-
|
|
54
|
+
/**
|
|
55
|
+
*
|
|
56
|
+
* @param {string} url
|
|
57
|
+
* @returns {Promise<import('axios').AxiosResponse['headers']>}
|
|
58
|
+
*/
|
|
59
|
+
async function retrieveHeaders(url) {
|
|
55
60
|
try {
|
|
56
61
|
return (await (0, axios_1.default)({
|
|
57
|
-
url
|
|
62
|
+
url,
|
|
58
63
|
method: 'HEAD',
|
|
59
64
|
timeout: 5000,
|
|
60
65
|
})).headers;
|
|
61
66
|
}
|
|
62
67
|
catch (e) {
|
|
63
|
-
logger_1.default.info(`Cannot send HEAD request to '${
|
|
68
|
+
logger_1.default.info(`Cannot send HEAD request to '${url}'. Original error: ${e.message}`);
|
|
64
69
|
}
|
|
65
70
|
return {};
|
|
66
71
|
}
|
|
@@ -203,6 +208,7 @@ async function configureApp(app, options = /** @type {ConfigureAppOptions} */ ({
|
|
|
203
208
|
let newApp = app;
|
|
204
209
|
let shouldUnzipApp = false;
|
|
205
210
|
let packageHash = null;
|
|
211
|
+
/** @type {import('axios').AxiosResponse['headers']?} */
|
|
206
212
|
let headers = null;
|
|
207
213
|
/** @type {RemoteAppProps} */
|
|
208
214
|
const remoteAppProps = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"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"}
|
package/build/lib/index.d.ts
CHANGED
|
@@ -12,5 +12,5 @@ import { BaseDriver } from "./basedriver/driver";
|
|
|
12
12
|
export { DEFAULT_BASE_PATH, PROTOCOLS } from "./constants";
|
|
13
13
|
export { server, normalizeBasePath } from "./express/server";
|
|
14
14
|
export { getSummaryByCode, codes as statusCodes } from "./jsonwp-status/status";
|
|
15
|
-
export { PREFIXED_APPIUM_OPTS_CAP, STANDARD_CAPS, processCapabilities, isStandardCap, validateCaps, promoteAppiumOptions } from "./basedriver/capabilities";
|
|
15
|
+
export { PREFIXED_APPIUM_OPTS_CAP, STANDARD_CAPS, processCapabilities, isStandardCap, validateCaps, promoteAppiumOptions, promoteAppiumOptionsForObject } from "./basedriver/capabilities";
|
|
16
16
|
//# sourceMappingURL=index.d.ts.map
|
package/build/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;yBA4Ca,OAAO,kBAAkB,EAAE,UAAU"}
|
package/build/lib/index.js
CHANGED
|
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.DEFAULT_WS_PATHNAME_PREFIX = exports.promoteAppiumOptions = exports.validateCaps = exports.isStandardCap = exports.processCapabilities = exports.STANDARD_CAPS = exports.PREFIXED_APPIUM_OPTS_CAP = exports.statusCodes = exports.getSummaryByCode = exports.JWProxy = exports.normalizeBasePath = exports.server = exports.STATIC_DIR = exports.PROTOCOLS = exports.DEFAULT_BASE_PATH = exports.errorFromCode = exports.BaseDriver = exports.DeviceSettings = exports.DriverCore = void 0;
|
|
20
|
+
exports.DEFAULT_WS_PATHNAME_PREFIX = exports.promoteAppiumOptionsForObject = exports.promoteAppiumOptions = exports.validateCaps = exports.isStandardCap = exports.processCapabilities = exports.STANDARD_CAPS = exports.PREFIXED_APPIUM_OPTS_CAP = exports.statusCodes = exports.getSummaryByCode = exports.JWProxy = exports.normalizeBasePath = exports.server = exports.STATIC_DIR = exports.PROTOCOLS = exports.DEFAULT_BASE_PATH = exports.errorFromCode = exports.BaseDriver = exports.DeviceSettings = exports.DriverCore = void 0;
|
|
21
21
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
22
22
|
bluebird_1.default.config({
|
|
23
23
|
cancellation: true,
|
|
@@ -58,6 +58,7 @@ Object.defineProperty(exports, "processCapabilities", { enumerable: true, get: f
|
|
|
58
58
|
Object.defineProperty(exports, "isStandardCap", { enumerable: true, get: function () { return capabilities_1.isStandardCap; } });
|
|
59
59
|
Object.defineProperty(exports, "validateCaps", { enumerable: true, get: function () { return capabilities_1.validateCaps; } });
|
|
60
60
|
Object.defineProperty(exports, "promoteAppiumOptions", { enumerable: true, get: function () { return capabilities_1.promoteAppiumOptions; } });
|
|
61
|
+
Object.defineProperty(exports, "promoteAppiumOptionsForObject", { enumerable: true, get: function () { return capabilities_1.promoteAppiumOptionsForObject; } });
|
|
61
62
|
// Web socket helpers
|
|
62
63
|
var websocket_1 = require("./express/websocket");
|
|
63
64
|
Object.defineProperty(exports, "DEFAULT_WS_PATHNAME_PREFIX", { enumerable: true, get: function () { return websocket_1.DEFAULT_WS_PATHNAME_PREFIX; } });
|
package/build/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAyB;AAEzB,kBAAC,CAAC,MAAM,CAAC;IACP,YAAY,EAAE,IAAI;CACnB,CAAC,CAAC;AAEH,qBAAqB;AACrB,gDAA+C;AAIvC,2FAJA,mBAAU,OAIA;AAHlB,0CAA6C;AAArC,kGAAA,UAAU,OAAA;AAClB,gEAA4D;AAApD,iHAAA,cAAc,OAAA;AAGtB,kBAAe,mBAAU,CAAC;AAE1B,kBAAkB;AAClB,6CAA2B;AAC3B,uCAAuE;AAA/D,yGAAA,0BAA0B,OAAiB;AACnD,yCAAyD;AAAjD,8GAAA,iBAAiB,OAAA;AAAE,sGAAA,SAAS,OAAA;AAEpC,kBAAkB;AAClB,2CAA4C;AAApC,oGAAA,UAAU,OAAA;AAClB,2CAA2D;AAAnD,gGAAA,MAAM,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AAEjC,uBAAuB;AACvB,8CAA6C;AAArC,gGAAA,OAAO,OAAA;AAEf,wBAAwB;AACxB,iDAA8E;AAAtE,0GAAA,gBAAgB,OAAA;AAAE,qGAAA,KAAK,OAAe;AAE9C,0BAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAyB;AAEzB,kBAAC,CAAC,MAAM,CAAC;IACP,YAAY,EAAE,IAAI;CACnB,CAAC,CAAC;AAEH,qBAAqB;AACrB,gDAA+C;AAIvC,2FAJA,mBAAU,OAIA;AAHlB,0CAA6C;AAArC,kGAAA,UAAU,OAAA;AAClB,gEAA4D;AAApD,iHAAA,cAAc,OAAA;AAGtB,kBAAe,mBAAU,CAAC;AAE1B,kBAAkB;AAClB,6CAA2B;AAC3B,uCAAuE;AAA/D,yGAAA,0BAA0B,OAAiB;AACnD,yCAAyD;AAAjD,8GAAA,iBAAiB,OAAA;AAAE,sGAAA,SAAS,OAAA;AAEpC,kBAAkB;AAClB,2CAA4C;AAApC,oGAAA,UAAU,OAAA;AAClB,2CAA2D;AAAnD,gGAAA,MAAM,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AAEjC,uBAAuB;AACvB,8CAA6C;AAArC,gGAAA,OAAO,OAAA;AAEf,wBAAwB;AACxB,iDAA8E;AAAtE,0GAAA,gBAAgB,OAAA;AAAE,qGAAA,KAAK,OAAe;AAE9C,0BAA0B;AAC1B,0DAQmC;AAPjC,wHAAA,wBAAwB,OAAA;AACxB,6GAAA,aAAa,OAAA;AACb,mHAAA,mBAAmB,OAAA;AACnB,6GAAA,aAAa,OAAA;AACb,4GAAA,YAAY,OAAA;AACZ,oHAAA,oBAAoB,OAAA;AACpB,6HAAA,6BAA6B,OAAA;AAG/B,qBAAqB;AACrB,iDAA+D;AAAvD,uHAAA,0BAA0B,OAAA;AAElC;;GAEG"}
|
|
@@ -334,77 +334,85 @@ function processCapabilities(
|
|
|
334
334
|
}
|
|
335
335
|
|
|
336
336
|
/**
|
|
337
|
-
* Return a copy of a capabilities object which has taken everything
|
|
338
|
-
* capability and promoted it to the top level.
|
|
337
|
+
* Return a copy of a "bare" (single-level, non-W3C) capabilities object which has taken everything
|
|
338
|
+
* within the 'appium:options' capability and promoted it to the top level.
|
|
339
339
|
*
|
|
340
340
|
* @template {Constraints} C
|
|
341
|
-
* @param {
|
|
342
|
-
* @return {
|
|
341
|
+
* @param {NSCapabilities<C>} obj
|
|
342
|
+
* @return {NSCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
343
343
|
*/
|
|
344
|
-
function
|
|
345
|
-
const
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
344
|
+
function promoteAppiumOptionsForObject(obj) {
|
|
345
|
+
const appiumOptions = obj[PREFIXED_APPIUM_OPTS_CAP];
|
|
346
|
+
if (!appiumOptions) {
|
|
347
|
+
return obj;
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
if (!_.isPlainObject(appiumOptions)) {
|
|
351
|
+
throw new errors.SessionNotCreatedError(
|
|
352
|
+
`The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`
|
|
353
|
+
);
|
|
354
|
+
}
|
|
355
|
+
if (_.isEmpty(appiumOptions)) {
|
|
356
|
+
return obj;
|
|
357
|
+
}
|
|
350
358
|
|
|
351
|
-
|
|
359
|
+
log.debug(
|
|
360
|
+
`Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`
|
|
361
|
+
);
|
|
362
|
+
|
|
363
|
+
/**
|
|
364
|
+
* @param {string} capName
|
|
365
|
+
*/
|
|
366
|
+
const shouldAddVendorPrefix = (capName) => !capName.startsWith(APPIUM_VENDOR_PREFIX);
|
|
367
|
+
const verifyIfAcceptable = (/** @type {string} */ capName) => {
|
|
368
|
+
if (!_.isString(capName)) {
|
|
352
369
|
throw new errors.SessionNotCreatedError(
|
|
353
|
-
`
|
|
370
|
+
`Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`
|
|
354
371
|
);
|
|
355
372
|
}
|
|
356
|
-
if (
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
log.debug(
|
|
361
|
-
`Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`
|
|
362
|
-
);
|
|
363
|
-
|
|
364
|
-
/**
|
|
365
|
-
* @param {string} capName
|
|
366
|
-
*/
|
|
367
|
-
const shouldAddVendorPrefix = (capName) => !capName.startsWith(APPIUM_VENDOR_PREFIX);
|
|
368
|
-
const verifyIfAcceptable = (capName) => {
|
|
369
|
-
if (!_.isString(capName)) {
|
|
370
|
-
throw new errors.SessionNotCreatedError(
|
|
371
|
-
`Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`
|
|
372
|
-
);
|
|
373
|
-
}
|
|
374
|
-
if (isStandardCap(capName)) {
|
|
375
|
-
throw new errors.SessionNotCreatedError(
|
|
376
|
-
`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilties. '${capName}' is unexpected`
|
|
377
|
-
);
|
|
378
|
-
}
|
|
379
|
-
return capName;
|
|
380
|
-
};
|
|
381
|
-
const preprocessedOptions = _(appiumOptions)
|
|
382
|
-
.mapKeys((value, key) => verifyIfAcceptable(key))
|
|
383
|
-
.mapKeys((value, key) => (shouldAddVendorPrefix(key) ? `${APPIUM_VENDOR_PREFIX}${key}` : key))
|
|
384
|
-
.value();
|
|
385
|
-
// warn if we are going to overwrite any keys on the base caps object
|
|
386
|
-
const overwrittenKeys = _.intersection(Object.keys(obj), Object.keys(preprocessedOptions));
|
|
387
|
-
if (overwrittenKeys.length > 0) {
|
|
388
|
-
log.warn(
|
|
389
|
-
`Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
|
|
390
|
-
`capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`
|
|
373
|
+
if (isStandardCap(capName)) {
|
|
374
|
+
throw new errors.SessionNotCreatedError(
|
|
375
|
+
`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilties. '${capName}' is unexpected`
|
|
391
376
|
);
|
|
392
377
|
}
|
|
393
|
-
return
|
|
394
|
-
..._.omit(obj, PREFIXED_APPIUM_OPTS_CAP),
|
|
395
|
-
...preprocessedOptions,
|
|
396
|
-
});
|
|
378
|
+
return capName;
|
|
397
379
|
};
|
|
380
|
+
const preprocessedOptions = _(appiumOptions)
|
|
381
|
+
.mapKeys((value, /** @type {string} */ key) => verifyIfAcceptable(key))
|
|
382
|
+
.mapKeys((value, key) => (shouldAddVendorPrefix(key) ? `${APPIUM_VENDOR_PREFIX}${key}` : key))
|
|
383
|
+
.value();
|
|
384
|
+
// warn if we are going to overwrite any keys on the base caps object
|
|
385
|
+
const overwrittenKeys = _.intersection(Object.keys(obj), Object.keys(preprocessedOptions));
|
|
386
|
+
if (overwrittenKeys.length > 0) {
|
|
387
|
+
log.warn(
|
|
388
|
+
`Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
|
|
389
|
+
`capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`
|
|
390
|
+
);
|
|
391
|
+
}
|
|
392
|
+
return _.cloneDeep({
|
|
393
|
+
.../** @type {NSCapabilities<C>} */ (_.omit(obj, PREFIXED_APPIUM_OPTS_CAP)),
|
|
394
|
+
...preprocessedOptions,
|
|
395
|
+
});
|
|
396
|
+
}
|
|
398
397
|
|
|
399
|
-
|
|
398
|
+
/**
|
|
399
|
+
* Return a copy of a capabilities object which has taken everything within the 'options'
|
|
400
|
+
* capability and promoted it to the top level.
|
|
401
|
+
*
|
|
402
|
+
* @template {Constraints} C
|
|
403
|
+
* @param {import('@appium/types').W3CCapabilities<C>} originalCaps
|
|
404
|
+
* @return {import('@appium/types').W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
|
|
405
|
+
*/
|
|
406
|
+
function promoteAppiumOptions(originalCaps) {
|
|
400
407
|
const result = {};
|
|
408
|
+
const {alwaysMatch, firstMatch} = originalCaps;
|
|
401
409
|
if (_.isPlainObject(alwaysMatch)) {
|
|
402
|
-
result.alwaysMatch =
|
|
410
|
+
result.alwaysMatch = promoteAppiumOptionsForObject(alwaysMatch);
|
|
403
411
|
} else if ('alwaysMatch' in originalCaps) {
|
|
404
412
|
result.alwaysMatch = alwaysMatch;
|
|
405
413
|
}
|
|
406
414
|
if (_.isArray(firstMatch)) {
|
|
407
|
-
result.firstMatch = firstMatch.map(
|
|
415
|
+
result.firstMatch = firstMatch.map(promoteAppiumOptionsForObject);
|
|
408
416
|
} else if ('firstMatch' in originalCaps) {
|
|
409
417
|
result.firstMatch = firstMatch;
|
|
410
418
|
}
|
|
@@ -421,6 +429,7 @@ export {
|
|
|
421
429
|
isStandardCap,
|
|
422
430
|
stripAppiumPrefixes,
|
|
423
431
|
promoteAppiumOptions,
|
|
432
|
+
promoteAppiumOptionsForObject,
|
|
424
433
|
PREFIXED_APPIUM_OPTS_CAP,
|
|
425
434
|
};
|
|
426
435
|
|
|
@@ -431,6 +440,11 @@ export {
|
|
|
431
440
|
* @typedef {import('@appium/types').BaseDriverCapConstraints} BaseDriverCapConstraints
|
|
432
441
|
*/
|
|
433
442
|
|
|
443
|
+
/**
|
|
444
|
+
* @template {Constraints} C
|
|
445
|
+
* @typedef {import('@appium/types').ConstraintsToCaps<C>} ConstraintsToCaps
|
|
446
|
+
*/
|
|
447
|
+
|
|
434
448
|
/**
|
|
435
449
|
* @typedef ValidateCapsOpts
|
|
436
450
|
* @property {boolean} [skipPresenceConstraint] - if true, skip the presence constraint
|
package/lib/basedriver/core.js
CHANGED
|
@@ -35,7 +35,7 @@ class DriverCore {
|
|
|
35
35
|
/**
|
|
36
36
|
* @type {string?}
|
|
37
37
|
*/
|
|
38
|
-
sessionId
|
|
38
|
+
sessionId;
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
41
|
* @type {import('@appium/types').DriverOpts<C>}
|
|
@@ -47,7 +47,8 @@ class DriverCore {
|
|
|
47
47
|
*/
|
|
48
48
|
initialOpts;
|
|
49
49
|
|
|
50
|
-
|
|
50
|
+
/** @type {typeof helpers} */
|
|
51
|
+
helpers;
|
|
51
52
|
|
|
52
53
|
/**
|
|
53
54
|
* basePath is used for several purposes, for example in setting up
|
|
@@ -56,39 +57,43 @@ class DriverCore {
|
|
|
56
57
|
* initially but it is automatically updated during any actual program
|
|
57
58
|
* execution by the routeConfiguringFunction, which is necessarily run as
|
|
58
59
|
* the entrypoint for any Appium server
|
|
60
|
+
* @type {string}
|
|
59
61
|
*/
|
|
60
|
-
basePath
|
|
62
|
+
basePath;
|
|
61
63
|
|
|
62
|
-
|
|
64
|
+
/** @type {boolean} */
|
|
65
|
+
relaxedSecurityEnabled;
|
|
63
66
|
|
|
64
67
|
/** @type {string[]} */
|
|
65
|
-
allowInsecure
|
|
68
|
+
allowInsecure;
|
|
66
69
|
|
|
67
70
|
/** @type {string[]} */
|
|
68
|
-
denyInsecure
|
|
71
|
+
denyInsecure;
|
|
69
72
|
|
|
70
|
-
|
|
73
|
+
/** @type {number} */
|
|
74
|
+
newCommandTimeoutMs;
|
|
71
75
|
|
|
72
|
-
|
|
76
|
+
/** @type {number} */
|
|
77
|
+
implicitWaitMs;
|
|
73
78
|
|
|
74
79
|
/** @type {string[]} */
|
|
75
|
-
locatorStrategies
|
|
80
|
+
locatorStrategies;
|
|
76
81
|
|
|
77
82
|
/** @type {string[]} */
|
|
78
|
-
webLocatorStrategies
|
|
83
|
+
webLocatorStrategies;
|
|
79
84
|
|
|
80
85
|
/** @type {Driver[]} */
|
|
81
|
-
managedDrivers
|
|
86
|
+
managedDrivers;
|
|
82
87
|
|
|
83
88
|
/** @type {NodeJS.Timeout?} */
|
|
84
|
-
noCommandTimer
|
|
89
|
+
noCommandTimer;
|
|
85
90
|
|
|
86
91
|
/** @type {EventHistory} */
|
|
87
|
-
_eventHistory
|
|
92
|
+
_eventHistory;
|
|
88
93
|
|
|
89
94
|
// used to handle driver events
|
|
90
95
|
/** @type {NodeJS.EventEmitter} */
|
|
91
|
-
eventEmitter
|
|
96
|
+
eventEmitter;
|
|
92
97
|
|
|
93
98
|
/**
|
|
94
99
|
* @type {AppiumLogger}
|
|
@@ -97,8 +102,9 @@ class DriverCore {
|
|
|
97
102
|
|
|
98
103
|
/**
|
|
99
104
|
* @protected
|
|
105
|
+
* @type {boolean}
|
|
100
106
|
*/
|
|
101
|
-
shutdownUnexpectedly
|
|
107
|
+
shutdownUnexpectedly;
|
|
102
108
|
|
|
103
109
|
/**
|
|
104
110
|
* @type {boolean}
|
|
@@ -107,16 +113,18 @@ class DriverCore {
|
|
|
107
113
|
|
|
108
114
|
/**
|
|
109
115
|
* @protected
|
|
116
|
+
* @type {AsyncLock}
|
|
110
117
|
*/
|
|
111
|
-
commandsQueueGuard
|
|
118
|
+
commandsQueueGuard;
|
|
112
119
|
|
|
113
120
|
/**
|
|
114
121
|
* settings should be instantiated by drivers which extend BaseDriver, but
|
|
115
122
|
* we set it to an empty DeviceSettings instance here to make sure that the
|
|
116
123
|
* default settings are applied even if an extending driver doesn't utilize
|
|
117
124
|
* the settings functionality itself
|
|
125
|
+
* @type {DeviceSettings}
|
|
118
126
|
*/
|
|
119
|
-
settings
|
|
127
|
+
settings;
|
|
120
128
|
|
|
121
129
|
/**
|
|
122
130
|
* @param {DriverOpts<C>} opts
|
|
@@ -139,6 +147,22 @@ class DriverCore {
|
|
|
139
147
|
this.initialOpts = _.cloneDeep(opts);
|
|
140
148
|
|
|
141
149
|
this.sessionId = null;
|
|
150
|
+
this.helpers = helpers;
|
|
151
|
+
this.basePath = DEFAULT_BASE_PATH;
|
|
152
|
+
this.relaxedSecurityEnabled = false;
|
|
153
|
+
this.allowInsecure = [];
|
|
154
|
+
this.denyInsecure = [];
|
|
155
|
+
this.newCommandTimeoutMs = NEW_COMMAND_TIMEOUT_MS;
|
|
156
|
+
this.implicitWaitMs = 0;
|
|
157
|
+
this.locatorStrategies = [];
|
|
158
|
+
this.webLocatorStrategies = [];
|
|
159
|
+
this.managedDrivers = [];
|
|
160
|
+
this.noCommandTimer = null;
|
|
161
|
+
this._eventHistory = {commands: []};
|
|
162
|
+
this.eventEmitter = new EventEmitter();
|
|
163
|
+
this.shutdownUnexpectedly = false;
|
|
164
|
+
this.commandsQueueGuard = new AsyncLock();
|
|
165
|
+
this.settings = new DeviceSettings();
|
|
142
166
|
}
|
|
143
167
|
|
|
144
168
|
get log() {
|
package/lib/basedriver/driver.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable require-await */
|
|
2
2
|
/* eslint-disable no-unused-vars */
|
|
3
3
|
|
|
4
|
-
import {validateCaps,
|
|
4
|
+
import {validateCaps, processCapabilities} from './capabilities';
|
|
5
5
|
import {DriverCore} from './core';
|
|
6
6
|
import {util} from '@appium/support';
|
|
7
7
|
import B from 'bluebird';
|
|
@@ -52,17 +52,22 @@ process.on('exit', () => {
|
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
-
|
|
55
|
+
/**
|
|
56
|
+
*
|
|
57
|
+
* @param {string} url
|
|
58
|
+
* @returns {Promise<import('axios').AxiosResponse['headers']>}
|
|
59
|
+
*/
|
|
60
|
+
async function retrieveHeaders(url) {
|
|
56
61
|
try {
|
|
57
62
|
return (
|
|
58
63
|
await axios({
|
|
59
|
-
url
|
|
64
|
+
url,
|
|
60
65
|
method: 'HEAD',
|
|
61
66
|
timeout: 5000,
|
|
62
67
|
})
|
|
63
68
|
).headers;
|
|
64
69
|
} catch (e) {
|
|
65
|
-
logger.info(`Cannot send HEAD request to '${
|
|
70
|
+
logger.info(`Cannot send HEAD request to '${url}'. Original error: ${e.message}`);
|
|
66
71
|
}
|
|
67
72
|
return {};
|
|
68
73
|
}
|
|
@@ -228,6 +233,7 @@ async function configureApp(app, options = /** @type {ConfigureAppOptions} */ ({
|
|
|
228
233
|
let newApp = app;
|
|
229
234
|
let shouldUnzipApp = false;
|
|
230
235
|
let packageHash = null;
|
|
236
|
+
/** @type {import('axios').AxiosResponse['headers']?} */
|
|
231
237
|
let headers = null;
|
|
232
238
|
/** @type {RemoteAppProps} */
|
|
233
239
|
const remoteAppProps = {
|
package/lib/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/base-driver",
|
|
3
|
-
"version": "9.3.
|
|
3
|
+
"version": "9.3.2",
|
|
4
4
|
"description": "Base driver class for Appium drivers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"test:unit": "mocha \"./test/unit/**/*.spec.js\""
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@appium/support": "^3.1.
|
|
47
|
-
"@appium/types": "^0.
|
|
46
|
+
"@appium/support": "^3.1.6",
|
|
47
|
+
"@appium/types": "^0.10.0",
|
|
48
48
|
"@colors/colors": "1.5.0",
|
|
49
49
|
"@types/async-lock": "1.4.0",
|
|
50
50
|
"@types/bluebird": "3.5.38",
|
|
@@ -53,19 +53,19 @@
|
|
|
53
53
|
"@types/serve-favicon": "2.5.3",
|
|
54
54
|
"async-lock": "1.4.0",
|
|
55
55
|
"asyncbox": "2.9.4",
|
|
56
|
-
"axios": "1.
|
|
56
|
+
"axios": "1.3.4",
|
|
57
57
|
"bluebird": "3.7.2",
|
|
58
|
-
"body-parser": "1.20.
|
|
58
|
+
"body-parser": "1.20.2",
|
|
59
59
|
"es6-error": "4.1.1",
|
|
60
60
|
"express": "4.18.2",
|
|
61
61
|
"http-status-codes": "2.2.0",
|
|
62
62
|
"lodash": "4.17.21",
|
|
63
|
-
"lru-cache": "7.
|
|
63
|
+
"lru-cache": "7.17.0",
|
|
64
64
|
"method-override": "3.0.0",
|
|
65
65
|
"morgan": "1.10.0",
|
|
66
66
|
"serve-favicon": "2.5.0",
|
|
67
67
|
"source-map-support": "0.5.21",
|
|
68
|
-
"type-fest": "3.
|
|
68
|
+
"type-fest": "3.6.0",
|
|
69
69
|
"validate.js": "0.13.1"
|
|
70
70
|
},
|
|
71
71
|
"engines": {
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"publishConfig": {
|
|
76
76
|
"access": "public"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "7b4935632222123a4fa7422461f6312f1f0dfbe4",
|
|
79
79
|
"typedoc": {
|
|
80
80
|
"entryPoint": "./lib/index.js"
|
|
81
81
|
}
|