@appium/base-driver 10.0.0-beta.1 → 10.0.0-rc.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 +1 -1
- package/build/lib/basedriver/capabilities.d.ts.map +1 -1
- package/build/lib/basedriver/capabilities.js +1 -1
- package/build/lib/basedriver/capabilities.js.map +1 -1
- package/build/lib/basedriver/commands/execute.js.map +1 -1
- package/build/lib/basedriver/commands/timeout.js +8 -9
- package/build/lib/basedriver/commands/timeout.js.map +1 -1
- package/build/lib/basedriver/core.d.ts +2 -1
- package/build/lib/basedriver/core.d.ts.map +1 -1
- package/build/lib/basedriver/core.js +2 -2
- package/build/lib/basedriver/core.js.map +1 -1
- package/build/lib/basedriver/driver.d.ts +2 -3
- package/build/lib/basedriver/driver.d.ts.map +1 -1
- package/build/lib/basedriver/driver.js +2 -11
- package/build/lib/basedriver/driver.js.map +1 -1
- package/build/lib/basedriver/extension-core.js +1 -1
- package/build/lib/basedriver/extension-core.js.map +1 -1
- package/build/lib/basedriver/helpers.js +3 -3
- package/build/lib/basedriver/helpers.js.map +1 -1
- package/build/lib/express/server.js +2 -2
- package/build/lib/express/server.js.map +1 -1
- package/build/lib/jsonwp-proxy/protocol-converter.js +2 -2
- package/build/lib/jsonwp-proxy/protocol-converter.js.map +1 -1
- package/build/lib/jsonwp-proxy/proxy.js +1 -1
- package/build/lib/jsonwp-proxy/proxy.js.map +1 -1
- package/build/lib/protocol/protocol.d.ts +16 -24
- package/build/lib/protocol/protocol.d.ts.map +1 -1
- package/build/lib/protocol/protocol.js +94 -115
- package/build/lib/protocol/protocol.js.map +1 -1
- package/build/lib/protocol/routes.d.ts +3 -2
- package/build/lib/protocol/routes.d.ts.map +1 -1
- package/build/lib/protocol/routes.js +11 -9
- package/build/lib/protocol/routes.js.map +1 -1
- package/lib/basedriver/capabilities.ts +2 -2
- package/lib/basedriver/commands/execute.ts +1 -1
- package/lib/basedriver/commands/timeout.ts +8 -12
- package/lib/basedriver/core.ts +4 -2
- package/lib/basedriver/driver.ts +2 -14
- package/lib/basedriver/extension-core.ts +1 -1
- package/lib/basedriver/helpers.js +3 -3
- package/lib/express/server.js +2 -2
- package/lib/jsonwp-proxy/protocol-converter.js +2 -2
- package/lib/jsonwp-proxy/proxy.js +1 -1
- package/lib/protocol/{protocol.js → protocol.ts} +140 -141
- package/lib/protocol/routes.js +11 -9
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"AAieA;;;;;;GAMG;AACH,6CALW,MAAM,WACN,OAAO,eAAe,EAAE,UAAU,aAClC,MAAM,GACJ,MAAM,GAAC,SAAS,CA8C5B;AA1gBD;;;;;GAKG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0cG;AAGH,iCAEyB;AAkEzB,8CAA0F"}
|
|
@@ -46,12 +46,7 @@ exports.METHOD_MAP = ({
|
|
|
46
46
|
POST: {
|
|
47
47
|
command: 'timeouts',
|
|
48
48
|
payloadParams: {
|
|
49
|
-
|
|
50
|
-
if ([script, pageLoad, implicit].every(lodash_1.default.isNil)) {
|
|
51
|
-
return 'W3C protocol expects any of script, pageLoad or implicit to be set';
|
|
52
|
-
}
|
|
53
|
-
},
|
|
54
|
-
optional: ['script', 'pageLoad', 'implicit'],
|
|
49
|
+
optional: ['type', 'ms', 'script', 'pageLoad', 'implicit'],
|
|
55
50
|
},
|
|
56
51
|
},
|
|
57
52
|
},
|
|
@@ -276,8 +271,15 @@ exports.METHOD_MAP = ({
|
|
|
276
271
|
POST: { command: 'setRotation', payloadParams: { required: ['x', 'y', 'z'] } },
|
|
277
272
|
},
|
|
278
273
|
'/session/:sessionId/location': {
|
|
279
|
-
GET: {
|
|
280
|
-
|
|
274
|
+
GET: {
|
|
275
|
+
command: 'getGeoLocation',
|
|
276
|
+
deprecated: true,
|
|
277
|
+
},
|
|
278
|
+
POST: {
|
|
279
|
+
command: 'setGeoLocation',
|
|
280
|
+
payloadParams: { required: ['location'] },
|
|
281
|
+
deprecated: true,
|
|
282
|
+
},
|
|
281
283
|
},
|
|
282
284
|
'/session/:sessionId/orientation': {
|
|
283
285
|
GET: { command: 'getOrientation' },
|
|
@@ -412,7 +414,7 @@ exports.METHOD_MAP = ({
|
|
|
412
414
|
},
|
|
413
415
|
// #endregion
|
|
414
416
|
//
|
|
415
|
-
// 3rd party vendor/
|
|
417
|
+
// 3rd party vendor/protocol support
|
|
416
418
|
//
|
|
417
419
|
// #region Selenium/Chromium browsers
|
|
418
420
|
'/session/:sessionId/se/log': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export type ParsedCaps<C extends Constraints> = {
|
|
|
27
27
|
};
|
|
28
28
|
export type ValidateCapsOpts = {
|
|
29
29
|
/** if true, skip the presence constraint */
|
|
30
|
-
skipPresenceConstraint?: boolean
|
|
30
|
+
skipPresenceConstraint?: boolean;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
/**
|
|
@@ -375,7 +375,7 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
|
|
|
375
375
|
}
|
|
376
376
|
if (isStandardCap(capName)) {
|
|
377
377
|
throw new errors.SessionNotCreatedError(
|
|
378
|
-
`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific
|
|
378
|
+
`${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilities. '${capName}' is unexpected`
|
|
379
379
|
);
|
|
380
380
|
}
|
|
381
381
|
return capName;
|
|
@@ -56,7 +56,7 @@ const ExecuteCommands: IExecuteCommands = {
|
|
|
56
56
|
sortedMatches.join(', ')
|
|
57
57
|
);
|
|
58
58
|
}
|
|
59
|
-
const args = validateExecuteMethodParams(protoArgs, commandMetadata.params);
|
|
59
|
+
const args = validateExecuteMethodParams(protoArgs as any[], commandMetadata.params);
|
|
60
60
|
const command = this[commandMetadata.command] as DriverCommand;
|
|
61
61
|
return await command.call(this, ...args);
|
|
62
62
|
},
|
|
@@ -15,9 +15,9 @@ const MIN_TIMEOUT = 0;
|
|
|
15
15
|
|
|
16
16
|
const TimeoutCommands: ITimeoutCommands = {
|
|
17
17
|
async timeouts<C extends Constraints>(this: BaseDriver<C>, type, ms, script, pageLoad, implicit) {
|
|
18
|
-
if (type && util.hasValue(ms)) {
|
|
18
|
+
if (type && _.isString(type) && util.hasValue(ms)) {
|
|
19
|
+
// legacy stuff with some Appium-specific additions
|
|
19
20
|
this.log.debug(`Timeout arguments: ${JSON.stringify({type, ms})}}`);
|
|
20
|
-
|
|
21
21
|
switch (type) {
|
|
22
22
|
case 'command':
|
|
23
23
|
return void (await this.newCommandTimeout(ms));
|
|
@@ -32,14 +32,10 @@ const TimeoutCommands: ITimeoutCommands = {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
pageLoad,
|
|
40
|
-
implicit,
|
|
41
|
-
})}}`
|
|
42
|
-
);
|
|
35
|
+
this.log.debug(`W3C timeout argument: ${JSON.stringify({script, pageLoad, implicit})}}`);
|
|
36
|
+
if ([script, pageLoad, implicit].every(_.isNil)) {
|
|
37
|
+
throw new errors.InvalidArgumentError('W3C protocol expects any of script, pageLoad or implicit to be set');
|
|
38
|
+
}
|
|
43
39
|
if (util.hasValue(script)) {
|
|
44
40
|
await this.scriptTimeoutW3C(script);
|
|
45
41
|
}
|
|
@@ -83,7 +79,7 @@ const TimeoutCommands: ITimeoutCommands = {
|
|
|
83
79
|
setImplicitWait<C extends Constraints>(this: BaseDriver<C>, ms: number) {
|
|
84
80
|
this.implicitWaitMs = ms;
|
|
85
81
|
this.log.debug(`Set implicit wait to ${ms}ms`);
|
|
86
|
-
if (this.managedDrivers
|
|
82
|
+
if (this.managedDrivers?.length) {
|
|
87
83
|
this.log.debug('Setting implicit wait on managed drivers');
|
|
88
84
|
for (const driver of this.managedDrivers) {
|
|
89
85
|
if (_.isFunction(driver.setImplicitWait)) {
|
|
@@ -96,7 +92,7 @@ const TimeoutCommands: ITimeoutCommands = {
|
|
|
96
92
|
setNewCommandTimeout<C extends Constraints>(this: BaseDriver<C>, ms: number) {
|
|
97
93
|
this.newCommandTimeoutMs = ms;
|
|
98
94
|
this.log.debug(`Set new command timeout to ${ms}ms`);
|
|
99
|
-
if (this.managedDrivers
|
|
95
|
+
if (this.managedDrivers?.length) {
|
|
100
96
|
this.log.debug('Setting new command timeout on managed drivers');
|
|
101
97
|
for (const driver of this.managedDrivers) {
|
|
102
98
|
if (_.isFunction(driver.setNewCommandTimeout)) {
|
package/lib/basedriver/core.ts
CHANGED
|
@@ -41,6 +41,8 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
|
|
|
41
41
|
|
|
42
42
|
sessionId: string | null;
|
|
43
43
|
|
|
44
|
+
sessionCreationTimestampMs: number;
|
|
45
|
+
|
|
44
46
|
opts: DriverOpts<C>;
|
|
45
47
|
|
|
46
48
|
initialOpts: InitialOpts;
|
|
@@ -137,7 +139,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
|
|
|
137
139
|
/**
|
|
138
140
|
* Set a callback handler if needed to execute a custom piece of code
|
|
139
141
|
* when the driver is shut down unexpectedly. Multiple calls to this method
|
|
140
|
-
* will cause the handler to be executed
|
|
142
|
+
* will cause the handler to be executed multiple times
|
|
141
143
|
*
|
|
142
144
|
* @param handler The code to be executed on unexpected shutdown.
|
|
143
145
|
* The function may accept one argument, which is the actual error instance, which
|
|
@@ -305,7 +307,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
|
|
|
305
307
|
`Potentially insecure feature '${name}' has not been ` +
|
|
306
308
|
`enabled. If you want to enable this feature and accept ` +
|
|
307
309
|
`the security ramifications, please do so by following ` +
|
|
308
|
-
`the documented instructions at http://appium.io/docs/en/
|
|
310
|
+
`the documented instructions at http://appium.io/docs/en/latest/guides/security/`,
|
|
309
311
|
);
|
|
310
312
|
}
|
|
311
313
|
}
|
package/lib/basedriver/driver.ts
CHANGED
|
@@ -9,7 +9,6 @@ import {
|
|
|
9
9
|
type Driver,
|
|
10
10
|
type DriverCaps,
|
|
11
11
|
type DriverData,
|
|
12
|
-
type MultiSessionData,
|
|
13
12
|
type ServerArgs,
|
|
14
13
|
type StringRecord,
|
|
15
14
|
type W3CDriverCaps,
|
|
@@ -302,6 +301,7 @@ export class BaseDriver<
|
|
|
302
301
|
this.validateDesiredCaps(caps);
|
|
303
302
|
|
|
304
303
|
this.sessionId = util.uuidV4();
|
|
304
|
+
this.sessionCreationTimestampMs = Date.now();
|
|
305
305
|
this.caps = caps;
|
|
306
306
|
// merge caps onto opts so we don't need to worry about what's where
|
|
307
307
|
this.opts = {..._.cloneDeep(this.initialOpts), ...this.caps};
|
|
@@ -345,22 +345,10 @@ export class BaseDriver<
|
|
|
345
345
|
|
|
346
346
|
return [this.sessionId, caps] as CreateResult;
|
|
347
347
|
}
|
|
348
|
-
async getSessions() {
|
|
349
|
-
const ret: MultiSessionData<C>[] = [];
|
|
350
|
-
|
|
351
|
-
if (this.sessionId) {
|
|
352
|
-
ret.push({
|
|
353
|
-
id: this.sessionId,
|
|
354
|
-
capabilities: this.caps,
|
|
355
|
-
});
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
return ret;
|
|
359
|
-
}
|
|
360
348
|
|
|
361
349
|
/**
|
|
362
350
|
* Returns capabilities for the session and event history (if applicable)
|
|
363
|
-
* @deprecated Use {@linkcode
|
|
351
|
+
* @deprecated Use {@linkcode getAppiumSessionCapabilities} instead for getting the capabilities.
|
|
364
352
|
* Use {@linkcode EventCommands.getLogEvents} instead to get the event history.
|
|
365
353
|
*/
|
|
366
354
|
async getSession() {
|
|
@@ -71,7 +71,7 @@ export class ExtensionCore {
|
|
|
71
71
|
}
|
|
72
72
|
|
|
73
73
|
// if the command module or method isn't part of our spec, reject
|
|
74
|
-
if (!this.bidiCommands[moduleName]
|
|
74
|
+
if (!(this.bidiCommands[moduleName]?.[methodName])) {
|
|
75
75
|
throw new errors.UnknownCommandError();
|
|
76
76
|
}
|
|
77
77
|
|
|
@@ -101,7 +101,7 @@ export async function configureApp(
|
|
|
101
101
|
const originalAppLink = app;
|
|
102
102
|
let packageHash = null;
|
|
103
103
|
/** @type {import('axios').AxiosResponse['headers']|undefined} */
|
|
104
|
-
let headers
|
|
104
|
+
let headers;
|
|
105
105
|
/** @type {RemoteAppProps} */
|
|
106
106
|
const remoteAppProps = {
|
|
107
107
|
lastModified: null,
|
|
@@ -434,7 +434,7 @@ async function fetchApp(srcStream, dstPath) {
|
|
|
434
434
|
*
|
|
435
435
|
* @param {string} app App link.
|
|
436
436
|
* @returns {string} Transformed app link or the original arg if
|
|
437
|
-
* no
|
|
437
|
+
* no transformation is needed.
|
|
438
438
|
*/
|
|
439
439
|
function toCacheKey(app) {
|
|
440
440
|
if (!isEnvOptionEnabled('APPIUM_APPS_CACHE_IGNORE_URL_QUERY') || !isSupportedUrl(app)) {
|
|
@@ -529,7 +529,7 @@ function isSupportedUrl(app) {
|
|
|
529
529
|
*
|
|
530
530
|
* @param {string} optionName Option name
|
|
531
531
|
* @param {boolean|null} [defaultValue=null] The value to return if the given env value
|
|
532
|
-
* is not set
|
|
532
|
+
* is not set explicitly
|
|
533
533
|
* @returns {boolean} True if the option is enabled
|
|
534
534
|
*/
|
|
535
535
|
function isEnvOptionEnabled(optionName, defaultValue = null) {
|
package/lib/express/server.js
CHANGED
|
@@ -231,7 +231,7 @@ function configureHttp({httpServer, reject, keepAliveTimeout, gracefulShutdownTi
|
|
|
231
231
|
}, gracefulShutdownTimeout);
|
|
232
232
|
httpServer.once('close', () => {
|
|
233
233
|
log.info(
|
|
234
|
-
`Appium HTTP server has been
|
|
234
|
+
`Appium HTTP server has been successfully closed after ` +
|
|
235
235
|
`${timer.getDuration().asMilliSeconds.toFixed(0)}ms`
|
|
236
236
|
);
|
|
237
237
|
clearTimeout(onTimeout);
|
|
@@ -309,7 +309,7 @@ export function normalizeBasePath(basePath) {
|
|
|
309
309
|
|
|
310
310
|
// likewise, ensure the path prefix does always START with /, unless the path
|
|
311
311
|
// is empty meaning no base path at all
|
|
312
|
-
if (basePath !== '' && basePath
|
|
312
|
+
if (basePath !== '' && !basePath.startsWith('/')) {
|
|
313
313
|
basePath = `/${basePath}`;
|
|
314
314
|
}
|
|
315
315
|
|
|
@@ -19,12 +19,12 @@ export const COMMAND_URLS_CONFLICTS = [
|
|
|
19
19
|
{
|
|
20
20
|
commandNames: ['getWindowHandles', 'getWindowHandle'],
|
|
21
21
|
jsonwpConverter(url) {
|
|
22
|
-
return
|
|
22
|
+
return url.endsWith('/window')
|
|
23
23
|
? url.replace(/\/window$/, '/window_handle')
|
|
24
24
|
: url.replace(/\/window\/handle(s?)$/, '/window_handle$1');
|
|
25
25
|
},
|
|
26
26
|
w3cConverter(url) {
|
|
27
|
-
return
|
|
27
|
+
return url.endsWith('/window_handle')
|
|
28
28
|
? url.replace(/\/window_handle$/, '/window')
|
|
29
29
|
: url.replace(/\/window_handles$/, '/window/handles');
|
|
30
30
|
},
|
|
@@ -236,7 +236,7 @@ export class JWProxy {
|
|
|
236
236
|
}
|
|
237
237
|
this.log.debug(`Got response with status ${status}: ${truncateBody(data)}`);
|
|
238
238
|
isResponseLogged = true;
|
|
239
|
-
const isSessionCreationRequest =
|
|
239
|
+
const isSessionCreationRequest = url.endsWith('/session') && method === 'POST';
|
|
240
240
|
if (isSessionCreationRequest) {
|
|
241
241
|
if (status === 200) {
|
|
242
242
|
this.sessionId = data.sessionId || (data.value || {}).sessionId;
|