@appium/base-driver 9.3.1 → 9.3.3

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.
Files changed (81) hide show
  1. package/LICENSE +1 -1
  2. package/build/lib/basedriver/capabilities.d.ts +10 -0
  3. package/build/lib/basedriver/capabilities.d.ts.map +1 -1
  4. package/build/lib/basedriver/capabilities.js +57 -44
  5. package/build/lib/basedriver/capabilities.js.map +1 -1
  6. package/build/lib/basedriver/commands/event.d.ts +5 -9
  7. package/build/lib/basedriver/commands/event.d.ts.map +1 -1
  8. package/build/lib/basedriver/commands/event.js +28 -49
  9. package/build/lib/basedriver/commands/event.js.map +1 -1
  10. package/build/lib/basedriver/commands/execute.d.ts +5 -11
  11. package/build/lib/basedriver/commands/execute.d.ts.map +1 -1
  12. package/build/lib/basedriver/commands/execute.js +15 -39
  13. package/build/lib/basedriver/commands/execute.js.map +1 -1
  14. package/build/lib/basedriver/commands/find.d.ts +5 -12
  15. package/build/lib/basedriver/commands/find.d.ts.map +1 -1
  16. package/build/lib/basedriver/commands/find.js +38 -98
  17. package/build/lib/basedriver/commands/find.js.map +1 -1
  18. package/build/lib/basedriver/commands/index.d.ts +7 -3
  19. package/build/lib/basedriver/commands/index.d.ts.map +1 -1
  20. package/build/lib/basedriver/commands/index.js +20 -27
  21. package/build/lib/basedriver/commands/index.js.map +1 -1
  22. package/build/lib/basedriver/commands/log.d.ts +5 -10
  23. package/build/lib/basedriver/commands/log.d.ts.map +1 -1
  24. package/build/lib/basedriver/commands/log.js +17 -50
  25. package/build/lib/basedriver/commands/log.js.map +1 -1
  26. package/build/lib/basedriver/commands/mixin.d.ts +12 -0
  27. package/build/lib/basedriver/commands/mixin.d.ts.map +1 -0
  28. package/build/lib/basedriver/commands/mixin.js +17 -0
  29. package/build/lib/basedriver/commands/mixin.js.map +1 -0
  30. package/build/lib/basedriver/commands/session.d.ts +5 -11
  31. package/build/lib/basedriver/commands/session.d.ts.map +1 -1
  32. package/build/lib/basedriver/commands/session.js +20 -45
  33. package/build/lib/basedriver/commands/session.js.map +1 -1
  34. package/build/lib/basedriver/commands/settings.d.ts +5 -9
  35. package/build/lib/basedriver/commands/settings.d.ts.map +1 -1
  36. package/build/lib/basedriver/commands/settings.js +14 -34
  37. package/build/lib/basedriver/commands/settings.js.map +1 -1
  38. package/build/lib/basedriver/commands/timeout.d.ts +5 -9
  39. package/build/lib/basedriver/commands/timeout.d.ts.map +1 -1
  40. package/build/lib/basedriver/commands/timeout.js +107 -126
  41. package/build/lib/basedriver/commands/timeout.js.map +1 -1
  42. package/build/lib/basedriver/core.d.ts +12 -5
  43. package/build/lib/basedriver/core.d.ts.map +1 -1
  44. package/build/lib/basedriver/core.js +10 -45
  45. package/build/lib/basedriver/core.js.map +1 -1
  46. package/build/lib/basedriver/driver.d.ts +12 -12
  47. package/build/lib/basedriver/driver.d.ts.map +1 -1
  48. package/build/lib/basedriver/driver.js +22 -14
  49. package/build/lib/basedriver/driver.js.map +1 -1
  50. package/build/lib/basedriver/helpers.d.ts.map +1 -1
  51. package/build/lib/basedriver/helpers.js +9 -3
  52. package/build/lib/basedriver/helpers.js.map +1 -1
  53. package/build/lib/express/server.d.ts +3 -15
  54. package/build/lib/express/server.d.ts.map +1 -1
  55. package/build/lib/index.d.ts +1 -1
  56. package/build/lib/index.d.ts.map +1 -1
  57. package/build/lib/index.js +2 -1
  58. package/build/lib/index.js.map +1 -1
  59. package/lib/basedriver/capabilities.js +68 -54
  60. package/lib/basedriver/commands/event.ts +48 -0
  61. package/lib/basedriver/commands/execute.ts +39 -0
  62. package/lib/basedriver/commands/find.ts +79 -0
  63. package/lib/basedriver/commands/index.ts +7 -0
  64. package/lib/basedriver/commands/log.ts +36 -0
  65. package/lib/basedriver/commands/mixin.ts +14 -0
  66. package/lib/basedriver/commands/session.ts +34 -0
  67. package/lib/basedriver/commands/settings.ts +25 -0
  68. package/lib/basedriver/commands/timeout.ts +155 -0
  69. package/lib/basedriver/core.js +41 -20
  70. package/lib/basedriver/driver.js +9 -12
  71. package/lib/basedriver/helpers.js +9 -3
  72. package/lib/index.js +1 -0
  73. package/package.json +8 -8
  74. package/lib/basedriver/commands/event.js +0 -63
  75. package/lib/basedriver/commands/execute.js +0 -45
  76. package/lib/basedriver/commands/find.js +0 -108
  77. package/lib/basedriver/commands/index.js +0 -35
  78. package/lib/basedriver/commands/log.js +0 -64
  79. package/lib/basedriver/commands/session.js +0 -57
  80. package/lib/basedriver/commands/settings.js +0 -38
  81. package/lib/basedriver/commands/timeout.js +0 -168
