appium-xcuitest-driver 5.15.0 → 5.16.0

package/build/lib/ios-deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios-deploy.d.ts","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":";AAsBA;IACE,uBAEC;IADC,UAAgB;IAGlB,qCAOC;IAED,wCAEC;IAED;;;;;;OAMG;IACH,aALW,MAAM,2CAEN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAoE/C;IAED,wFA8BC;IAED;;;;;OAKG;IACH,gBAJW,MAAM,WACN,MAAM,YACN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAI/C;IAED;;;;;;;OAOG;IACH,yBAJW,MAAM,GACL,QAAQ,OAAO,CAAC,CAK3B;IAED;;;;;;;;;;;OAWG;IACH,uBARW,MAAM,qBACN,MAAM,GAAC,MAAM,EAAE,GAAC,SAAS,GAIvB,QAAQ,MAAO,SAAS,CAAC,CAgBrC;IAED,oEAiFC;IAED;;;;;OAKG;IACH,kDALW,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;IAED,mCAEC;CACF"}
+{"version":3,"file":"ios-deploy.d.ts","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":";AAsBA;IACE,uBAEC;IADC,UAAgB;IAGlB,qCAOC;IAED,wCAEC;IAED;;;;;;OAMG;IACH,aALW,MAAM,2CAEN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAoE/C;IAED,wFA8BC;IAED;;;;;OAKG;IACH,gBAJW,MAAM,WACN,MAAM,YACN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAI/C;IAED;;;;;;;OAOG;IACH,yBAJW,MAAM,GACL,QAAQ,OAAO,CAAC,CAK3B;IAED;;;;;;;;;;;OAWG;IACH,uBARW,MAAM,qBACN,MAAM,GAAC,MAAM,EAAE,GAAC,SAAS,GAIvB,QAAQ,MAAO,SAAS,CAAC,CAgBrC;IAED,oEAwDC;IAED;;;;;OAKG;IACH,kDALW,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;IAED,mCAEC;CACF"}

package/build/lib/ios-deploy.js

@@ -12,7 +12,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const teen_process_1 = require("teen_process");
 const app_utils_1 = require("./app-utils");
 const ios_fs_helpers_1 = require("./ios-fs-helpers");
-const xcrun_1 = require("./xcrun");
+const devicectl_1 = require("./devicectl");
 const APPLICATION_INSTALLED_NOTIFICATION = 'com.apple.mobile.application_installed';
 const INSTALLATION_STAGING_DIR = 'PublicStaging';
 const APPLICATION_NOTIFICATION_TIMEOUT_MS = 30 * 1000;
