@appium/base-driver 9.3.3 → 9.3.5
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 +59 -36
- package/build/lib/basedriver/capabilities.d.ts.map +1 -1
- package/build/lib/basedriver/capabilities.js +57 -45
- package/build/lib/basedriver/capabilities.js.map +1 -1
- package/build/lib/basedriver/commands/event.d.ts +1 -1
- package/build/lib/basedriver/commands/event.d.ts.map +1 -1
- package/build/lib/basedriver/commands/event.js.map +1 -1
- package/build/lib/basedriver/commands/execute.d.ts +1 -1
- package/build/lib/basedriver/commands/execute.d.ts.map +1 -1
- package/build/lib/basedriver/commands/execute.js.map +1 -1
- package/build/lib/basedriver/commands/find.d.ts +1 -1
- package/build/lib/basedriver/commands/find.d.ts.map +1 -1
- package/build/lib/basedriver/commands/find.js.map +1 -1
- package/build/lib/basedriver/commands/index.d.ts +7 -7
- package/build/lib/basedriver/commands/index.d.ts.map +1 -1
- package/build/lib/basedriver/commands/index.js +7 -21
- package/build/lib/basedriver/commands/index.js.map +1 -1
- package/build/lib/basedriver/commands/log.d.ts +1 -1
- package/build/lib/basedriver/commands/log.d.ts.map +1 -1
- package/build/lib/basedriver/commands/log.js.map +1 -1
- package/build/lib/basedriver/commands/mixin.d.ts +4 -4
- package/build/lib/basedriver/commands/mixin.d.ts.map +1 -1
- package/build/lib/basedriver/commands/mixin.js +5 -4
- package/build/lib/basedriver/commands/mixin.js.map +1 -1
- package/build/lib/basedriver/commands/session.d.ts +1 -1
- package/build/lib/basedriver/commands/session.d.ts.map +1 -1
- package/build/lib/basedriver/commands/session.js +1 -4
- package/build/lib/basedriver/commands/session.js.map +1 -1
- package/build/lib/basedriver/commands/settings.d.ts +1 -1
- package/build/lib/basedriver/commands/settings.d.ts.map +1 -1
- package/build/lib/basedriver/commands/settings.js.map +1 -1
- package/build/lib/basedriver/commands/timeout.d.ts +1 -1
- package/build/lib/basedriver/commands/timeout.d.ts.map +1 -1
- package/build/lib/basedriver/commands/timeout.js +1 -4
- package/build/lib/basedriver/commands/timeout.js.map +1 -1
- package/build/lib/basedriver/core.d.ts +13 -17
- package/build/lib/basedriver/core.d.ts.map +1 -1
- package/build/lib/basedriver/core.js +32 -20
- package/build/lib/basedriver/core.js.map +1 -1
- package/build/lib/basedriver/device-settings.d.ts +11 -11
- package/build/lib/basedriver/device-settings.d.ts.map +1 -1
- package/build/lib/basedriver/device-settings.js +7 -8
- package/build/lib/basedriver/device-settings.js.map +1 -1
- package/build/lib/basedriver/driver.d.ts +23 -108
- package/build/lib/basedriver/driver.d.ts.map +1 -1
- package/build/lib/basedriver/driver.js +21 -126
- package/build/lib/basedriver/driver.js.map +1 -1
- package/build/lib/basedriver/helpers.d.ts +21 -98
- package/build/lib/basedriver/helpers.d.ts.map +1 -1
- package/build/lib/basedriver/helpers.js +178 -182
- package/build/lib/basedriver/helpers.js.map +1 -1
- package/build/lib/express/server.d.ts +3 -3
- package/build/lib/express/server.d.ts.map +1 -1
- package/build/lib/express/server.js +4 -2
- package/build/lib/express/server.js.map +1 -1
- package/build/lib/express/websocket.d.ts +5 -44
- package/build/lib/express/websocket.d.ts.map +1 -1
- package/build/lib/express/websocket.js +10 -39
- package/build/lib/express/websocket.js.map +1 -1
- package/build/lib/helpers/capabilities.d.ts +2 -2
- package/build/lib/helpers/capabilities.d.ts.map +1 -1
- package/build/lib/helpers/capabilities.js +2 -3
- package/build/lib/helpers/capabilities.js.map +1 -1
- package/build/lib/protocol/protocol.d.ts +1 -1
- package/build/lib/protocol/protocol.d.ts.map +1 -1
- package/build/lib/protocol/protocol.js +10 -2
- package/build/lib/protocol/protocol.js.map +1 -1
- package/build/lib/protocol/routes.d.ts +1 -0
- package/build/lib/protocol/routes.d.ts.map +1 -1
- package/build/lib/protocol/routes.js +12 -10
- package/build/lib/protocol/routes.js.map +1 -1
- package/lib/basedriver/capabilities.js +70 -56
- package/lib/basedriver/commands/event.ts +3 -2
- package/lib/basedriver/commands/execute.ts +2 -1
- package/lib/basedriver/commands/find.ts +1 -0
- package/lib/basedriver/commands/index.ts +7 -7
- package/lib/basedriver/commands/log.ts +2 -4
- package/lib/basedriver/commands/mixin.ts +5 -4
- package/lib/basedriver/commands/session.ts +9 -7
- package/lib/basedriver/commands/settings.ts +1 -0
- package/lib/basedriver/commands/timeout.ts +17 -17
- package/lib/basedriver/core.js +11 -25
- package/lib/basedriver/device-settings.js +9 -11
- package/lib/basedriver/{driver.js → driver.ts} +69 -175
- package/lib/basedriver/helpers.js +214 -212
- package/lib/express/server.js +4 -2
- package/lib/express/websocket.js +10 -39
- package/lib/helpers/capabilities.js +2 -3
- package/lib/protocol/protocol.js +11 -2
- package/lib/protocol/routes.js +12 -13
- package/package.json +10 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAU,YAAY,EAAe,MAAM,eAAe,CAAC;AAK9E,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,YAAY;KAAG;CACpE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.ts"],"names":[],"mappings":";;;;;AACA,oDAAuB;AAEvB,mCAA8B;
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.ts"],"names":[],"mappings":";;;;;AACA,oDAAuB;AAEvB,mCAA8B;AAO9B,MAAM,WAAW,GAAiB;IAChC,iBAAiB,EAAgB,EAAE;IAEnC,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,MAAM,CAAyC,OAAe;QAClE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEvD,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE;YACxC,MAAM,yBAAyB,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;YACrF,MAAM,IAAI,KAAK,CACb,yBAAyB,MAAM,CAAC,OAAO,CAAC,KAAK;gBAC3C,oBAAoB,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,CAClE,CAAC;SACH;QAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,WAAW,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Constraints } from '@appium/types';
|
|
2
2
|
import { BaseDriver } from '../driver';
|
|
3
3
|
/**
|
|
4
|
-
* This function assigns a mixin `T` to the `
|
|
5
|
-
* While each mixin has its own interface which is (in isolation) unrelated to `
|
|
6
|
-
* on this generic type `T` is that it must be a partial of `
|
|
7
|
-
* that it does not conflict with the existing interface of `
|
|
4
|
+
* This function assigns a mixin `T` to the `BaseDriver` class' prototype.
|
|
5
|
+
* While each mixin has its own interface which is (in isolation) unrelated to `BaseDriver`, the constraint
|
|
6
|
+
* on this generic type `T` is that it must be a partial of `BaseDriver`'s interface. This enforces
|
|
7
|
+
* that it does not conflict with the existing interface of `BaseDriver`. In that way, you can
|
|
8
8
|
* think of it as a type guard.
|
|
9
9
|
* @param mixin Mixin implementation
|
|
10
10
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mixin.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/mixin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAErC;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"mixin.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/mixin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAErC;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAG7F"}
|
|
@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.mixin = void 0;
|
|
4
4
|
const driver_1 = require("../driver");
|
|
5
5
|
/**
|
|
6
|
-
* This function assigns a mixin `T` to the `
|
|
7
|
-
* While each mixin has its own interface which is (in isolation) unrelated to `
|
|
8
|
-
* on this generic type `T` is that it must be a partial of `
|
|
9
|
-
* that it does not conflict with the existing interface of `
|
|
6
|
+
* This function assigns a mixin `T` to the `BaseDriver` class' prototype.
|
|
7
|
+
* While each mixin has its own interface which is (in isolation) unrelated to `BaseDriver`, the constraint
|
|
8
|
+
* on this generic type `T` is that it must be a partial of `BaseDriver`'s interface. This enforces
|
|
9
|
+
* that it does not conflict with the existing interface of `BaseDriver`. In that way, you can
|
|
10
10
|
* think of it as a type guard.
|
|
11
11
|
* @param mixin Mixin implementation
|
|
12
12
|
*/
|
|
13
13
|
function mixin(mixin) {
|
|
14
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
14
15
|
Object.assign(driver_1.BaseDriver.prototype, mixin);
|
|
15
16
|
}
|
|
16
17
|
exports.mixin = mixin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mixin.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/mixin.ts"],"names":[],"mappings":";;;AACA,sCAAqC;AAErC;;;;;;;GAOG;AACH,SAAgB,KAAK,CAA0D,KAAQ;IACrF,MAAM,CAAC,MAAM,CAAC,mBAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"mixin.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/mixin.ts"],"names":[],"mappings":";;;AACA,sCAAqC;AAErC;;;;;;;GAOG;AACH,SAAgB,KAAK,CAA0D,KAAQ;IACrF,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,mBAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAHD,sBAGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAwC,MAAM,eAAe,CAAC;AAInG,OAAO,QAAQ,WAAW,CAAC;IACzB,UAAU,UAAU,CAElB,CAAC,SAAS,WAAW,CACrB,SAAQ,gBAAgB;KAAG;CAC9B"}
|
|
@@ -16,10 +16,7 @@ const SessionCommands = {
|
|
|
16
16
|
* Returns capabilities for the session and event history (if applicable)
|
|
17
17
|
*/
|
|
18
18
|
async getSession() {
|
|
19
|
-
|
|
20
|
-
return { ...this.caps, events: this.eventHistory };
|
|
21
|
-
}
|
|
22
|
-
return this.caps;
|
|
19
|
+
return ((this.caps.eventTimings ? { ...this.caps, events: this.eventHistory } : this.caps));
|
|
23
20
|
},
|
|
24
21
|
};
|
|
25
22
|
(0, mixin_1.mixin)(SessionCommands);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.ts"],"names":[],"mappings":";;AAEA,mCAA8B;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.ts"],"names":[],"mappings":";;AAEA,mCAA8B;AAS9B,MAAM,eAAe,GAAqB;IACxC,KAAK,CAAC,WAAW;QACf,MAAM,GAAG,GAA0B,EAAE,CAAC;QAEtC,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,GAAG,CAAC,IAAI,CAAC;gBACP,EAAE,EAAE,IAAI,CAAC,SAAS;gBAClB,YAAY,EAAE,IAAI,CAAC,IAAI;aACxB,CAAC,CAAC;SACJ;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,OAA+B,CAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAC,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACjF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,eAAe,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAe,MAAM,eAAe,CAAC;AAG3E,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,iBAAiB;KAAG;CACzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":";;AAEA,mCAA8B;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":";;AAEA,mCAA8B;AAO9B,MAAM,gBAAgB,GAAsB;IAC1C,KAAK,CAAC,cAAc,CAA6C,WAAyB;QACxF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,mDAAmD,CAAC,CAAC;SAC7E;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gDAAgD,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAG5D,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,gBAAgB;KAAG;CACxE"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// @ts-check
|
|
3
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
4
|
};
|
|
6
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
/* eslint-disable no-unused-vars */
|
|
8
|
-
/* eslint-disable require-await */
|
|
9
6
|
const asyncbox_1 = require("asyncbox");
|
|
10
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
8
|
const support_1 = require("@appium/support");
|
|
@@ -63,7 +60,7 @@ const TimeoutCommands = {
|
|
|
63
60
|
await this.implicitWait(ms);
|
|
64
61
|
},
|
|
65
62
|
async implicitWait(ms) {
|
|
66
|
-
|
|
63
|
+
this.setImplicitWait(this.parseTimeoutArgument(ms));
|
|
67
64
|
},
|
|
68
65
|
// pageLoad
|
|
69
66
|
async pageLoadTimeoutW3C(ms) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,15 +5,14 @@ export type EventHistory = import('@appium/types').EventHistory;
|
|
|
5
5
|
export type AppiumLogger = import('@appium/types').AppiumLogger;
|
|
6
6
|
export type StringRecord = import('@appium/types').StringRecord;
|
|
7
7
|
export type BaseDriverCapConstraints = import('@appium/types').BaseDriverCapConstraints;
|
|
8
|
-
export type
|
|
9
|
-
export type
|
|
10
|
-
export type Core<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').Core<C>;
|
|
11
|
-
export type DriverOpts<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').DriverOpts<C>;
|
|
8
|
+
export type Core<C extends import("@appium/types").Constraints, S extends StringRecord = StringRecord> = import('@appium/types').Core<C, S>;
|
|
9
|
+
export type DriverOpts<C extends import("@appium/types").Constraints> = import('@appium/types').DriverOpts<C>;
|
|
12
10
|
/**
|
|
13
|
-
* @template {Constraints}
|
|
14
|
-
* @
|
|
11
|
+
* @template {Constraints} C
|
|
12
|
+
* @template {StringRecord} [Settings=StringRecord]
|
|
13
|
+
* @implements {Core<C, Settings>}
|
|
15
14
|
*/
|
|
16
|
-
export class DriverCore<C extends
|
|
15
|
+
export class DriverCore<C extends import("@appium/types").Constraints, Settings extends StringRecord = StringRecord> implements Core<C, Settings> {
|
|
17
16
|
/**
|
|
18
17
|
* Make the basedriver version available so for any driver which inherits from this package, we
|
|
19
18
|
* know which version of basedriver it inherited from
|
|
@@ -33,9 +32,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
33
32
|
*/
|
|
34
33
|
opts: import('@appium/types').DriverOpts<C>;
|
|
35
34
|
/**
|
|
36
|
-
* @type {
|
|
35
|
+
* @type {import('@appium/types').DriverOpts<C>}
|
|
37
36
|
*/
|
|
38
|
-
initialOpts:
|
|
37
|
+
initialOpts: import('@appium/types').DriverOpts<C>;
|
|
39
38
|
/** @type {typeof helpers} */
|
|
40
39
|
helpers: typeof helpers;
|
|
41
40
|
/**
|
|
@@ -75,10 +74,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
75
74
|
*/
|
|
76
75
|
_log: AppiumLogger;
|
|
77
76
|
/**
|
|
78
|
-
* @protected
|
|
79
77
|
* @type {boolean}
|
|
80
78
|
*/
|
|
81
|
-
|
|
79
|
+
shutdownUnexpectedly: boolean;
|
|
82
80
|
/**
|
|
83
81
|
* @type {boolean}
|
|
84
82
|
*/
|
|
@@ -93,9 +91,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
93
91
|
* we set it to an empty DeviceSettings instance here to make sure that the
|
|
94
92
|
* default settings are applied even if an extending driver doesn't utilize
|
|
95
93
|
* the settings functionality itself
|
|
96
|
-
* @type {DeviceSettings}
|
|
94
|
+
* @type {DeviceSettings<Settings>}
|
|
97
95
|
*/
|
|
98
|
-
settings: DeviceSettings<
|
|
96
|
+
settings: DeviceSettings<Settings>;
|
|
99
97
|
get log(): import("@appium/types").AppiumLogger;
|
|
100
98
|
/**
|
|
101
99
|
* Set a callback handler if needed to execute a custom piece of code
|
|
@@ -112,10 +110,8 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
112
110
|
* specific driver sessions. This data can be later used to adjust
|
|
113
111
|
* properties for driver instances running in parallel.
|
|
114
112
|
* Override it in inherited driver classes if necessary.
|
|
115
|
-
*
|
|
116
|
-
* @return {Record<string,unknown>} Driver properties mapping
|
|
117
113
|
*/
|
|
118
|
-
get driverData():
|
|
114
|
+
get driverData(): import("@appium/types").DriverData;
|
|
119
115
|
/**
|
|
120
116
|
* This property controls the way the `executeCommand` method
|
|
121
117
|
* handles new driver commands received from the client.
|
|
@@ -224,7 +220,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
|
|
|
224
220
|
* @param {Driver} driver
|
|
225
221
|
*/
|
|
226
222
|
addManagedDriver(driver: Driver): void;
|
|
227
|
-
getManagedDrivers(): import("@appium/types").Driver<
|
|
223
|
+
getManagedDrivers(): import("@appium/types").Driver<import("@appium/types").Constraints, import("@appium/types").StringRecord<any>, import("@appium/types").StringRecord<any>, import("@appium/types").DefaultCreateSessionResult<import("@appium/types").Constraints>, void>[];
|
|
228
224
|
clearNewCommandTimeout(): Promise<void>;
|
|
229
225
|
}
|
|
230
226
|
import helpers from "./helpers";
|
|
@@ -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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"}
|
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable no-unused-vars */
|
|
3
3
|
/* eslint-disable require-await */
|
|
4
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
5
|
+
if (k2 === undefined) k2 = k;
|
|
6
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
7
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
8
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
9
|
+
}
|
|
10
|
+
Object.defineProperty(o, k2, desc);
|
|
11
|
+
}) : (function(o, m, k, k2) {
|
|
12
|
+
if (k2 === undefined) k2 = k;
|
|
13
|
+
o[k2] = m[k];
|
|
14
|
+
}));
|
|
15
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
16
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
17
|
+
}) : function(o, v) {
|
|
18
|
+
o["default"] = v;
|
|
19
|
+
});
|
|
20
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
21
|
+
if (mod && mod.__esModule) return mod;
|
|
22
|
+
var result = {};
|
|
23
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
24
|
+
__setModuleDefault(result, mod);
|
|
25
|
+
return result;
|
|
26
|
+
};
|
|
4
27
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
28
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
29
|
};
|
|
@@ -14,14 +37,13 @@ const os_1 = __importDefault(require("os"));
|
|
|
14
37
|
const constants_1 = require("../constants");
|
|
15
38
|
const protocol_1 = require("../protocol");
|
|
16
39
|
const device_settings_1 = __importDefault(require("./device-settings"));
|
|
17
|
-
const helpers_1 =
|
|
18
|
-
// for compat with running tests transpiled and in-place
|
|
19
|
-
const { version: BASEDRIVER_VER } = support_1.fs.readPackageJsonFrom(__dirname);
|
|
40
|
+
const helpers_1 = __importStar(require("./helpers"));
|
|
20
41
|
const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
|
|
21
42
|
const ON_UNEXPECTED_SHUTDOWN_EVENT = 'onUnexpectedShutdown';
|
|
22
43
|
/**
|
|
23
|
-
* @template {Constraints}
|
|
24
|
-
* @
|
|
44
|
+
* @template {Constraints} C
|
|
45
|
+
* @template {StringRecord} [Settings=StringRecord]
|
|
46
|
+
* @implements {Core<C, Settings>}
|
|
25
47
|
*/
|
|
26
48
|
class DriverCore {
|
|
27
49
|
/**
|
|
@@ -77,11 +99,9 @@ class DriverCore {
|
|
|
77
99
|
* specific driver sessions. This data can be later used to adjust
|
|
78
100
|
* properties for driver instances running in parallel.
|
|
79
101
|
* Override it in inherited driver classes if necessary.
|
|
80
|
-
*
|
|
81
|
-
* @return {Record<string,unknown>} Driver properties mapping
|
|
82
102
|
*/
|
|
83
103
|
get driverData() {
|
|
84
|
-
return {};
|
|
104
|
+
return /** @type {import('@appium/types').DriverData} */ ({});
|
|
85
105
|
}
|
|
86
106
|
/**
|
|
87
107
|
* This property controls the way the `executeCommand` method
|
|
@@ -148,7 +168,7 @@ class DriverCore {
|
|
|
148
168
|
* @returns {Core<C> | null}
|
|
149
169
|
*/
|
|
150
170
|
driverForSession(sessionId) {
|
|
151
|
-
return this;
|
|
171
|
+
return /** @type {Core<C> | null} */ (this);
|
|
152
172
|
}
|
|
153
173
|
isMjsonwpProtocol() {
|
|
154
174
|
return this.protocol === constants_1.PROTOCOLS.MJSONWP;
|
|
@@ -304,7 +324,7 @@ exports.DriverCore = DriverCore;
|
|
|
304
324
|
* Make the basedriver version available so for any driver which inherits from this package, we
|
|
305
325
|
* know which version of basedriver it inherited from
|
|
306
326
|
*/
|
|
307
|
-
DriverCore.baseVersion = BASEDRIVER_VER;
|
|
327
|
+
DriverCore.baseVersion = helpers_1.BASEDRIVER_VER;
|
|
308
328
|
/**
|
|
309
329
|
* @typedef {import('@appium/types').Driver} Driver
|
|
310
330
|
* @typedef {import('@appium/types').Constraints} Constraints
|
|
@@ -314,18 +334,10 @@ DriverCore.baseVersion = BASEDRIVER_VER;
|
|
|
314
334
|
* @typedef {import('@appium/types').StringRecord} StringRecord
|
|
315
335
|
* @typedef {import('@appium/types').BaseDriverCapConstraints} BaseDriverCapConstraints
|
|
316
336
|
*/
|
|
317
|
-
/**
|
|
318
|
-
* @template {Constraints} [C=BaseDriverCapConstraints]
|
|
319
|
-
* @template {StringRecord|void} [Extra=void]
|
|
320
|
-
* @typedef {import('@appium/types').Capabilities<C, Extra>} Capabilities
|
|
321
|
-
*/
|
|
322
|
-
/**
|
|
323
|
-
* @template {StringRecord} [T={}]
|
|
324
|
-
* @typedef {import('@appium/types').W3CCapabilities<T>} W3CCapabilities
|
|
325
|
-
*/
|
|
326
337
|
/**
|
|
327
338
|
* @template {Constraints} C
|
|
328
|
-
* @
|
|
339
|
+
* @template {StringRecord} [S=StringRecord]
|
|
340
|
+
* @typedef {import('@appium/types').Core<C, S>} Core
|
|
329
341
|
*/
|
|
330
342
|
/**
|
|
331
343
|
* @template {Constraints} C
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,kCAAkC
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"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"}
|
|
@@ -2,24 +2,22 @@
|
|
|
2
2
|
* Maximum size (in bytes) of a given driver's settings object (which is internal to {@linkcode DriverSettings}).
|
|
3
3
|
*/
|
|
4
4
|
export const MAX_SETTINGS_SIZE: number;
|
|
5
|
-
export default DeviceSettings;
|
|
6
|
-
export type IDeviceSettings<T> = import('@appium/types').DeviceSettings<T>;
|
|
7
5
|
/**
|
|
8
|
-
* @template T
|
|
6
|
+
* @template {import('@appium/types').StringRecord} T
|
|
9
7
|
* @implements {IDeviceSettings<T>}
|
|
10
8
|
*/
|
|
11
|
-
export class DeviceSettings<T
|
|
9
|
+
export class DeviceSettings<T extends import("@appium/types").StringRecord<any>> implements IDeviceSettings<T> {
|
|
12
10
|
/**
|
|
13
11
|
* Creates a _shallow copy_ of the `defaultSettings` parameter!
|
|
14
|
-
* @param {
|
|
12
|
+
* @param {T} [defaultSettings]
|
|
15
13
|
* @param {import('@appium/types').SettingsUpdateListener<T>} [onSettingsUpdate]
|
|
16
14
|
*/
|
|
17
|
-
constructor(defaultSettings?:
|
|
15
|
+
constructor(defaultSettings?: T | undefined, onSettingsUpdate?: import("@appium/types").SettingsUpdateListener<T> | undefined);
|
|
18
16
|
/**
|
|
19
17
|
* @protected
|
|
20
|
-
* @type {
|
|
18
|
+
* @type {T}
|
|
21
19
|
*/
|
|
22
|
-
protected _settings:
|
|
20
|
+
protected _settings: T;
|
|
23
21
|
/**
|
|
24
22
|
* @protected
|
|
25
23
|
* @type {import('@appium/types').SettingsUpdateListener<T>}
|
|
@@ -27,9 +25,11 @@ export class DeviceSettings<T> implements IDeviceSettings<T> {
|
|
|
27
25
|
protected _onSettingsUpdate: import('@appium/types').SettingsUpdateListener<T>;
|
|
28
26
|
/**
|
|
29
27
|
* calls updateSettings from implementing driver every time a setting is changed.
|
|
30
|
-
* @param {
|
|
28
|
+
* @param {T} newSettings
|
|
31
29
|
*/
|
|
32
|
-
update(newSettings:
|
|
33
|
-
getSettings():
|
|
30
|
+
update(newSettings: T): Promise<void>;
|
|
31
|
+
getSettings(): T;
|
|
34
32
|
}
|
|
33
|
+
export default DeviceSettings;
|
|
34
|
+
export type IDeviceSettings<T extends import("@appium/types").StringRecord<any> = import("@appium/types").StringRecord<any>> = import('@appium/types').IDeviceSettings<T>;
|
|
35
35
|
//# sourceMappingURL=device-settings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-settings.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,uCAAkD
|
|
1
|
+
{"version":3,"file":"device-settings.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,uCAAkD;AAElD;;;GAGG;AACH,4GAFgC,CAAC;IAe/B;;;;OAIG;IACH,+HAGC;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;;+HAMY,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC"}
|
|
@@ -13,22 +13,22 @@ const errors_1 = require("../protocol/errors");
|
|
|
13
13
|
*/
|
|
14
14
|
exports.MAX_SETTINGS_SIZE = 20 * 1024 * 1024; // 20 MB
|
|
15
15
|
/**
|
|
16
|
-
* @template T
|
|
16
|
+
* @template {import('@appium/types').StringRecord} T
|
|
17
17
|
* @implements {IDeviceSettings<T>}
|
|
18
18
|
*/
|
|
19
19
|
class DeviceSettings {
|
|
20
20
|
/**
|
|
21
21
|
* Creates a _shallow copy_ of the `defaultSettings` parameter!
|
|
22
|
-
* @param {
|
|
22
|
+
* @param {T} [defaultSettings]
|
|
23
23
|
* @param {import('@appium/types').SettingsUpdateListener<T>} [onSettingsUpdate]
|
|
24
24
|
*/
|
|
25
|
-
constructor(defaultSettings = {}, onSettingsUpdate = async () => { }) {
|
|
25
|
+
constructor(defaultSettings = /** @type {T} */ ({}), onSettingsUpdate = async () => { }) {
|
|
26
26
|
this._settings = { ...defaultSettings };
|
|
27
27
|
this._onSettingsUpdate = onSettingsUpdate;
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
30
30
|
* calls updateSettings from implementing driver every time a setting is changed.
|
|
31
|
-
* @param {
|
|
31
|
+
* @param {T} newSettings
|
|
32
32
|
*/
|
|
33
33
|
async update(newSettings) {
|
|
34
34
|
if (!lodash_1.default.isPlainObject(newSettings)) {
|
|
@@ -39,8 +39,7 @@ class DeviceSettings {
|
|
|
39
39
|
throw new errors_1.errors.InvalidArgumentError(`New settings cannot be applied, because the overall ` +
|
|
40
40
|
`object size exceeds the allowed limit of ${support_1.util.toReadableSizeString(exports.MAX_SETTINGS_SIZE)}`);
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
for (const prop of props) {
|
|
42
|
+
for (const prop in newSettings) {
|
|
44
43
|
if (!lodash_1.default.isUndefined(this._settings[prop])) {
|
|
45
44
|
if (this._settings[prop] === newSettings[prop]) {
|
|
46
45
|
logger_1.default.debug(`The value of '${prop}' setting did not change. Skipping the update for it`);
|
|
@@ -58,7 +57,7 @@ class DeviceSettings {
|
|
|
58
57
|
exports.DeviceSettings = DeviceSettings;
|
|
59
58
|
exports.default = DeviceSettings;
|
|
60
59
|
/**
|
|
61
|
-
* @template T
|
|
62
|
-
* @typedef {import('@appium/types').
|
|
60
|
+
* @template {import('@appium/types').StringRecord} [T=import('@appium/types').StringRecord]
|
|
61
|
+
* @typedef {import('@appium/types').IDeviceSettings<T>} IDeviceSettings
|
|
63
62
|
*/
|
|
64
63
|
//# sourceMappingURL=device-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-settings.js","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,sDAA2B;AAC3B,6CAA2C;AAC3C,+CAA0C;AAE1C;;GAEG;AACU,QAAA,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ;AAE3D;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"device-settings.js","sourceRoot":"","sources":["../../../lib/basedriver/device-settings.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,sDAA2B;AAC3B,6CAA2C;AAC3C,+CAA0C;AAE1C;;GAEG;AACU,QAAA,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ;AAE3D;;;GAGG;AACH,MAAa,cAAc;IAazB;;;;OAIG;IACH,YAAY,eAAe,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC;QACpF,IAAI,CAAC,SAAS,GAAG,EAAC,GAAG,eAAe,EAAC,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,WAAW;QACtB,IAAI,CAAC,gBAAC,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE;YACjC,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,wDAAwD;gBACtD,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAC3C,CAAC;SACH;QAED,IAAI,cAAI,CAAC,aAAa,CAAC,EAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,WAAW,EAAC,CAAC,IAAI,yBAAiB,EAAE;YAChF,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,sDAAsD;gBACpD,4CAA4C,cAAI,CAAC,oBAAoB,CAAC,yBAAiB,CAAC,EAAE,CAC7F,CAAC;SACH;QAED,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,IAAI,CAAC,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE;gBACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,EAAE;oBAC9C,gBAAG,CAAC,KAAK,CAAC,iBAAiB,IAAI,sDAAsD,CAAC,CAAC;oBACvF,SAAS;iBACV;aACF;YACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF;AAzDD,wCAyDC;AAED,kBAAe,cAAc,CAAC;AAE9B;;;GAGG"}
|