appium-uiautomator2-driver 2.31.4 → 2.32.1

package/lib/commands/actions.js

@@ -8,7 +8,7 @@ import {mixin} from './mixins';
  */
 const ActionsMixin = {
   async pressKeyCode(keycode, metastate, flags) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/device/press_keycode',
       'POST',
       {
@@ -20,7 +20,7 @@ const ActionsMixin = {
   },
 
   async longPressKeyCode(keycode, metastate, flags) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/device/long_press_keycode',
       'POST',
       {
@@ -32,7 +32,7 @@ const ActionsMixin = {
   },
 
   async doSwipe(swipeOpts) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/perform`,
       'POST',
       swipeOpts
@@ -40,7 +40,7 @@ const ActionsMixin = {
   },
 
   async doDrag(dragOpts) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/drag`,
       'POST',
       dragOpts
@@ -49,7 +49,7 @@ const ActionsMixin = {
 
   async getOrientation() {
     return /** @type {import('@appium/types').Orientation} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/orientation`,
         'GET',
         {}
@@ -59,7 +59,7 @@ const ActionsMixin = {
 
   async setOrientation(orientation) {
     orientation = /** @type {import('@appium/types').Orientation} */ (orientation.toUpperCase());
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/orientation`,
       'POST',
       {orientation}
@@ -69,7 +69,7 @@ const ActionsMixin = {
   async mobilePressKey(opts) {
     const {keycode, metastate, flags, isLongPress = false} = opts;
 
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/appium/device/${isLongPress ? 'long_' : ''}press_keycode`,
       'POST',
       {
@@ -85,7 +85,7 @@ const ActionsMixin = {
    * @param {Record<string, any>} opts
    */
   async mobileScheduleAction(opts = {}) {
-    return await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    return await this.uiautomator2.jwproxy.command(
       '/appium/schedule_action',
       'POST',
       opts
@@ -97,7 +97,7 @@ const ActionsMixin = {
    */
   async mobileGetActionHistory(opts) {
     return /** @type {import('./types').ActionResult} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/appium/action_history',
         'POST',
         opts ?? {}
@@ -109,7 +109,7 @@ const ActionsMixin = {
    * @see https://github.com/appium/appium-uiautomator2-driver/blob/master/docs/scheduled-actions.md#mobile-unscheduleaction
    */
   async mobileUnscheduleAction(opts) {
-    return await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    return await this.uiautomator2.jwproxy.command(
       '/appium/unschedule_action',
       'POST',
       opts ?? {}

package/lib/commands/alert.js

@@ -9,7 +9,7 @@ import {mixin} from './mixins';
 const AlertMixin = {
   async getAlertText() {
     return String(
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/alert/text',
         'GET',
         {}
@@ -17,7 +17,7 @@ const AlertMixin = {
     );
   },
   async mobileAcceptAlert(opts = {}) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/alert/accept',
       'POST',
       opts
@@ -27,7 +27,7 @@ const AlertMixin = {
     await this.mobileAcceptAlert();
   },
   async mobileDismissAlert(opts = {}) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/alert/dismiss',
       'POST',
       opts

package/lib/commands/app-strings.js

@@ -10,9 +10,8 @@ import {fs, tempDir} from 'appium/support';
  */
 const AppStringsMixin = {
   async getStrings(language) {
-    const adb = /** @type {ADB} */ (this.adb);
     if (!language) {
-      language = await adb.getDeviceLanguage();
+      language = await this.adb.getDeviceLanguage();
       this.log.info(`No language specified, returning strings for: ${language}`);
     }
 
@@ -45,7 +44,7 @@ const AppStringsMixin = {
     try {
       if (!app) {
         try {
-          app = await adb.pullApk(/** @type {string} */ (this.opts.appPackage), tmpRoot);
+          app = await this.adb.pullApk(/** @type {string} */ (this.opts.appPackage), tmpRoot);
         } catch (err) {
           this.log.errorAndThrow(
             `Failed to pull an apk from '${this.opts.appPackage}'. Original error: ${
@@ -62,7 +61,7 @@ const AppStringsMixin = {
       }
 
       try {
-        const {apkStrings} = await adb.extractStringsFromApk(app, language, tmpRoot);
+        const {apkStrings} = await this.adb.extractStringsFromApk(app, language, tmpRoot);
         this.apkStrings[language] = apkStrings;
         return preprocessStringsMap(apkStrings);
       } catch (err) {

package/lib/commands/element.js

@@ -22,7 +22,7 @@ function toBool(s) {
 const ElementMixin = {
   async active() {
     return /** @type {import('@appium/types').Element} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/element/active',
         'GET'
       )
@@ -30,7 +30,7 @@ const ElementMixin = {
   },
   async getAttribute(attribute, elementId) {
     return String(
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/attribute/${attribute}`,
         'GET',
         {}
@@ -48,7 +48,7 @@ const ElementMixin = {
   },
   async getName(elementId) {
     return /** @type {string} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/name`,
         'GET',
         {}
@@ -57,7 +57,7 @@ const ElementMixin = {
   },
   async getLocation(elementId) {
     return /** @type {import('@appium/types').Position} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/location`,
         'GET',
         {}
@@ -66,7 +66,7 @@ const ElementMixin = {
   },
   async getSize(elementId) {
     return /** @type {import('@appium/types').Size} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/size`,
         'GET',
         {}
@@ -75,7 +75,7 @@ const ElementMixin = {
   },
   async touchLongClick(element, x, y, duration) {
     let params = {element, x, y, duration};
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/longclick`,
       'POST',
       {params}
@@ -83,7 +83,7 @@ const ElementMixin = {
   },
   async touchDown(element, x, y) {
     let params = {element, x, y};
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/down`,
       'POST',
       {params}
@@ -91,7 +91,7 @@ const ElementMixin = {
   },
   async touchUp(element, x, y) {
     let params = {element, x, y};
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/up`,
       'POST',
       {params}
@@ -99,21 +99,21 @@ const ElementMixin = {
   },
   async touchMove(element, x, y) {
     let params = {element, x, y};
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/touch/move`,
       'POST',
       {params}
     );
   },
   async doSetElementValue(params) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/element/${params.elementId}/value`,
       'POST',
       params
     );
   },
   async setValueImmediate(keys, elementId) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/element/${elementId}/value`,
       'POST',
       {
@@ -125,7 +125,7 @@ const ElementMixin = {
   },
   async getText(elementId) {
     return String(
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/text`,
         'GET',
         {}
@@ -133,7 +133,7 @@ const ElementMixin = {
     );
   },
   async click(element) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/element/${element}/click`,
       'POST',
       {element}
@@ -141,7 +141,7 @@ const ElementMixin = {
   },
   async getElementScreenshot(element) {
     return String(
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${element}/screenshot`,
         'GET',
         {}
@@ -159,12 +159,12 @@ const ElementMixin = {
       if (util.hasValue(elementId) && !areCoordinatesDefined) {
         // we are either tapping on the default location of the element
         // or an offset from the top left corner
-        await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+        await this.uiautomator2.jwproxy.command(
           `/element/${elementId}/click`,
           'POST'
         );
       } else {
-        await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+        await this.uiautomator2.jwproxy.command(
           `/appium/tap`,
           'POST',
           {
@@ -178,7 +178,7 @@ const ElementMixin = {
   },
 
   async clear(elementId) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/element/${elementId}/clear`,
       'POST',
       {
@@ -208,7 +208,7 @@ const ElementMixin = {
       );
     }
     return /** @type {import('@appium/types').Rect} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         `/element/${elementId}/rect`,
         'GET'
       )
@@ -223,7 +223,7 @@ const ElementMixin = {
    */
   async mobileReplaceElementValue(opts) {
     const {elementId, text} = requireArgs(['elementId', 'text'], opts);
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/element/${elementId}/value`,
       'POST',
       {

package/lib/commands/general.js

@@ -55,7 +55,7 @@ function toExecuteMethodName(script) {
 const GeneralMixin = {
   async getPageSource() {
     return String(
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/source',
         'GET',
         {}
@@ -64,20 +64,19 @@ const GeneralMixin = {
   },
 
   async getClipboard() {
-    const adb = /** @type {ADB} */ (this.adb);
     return String(
-      (await adb.getApiLevel()) < 29
-        ? await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      (await this.adb.getApiLevel()) < 29
+        ? await this.uiautomator2.jwproxy.command(
             '/appium/device/get_clipboard',
             'POST',
             {}
           )
-        : await adb.getClipboard()
+        : await this.adb.getClipboard()
     );
   },
 
   async doSendKeys(params) {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/keys',
       'POST',
       params
@@ -86,16 +85,16 @@ const GeneralMixin = {
 
   async keyevent(keycode, metastate) {
     this.log.debug(`Ignoring metastate ${metastate}`);
-    await /** @type {ADB} */ (this.adb).keyevent(keycode);
+    await this.adb.keyevent(keycode);
   },
 
   async back() {
-    await /** @type {ADB} */ (this.adb).keyevent(4);
+    await this.adb.keyevent(4);
   },
 
   async getDisplayDensity() {
     return /** @type {number} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/appium/device/display_density',
         'GET',
         {}
@@ -105,7 +104,7 @@ const GeneralMixin = {
 
   async getWindowSize() {
     return /** @type {import('@appium/types').Size} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/window/current/size',
         'GET',
         {}
@@ -191,7 +190,7 @@ const GeneralMixin = {
   },
 
   async setUrl(url) {
-    await /** @type {ADB} */ (this.adb).startUri(url, /** @type {string} */ (this.opts.appPackage));
+    await this.adb.startUri(url, /** @type {string} */ (this.opts.appPackage));
   },
 
   /**
@@ -199,11 +198,11 @@ const GeneralMixin = {
    */
   async mobileDeepLink(opts) {
     const {url, package: pkg, waitForLaunch} = opts;
-    return await /** @type {ADB} */ (this.adb).startUri(url, pkg, {waitForLaunch});
+    return await this.adb.startUri(url, pkg, {waitForLaunch});
   },
 
   async openNotifications() {
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/device/open_notifications',
       'POST',
       {}
@@ -213,11 +212,11 @@ const GeneralMixin = {
   // Stop proxying to any Chromedriver and redirect to uiautomator2
   suspendChromedriverProxy() {
     this.chromedriver = undefined;
-    this.proxyReqRes = /** @type {UiAutomator2Server} */ (this.uiautomator2).proxyReqRes.bind(
+    this.proxyReqRes = this.uiautomator2.proxyReqRes.bind(
       this.uiautomator2
     );
     this.proxyCommand = /** @type {typeof this.proxyCommand} */ (
-      /** @type {UiAutomator2Server} */ (this.uiautomator2).proxyCommand.bind(this.uiautomator2)
+      this.uiautomator2.proxyCommand.bind(this.uiautomator2)
     );
     this.jwpProxyActive = true;
   },
@@ -228,7 +227,7 @@ const GeneralMixin = {
    */
   async mobileGetDeviceInfo() {
     return /** @type {StringRecord} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/appium/device/info',
         'GET'
       )
@@ -249,7 +248,7 @@ const GeneralMixin = {
       this.log.errorAndThrow(`The 'text' argument is mandatory`);
       throw new Error(); // unreachable
     }
-    return await /** @type {ADB} */ (this.adb).typeUnicode(String(text));
+    return await this.adb.typeUnicode(String(text));
   },
 
   /**
@@ -264,7 +263,7 @@ const GeneralMixin = {
     const apks = await B.all(
       opts.apks.map((app) => this.helpers.configureApp(app, [APK_EXTENSION]))
     );
-    await /** @type {ADB} */ (this.adb).installMultipleApks(apks, opts.options);
+    await this.adb.installMultipleApks(apks, opts.options);
   },
 
   /**

package/lib/commands/gestures.js

@@ -49,7 +49,7 @@ const GesturesMixin = {
    */
   async mobileClickGesture(opts = {}) {
     const {elementId, x, y} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/click',
       'POST',
       {
@@ -66,7 +66,7 @@ const GesturesMixin = {
    */
   async mobileLongClickGesture(opts = {}) {
     const {elementId, x, y, duration} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/long_click',
       'POST',
       {
@@ -84,7 +84,7 @@ const GesturesMixin = {
    */
   async mobileDoubleClickGesture(opts = {}) {
     const {elementId, x, y} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/double_click',
       'POST',
       {
@@ -101,7 +101,7 @@ const GesturesMixin = {
    */
   async mobileDragGesture(opts) {
     const {elementId, startX, startY, endX, endY, speed} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/drag',
       'POST',
       {
@@ -122,7 +122,7 @@ const GesturesMixin = {
   async mobileFlingGesture(opts) {
     const {elementId, left, top, width, height, direction, speed} = opts;
     return /** @type {boolean} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/appium/gestures/fling',
         'POST',
         {
@@ -142,7 +142,7 @@ const GesturesMixin = {
    */
   async mobilePinchCloseGesture(opts) {
     const {elementId, left, top, width, height, percent, speed} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/pinch_close',
       'POST',
       {
@@ -161,7 +161,7 @@ const GesturesMixin = {
    */
   async mobilePinchOpenGesture(opts) {
     const {elementId, left, top, width, height, percent, speed} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/pinch_open',
       'POST',
       {
@@ -180,7 +180,7 @@ const GesturesMixin = {
    */
   async mobileSwipeGesture(opts) {
     const {elementId, left, top, width, height, direction, percent, speed} = opts;
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/appium/gestures/swipe',
       'POST',
       {
@@ -202,7 +202,7 @@ const GesturesMixin = {
   async mobileScrollGesture(opts) {
     const {elementId, left, top, width, height, direction, percent, speed} = opts;
     return /** @type {boolean} */ (
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/appium/gestures/scroll',
         'POST',
         {
@@ -233,7 +233,7 @@ const GesturesMixin = {
         `Both elementId and elementToId arguments must be provided`
       );
     }
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       `/appium/element/${util.unwrapElement(elementId)}/scroll_to/${util.unwrapElement(
         elementToId
       )}`,
@@ -265,7 +265,7 @@ const GesturesMixin = {
         `Both strategy and selector arguments must be provided`
       );
     }
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/touch/scroll',
       'POST',
       {

package/lib/commands/touch.js

@@ -15,7 +15,7 @@ const TouchMixin = {
         actions: states,
       };
 
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/touch/multi/perform',
         'POST',
         opts
@@ -24,7 +24,7 @@ const TouchMixin = {
       opts = {
         actions: states,
       };
-      await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+      await this.uiautomator2.jwproxy.command(
         '/touch/multi/perform',
         'POST',
         opts
@@ -49,7 +49,7 @@ const TouchMixin = {
       )
     );
     this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, '  ')}`);
-    await /** @type {UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(
+    await this.uiautomator2.jwproxy.command(
       '/actions',
       'POST',
       {