@@ -196,39 +196,15 @@ class IOSDeploy {
             // so hre uses the 'devicectl' only for iOS 17+.
             if (support_1.util.compareVersions(platformVersion, '>=', '17.0')) {
                 logger_1.default.debug(`Calling devicectl to kill the process`);
-                // FIXME: replace `devicectl` command with a wrapper later
-                // or remove after implementing appium-ios-device for iOS 17+.
-                const xcrunBinnaryPath = await (0, xcrun_1.requireXcrun)();
-                const { stdout } = await (0, teen_process_1.exec)(xcrunBinnaryPath, [
-                    'devicectl',
-                    'device',
-                    'info',
-                    'processes',
-                    `--device`, this.udid
-                ]);
-                // Each line has spaces. devicectl has JSON output option, but it writes it to a file only.
-                // Here parse the standard output directly.
-                // e.g.:
-                // 823   /private/var/containers/Bundle/Application/8E748312-8CBE-4C13-8295-C2EF3ED2C0C1/WebDriverAgentRunner-Runner.app/WebDriverAgentRunner-Runner
-                // 824   /Applications/MobileSafari.app/MobileSafari
-                // 825   /usr/libexec/debugserver
-                const executableLine = stdout.split('\n').find((line) => line.trim().endsWith(executableName));
-                if (!executableLine) {
+                const devicectl = new devicectl_1.Devicectl(this.udid, logger_1.default);
+                const pids = (await devicectl.listProcesses())
+                    .filter(({ executable }) => executable.endsWith(`/${executableName}`))
+                    .map(({ processIdentifier }) => processIdentifier);
+                if (lodash_1.default.isEmpty(pids)) {
                     logger_1.default.info(`The process of the bundle id '${bundleId}' was not running`);
                     return false;
                 }
-                await (0, teen_process_1.exec)(xcrunBinnaryPath, [
-                    'devicectl',
-                    'device',
-                    'process',
-                    'signal',
-                    '-s', `2`,
-                    // e.g.
-                    // '824   /Applications/MobileSafari.app/MobileSafari              '
-                    // ' 999   /Applications/MobileSafari.app/MobileSafari              '  (can include spaces in the top)
-                    '-p', `${executableLine.trim().split(/\s+/)[0]}`,
-                    `--device`, this.udid
-                ]);
+                await devicectl.sendSignalToProcess(pids[0], 2);
             }
             else {
                 instrumentService = await appium_ios_device_1.services.startInstrumentService(this.udid);

package/build/lib/ios-deploy.js.map

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

package/lib/commands/gesture.js

@@ -4,37 +4,6 @@ import _ from 'lodash';
 
 const SUPPORTED_GESTURE_DIRECTIONS = ['up', 'down', 'left', 'right'];
 
-/**
- * @param {any} [opts]
- * @returns {string|undefined}
- */
-function toElementId(opts) {
-  if (_.isUndefined(opts)) {
-    return;
-  }
-  if (_.isString(opts) || _.isNumber(opts)) {
-    return String(opts);
-  }
-  if ('elementId' in opts || 'element' in opts) {
-    return util.unwrapElement(opts);
-  }
-}
-
-/**
- *
- * @param {XCUITestDriver} driver
- * @param {Element|string} [elementId]
- * @returns {Promise<string>}
- */
-async function toElementOrApplicationId(driver, elementId) {
-  if (!_.isUndefined(elementId)) {
-    return util.unwrapElement(elementId);
-  }
-  return util.unwrapElement(
-    await driver.findNativeElementOrElements(`class name`, `XCUIElementTypeApplication`, false),
-  );
-}
-
 /**
  * Converts the given value to a float number.
  *
@@ -43,7 +12,7 @@ async function toElementOrApplicationId(driver, elementId) {
  * @param {string} paramName
  * @returns {number}
  */
-function asFloat(value, paramName) {
+function requireFloat(value, paramName) {
   const num = parseFloat(String(value));
   if (Number.isNaN(num)) {
     throw new errors.InvalidArgumentError(
@@ -53,24 +22,6 @@ function asFloat(value, paramName) {
   return num;
 }
 
-/**
- * Converts the given value to an integer number.
- *
- * @throws If `value` is `NaN`
- * @param {any} value
- * @param {string} paramName
- * @returns {number}
- */
-function asInt(value, paramName) {
-  const num = parseInt(String(value), 10);
-  if (Number.isNaN(num)) {
-    throw new errors.InvalidArgumentError(
-      `"${paramName}" parameter should be a valid integer. "${value}" is given instead`,
-    );
-  }
-  return num;
-}
-
 /**
  *
  * @param {any[]} gestures
@@ -327,8 +278,8 @@ const helpers = {
     if (!_.isNil(distance)) {
       params.distance = distance;
     }
-    elementId = await toElementOrApplicationId(this, elementId);
-    return await this.proxyCommand(`/wda/element/${elementId}/scroll`, 'POST', params);
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/scroll` : '/wda/scroll';
+    return await this.proxyCommand(endpoint, 'POST', params);
   },
   /**
    * @param {import('./types').Direction} direction
@@ -346,8 +297,8 @@ const helpers = {
     if (!_.isNil(velocity)) {
       params.velocity = velocity;
     }
-    elementId = await toElementOrApplicationId(this, elementId);
-    return await this.proxyCommand(`/wda/element/${elementId}/swipe`, 'POST', params);
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/swipe` : '/wda/swipe';
+    await this.proxyCommand(endpoint, 'POST', params);
   },
   /**
    * Performs a pinch gesture on the given element or on the Application element.
@@ -366,18 +317,18 @@ const helpers = {
    */
   async mobilePinch(scale, velocity, elementId) {
     const params = {
-      scale: asFloat(scale, 'scale'),
-      velocity: asFloat(velocity, 'velocity'),
+      scale: requireFloat(scale, 'scale'),
+      velocity: requireFloat(velocity, 'velocity'),
     };
-    elementId = await toElementOrApplicationId(this, elementId);
-    return await this.proxyCommand(`/wda/element/${elementId}/pinch`, 'POST', params);
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/pinch` : '/wda/pinch';
+    await this.proxyCommand(endpoint, 'POST', params);
   },
   /**
    * Performs double tap gesture on the given element or on the screen.
    *
-   * @param {Element|string} [elementId] - The internal element identifier (as hexadecimal hash string) to double tap on. This is required if `x` and `y` are not provided.
-   * @param {number} [x] - The _x_ coordinate (float value) to double tap on. This is required if `elementId` is not provided.
-   * @param {number} [y] - The _y_ coordinate (float value) to double tap on. This is required if `elementId` is not provided.
+   * @param {Element|string} [elementId] - The internal element identifier (as hexadecimal hash string) to double tap on. The Application element will be used if this parameter is not provided.
+   * @param {number} [x] - The _x_ coordinate (float value) to double tap on.
+   * @param {number} [y] - The _y_ coordinate (float value) to double tap on.
    * @returns {Promise<void>}
    * @this {XCUITestDriver}
    * @example
@@ -387,16 +338,8 @@ const helpers = {
    * ```
    */
   async mobileDoubleTap(elementId, x, y) {
-    if (elementId) {
-      // Double tap element
-      return await this.proxyCommand(`/wda/element/${elementId}/doubleTap`, 'POST');
-    }
-    // Double tap coordinates
-    const params = {
-      x: asFloat(x, 'x'),
-      y: asFloat(y, 'y'),
-    };
-    return await this.proxyCommand('/wda/doubleTap', 'POST', params);
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/doubleTap` : '/wda/doubleTap';
+    await this.proxyCommand(endpoint, 'POST', {x, y});
   },
   /**
    * Performs two finger tap gesture on the given element or on the application element.
@@ -413,16 +356,16 @@ const helpers = {
    * ```
    */
   async mobileTwoFingerTap(elementId) {
-    elementId = await toElementOrApplicationId(this, elementId);
-    return await this.proxyCommand(`/wda/element/${elementId}/twoFingerTap`, 'POST');
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/twoFingerTap` : '/wda/twoFingerTap';
+    await this.proxyCommand(endpoint, 'POST');
   },
   /**
    * Performs a "long press" gesture on the given element or on the screen.
    *
    * @param {number} duration - The duration (in seconds) of the gesture.
-   * @param {number} [y] - The _y_ coordinate (float value) to double tap on. This is required if `elementId` is not provided.
-   * @param {number} [x] - The _x_ coordinate (float value) to double tap on. This is required if `elementId` is not provided.
-   * @param {Element|string} [elementId] - The internal element identifier (as hexadecimal hash string) to double tap on. This is required if `x` and `y` are not provided.
+   * @param {number} [y] - The _y_ coordinate (float value) to hold on.
+   * @param {number} [x] - The _x_ coordinate (float value) to hold on.
+   * @param {Element|string} [elementId] - The internal element identifier (as hexadecimal hash string) to double tap on.  The Application element will be used if this parameter is not provided.
    * @this {XCUITestDriver}
    * @see https://developer.apple.com/documentation/xctest/xcuielement/1618663-pressforduration?language=objc
    * @example
@@ -434,33 +377,24 @@ const helpers = {
    * ```
    */
   async mobileTouchAndHold(duration, x, y, elementId) {
-    const params = {
-      duration: asFloat(duration, 'duration'),
-    };
-    if (elementId) {
-      // Long tap element
-      return await this.proxyCommand(`/wda/element/${elementId}/touchAndHold`, 'POST', params);
-    }
-    // Long tap coordinates
-    params.x = asFloat(x, 'x');
-    params.y = asFloat(y, 'y');
-    return await this.proxyCommand('/wda/touchAndHold', 'POST', params);
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/touchAndHold` : '/wda/touchAndHold';
+    await this.proxyCommand(endpoint, 'POST', {
+      duration: requireFloat(duration, 'duration'),
+      x, y,
+    });
   },
   /**
    * Performs tap gesture by coordinates on the given element or on the screen.
    *
    * @param {number} x - The _x_ coordinate (float value) to tap on. If `elementId` is provided, this is computed relative to the element; otherwise it is computed relative to the active Application element.
    * @param {number} y - The _y_ coordinate (float value) to tap on. If `elementId` is provided, this is computed relative to the element; otherwise it is computed relative to the active Application element.
-   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to tap on.
+   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to tap on.  The Application element will be used if this parameter is not provided.
    * @this {XCUITestDriver}
    * @returns {Promise<void>}
    */
-  async mobileTap(x, y, elementId = '0') {
-    const params = {
-      x: asFloat(x, 'x'),
-      y: asFloat(y, 'y'),
-    };
-    return await this.proxyCommand(`/wda/tap/${elementId}`, 'POST', params);
+  async mobileTap(x, y, elementId) {
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/tap` : '/wda/tap';
+    await this.proxyCommand(endpoint, 'POST', {x, y});
   },
   /**
    * Performs drag and drop gesture by coordinates on the given element or on the screen.
@@ -489,16 +423,15 @@ const helpers = {
    */
   async mobileDragFromToForDuration(duration, fromX, fromY, toX, toY, elementId) {
     const params = {
-      duration: asFloat(duration, 'duration'),
-      fromX: asFloat(fromX, 'fromX'),
-      fromY: asFloat(fromY, 'fromY'),
-      toX: asFloat(toX, 'toX'),
-      toY: asFloat(toY, 'toY'),
+      duration: requireFloat(duration, 'duration'),
+      fromX: requireFloat(fromX, 'fromX'),
+      fromY: requireFloat(fromY, 'fromY'),
+      toX: requireFloat(toX, 'toX'),
+      toY: requireFloat(toY, 'toY'),
     };
-    elementId = toElementId(elementId);
     return elementId
       ? // Drag element
-        await this.proxyCommand(`/wda/element/${elementId}/dragfromtoforduration`, 'POST', params)
+        await this.proxyCommand(`/wda/element/${util.unwrapElement(elementId)}/dragfromtoforduration`, 'POST', params)
       : // Drag coordinates
         await this.proxyCommand('/wda/dragfromtoforduration', 'POST', params);
   },
@@ -531,9 +464,9 @@ const helpers = {
     toY,
   ) {
     const params = {
-      pressDuration: asFloat(pressDuration, 'pressDuration'),
-      holdDuration: asFloat(holdDuration, 'holdDuration'),
-      velocity: asFloat(velocity, 'velocity'),
+      pressDuration: requireFloat(pressDuration, 'pressDuration'),
+      holdDuration: requireFloat(holdDuration, 'holdDuration'),
+      velocity: requireFloat(velocity, 'velocity'),
     };
     fromElementId = fromElementId ? util.unwrapElement(fromElementId) : undefined;
     if (fromElementId) {
@@ -550,19 +483,20 @@ const helpers = {
         params,
       );
     }
-    params.fromX = asFloat(fromX, 'fromX');
-    params.fromY = asFloat(fromY, 'fromY');
-    params.toX = asFloat(toX, 'toX');
-    params.toY = asFloat(toY, 'toY');
+    params.fromX = requireFloat(fromX, 'fromX');
+    params.fromY = requireFloat(fromY, 'fromY');
+    params.toX = requireFloat(toX, 'toX');
+    params.toY = requireFloat(toY, 'toY');
     return await this.proxyCommand('/wda/pressAndDragWithVelocity', 'POST', params);
   },
   /**
    * Sends one or more taps with one or more touch points.
    *
    * @since 1.17.1
-   * @param {string|Element} elementId - The internal element identifier (as hexadecimal hash string) to perform one or more taps.
-   * @param {number} numberOfTaps - Number of taps to perform.
-   * @param {number} numberOfTouches - Number of touch points to use.
+   * @param {number} [numberOfTaps=1] - Number of taps to perform.
+   * @param {number} [numberOfTouches=1] - Number of touch points to use.
+   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to perform one or more taps.
+   * The Application element will be used if this parameter is not provided.
    * @returns {Promise<void>}
    * @this {XCUITestDriver}
    * @see https://developer.apple.com/documentation/xctest/xcuielement/1618671-tapwithnumberoftaps?language=objc
@@ -573,17 +507,14 @@ const helpers = {
    * @driver.execute_script 'mobile: tapWithNumberOfTaps', {element: e.ref, numberOfTaps: 2, numberOfTouches: 1}
    * ```
    */
-  async mobileTapWithNumberOfTaps(elementId, numberOfTouches, numberOfTaps) {
-    if (!elementId) {
-      throw new errors.InvalidArgumentError(
-        'Element id is expected to be set for tapWithNumberOfTaps method',
-      );
-    }
-    const params = {
-      numberOfTaps: asInt(numberOfTaps, 'numberOfTaps'),
-      numberOfTouches: asInt(numberOfTouches, 'numberOfTouches'),
-    };
-    return await this.proxyCommand(`/wda/element/${elementId}/tapWithNumberOfTaps`, 'POST', params);
+  async mobileTapWithNumberOfTaps(numberOfTouches = 1, numberOfTaps = 1, elementId = undefined) {
+    const endpoint = elementId
+      ? `/wda/element/${util.unwrapElement(elementId)}/tapWithNumberOfTaps`
+      : '/wda/tapWithNumberOfTaps';
+    return await this.proxyCommand(endpoint, 'POST', {
+      numberOfTaps,
+      numberOfTouches,
+    });
   },
   /**
    * Performs a "force press" on the given element or coordinates.
@@ -593,13 +524,13 @@ const helpers = {
    * @param {number} [y] - The _y_ coordinate of the gesture. If `elementId` is set, this is calculated relative to its position; otherwise it's calculated relative to the active Application.
    * @param {number} [duration] - The duraiton (in seconds) of the force press. If this is provided, `pressure` must also be provided.
    * @param {number} [pressure] - A float value defining the pressure of the force press. If this is provided, `duration` must also be provided.
-   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to perform one or more taps. If this is _not_ provided, both `x` and `y` must be provided. If this is provided _and_ `x` and `y` are not provided, the actual touch point will be calculated internally.
+   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to perform one or more taps.
+   * The Application element will be used if this parameter is not provided.
    * @returns {Promise<void>}
    * @this {XCUITestDriver}
    */
   async mobileForcePress(x, y, duration, pressure, elementId) {
-    elementId = toElementId(elementId);
-    const endpoint = elementId ? `/wda/element/${elementId}/forceTouch` : `/wda/forceTouch`;
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/forceTouch` : `/wda/forceTouch`;
     return await this.proxyCommand(endpoint, 'POST', {x, y, duration, pressure});
   },
   /**
@@ -625,7 +556,6 @@ const helpers = {
    * ```
    */
   async mobileSelectPickerWheelValue(elementId, order, offset, value, maxAttempts) {
-    elementId = /** @type {string} */ (toElementId(elementId));
     if (!elementId) {
       throw new errors.InvalidArgumentError(
         'elementId is expected to be set for selectPickerWheelValue method',
@@ -639,7 +569,7 @@ const helpers = {
     }
     const params = {order};
     if (offset) {
-      params.offset = asFloat(offset, 'offset');
+      params.offset = requireFloat(offset, 'offset');
     }
     if (!_.isNil(value)) {
       params.value = value;
@@ -647,15 +577,16 @@ const helpers = {
     if (!_.isNil(maxAttempts)) {
       params.maxAttempts = maxAttempts;
     }
-    return await this.proxyCommand(`/wda/pickerwheel/${elementId}/select`, 'POST', params);
+    return await this.proxyCommand(`/wda/pickerwheel/${util.unwrapElement(elementId)}/select`, 'POST', params);
   },
   /**
    * Performs a rotate gesture on the given element.
    *
    * @see https://developer.apple.com/documentation/xctest/xcuielement/1618665-rotate?language=objc
-   * @param {string|Element} elementId - The internal element identifier (as hexadecimal hash string) to perform the gesture on.
    * @param {number} rotation - The rotation gesture (in radians)
    * @param {number} velocity - The velocity (in radians-per-second) of the gesture.
+   * @param {string|Element} [elementId] - The internal element identifier (as hexadecimal hash string) to perform the gesture on.
+   * The Application element will be used if this parameter is not provided.
    * @returns {Promise<void>}
    * @this {XCUITestDriver}
    * @example
@@ -670,65 +601,13 @@ const helpers = {
    * ));
    * ```
    */
-  async mobileRotateElement(elementId, rotation, velocity) {
-    elementId = /** @type {string} */ (toElementId(elementId));
-    if (!elementId) {
-      throw new errors.InvalidArgumentError(
-        'Element id is expected to be set for rotateElement method',
-      );
-    }
+  async mobileRotateElement(rotation, velocity, elementId) {
     const params = {
-      rotation: asFloat(rotation, 'rotation'),
-      velocity: asFloat(velocity, 'velocity'),
+      rotation: requireFloat(rotation, 'rotation'),
+      velocity: requireFloat(velocity, 'velocity'),
     };
-    return await this.proxyCommand(`/wda/element/${elementId}/rotate`, 'POST', params);
-  },
-  /**
-   * @this {XCUITestDriver}
-   */
-  async getCoordinates(gesture) {
-    // defaults
-    let coordinates = {x: 0, y: 0, areOffsets: false};
-
-    let optionX = null;
-    if (gesture.options.x) {
-      optionX = asFloat(gesture.options.x, 'x');
-    }
-    let optionY = null;
-    if (gesture.options.y) {
-      optionY = asFloat(gesture.options.y, 'y');
-    }
-
-    // figure out the element coordinates.
-    const elementId = toElementId(gesture.options);
-    if (elementId) {
-      let rect = await this.getElementRect(elementId);
-      let pos = {x: rect.x, y: rect.y};
-      let size = {w: rect.width, h: rect.height};
-
-      // defaults
-      let offsetX = 0;
-      let offsetY = 0;
-
-      // get the real offsets
-      if (optionX || optionY) {
-        offsetX = optionX || 0;
-        offsetY = optionY || 0;
-      } else {
-        offsetX = size.w / 2;
-        offsetY = size.h / 2;
-      }
-
-      // apply the offsets
-      coordinates.x = pos.x + offsetX;
-      coordinates.y = pos.y + offsetY;
-    } else {
-      // moveTo coordinates are passed in as offsets
-      coordinates.areOffsets = gesture.action === 'moveTo';
-      coordinates.x = optionX || 0;
-      coordinates.y = optionY || 0;
-    }
-    return coordinates;
+    const endpoint = elementId ? `/wda/element/${util.unwrapElement(elementId)}/rotate` : '/wda/rotate';
+    return await this.proxyCommand(endpoint, 'POST', params);
   },
 };
 

package/lib/devicectl.js

@@ -122,7 +122,7 @@ export class Devicectl {
   /**
    * Simulates memory warning for the process with the given PID
    *
-   * @param {number} pid
+   * @param {number|string} pid The process identifier to simulate the Low Memory warning for
    * @return {Promise<void>}
    */
   async sendMemoryWarning(pid) {
@@ -141,6 +141,19 @@ export class Devicectl {
     return JSON.parse(stdout).result.runningProcesses;
   }
 
+  /**
+   * Send POSIX signal to the running process
+   *
+   * @param {number|string} pid The process identifier to send a signal to
+   * @param {number|string} signal The signal to send to a process. See 'man signal' for a list of signals
+   * @returns {Promise<void>}
+   */
+  async sendSignalToProcess(pid, signal) {
+    await this.execute(['device', 'process', 'signal'], {
+      subcommandOptions: ['--signal', `${signal}`, '--pid', `${pid}`]
+    });
+  }
+
   /**
    * Retrieves the list of installed apps from the device
    *

package/lib/driver.js

@@ -2018,7 +2018,6 @@ class XCUITestDriver extends BaseDriver {
   mobileForcePress = commands.gestureExtensions.mobileForcePress;
   mobileSelectPickerWheelValue = commands.gestureExtensions.mobileSelectPickerWheelValue;
   mobileRotateElement = commands.gestureExtensions.mobileRotateElement;
-  getCoordinates = commands.gestureExtensions.getCoordinates;
 
   /*-------+
    | IOHID |

package/lib/execute-method-map.ts

@@ -61,7 +61,7 @@ export const executeMethodMap = {
   'mobile: tapWithNumberOfTaps': {
     command: 'mobileTapWithNumberOfTaps',
     params: {
-      required: ['elementId', 'numberOfTouches', 'numberOfTaps'],
+      optional: ['numberOfTouches', 'numberOfTaps', 'elementId'],
     },
   },
   // https://developer.apple.com/documentation/xctest/xcuielement/1618663-pressforduration?language=objc
@@ -84,7 +84,8 @@ export const executeMethodMap = {
   'mobile: rotateElement': {
     command: 'mobileRotateElement',
     params: {
-      required: ['elementId', 'rotation', 'velocity'],
+      required: ['rotation', 'velocity'],
+      optional: ['elementId'],
     },
   },
   // https://developer.apple.com/documentation/xctest/xcuicoordinate/3551692-pressforduration?language=objc

package/lib/ios-deploy.js

@@ -7,7 +7,7 @@ import _ from 'lodash';
 import {exec} from 'teen_process';
 import {extractBundleId} from './app-utils';
 import {pushFolder} from './ios-fs-helpers';
-import { requireXcrun } from './xcrun';
+import { Devicectl } from './devicectl';
 
 const APPLICATION_INSTALLED_NOTIFICATION = 'com.apple.mobile.application_installed';
 const INSTALLATION_STAGING_DIR = 'PublicStaging';
@@ -211,40 +211,15 @@ class IOSDeploy {
       if (util.compareVersions(platformVersion, '>=', '17.0')) {
         log.debug(`Calling devicectl to kill the process`);
 
-        // FIXME: replace `devicectl` command with a wrapper later
-        // or remove after implementing appium-ios-device for iOS 17+.
-
-        const xcrunBinnaryPath = await requireXcrun();
-        const {stdout} = await exec(xcrunBinnaryPath, [
-          'devicectl',
-          'device',
-          'info',
-          'processes',
-          `--device`, this.udid
-        ]);
-        // Each line has spaces. devicectl has JSON output option, but it writes it to a file only.
-        // Here parse the standard output directly.
-        // e.g.:
-        // 823   /private/var/containers/Bundle/Application/8E748312-8CBE-4C13-8295-C2EF3ED2C0C1/WebDriverAgentRunner-Runner.app/WebDriverAgentRunner-Runner
-        // 824   /Applications/MobileSafari.app/MobileSafari
-        // 825   /usr/libexec/debugserver
-        const executableLine = stdout.split('\n').find((line) => line.trim().endsWith(executableName));
-        if (!executableLine) {
+        const devicectl = new Devicectl(this.udid, log);
+        const pids = (await devicectl.listProcesses())
+          .filter(({executable}) => executable.endsWith(`/${executableName}`))
+          .map(({processIdentifier}) => processIdentifier);
+        if (_.isEmpty(pids)) {
           log.info(`The process of the bundle id '${bundleId}' was not running`);
           return false;
         }
-        await exec(xcrunBinnaryPath, [
-          'devicectl',
-          'device',
-          'process',
-          'signal',
-          '-s', `2`,
-          // e.g.
-          // '824   /Applications/MobileSafari.app/MobileSafari              '
-          // ' 999   /Applications/MobileSafari.app/MobileSafari              '  (can include spaces in the top)
-          '-p', `${executableLine.trim().split(/\s+/)[0]}`,
-          `--device`, this.udid
-        ]);
+        await devicectl.sendSignalToProcess(pids[0], 2);
       } else {
         instrumentService = await services.startInstrumentService(this.udid);
         const processes = await instrumentService.callChannel(