appium-uiautomator2-driver 2.30.0 → 2.31.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/build/lib/commands/general.d.ts.map +1 -1
  3. package/build/lib/commands/general.js +0 -8
  4. package/build/lib/commands/general.js.map +1 -1
  5. package/build/lib/commands/mixins.d.ts +5 -2
  6. package/build/lib/commands/mixins.d.ts.map +1 -1
  7. package/build/lib/commands/mixins.js +4 -1
  8. package/build/lib/commands/mixins.js.map +1 -1
  9. package/build/lib/constraints.d.ts +0 -9
  10. package/build/lib/constraints.d.ts.map +1 -1
  11. package/build/lib/driver.d.ts +5 -13
  12. package/build/lib/driver.d.ts.map +1 -1
  13. package/build/lib/driver.js +2 -17
  14. package/build/lib/driver.js.map +1 -1
  15. package/build/lib/types.d.ts +2 -3
  16. package/build/lib/types.d.ts.map +1 -1
  17. package/build/tsconfig.tsbuildinfo +1 -1
  18. package/lib/commands/general.js +0 -9
  19. package/lib/commands/mixins.ts +4 -2
  20. package/lib/driver.ts +14 -37
  21. package/lib/types.ts +2 -4
  22. package/npm-shrinkwrap.json +31 -35
  23. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [2.31.0](https://github.com/appium/appium-uiautomator2-driver/compare/v2.30.0...v2.31.0) (2023-10-14)
2
+
3
+
4
+ ### Features
5
+
6
+ * Bump android driver to v7 ([#662](https://github.com/appium/appium-uiautomator2-driver/issues/662)) ([a54bc4a](https://github.com/appium/appium-uiautomator2-driver/commit/a54bc4a2d45bed3ddd0f632048f928b76609e0b2))
7
+
1
8
  ## [2.30.0](https://github.com/appium/appium-uiautomator2-driver/compare/v2.29.11...v2.30.0) (2023-10-13)
2
9
 
3
10
 
package/build/lib/commands/general.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"iCA2Ra,OAAO,iBAAiB,EAAE,kBAAkB;kBAC5C,OAAO,YAAY,EAAE,GAAG;oCAKxB,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"iCAkRa,OAAO,iBAAiB,EAAE,kBAAkB;kBAC5C,OAAO,YAAY,EAAE,GAAG;oCAKxB,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC"}
package/build/lib/commands/general.js CHANGED
@@ -146,14 +146,6 @@ const GeneralMixin = {
146
146
  async openNotifications() {
147
147
  await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command('/appium/device/open_notifications', 'POST', {});
148
148
  },
149
- /**
150
- * Overriding appium-android-driver's wrapBootstrapDisconnect,
151
- * unlike in appium-android-driver avoiding adb restarting as it intern
152
- * kills UiAutomator2 server running in the device.
153
- **/
154
- async wrapBootstrapDisconnect(wrapped) {
155
- await wrapped();
156
- },
157
149
  // Stop proxying to any Chromedriver and redirect to uiautomator2
158
150
  suspendChromedriverProxy() {
159
151
  this.chromedriver = undefined;
package/build/lib/commands/general.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"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"}
package/build/lib/commands/mixins.d.ts CHANGED
@@ -1,6 +1,9 @@
1
1
  /**
2
2
  * @module
3
- * @privateRemarks These mixins are kind of a mishmash of stuff from `appium-android-driver`, unique things, and stuff from `ExternalDriver`. Ideally, we should be pulling the method definitions right out of `ExternalDriver` whenever possible. Also note that the mixins contain _more stuff than just commands or execute methods_.
3
+ * @privateRemarks These mixins are kind of a mishmash of stuff from `appium-android-driver`,
4
+ * @privateRemarks unique things, and stuff from `ExternalDriver`. Ideally, we should be pulling the method
5
+ * @privateRemarks definitions right out of `ExternalDriver` whenever possible. Also note that the mixins
6
+ * @privateRemarks contain _more stuff than just commands or execute methods_.
4
7
  */
5
8
  import type { Element, ExternalDriver, StringRecord } from '@appium/types';
6
9
  import type { ActionsMixin, AlertMixin, ElementMixin, ExecuteMixin, FindMixin, GeneralMixin, NetworkMixin, TouchMixin } from 'appium-android-driver';
@@ -30,7 +33,7 @@ export type UIA2ElementMixin = UIA2Mixin<Pick<ElementMixin, 'getAttribute' | 'el
30
33
  getElementScreenshot(elementId: string): Promise<string>;
31
34
  };
32
35
  export type UIA2FindMixin = UIA2Mixin<Pick<FindMixin, 'doFindElementOrEls'>>;
33
- export type UIA2GeneralMixin = UIA2Mixin<Pick<GeneralMixin & NetworkMixin & ActionsMixin & ExecuteMixin, 'getPageSource' | 'doSendKeys' | 'back' | 'getDisplayDensity' | 'getWindowSize' | 'getWindowRect' | 'setUrl' | 'wrapBootstrapDisconnect' | 'keyevent' | 'execute' | 'executeMobile'>> & {
36
+ export type UIA2GeneralMixin = UIA2Mixin<Pick<GeneralMixin & NetworkMixin & ActionsMixin & ExecuteMixin, 'getPageSource' | 'doSendKeys' | 'back' | 'getDisplayDensity' | 'getWindowSize' | 'getWindowRect' | 'setUrl' | 'keyevent' | 'execute' | 'executeMobile'>> & {
34
37
  getClipboard(): Promise<string>;
35
38
  mobileViewportScreenshot(): Promise<string>;
36
39
  mobileViewPortRect(): Promise<types.RelativeRect>;
package/build/lib/commands/mixins.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mixins.d.ts","sourceRoot":"","sources":["../../../lib/commands/mixins.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mixins.d.ts","sourceRoot":"","sources":["../../../lib/commands/mixins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,UAAU,EACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,KAAK,KAAK,MAAM,SAAS,CAAC;AAEtC,KAAK,SAAS,CAAC,CAAC,GAAG,WAAW,IAAI,QAAQ,CAAC,OAAO,WAAW,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC;AAE9F,MAAM,MAAM,gBAAgB,GAAG,SAAS,CACtC,IAAI,CACF,YAAY,EACZ,cAAc,GAAG,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,gBAAgB,GAAG,gBAAgB,CACjG,CACF,GAAG;IACF,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,oBAAoB,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC7E,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnE,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,SAAS,CACpC,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,iBAAiB,GAAG,kBAAkB,CAAC,CAC1E,GAAG;IACF,iBAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,kBAAkB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,GAAG;IAC9E,mBAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG;IACzC,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,SAAS,CACtC,IAAI,CACF,YAAY,EACV,cAAc,GACd,kBAAkB,GAClB,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,GACT,aAAa,GACb,SAAS,GACT,gBAAgB,GAChB,WAAW,GACX,SAAS,GACT,WAAW,GACX,mBAAmB,GACnB,mBAAmB,GACnB,SAAS,GACT,OAAO,GACP,KAAK,GACL,OAAO,GACP,gBAAgB,CACnB,CACF,GAAG;IACF,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAE7E,MAAM,MAAM,gBAAgB,GAAG,SAAS,CACtC,IAAI,CACF,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,YAAY,EACvD,eAAe,GACf,YAAY,GACZ,MAAM,GACN,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,QAAQ,GACR,UAAU,GACV,SAAS,GACT,eAAe,CAClB,CACF,GAAG;IACF,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,kBAAkB,IAAI,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClD,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,wBAAwB,IAAI,IAAI,CAAC;IACjC,mBAAmB,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7C,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxD,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,mBAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG;IAC1C,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,eAAe,IAAI,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG;IAC1C,kBAAkB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,wBAAwB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,GAAG;IACjF,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;CACzF,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,SAAS,CAEpC,QAAQ,CACN,IAAI,CAAC,cAAc,GAAG,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,sBAAsB,CAAC,CAChG,CACF,CAAC;AAEF,OAAO,QAAQ,WAAW,CAAC;IACzB,UAAU,yBACR,SAAQ,gBAAgB,EACtB,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,iBAAiB;KAAG;CACzB;AAED;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,OAAO,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAElF"}
package/build/lib/commands/mixins.js CHANGED
@@ -1,7 +1,10 @@
1
1
  "use strict";
2
2
  /**
3
3
  * @module
4
- * @privateRemarks These mixins are kind of a mishmash of stuff from `appium-android-driver`, unique things, and stuff from `ExternalDriver`. Ideally, we should be pulling the method definitions right out of `ExternalDriver` whenever possible. Also note that the mixins contain _more stuff than just commands or execute methods_.
4
+ * @privateRemarks These mixins are kind of a mishmash of stuff from `appium-android-driver`,
5
+ * @privateRemarks unique things, and stuff from `ExternalDriver`. Ideally, we should be pulling the method
6
+ * @privateRemarks definitions right out of `ExternalDriver` whenever possible. Also note that the mixins
7
+ * @privateRemarks contain _more stuff than just commands or execute methods_.
5
8
  */
6
9
  Object.defineProperty(exports, "__esModule", { value: true });
7
10
  exports.mixin = void 0;
package/build/lib/commands/mixins.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mixins.js","sourceRoot":"","sources":["../../../lib/commands/mixins.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAcH,sCAAoD;AAyIpD;;;;;;;;;GASG;AACH,SAAgB,KAAK,CAA+C,KAAQ;IAC1E,MAAM,CAAC,MAAM,CAAC,kCAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5D,CAAC;AAFD,sBAEC"}
1
+ {"version":3,"file":"mixins.js","sourceRoot":"","sources":["../../../lib/commands/mixins.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAcH,sCAAoD;AAwIpD;;;;;;;;;GASG;AACH,SAAgB,KAAK,CAA+C,KAAQ;IAC1E,MAAM,CAAC,MAAM,CAAC,kCAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5D,CAAC;AAFD,sBAEC"}
package/build/lib/constraints.d.ts CHANGED
@@ -267,21 +267,12 @@ declare const UIAUTOMATOR2_CONSTRAINTS: {
267
267
  readonly ignoreUnimportantViews: {
268
268
  readonly isBoolean: true;
269
269
  };
270
- readonly disableAndroidWatchers: {
271
- readonly isBoolean: true;
272
- };
273
270
  readonly acceptSslCerts: {
274
271
  readonly isBoolean: true;
275
272
  };
276
- readonly androidNaturalOrientation: {
277
- readonly isBoolean: true;
278
- };
279
273
  readonly disableWindowAnimation: {
280
274
  readonly isBoolean: true;
281
275
  };
282
- readonly bootstrapPort: {
283
- readonly isNumber: true;
284
- };
285
276
  readonly appWaitForLaunch: {
286
277
  readonly isBoolean: true;
287
278
  };
package/build/lib/constraints.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CE,CAAC;AAEjC,eAAe,wBAAwB,CAAC;AAExC,MAAM,MAAM,uBAAuB,GAAG,OAAO,wBAAwB,CAAC"}
1
+ {"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CE,CAAC;AAEjC,eAAe,wBAAwB,CAAC;AAExC,MAAM,MAAM,uBAAuB,GAAG,OAAO,wBAAwB,CAAC"}
package/build/lib/driver.d.ts CHANGED
@@ -2,9 +2,9 @@ import type { DriverData, ExternalDriver, InitialOpts, RouteMatcher, SingularSes
2
2
  import AndroidDriver from 'appium-android-driver';
3
3
  import { mjpeg } from 'appium/support';
4
4
  import { type Uiautomator2Constraints } from './constraints';
5
- import type { Uiautomator2Settings, Uiautomator2CreateResult, Uiautomator2DeviceDetails, Uiautomator2DeviceInfo, Uiautomator2DriverCaps, Uiautomator2DriverOpts, Uiautomator2SessionCaps, Uiautomator2StartSessionOpts, W3CUiautomator2DriverCaps } from './types';
5
+ import type { Uiautomator2Settings, Uiautomator2DeviceDetails, Uiautomator2DeviceInfo, Uiautomator2DriverCaps, Uiautomator2DriverOpts, Uiautomator2SessionCaps, Uiautomator2StartSessionOpts, W3CUiautomator2DriverCaps } from './types';
6
6
  import { UiAutomator2Server } from './uiautomator2';
7
- declare class AndroidUiautomator2Driver extends AndroidDriver<Uiautomator2Settings, Uiautomator2CreateResult> implements ExternalDriver<Uiautomator2Constraints, string, StringRecord, Uiautomator2Settings, Uiautomator2CreateResult> {
7
+ declare class AndroidUiautomator2Driver extends AndroidDriver implements ExternalDriver<Uiautomator2Constraints, string, StringRecord> {
8
8
  static newMethodMap: {
9
9
  readonly '/session/:sessionId/appium/device/get_clipboard': {
10
10
  readonly POST: {
@@ -692,9 +692,7 @@ declare class AndroidUiautomator2Driver extends AndroidDriver<Uiautomator2Settin
692
692
  readonly 'mobile: installMultipleApks': {
693
693
  readonly command: "mobileInstallMultipleApks";
694
694
  readonly params: {
695
- readonly required: readonly ["apks"]; /**
696
- * @privateRemarks moved from `this.opts`
697
- */
695
+ readonly required: readonly ["apks"];
698
696
  readonly optional: readonly ["options"];
699
697
  };
700
698
  };
@@ -878,11 +876,10 @@ declare class AndroidUiautomator2Driver extends AndroidDriver<Uiautomator2Settin
878
876
  desiredCapConstraints: Uiautomator2Constraints;
879
877
  constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
880
878
  validateDesiredCaps(caps: any): caps is Uiautomator2DriverCaps;
881
- createSession(w3cCaps1: W3CUiautomator2DriverCaps, w3cCaps2?: W3CUiautomator2DriverCaps, w3cCaps3?: W3CUiautomator2DriverCaps, driverData?: DriverData[]): Promise<Uiautomator2CreateResult>;
879
+ createSession(w3cCaps1: W3CUiautomator2DriverCaps, w3cCaps2?: W3CUiautomator2DriverCaps, w3cCaps3?: W3CUiautomator2DriverCaps, driverData?: DriverData[]): Promise<any>;
882
880
  getDeviceDetails(): Promise<Uiautomator2DeviceDetails>;
883
881
  get driverData(): {};
884
882
  getSession(): Promise<SingularSessionData<Uiautomator2Constraints>>;
885
- isEmulator(): boolean;
886
883
  setAvdFromCapabilities(caps: Uiautomator2StartSessionOpts): void;
887
884
  allocateSystemPort(): Promise<void>;
888
885
  releaseSystemPort(): Promise<void>;
@@ -896,16 +893,11 @@ declare class AndroidUiautomator2Driver extends AndroidDriver<Uiautomator2Settin
896
893
  deleteSession(): Promise<void>;
897
894
  checkAppPresent(): Promise<void>;
898
895
  onSettingsUpdate(): Promise<void>;
899
- wrapBootstrapDisconnect(wrapped: () => Promise<void>): Promise<void>;
900
896
  proxyActive(sessionId: string): boolean;
901
897
  canProxy(sessionId: string): boolean;
902
898
  getProxyAvoidList(): RouteMatcher[];
903
- get isChromeSession(): boolean;
904
899
  updateSettings(settings: Uiautomator2Settings): Promise<void>;
905
- getSettings(): Promise<{
906
- allowInvisibleElements: boolean;
907
- ignoreUnimportantViews: boolean;
908
- }>;
900
+ getSettings(): Promise<any>;
909
901
  }
910
902
  import './commands';
911
903
  export { AndroidUiautomator2Driver };
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/driver.js CHANGED
@@ -267,9 +267,6 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.default {
267
267
  const uia2Data = (await this.uiautomator2.jwproxy.command('/', 'GET', {}));
268
268
  return { ...sessionData, ...uia2Data };
269
269
  }
270
- isEmulator() {
271
- return helpers.isEmulator(this.adb, this.opts);
272
- }
273
270
  setAvdFromCapabilities(caps) {
274
271
  if (this.opts.avd) {
275
272
  this.log.info('avd name defined, ignoring device name and platform version');
@@ -719,22 +716,13 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.default {
719
716
  // intentionally do nothing here, since commands.updateSettings proxies
720
717
  // settings to the uiauto2 server already
721
718
  }
722
- // Need to override android-driver's version of this since we don't actually
723
- // have a bootstrap; instead we just restart adb and re-forward the UiAutomator2
724
- // port
725
- async wrapBootstrapDisconnect(wrapped) {
726
- await wrapped();
727
- this.adb.restart();
728
- await this.allocateSystemPort();
729
- await this.allocateMjpegServerPort();
730
- }
719
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
731
720
  proxyActive(sessionId) {
732
- driver_1.BaseDriver.prototype.proxyActive.call(this, sessionId);
733
721
  // we always have an active proxy to the UiAutomator2 server
734
722
  return true;
735
723
  }
724
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
736
725
  canProxy(sessionId) {
737
- driver_1.BaseDriver.prototype.canProxy.call(this, sessionId);
738
726
  // we can always proxy to the uiautomator2 server
739
727
  return true;
740
728
  }
@@ -756,9 +744,6 @@ class AndroidUiautomator2Driver extends appium_android_driver_1.default {
756
744
  }
757
745
  return this.jwpProxyAvoid;
758
746
  }
759
- get isChromeSession() {
760
- return helpers.isChromeBrowser(this.opts.browserName);
761
- }
762
747
  async updateSettings(settings) {
763
748
  await this.settings.update(settings);
764
749
  await this.uiautomator2.jwproxy.command('/appium/settings', 'POST', { settings });
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/types.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import type { DriverCaps, DriverOpts, W3CDriverCaps } from '@appium/types';
2
- import type { AndroidSettings } from 'appium-android-driver';
3
2
  import type { EmptyObject } from 'type-fest';
4
3
  import type { RelativeRect } from './commands/types';
5
4
  import type { Uiautomator2Constraints } from './constraints';
@@ -38,8 +37,8 @@ export interface Uiautomator2StartSessionOpts extends Uiautomator2DriverCaps, Ui
38
37
  }
39
38
  export interface Uiautomator2SessionCaps extends Uiautomator2ServerInfo, Uiautomator2SessionInfo, Uiautomator2DeviceInfo, Uiautomator2DeviceDetails {
40
39
  }
41
- export type Uiautomator2CreateResult = [string, Uiautomator2SessionCaps];
42
- export interface Uiautomator2Settings extends AndroidSettings {
40
+ export interface Uiautomator2Settings {
41
+ ignoreUnimportantViews: boolean;
43
42
  allowInvisibleElements: boolean;
44
43
  }
45
44
  //# sourceMappingURL=types.d.ts.map
package/build/lib/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAE3D,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAC;AAEzE,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAC;AAEzE,MAAM,MAAM,yBAAyB,GAAG,aAAa,CAAC,uBAAuB,CAAC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,KAAK,CAAC;IACzB,eAAe,EAAE,IAAI,CAAC;IACtB,iBAAiB,EAAE,IAAI,CAAC;IACxB,eAAe,EAAE,KAAK,CAAC;IACvB,wBAAwB,EAAE,IAAI,CAAC;IAC/B,sBAAsB,EAAE,KAAK,CAAC;IAC9B,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,MAAM,WAAW,4BACf,SAAQ,sBAAsB,EAC5B,sBAAsB;CAAG;AAE7B,MAAM,WAAW,uBACf,SAAQ,sBAAsB,EAC5B,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB;CAAG;AAEhC,MAAM,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAEzE,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,sBAAsB,EAAE,OAAO,CAAC;CACjC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAE3D,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAC;AAEzE,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAC;AAEzE,MAAM,MAAM,yBAAyB,GAAG,aAAa,CAAC,uBAAuB,CAAC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,KAAK,CAAC;IACzB,eAAe,EAAE,IAAI,CAAC;IACtB,iBAAiB,EAAE,IAAI,CAAC;IACxB,eAAe,EAAE,KAAK,CAAC;IACvB,wBAAwB,EAAE,IAAI,CAAC;IAC/B,sBAAsB,EAAE,KAAK,CAAC;IAC9B,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,MAAM,WAAW,4BACf,SAAQ,sBAAsB,EAC5B,sBAAsB;CAAG;AAE7B,MAAM,WAAW,uBACf,SAAQ,sBAAsB,EAC5B,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB;CAAG;AAEhC,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,OAAO,CAAC;IAChC,sBAAsB,EAAE,OAAO,CAAC;CACjC"}