@@ -4,149 +4,130 @@ 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.TimeoutMixin = void 0;
8
7
  /* eslint-disable no-unused-vars */
9
8
  /* eslint-disable require-await */
10
9
  const asyncbox_1 = require("asyncbox");
11
10
  const lodash_1 = __importDefault(require("lodash"));
12
11
  const support_1 = require("@appium/support");
13
12
  const protocol_1 = require("../../protocol");
13
+ const mixin_1 = require("./mixin");
14
14
  const MIN_TIMEOUT = 0;
15
- /**
16
- * @template {Constraints} C
17
- * @param {import('../driver').BaseDriverBase<C>} Base
18
- * @returns {TimeoutBase<C>}
19
- */
20
- function TimeoutMixin(Base) {
21
- /**
22
- * @implements {ITimeoutCommands}
23
- */
24
- class TimeoutCommands extends Base {
25
- async timeouts(type, ms, script, pageLoad, implicit) {
26
- if (support_1.util.hasValue(type) && support_1.util.hasValue(ms)) {
27
- this.log.debug(`MJSONWP timeout arguments: ${JSON.stringify({ type, ms })}}`);
28
- switch (type) {
29
- case 'command':
30
- await this.newCommandTimeout(ms);
31
- return;
32
- case 'implicit':
33
- await this.implicitWaitMJSONWP(ms);
34
- return;
35
- case 'page load':
36
- await this.pageLoadTimeoutMJSONWP(ms);
37
- return;
38
- case 'script':
39
- await this.scriptTimeoutMJSONWP(ms);
40
- return;
41
- default:
42
- throw new Error(`'${type}' type is not supported for MJSONWP timeout`);
43
- }
44
- }
45
- // Otherwise assume it is W3C protocol
46
- this.log.debug(`W3C timeout argument: ${JSON.stringify({
47
- script,
48
- pageLoad,
49
- implicit,
50
- })}}`);
51
- if (support_1.util.hasValue(script)) {
52
- await this.scriptTimeoutW3C(script);
53
- }
54
- if (support_1.util.hasValue(pageLoad)) {
55
- await this.pageLoadTimeoutW3C(pageLoad);
56
- }
57
- if (support_1.util.hasValue(implicit)) {
58
- await this.implicitWaitW3C(implicit);
15
+ const TimeoutCommands = {
16
+ async timeouts(type, ms, script, pageLoad, implicit) {
17
+ if (support_1.util.hasValue(type) && support_1.util.hasValue(ms)) {
18
+ this.log.debug(`MJSONWP timeout arguments: ${JSON.stringify({ type, ms })}}`);
19
+ switch (type) {
20
+ case 'command':
21
+ await this.newCommandTimeout(ms);
22
+ return;
23
+ case 'implicit':
24
+ await this.implicitWaitMJSONWP(ms);
25
+ return;
26
+ case 'page load':
27
+ await this.pageLoadTimeoutMJSONWP(ms);
28
+ return;
29
+ case 'script':
30
+ await this.scriptTimeoutMJSONWP(ms);
31
+ return;
32
+ default:
33
+ throw new Error(`'${type}' type is not supported for MJSONWP timeout`);
59
34
  }
60
35
  }
61
- async getTimeouts() {
62
- return {
63
- command: this.newCommandTimeoutMs,
64
- implicit: this.implicitWaitMs,
65
- };
66
- }
67
- // implicit
68
- async implicitWaitW3C(ms) {
69
- await this.implicitWait(ms);
70
- }
71
- async implicitWaitMJSONWP(ms) {
72
- await this.implicitWait(ms);
73
- }
74
- async implicitWait(ms) {
75
- await this.setImplicitWait(this.parseTimeoutArgument(ms));
36
+ // Otherwise assume it is W3C protocol
37
+ this.log.debug(`W3C timeout argument: ${JSON.stringify({
38
+ script,
39
+ pageLoad,
40
+ implicit,
41
+ })}}`);
42
+ if (support_1.util.hasValue(script)) {
43
+ await this.scriptTimeoutW3C(script);
76
44
  }
77
- // pageLoad
78
- async pageLoadTimeoutW3C(ms) {
79
- throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
45
+ if (support_1.util.hasValue(pageLoad)) {
46
+ await this.pageLoadTimeoutW3C(pageLoad);
80
47
  }
81
- async pageLoadTimeoutMJSONWP(ms) {
82
- throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
48
+ if (support_1.util.hasValue(implicit)) {
49
+ await this.implicitWaitW3C(implicit);
83
50
  }
84
- // script
85
- async scriptTimeoutW3C(ms) {
86
- throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
87
- }
88
- async scriptTimeoutMJSONWP(ms) {
89
- throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
90
- }
91
- // command
92
- async newCommandTimeout(ms) {
93
- this.setNewCommandTimeout(this.parseTimeoutArgument(ms));
94
- }
95
- setImplicitWait(ms) {
96
- // eslint-disable-line require-await
97
- this.implicitWaitMs = ms;
98
- this.log.debug(`Set implicit wait to ${ms}ms`);
99
- if (this.managedDrivers && this.managedDrivers.length) {
100
- this.log.debug('Setting implicit wait on managed drivers');
101
- for (let driver of this.managedDrivers) {
102
- if (lodash_1.default.isFunction(driver.setImplicitWait)) {
103
- driver.setImplicitWait(ms);
104
- }
51
+ },
52
+ async getTimeouts() {
53
+ return {
54
+ command: this.newCommandTimeoutMs,
55
+ implicit: this.implicitWaitMs,
56
+ };
57
+ },
58
+ // implicit
59
+ async implicitWaitW3C(ms) {
60
+ await this.implicitWait(ms);
61
+ },
62
+ async implicitWaitMJSONWP(ms) {
63
+ await this.implicitWait(ms);
64
+ },
65
+ async implicitWait(ms) {
66
+ await this.setImplicitWait(this.parseTimeoutArgument(ms));
67
+ },
68
+ // pageLoad
69
+ async pageLoadTimeoutW3C(ms) {
70
+ throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
71
+ },
72
+ async pageLoadTimeoutMJSONWP(ms) {
73
+ throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
74
+ },
75
+ // script
76
+ async scriptTimeoutW3C(ms) {
77
+ throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
78
+ },
79
+ async scriptTimeoutMJSONWP(ms) {
80
+ throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
81
+ },
82
+ // command
83
+ async newCommandTimeout(ms) {
84
+ this.setNewCommandTimeout(this.parseTimeoutArgument(ms));
85
+ },
86
+ setImplicitWait(ms) {
87
+ // eslint-disable-line require-await
88
+ this.implicitWaitMs = ms;
89
+ this.log.debug(`Set implicit wait to ${ms}ms`);
90
+ if (this.managedDrivers && this.managedDrivers.length) {
91
+ this.log.debug('Setting implicit wait on managed drivers');
92
+ for (const driver of this.managedDrivers) {
93
+ if (lodash_1.default.isFunction(driver.setImplicitWait)) {
94
+ driver.setImplicitWait(ms);
105
95
  }
106
96
  }
107
97
  }
108
- setNewCommandTimeout(ms) {
109
- this.newCommandTimeoutMs = ms;
110
- this.log.debug(`Set new command timeout to ${ms}ms`);
111
- if (this.managedDrivers && this.managedDrivers.length) {
112
- this.log.debug('Setting new command timeout on managed drivers');
113
- for (let driver of this.managedDrivers) {
114
- if (lodash_1.default.isFunction(driver.setNewCommandTimeout)) {
115
- driver.setNewCommandTimeout(ms);
116
- }
98
+ },
99
+ setNewCommandTimeout(ms) {
100
+ this.newCommandTimeoutMs = ms;
101
+ this.log.debug(`Set new command timeout to ${ms}ms`);
102
+ if (this.managedDrivers && this.managedDrivers.length) {
103
+ this.log.debug('Setting new command timeout on managed drivers');
104
+ for (const driver of this.managedDrivers) {
105
+ if (lodash_1.default.isFunction(driver.setNewCommandTimeout)) {
106
+ driver.setNewCommandTimeout(ms);
117
107
  }
118
108
  }
119
109
  }
120
- async implicitWaitForCondition(condFn) {
121
- this.log.debug(`Waiting up to ${this.implicitWaitMs} ms for condition`);
122
- let wrappedCondFn = async (...args) => {
123
- // reset command timeout
124
- await this.clearNewCommandTimeout();
125
- return await condFn(...args);
126
- };
127
- return await (0, asyncbox_1.waitForCondition)(wrappedCondFn, {
128
- waitMs: this.implicitWaitMs,
129
- intervalMs: 500,
130
- logger: this.log,
131
- });
110
+ },
111
+ async implicitWaitForCondition(condFn) {
112
+ this.log.debug(`Waiting up to ${this.implicitWaitMs} ms for condition`);
113
+ const wrappedCondFn = async (...args) => {
114
+ // reset command timeout
115
+ await this.clearNewCommandTimeout();
116
+ return await condFn(...args);
117
+ };
118
+ return await (0, asyncbox_1.waitForCondition)(wrappedCondFn, {
119
+ waitMs: this.implicitWaitMs,
120
+ intervalMs: 500,
121
+ logger: this.log,
122
+ });
123
+ },
124
+ parseTimeoutArgument(ms) {
125
+ const duration = parseInt(String(ms), 10);
126
+ if (lodash_1.default.isNaN(duration) || duration < MIN_TIMEOUT) {
127
+ throw new protocol_1.errors.UnknownError(`Invalid timeout value '${ms}'`);
132
128
  }
133
- parseTimeoutArgument(ms) {
134
- let duration = parseInt(ms, 10);
135
- if (lodash_1.default.isNaN(duration) || duration < MIN_TIMEOUT) {
136
- throw new protocol_1.errors.UnknownError(`Invalid timeout value '${ms}'`);
137
- }
138
- return duration;
139
- }
140
- }
141
- return TimeoutCommands;
142
- }
143
- exports.TimeoutMixin = TimeoutMixin;
144
- /**
145
- * @typedef {import('@appium/types').ITimeoutCommands} ITimeoutCommands
146
- * @typedef {import('@appium/types').Constraints} Constraints
147
- */
148
- /**
149
- * @template {Constraints} C
150
- * @typedef {import('../driver').BaseDriverBase<C, ITimeoutCommands>} TimeoutBase
151
- */
129
+ return duration;
130
+ },
131
+ };
132
+ (0, mixin_1.mixin)(TimeoutCommands);
152
133
  //# sourceMappingURL=timeout.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}
@@ -18,9 +18,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
18
18
  * Make the basedriver version available so for any driver which inherits from this package, we
19
19
  * know which version of basedriver it inherited from
20
20
  */
21
- static baseVersion: any;
22
- /** @type {import('@appium/types').ExecuteMethodMap<DriverCore>} */
23
- static executeMethodMap: import('@appium/types').ExecuteMethodMap<DriverCore>;
21
+ static baseVersion: string;
24
22
  /**
25
23
  * @param {DriverOpts<C>} opts
26
24
  * @param {boolean} [shouldValidateCaps]
@@ -38,7 +36,8 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
38
36
  * @type {ServerArgs}
39
37
  */
40
38
  initialOpts: ServerArgs;
41
- helpers: import("@appium/types").DriverHelpers<any>;
39
+ /** @type {typeof helpers} */
40
+ helpers: typeof helpers;
42
41
  /**
43
42
  * basePath is used for several purposes, for example in setting up
44
43
  * proxying to other drivers, since we need to know what the base path
@@ -46,14 +45,18 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
46
45
  * initially but it is automatically updated during any actual program
47
46
  * execution by the routeConfiguringFunction, which is necessarily run as
48
47
  * the entrypoint for any Appium server
48
+ * @type {string}
49
49
  */
50
50
  basePath: string;
51
+ /** @type {boolean} */
51
52
  relaxedSecurityEnabled: boolean;
52
53
  /** @type {string[]} */
53
54
  allowInsecure: string[];
54
55
  /** @type {string[]} */
55
56
  denyInsecure: string[];
57
+ /** @type {number} */
56
58
  newCommandTimeoutMs: number;
59
+ /** @type {number} */
57
60
  implicitWaitMs: number;
58
61
  /** @type {string[]} */
59
62
  locatorStrategies: string[];
@@ -73,6 +76,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
73
76
  _log: AppiumLogger;
74
77
  /**
75
78
  * @protected
79
+ * @type {boolean}
76
80
  */
77
81
  protected shutdownUnexpectedly: boolean;
78
82
  /**
@@ -81,6 +85,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
81
85
  shouldValidateCaps: boolean;
82
86
  /**
83
87
  * @protected
88
+ * @type {AsyncLock}
84
89
  */
85
90
  protected commandsQueueGuard: AsyncLock;
86
91
  /**
@@ -88,6 +93,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
88
93
  * we set it to an empty DeviceSettings instance here to make sure that the
89
94
  * default settings are applied even if an extending driver doesn't utilize
90
95
  * the settings functionality itself
96
+ * @type {DeviceSettings}
91
97
  */
92
98
  settings: DeviceSettings<any>;
93
99
  get log(): import("@appium/types").AppiumLogger;
@@ -218,9 +224,10 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
218
224
  * @param {Driver} driver
219
225
  */
220
226
  addManagedDriver(driver: Driver): void;
221
- getManagedDrivers(): import("@appium/types").Driver<typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, import("@appium/types").StringRecord, any>[];
227
+ getManagedDrivers(): import("@appium/types").Driver<Readonly<Record<string, import("@appium/types").Constraint>>, import("@appium/types").StringRecord>[];
222
228
  clearNewCommandTimeout(): Promise<void>;
223
229
  }
230
+ import helpers from "./helpers";
224
231
  import { EventEmitter } from "events";
225
232
  import AsyncLock from "async-lock";
226
233
  import DeviceSettings from "./device-settings";
@@ -1 +1 @@
1
- {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"qBAoaa,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;2BACpC,OAAO,eAAe,EAAE,YAAY;2BACpC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;mOAMhD,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC;mFAI9C,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;2FAK1C,OAAO,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;iGAK/B,OAAO,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC;AA1alD;;;GAGG;AACH,8KAFqB,CAAC;IAGpB;;;OAGG;IACH,wBAAoC;IAEpC,mEAAmE;IACnE,yBADW,OAAO,eAAe,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAClC;IAwF7B;;;OAGG;IACH,mBAHW,WAAW,CAAC,CAAC,4CAoBvB;IA3GD;;OAEG;IACH,WAFU,MAAM,QAEC;IAEjB;;OAEG;IACH,MAFU,OAAO,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAE1C;IAEL;;OAEG;IACH,aAFU,UAAU,CAER;IAEZ,oDAAkB;IAElB;;;;;;;OAOG;IACH,iBAA6B;IAE7B,gCAA+B;IAE/B,uBAAuB;IACvB,eADW,MAAM,EAAE,CACA;IAEnB,uBAAuB;IACvB,cADW,MAAM,EAAE,CACD;IAElB,4BAA6C;IAE7C,uBAAmB;IAEnB,uBAAuB;IACvB,mBADW,MAAM,EAAE,CACI;IAEvB,uBAAuB;IACvB,sBADW,MAAM,EAAE,CACO;IAE1B,uBAAuB;IACvB,gBADW,MAAM,EAAE,CACC;IAEpB,8BAA8B;IAC9B,gBADW,OAAO,OAAO,QACH;IAEtB,2BAA2B;IAC3B,eADW,YAAY,CACQ;IAG/B,kCAAkC;IAClC,cADW,mBAAmB,CACI;IAElC;;OAEG;IACH,MAFU,YAAY,CAEjB;IAEL;;OAEG;IACH,wCAA6B;IAE7B;;OAEG;IACH,oBAFU,OAAO,CAEE;IAEnB;;OAEG;IACH,wCAAqC;IAErC;;;;;OAKG;IACH,8BAAgC;IAyBhC,gDAEC;IAED;;;;;;;;OAQG;IACH,wCAJqB,GAAG,EAAE,KAAK,IAAI,QAMlC;IAED;;;;;;;OAOG;IACH,0CAEC;IAED;;;;;;;;;;OAUG;IACH,sCAEC;IAMD,yDAEC;IAED;;;OAGG;IACH,oBAFW,MAAM,QAgBhB;IAED;;;OAGG;IACH,yBAEC;IAED;;;;;OAKG;IACH,+CAFa,OAAO,CAKnB;IAED;;;;;OAKG;IACH,4BAHW,MAAM,GACJ,KAAK,CAAC,CAAC,GAAG,IAAI,CAI1B;IAED,6BAEC;IAED,yBAEC;IAED,2BAEC;IADC,6BAAiC;IAGnC,uBAEC;IAED;;;;;;OAMG;IACH,uBAJW,MAAM,WAuBhB;IAED;;;;;;OAMG;IACH,2BAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,2BAFW,MAAM,QAYhB;IAED;;;;OAIG;IACH,kCAHW,MAAM,0CAgBhB;IAED;;;;OAIG;IACH,6CAFa,OAAO,CAInB;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,OAAO,eAAe,EAAE,YAAY,EAAE,CAIlD;IAED;;;;OAIG;IACH,0CAFa,OAAO,CAInB;IAED;;;;;;;;;;;;OAYG;IACH,+BATW,MAAM,UAGN,OAAO,eAAe,EAAE,UAAU,OAClC,MAAM,SACN,GAAG,GAED,OAAO,CAoBnB;IAED;;;OAGG;IACH,yBAFW,MAAM,QAIhB;IAED,8JAEC;IAED,wCAKC;CACF"}
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
- * @type {string?}
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;
@@ -338,8 +305,6 @@ exports.DriverCore = DriverCore;
338
305
  * know which version of basedriver it inherited from
339
306
  */
340
307
  DriverCore.baseVersion = BASEDRIVER_VER;
341
- /** @type {import('@appium/types').ExecuteMethodMap<DriverCore>} */
342
- DriverCore.executeMethodMap = {};
343
308
  /**
344
309
  * @typedef {import('@appium/types').Driver} Driver
345
310
  * @typedef {import('@appium/types').Constraints} Constraints
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/basedriver/core.js"],"names":[],"mappings":"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"}
@@ -1,10 +1,18 @@
1
+ declare const BaseDriver_base: typeof DriverCore;
2
+ declare const BaseDriver_base_1: typeof DriverCore;
3
+ declare const BaseDriver_base_2: typeof DriverCore;
4
+ declare const BaseDriver_base_3: typeof DriverCore;
5
+ declare const BaseDriver_base_4: typeof DriverCore;
6
+ declare const BaseDriver_base_5: typeof DriverCore;
7
+ declare const BaseDriver_base_6: typeof DriverCore;
1
8
  /**
2
9
  * @implements {SessionHandler<C>}
3
10
  * @template {Constraints} C
4
11
  * @template {StringRecord} [CArgs=StringRecord]
12
+ * @implements {Driver<C, CArgs>}
5
13
  * @extends {DriverCore<C>}
6
14
  */
7
- export class BaseDriverCore<C extends Readonly<Record<string, import("@appium/types").Constraint>>, CArgs extends import("@appium/types").StringRecord = import("@appium/types").StringRecord> extends DriverCore<C> implements SessionHandler<C> {
15
+ export class BaseDriver<C extends Readonly<Record<string, import("@appium/types").Constraint>>, CArgs extends import("@appium/types").StringRecord = import("@appium/types").StringRecord> extends DriverCore<C>, BaseDriver_base, BaseDriver_base_1, BaseDriver_base_2, BaseDriver_base_3, BaseDriver_base_4, BaseDriver_base_5, BaseDriver_base_6 implements SessionHandler<C>, Driver<C, CArgs> {
8
16
  /**
9
17
  *
10
18
  * @param {DriverOpts<C>} opts
@@ -99,15 +107,7 @@ export class BaseDriverCore<C extends Readonly<Record<string, import("@appium/ty
99
107
  */
100
108
  validateDesiredCaps(caps: Capabilities<C>): boolean;
101
109
  }
102
- declare const BaseDriver_base: import("./commands/execute").ExecuteBase<any>;
103
- /**
104
- * This ensures that all of the mixins correctly implement the interface described in {@linkcode Driver}.
105
- * @template {Constraints} [C={}]
106
- * @implements {Driver<C>}
107
- */
108
- export class BaseDriver<C extends Readonly<Record<string, import("@appium/types").Constraint>> = {}> extends BaseDriver_base implements Driver<C> {
109
- constructor(...arguments_: any[]);
110
- }
110
+ export * from "./commands";
111
111
  export default BaseDriver;
112
112
  export type HTTPMethod = import('@appium/types').HTTPMethod;
113
113
  export type DriverData = import('@appium/types').DriverData;
@@ -118,9 +118,9 @@ export type BaseDriverCapConstraints = import('@appium/types').BaseDriverCapCons
118
118
  export type ServerArgs = import('@appium/types').ServerArgs;
119
119
  export type UpdateServerCallback = (app: import('express').Express, httpServer: import('@appium/types').AppiumServer) => import('type-fest').Promisable<void>;
120
120
  /**
121
- * This is used to extend {@linkcode BaseDriverCore } by the mixins and also external drivers.
121
+ * This is used to extend {@linkcode BaseDriver } by the mixins and also external drivers.
122
122
  */
123
- export type BaseDriverBase<C extends Readonly<Record<string, import("@appium/types").Constraint>>, Proto = {}, Static = {}> = import('@appium/types').Class<BaseDriverCore<C> & Proto, import("@appium/types").DriverStatic<any> & Static>;
123
+ export type BaseDriverBase<C extends Readonly<Record<string, import("@appium/types").Constraint>>, Proto = {}, Static = {}> = import('@appium/types').Class<BaseDriver<C> & Proto, import("@appium/types").DriverStatic<any> & Static>;
124
124
  export type SessionHandler<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof BASE_DESIRED_CAP_CONSTRAINTS> = import('@appium/types').SessionHandler<[string, object], void, C>;
125
125
  export type Capabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').Capabilities<C, Extra>;
126
126
  export type W3CCapabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').W3CCapabilities<C, Extra>;
@@ -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;IAnZmD,kCAC5C;CAoZyC;;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
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/driver.js"],"names":[],"mappings":";;;;;;;AAmBA;;;;;;GAMG;AACH,8WAN+B,CAAC,UAGT,CAAC,EAAE,KAAK;IA6B7B;;;;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;;;yBAQY,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,WAAW,CAAC,CAAC,GAAG,KAAK,EAAC,4CAAuC,MAAM,CAAC;2IAKlG,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"}