appium-uiautomator2-driver 2.45.0 → 3.0.0

package/lib/commands/actions.js

@@ -42,6 +42,45 @@ export async function mobileUnscheduleAction(opts) {
   );
 }
 
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('@appium/types').StringRecord[]} actions
+ * @returns {Promise<void>}
+ */
+export async function performActions(actions) {
+  // This is mandatory, since Selenium API uses MOUSE as the default pointer type
+  const preprocessedActions = actions.map((action) =>
+    Object.assign(
+      {},
+      action,
+      action.type === 'pointer'
+        ? {
+            parameters: {
+              pointerType: 'touch',
+            },
+          }
+        : {}
+    )
+  );
+  this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, '  ')}`);
+  await this.uiautomator2.jwproxy.command(
+    '/actions',
+    'POST',
+    {
+      actions: preprocessedActions,
+    }
+  );
+}
+
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<void>}
+ */
+// eslint-disable-next-line require-await
+export async function releaseActions() {
+  this.log.info('On this platform, releaseActions is a no-op');
+}
+
 /**
  * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
  */

package/lib/commands/gestures.js

@@ -250,7 +250,7 @@ export async function mobileScroll(opts) {
     );
   }
   await this.uiautomator2.jwproxy.command(
-    '/touch/scroll',
+    '/gestures/scroll_to',
     'POST',
     {
       origin: toOrigin(elementId || element),

package/lib/driver.ts

@@ -42,6 +42,8 @@ import {
   mobileGetActionHistory,
   mobileScheduleAction,
   mobileUnscheduleAction,
+  performActions,
+  releaseActions,
 } from './commands/actions';
 import {
   getAlertText,
@@ -126,18 +128,6 @@ import {
   getScreenshot,
   getViewportScreenshot,
 } from './commands/screenshot';
-import {
-  doSwipe,
-  doDrag,
-  touchDown,
-  touchLongClick,
-  touchMove,
-  touchUp,
-  tap,
-  doPerformMultiAction,
-  performActions,
-  releaseActions,
-} from './commands/touch';
 import {
   getStatusBarHeight,
   getDevicePixelRatio,
@@ -222,8 +212,6 @@ const NO_PROXY: RouteMatcher[] = [
   ['POST', new RegExp('^/session/[^/]+/location')],
   ['POST', new RegExp('^/session/[^/]+/network_connection')],
   ['POST', new RegExp('^/session/[^/]+/timeouts')],
-  ['POST', new RegExp('^/session/[^/]+/touch/multi/perform')],
-  ['POST', new RegExp('^/session/[^/]+/touch/perform')],
   ['POST', new RegExp('^/session/[^/]+/url')],
 
   // MJSONWP commands
@@ -250,8 +238,6 @@ const CHROME_NO_PROXY: RouteMatcher[] = [
   ['POST', new RegExp('^/session/[^/]+/appium')],
   ['POST', new RegExp('^/session/[^/]+/context')],
   ['POST', new RegExp('^/session/[^/]+/orientation')],
-  ['POST', new RegExp('^/session/[^/]+/touch/multi/perform')],
-  ['POST', new RegExp('^/session/[^/]+/touch/perform')],
 
   // this is needed to make the mobile: commands working in web context
   ['POST', new RegExp('^/session/[^/]+/execute$')],
@@ -1011,6 +997,8 @@ class AndroidUiautomator2Driver
   mobileGetActionHistory = mobileGetActionHistory;
   mobileScheduleAction = mobileScheduleAction;
   mobileUnscheduleAction = mobileUnscheduleAction;
+  performActions = performActions;
+  releaseActions = releaseActions;
 
   getAlertText = getAlertText;
   mobileAcceptAlert = mobileAcceptAlert;
@@ -1083,17 +1071,6 @@ class AndroidUiautomator2Driver
   getScreenshot = getScreenshot;
   getViewportScreenshot = getViewportScreenshot;
 
-  doSwipe = doSwipe;
-  doDrag = doDrag;
-  touchDown = touchDown;
-  touchLongClick = touchLongClick;
-  touchMove = touchMove;
-  touchUp = touchUp;
-  tap = tap;
-  doPerformMultiAction = doPerformMultiAction;
-  performActions = performActions;
-  releaseActions = releaseActions;
-
   getStatusBarHeight = getStatusBarHeight;
   getDevicePixelRatio = getDevicePixelRatio;
   getDisplayDensity = getDisplayDensity;

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "appium-uiautomator2-driver",
-  "version": "2.45.0",
+  "version": "3.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-uiautomator2-driver",
-      "version": "2.45.0",
+      "version": "3.0.0",
       "license": "Apache-2.0",
       "dependencies": {
         "appium-adb": "^12.0.0",
-        "appium-android-driver": "^8.4.0",
+        "appium-android-driver": "^9.0.0",
         "appium-chromedriver": "^5.6.28",
-        "appium-uiautomator2-server": "^6.0.7",
+        "appium-uiautomator2-server": "^7.0.0",
         "asyncbox": "^3.0.0",
         "axios": "^1.6.5",
         "bluebird": "^3.5.1",
@@ -1073,9 +1073,9 @@
       }
     },
     "node_modules/appium-android-driver": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-8.4.0.tgz",
-      "integrity": "sha512-zzGszG1u3nMvSDaZbZKA2rEMFNT/CyWR4SkDRPEZa68rQYAjYzy2fkFbaceCuJdt4oVlch0Kb2033ePg4pVggQ==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.0.0.tgz",
+      "integrity": "sha512-AA1IRuG0BFVUPtXEV2YXvcP4QMNMV6WJb2uBPWban8y+i7C7ockMCfKxdGSEHO4c9/gNH+O5G0M7mhCdlvTwtQ==",
       "dependencies": {
         "@appium/support": "^4.2.0",
         "@colors/colors": "^1.6.0",
@@ -1131,9 +1131,9 @@
       }
     },
     "node_modules/appium-uiautomator2-server": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-6.0.8.tgz",
-      "integrity": "sha512-03JiJrzFhsHwB/xsVTt5Y+ktWo0mX5GB992zZmksOBg3ZZd6htAkq4V7oMMIIPnL1zg90RrdzFcO5NZ+df7SjA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-7.0.0.tgz",
+      "integrity": "sha512-1q4CT/9ryJL8etIAudUS/gtp8RCS02/X+3Xob2EC8FC56wtAPUlgxfzs6y7BN0/iGA4lKv1U6h9yL9dFge4wDg==",
       "engines": {
         "node": ">=14",
         "npm": ">=8"
@@ -1288,6 +1288,12 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/bare-events": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
+      "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+      "optional": true
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -3998,9 +4004,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="
     },
     "node_modules/spdy": {
       "version": "4.0.2",
@@ -4066,12 +4072,15 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.15.7",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.7.tgz",
-      "integrity": "sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==",
+      "version": "2.15.8",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.8.tgz",
+      "integrity": "sha512-6pwMeMY/SuISiRsuS8TeIrAzyFbG5gGPHFQsYjUr/pbBadaL1PCWmzKw+CHZSwainfvcF6Si6cVLq4XTEwswFQ==",
       "dependencies": {
         "fast-fifo": "^1.1.0",
         "queue-tick": "^1.0.1"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
       }
     },
     "node_modules/string_decoder": {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.45.0",
+  "version": "3.0.0",
   "bugs": {
     "url": "https://github.com/appium/appium-uiautomator2-driver/issues"
   },
@@ -57,9 +57,9 @@
   },
   "dependencies": {
     "appium-adb": "^12.0.0",
-    "appium-android-driver": "^8.4.0",
+    "appium-android-driver": "^9.0.0",
     "appium-chromedriver": "^5.6.28",
-    "appium-uiautomator2-server": "^6.0.7",
+    "appium-uiautomator2-server": "^7.0.0",
     "asyncbox": "^3.0.0",
     "axios": "^1.6.5",
     "bluebird": "^3.5.1",

package/build/lib/commands/touch.d.ts

@@ -1,83 +0,0 @@
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {import('appium-android-driver').SwipeOpts} swipeOpts
- * @returns {Promise<void>}
- */
-export function doSwipe(this: import("../driver").AndroidUiautomator2Driver, swipeOpts: import('appium-android-driver').SwipeOpts): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {import('appium-android-driver').DragOpts} dragOpts
- * @returns {Promise<void>}
- */
-export function doDrag(this: import("../driver").AndroidUiautomator2Driver, dragOpts: import('appium-android-driver').DragOpts): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @param {number} duration
- * @returns {Promise<void>}
- */
-export function touchLongClick(this: import("../driver").AndroidUiautomator2Driver, element: string, x: number, y: number, duration: number): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-export function touchDown(this: import("../driver").AndroidUiautomator2Driver, element: string, x: number, y: number): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-export function touchUp(this: import("../driver").AndroidUiautomator2Driver, element: string, x: number, y: number): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-export function touchMove(this: import("../driver").AndroidUiautomator2Driver, element: string, x: number, y: number): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string?} [elementId=null]
- * @param {number?} [x=null]
- * @param {number?} [y=null]
- * @param {number} [count=1]
- * @returns {Promise<void>}
- */
-export function tap(this: import("../driver").AndroidUiautomator2Driver, elementId?: string | null | undefined, x?: number | null | undefined, y?: number | null | undefined, count?: number | undefined): Promise<void>;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} elementId
- * @param {import('appium-android-driver').TouchState[]} states
- * @returns {Promise<void>}
- */
-export function doPerformMultiAction(this: import("../driver").AndroidUiautomator2Driver, elementId: string, states: import('appium-android-driver').TouchState[]): Promise<void>;
-/**
- * @this {AndroidUiautomator2Driver}
- * @param {import('@appium/types').StringRecord} actions
- * @returns {Promise<void>}
- */
-export function performActions(this: import("../driver").AndroidUiautomator2Driver, actions: import('@appium/types').StringRecord): Promise<void>;
-/**
- * @this {AndroidUiautomator2Driver}
- * @returns {Promise<void>}
- */
-export function releaseActions(this: import("../driver").AndroidUiautomator2Driver): Promise<void>;
-export type UiAutomator2Server = import('../uiautomator2').UiAutomator2Server;
-export type AndroidUiautomator2Driver = import('../driver').AndroidUiautomator2Driver;
-//# sourceMappingURL=touch.d.ts.map

package/build/lib/commands/touch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"touch.d.ts","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wFAHW,OAAO,uBAAuB,EAAE,SAAS,GACvC,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,sFAHW,OAAO,uBAAuB,EAAE,QAAQ,GACtC,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;;;;GAQG;AACH,6FANW,MAAM,KACN,MAAM,KACN,MAAM,YACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CASzB;AAED;;;;;;;GAOG;AACH,wFALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CASzB;AAED;;;;;;;GAOG;AACH,sFALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CASzB;AAED;;;;;;;GAOG;AACH,wFALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CASzB;AAED;;;;;;;;GAQG;AACH,2MAFa,QAAQ,IAAI,CAAC,CA4BzB;AAED;;;;;;GAMG;AACH,qGAJW,MAAM,UACN,OAAO,uBAAuB,EAAE,UAAU,EAAE,GAC1C,QAAQ,IAAI,CAAC,CAyBzB;AAED;;;;GAIG;AACH,6FAHW,OAAO,eAAe,EAAE,YAAY,GAClC,QAAQ,IAAI,CAAC,CA0BzB;AAED;;;GAGG;AAEH,qFAHa,QAAQ,IAAI,CAAC,CAKzB;iCAGY,OAAO,iBAAiB,EAAE,kBAAkB;wCAC5C,OAAO,WAAW,EAAE,yBAAyB"}

package/build/lib/commands/touch.js

@@ -1,167 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.releaseActions = exports.performActions = exports.doPerformMultiAction = exports.tap = exports.touchMove = exports.touchUp = exports.touchDown = exports.touchLongClick = exports.doDrag = exports.doSwipe = void 0;
-const support_1 = require("appium/support");
-const driver_1 = require("appium/driver");
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {import('appium-android-driver').SwipeOpts} swipeOpts
- * @returns {Promise<void>}
- */
-async function doSwipe(swipeOpts) {
-    await this.uiautomator2.jwproxy.command(`/touch/perform`, 'POST', swipeOpts);
-}
-exports.doSwipe = doSwipe;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {import('appium-android-driver').DragOpts} dragOpts
- * @returns {Promise<void>}
- */
-async function doDrag(dragOpts) {
-    await this.uiautomator2.jwproxy.command(`/touch/drag`, 'POST', dragOpts);
-}
-exports.doDrag = doDrag;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @param {number} duration
- * @returns {Promise<void>}
- */
-async function touchLongClick(element, x, y, duration) {
-    let params = { element, x, y, duration };
-    await this.uiautomator2.jwproxy.command(`/touch/longclick`, 'POST', { params });
-}
-exports.touchLongClick = touchLongClick;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-async function touchDown(element, x, y) {
-    let params = { element, x, y };
-    await this.uiautomator2.jwproxy.command(`/touch/down`, 'POST', { params });
-}
-exports.touchDown = touchDown;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-async function touchUp(element, x, y) {
-    let params = { element, x, y };
-    await this.uiautomator2.jwproxy.command(`/touch/up`, 'POST', { params });
-}
-exports.touchUp = touchUp;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} element
- * @param {number} x
- * @param {number} y
- * @returns {Promise<void>}
- */
-async function touchMove(element, x, y) {
-    let params = { element, x, y };
-    await this.uiautomator2.jwproxy.command(`/touch/move`, 'POST', { params });
-}
-exports.touchMove = touchMove;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string?} [elementId=null]
- * @param {number?} [x=null]
- * @param {number?} [y=null]
- * @param {number} [count=1]
- * @returns {Promise<void>}
- */
-async function tap(elementId = null, x = null, y = null, count = 1) {
-    const areCoordinatesDefined = support_1.util.hasValue(x) && support_1.util.hasValue(y);
-    if (!support_1.util.hasValue(elementId) && !areCoordinatesDefined) {
-        throw new Error(`Either element id to tap or both absolute coordinates should be defined`);
-    }
-    for (let i = 0; i < count; i++) {
-        if (support_1.util.hasValue(elementId) && !areCoordinatesDefined) {
-            // we are either tapping on the default location of the element
-            // or an offset from the top left corner
-            await this.uiautomator2.jwproxy.command(`/element/${elementId}/click`, 'POST');
-        }
-        else {
-            await this.uiautomator2.jwproxy.command(`/appium/tap`, 'POST', {
-                x,
-                y,
-                [driver_1.W3C_ELEMENT_KEY]: elementId,
-            });
-        }
-    }
-}
-exports.tap = tap;
-/**
- * @deprecated
- * @this {AndroidUiautomator2Driver}
- * @param {string} elementId
- * @param {import('appium-android-driver').TouchState[]} states
- * @returns {Promise<void>}
- */
-async function doPerformMultiAction(elementId, states) {
-    let opts;
-    if (elementId) {
-        opts = {
-            elementId,
-            actions: states,
-        };
-        await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
-    }
-    else {
-        opts = {
-            actions: states,
-        };
-        await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
-    }
-}
-exports.doPerformMultiAction = doPerformMultiAction;
-/**
- * @this {AndroidUiautomator2Driver}
- * @param {import('@appium/types').StringRecord} actions
- * @returns {Promise<void>}
- */
-async function performActions(actions) {
-    this.log.debug(`Received the following W3C actions: ${JSON.stringify(actions, null, '  ')}`);
-    // This is mandatory, since Selenium API uses MOUSE as the default pointer type
-    const preprocessedActions = actions.map((action) => Object.assign({}, action, action.type === 'pointer'
-        ? {
-            parameters: {
-                pointerType: 'touch',
-            },
-        }
-        : {}));
-    this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, '  ')}`);
-    await this.uiautomator2.jwproxy.command('/actions', 'POST', {
-        actions: preprocessedActions,
-    });
-}
-exports.performActions = performActions;
-/**
- * @this {AndroidUiautomator2Driver}
- * @returns {Promise<void>}
- */
-// eslint-disable-next-line require-await
-async function releaseActions() {
-    this.log.info('On this platform, releaseActions is a no-op');
-}
-exports.releaseActions = releaseActions;
-/**
- * @typedef {import('../uiautomator2').UiAutomator2Server} UiAutomator2Server
- * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
- */
-//# sourceMappingURL=touch.js.map

package/build/lib/commands/touch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"touch.js","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":"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"}