appium-xcuitest-driver 7.33.0 → 7.34.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [7.34.0](https://github.com/appium/appium-xcuitest-driver/compare/v7.33.1...v7.34.0) (2024-12-13)
+
+### Features
+
+* extend to handle critical notification elements in respectSystemAlerts settings ([#2502](https://github.com/appium/appium-xcuitest-driver/issues/2502)) ([b4fcccb](https://github.com/appium/appium-xcuitest-driver/commit/b4fcccb1c79f0d6b3dcc4041267893b849c2f557))
+
+## [7.33.1](https://github.com/appium/appium-xcuitest-driver/compare/v7.33.0...v7.33.1) (2024-12-12)
+
+### Miscellaneous Chores
+
+* Replace occurrences of the deprecated errorAndThrow API ([#2501](https://github.com/appium/appium-xcuitest-driver/issues/2501)) ([d2122eb](https://github.com/appium/appium-xcuitest-driver/commit/d2122ebb86e82026ede34803c33a5234e4111982))
+
 ## [7.33.0](https://github.com/appium/appium-xcuitest-driver/compare/v7.32.1...v7.33.0) (2024-12-09)
 
 ### Features

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

@@ -1 +1 @@
-{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../../../lib/commands/condition.js"],"names":[],"mappings":";IAuDE;;;;;;;OAOG;IACH,0EALa,OAAO,CAAC,SAAS,EAAE,CAAC,CAiBhC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,uFARW,MAAM,aACN,MAAM,GACJ,OAAO,CAAC,OAAO,CAAC,CAwB5B;IAED;;;;;;;;;;;OAWG;IACH,4EALa,OAAO,CAAC,OAAO,CAAC,CA0B5B;;;;UAtIW,MAAM;;;;gBACN,MAAM;;;;iBACN,MAAM;;;;;;cAMN,OAAO,EAAE;;;;gBACT,MAAM;oBACN,OAAO;mBACP,OAAO;gBACP,OAAO;;;;cACP,OAAO;;;;mBACP,MAAM;;6BA4HP,OAAO,WAAW,EAAE,cAAc"}
+{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../../../lib/commands/condition.js"],"names":[],"mappings":";IAuDE;;;;;;;OAOG;IACH,0EALa,OAAO,CAAC,SAAS,EAAE,CAAC,CAiBhC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,uFARW,MAAM,aACN,MAAM,GACJ,OAAO,CAAC,OAAO,CAAC,CA0B5B;IAED;;;;;;;;;;;OAWG;IACH,4EALa,OAAO,CAAC,OAAO,CAAC,CA0B5B;;;;UAxIW,MAAM;;;;gBACN,MAAM;;;;iBACN,MAAM;;;;;;cAMN,OAAO,EAAE;;;;gBACT,MAAM;oBACN,OAAO;mBACP,OAAO;gBACP,OAAO;;;;cACP,OAAO;;;;mBACP,MAAM;;6BA8HP,OAAO,WAAW,EAAE,cAAc"}

package/build/lib/commands/condition.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const appium_ios_device_1 = require("appium-ios-device");
 const lodash_1 = __importDefault(require("lodash"));
-const support_1 = require("appium/support");
-function requireConditionInducerCompatibleDevice(driver) {
-    if (driver.isSimulator()) {
-        driver.log.errorAndThrow('Condition inducer only works on real devices');
-    }
-    if (support_1.util.compareVersions(driver.opts.platformVersion, '<', '13.0')) {
-        driver.log.errorAndThrow('Condition inducer is only supported since iOS 13+');
+/**
+ * @this {XCUITestDriver}
+ * @returns {void}
+ */
+function requireConditionInducerCompatibleDevice() {
+    if (this.isSimulator()) {
+        throw this.log.errorWithException('Condition inducer only works on real devices');
     }
 }
 /**
@@ -63,7 +63,7 @@ exports.default = {
      * @this {XCUITestDriver}
      */
     async listConditionInducers() {
-        requireConditionInducerCompatibleDevice(this);
+        requireConditionInducerCompatibleDevice.bind(this);
         const conditionInducerService = await appium_ios_device_1.services.startInstrumentService(this.device.udid);
         try {
             const ret = await conditionInducerService.callChannel(appium_ios_device_1.INSTRUMENT_CHANNEL.CONDITION_INDUCER, 'availableConditionInducers');
@@ -93,16 +93,16 @@ exports.default = {
      * @this {XCUITestDriver}
      */
     async enableConditionInducer(conditionID, profileID) {
-        requireConditionInducerCompatibleDevice(this);
+        requireConditionInducerCompatibleDevice.bind(this);
         if (this._conditionInducerService && !this._conditionInducerService._socketClient.destroyed) {
-            this.log.errorAndThrow(`Condition inducer has been started. A condition is already active.`);
+            throw this.log.errorWithException(`Condition inducer has been started. A condition is already active.`);
         }
         this._conditionInducerService = await appium_ios_device_1.services.startInstrumentService(this.device.udid);
         const ret = await this._conditionInducerService.callChannel(appium_ios_device_1.INSTRUMENT_CHANNEL.CONDITION_INDUCER, 'enableConditionWithIdentifier:profileIdentifier:', conditionID, profileID);
         if (!lodash_1.default.isBoolean(ret.selector)) {
             this._conditionInducerService.close();
             this._conditionInducerService = null;
-            this.log.errorAndThrow(`Enable condition inducer error: '${JSON.stringify(ret.selector)}'`);
+            throw this.log.errorWithException(`Enable condition inducer error: '${JSON.stringify(ret.selector)}'`);
         }
         return ret.selector;
     },

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

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

package/build/lib/commands/file-movement.d.ts

@@ -1,13 +1,14 @@
 /**
  * Parses the actual path and the bundle identifier from the given path string
  *
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The given path string. The string should
  * match `CONTAINER_PATH_PATTERN` regexp, otherwise an error is going
  * to be thrown. A valid string example: `@bundle.identifier:container_type/relative_path_in_container`
  * @param {import('./types').ContainerRootSupplier|string} [containerRootSupplier] - Container root path supplier function or string value
  * @returns {Promise<import('./types').ContainerObject>}
  */
-export function parseContainerPath(remotePath: string, containerRootSupplier?: import("./types").ContainerRootSupplier | string): Promise<import("./types").ContainerObject>;
+export function parseContainerPath(this: import("../driver").XCUITestDriver, remotePath: string, containerRootSupplier?: import("./types").ContainerRootSupplier | string): Promise<import("./types").ContainerObject>;
 declare namespace _default {
     /**
      * Pushes the given data to a file on the remote device
@@ -21,7 +22,7 @@ declare namespace _default {
      * @throws {Error} If there was an error while pushing the data
      * @this {XCUITestDriver}
      */
-    function pushFile(this: import("../driver").XCUITestDriver, remotePath: string, base64Data: string): Promise<void>;
+    function pushFile(this: import("../driver").XCUITestDriver, remotePath: string, base64Data: string): Promise<any>;
     /**
      * Pushes the given data to a file on the remote device.
      *
@@ -30,7 +31,7 @@ declare namespace _default {
      * @param {string} payload - Base64-encoded content of the file to be pushed.
      * @this {XCUITestDriver}
      */
-    function mobilePushFile(this: import("../driver").XCUITestDriver, remotePath: string, payload: string): Promise<void>;
+    function mobilePushFile(this: import("../driver").XCUITestDriver, remotePath: string, payload: string): Promise<any>;
     /**
      * Pulls a remote file from the device.
      *

package/build/lib/commands/file-movement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-movement.d.ts","sourceRoot":"","sources":["../../../lib/commands/file-movement.js"],"names":[],"mappings":"AAeA;;;;;;;;GAQG;AACH,+CANW,MAAM,0BAGN,OAAO,SAAS,EAAE,qBAAqB,GAAC,MAAM,GAC5C,OAAO,CAAC,OAAO,SAAS,EAAE,eAAe,CAAC,CA+BtD;;IA6RC;;;;;;;;;;;OAWG;IACH,wEATW,MAAM,cAIN,MAAM,iBAoBhB;IAED;;;;;;;OAOG;IACH,8EALW,MAAM,WAEN,MAAM,iBAKhB;IAED;;;;;;;;;;OAUG;IACH,wEARW,MAAM,GAIJ,OAAO,CAAC,MAAM,CAAC,CAc3B;IAED;;;;;;;OAOG;IACH,8EALW,MAAM,GAEJ,OAAO,CAAC,MAAM,CAAC,CAK3B;IAED;;;;;;OAMG;IACH,kFAJW,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAOzB;IAED;;;;;;OAMG;IACH,gFAJW,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAUzB;IAED;;;;;;;;OAQG;IACH,0EANW,MAAM,GAEJ,OAAO,CAAC,MAAM,CAAC,CAW3B;IAED;;;;;;OAMG;IACH,gFAJW,MAAM,GACJ,OAAO,CAAC,MAAM,CAAC,CAK3B;;;6BAIU,OAAO,WAAW,EAAE,cAAc"}
+{"version":3,"file":"file-movement.d.ts","sourceRoot":"","sources":["../../../lib/commands/file-movement.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH,yFANW,MAAM,0BAGN,OAAO,SAAS,EAAE,qBAAqB,GAAC,MAAM,GAC5C,OAAO,CAAC,OAAO,SAAS,EAAE,eAAe,CAAC,CA+BtD;;IAoTC;;;;;;;;;;;OAWG;IACH,wEATW,MAAM,cAIN,MAAM,gBAoBhB;IAED;;;;;;;OAOG;IACH,8EALW,MAAM,WAEN,MAAM,gBAKhB;IAED;;;;;;;;;;OAUG;IACH,wEARW,MAAM,GAIJ,OAAO,CAAC,MAAM,CAAC,CAc3B;IAED;;;;;;;OAOG;IACH,8EALW,MAAM,GAEJ,OAAO,CAAC,MAAM,CAAC,CAK3B;IAED;;;;;;OAMG;IACH,kFAJW,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAOzB;IAED;;;;;;OAMG;IACH,gFAJW,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAUzB;IAED;;;;;;;;OAQG;IACH,0EANW,MAAM,GAEJ,OAAO,CAAC,MAAM,CAAC,CAW3B;IAED;;;;;;OAMG;IACH,gFAJW,MAAM,GACJ,OAAO,CAAC,MAAM,CAAC,CAK3B;;;6BAIU,OAAO,WAAW,EAAE,cAAc"}

package/build/lib/commands/file-movement.js

@@ -7,7 +7,6 @@ exports.parseContainerPath = parseContainerPath;
 const lodash_1 = __importDefault(require("lodash"));
 const support_1 = require("appium/support");
 const path_1 = __importDefault(require("path"));
-const logger_1 = __importDefault(require("../logger"));
 const appium_ios_device_1 = require("appium-ios-device");
 const ios_fs_helpers_1 = require("../ios-fs-helpers");
 const driver_1 = require("appium/driver");
@@ -20,6 +19,7 @@ const OBJECT_NOT_FOUND_ERROR_MESSAGE = 'OBJECT_NOT_FOUND';
 /**
  * Parses the actual path and the bundle identifier from the given path string
  *
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The given path string. The string should
  * match `CONTAINER_PATH_PATTERN` regexp, otherwise an error is going
  * to be thrown. A valid string example: `@bundle.identifier:container_type/relative_path_in_container`
@@ -40,7 +40,7 @@ async function parseContainerPath(remotePath, containerRootSupplier) {
     // not counting the colon
     if (typeSeparatorPos > 0 && typeSeparatorPos < bundleId.length - 1) {
         containerType = bundleId.substring(typeSeparatorPos + 1);
-        logger_1.default.debug(`Parsed container type: ${containerType}`);
+        this.log.debug(`Parsed container type: ${containerType}`);
         bundleId = bundleId.substring(0, typeSeparatorPos);
     }
     if (lodash_1.default.isNil(containerRootSupplier)) {
@@ -54,6 +54,12 @@ async function parseContainerPath(remotePath, containerRootSupplier) {
     verifyIsSubPath(pathInContainer, containerRoot);
     return { bundleId, pathInContainer, containerType };
 }
+/**
+ *
+ * @param {string} originalPath
+ * @param {string} root
+ * @returns {void}
+ */
 function verifyIsSubPath(originalPath, root) {
     const normalizedRoot = path_1.default.normalize(root);
     const normalizedPath = path_1.default.normalize(path_1.default.dirname(originalPath));
@@ -62,6 +68,13 @@ function verifyIsSubPath(originalPath, root) {
         throw new Error(`'${normalizedPath}' is expected to be a subpath of '${normalizedRoot}'`);
     }
 }
+/**
+ *
+ * @param {string} udid
+ * @param {string} [bundleId]
+ * @param {string} [containerType]
+ * @returns {Promise<any>}
+ */
 async function createAfcClient(udid, bundleId, containerType) {
     if (!bundleId) {
         return await appium_ios_device_1.services.startAfcService(udid);
@@ -71,29 +84,38 @@ async function createAfcClient(udid, bundleId, containerType) {
         ? await service.vendDocuments(bundleId)
         : await service.vendContainer(bundleId);
 }
+/**
+ *
+ * @param {string} [containerType]
+ * @returns {boolean}
+ */
 function isDocumentsContainer(containerType) {
     return lodash_1.default.toLower(containerType) === lodash_1.default.toLower(CONTAINER_DOCUMENTS_PATH);
 }
-async function createService(udid, remotePath) {
+/**
+ *
+ * @this {XCUITestDriver}
+ * @param {string} remotePath
+ * @returns {Promise<{service: any, relativePath: string}>}
+ */
+async function createService(remotePath) {
     if (CONTAINER_PATH_PATTERN.test(remotePath)) {
-        const { bundleId, pathInContainer, containerType } = await parseContainerPath(remotePath);
-        const service = await createAfcClient(udid, bundleId, containerType);
+        const { bundleId, pathInContainer, containerType } = await parseContainerPath.bind(this)(remotePath);
+        const service = await createAfcClient(this.device.udid, bundleId, containerType);
         const relativePath = isDocumentsContainer(containerType)
             ? path_1.default.join(CONTAINER_DOCUMENTS_PATH, pathInContainer)
             : pathInContainer;
         return { service, relativePath };
     }
     else {
-        const service = await createAfcClient(udid);
+        const service = await createAfcClient(this.device.udid);
         return { service, relativePath: remotePath };
     }
 }
 /**
  * Save the given base64 data chunk as a binary file on the Simulator under test.
  *
- * @param {import('../driver').Simulator} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The remote path on the device. This variable can be prefixed with
  *                              bundle id, so then the file will be uploaded to the corresponding
  *                              application container instead of the default media folder, for example
@@ -106,14 +128,15 @@ async function createService(udid, remotePath) {
  *                              to the default media folder and only the file name is considered important.
  * @param {string} base64Data - Base-64 encoded content of the file to be uploaded.
  */
-async function pushFileToSimulator(device, remotePath, base64Data) {
+async function pushFileToSimulator(remotePath, base64Data) {
     const buffer = Buffer.from(base64Data, 'base64');
+    const device = /** @type {import('../driver').Simulator} */ (this.device);
     if (CONTAINER_PATH_PATTERN.test(remotePath)) {
-        const { bundleId, pathInContainer: dstPath } = await parseContainerPath(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
-        logger_1.default.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
+        const { bundleId, pathInContainer: dstPath } = await parseContainerPath.bind(this)(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
+        this.log.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
             `Will put the data into '${dstPath}'`);
         if (!(await support_1.fs.exists(path_1.default.dirname(dstPath)))) {
-            logger_1.default.debug(`The destination folder '${path_1.default.dirname(dstPath)}' does not exist. Creating...`);
+            this.log.debug(`The destination folder '${path_1.default.dirname(dstPath)}' does not exist. Creating...`);
             await (0, support_1.mkdirp)(path_1.default.dirname(dstPath));
         }
         await support_1.fs.writeFile(dstPath, buffer);
@@ -132,9 +155,7 @@ async function pushFileToSimulator(device, remotePath, base64Data) {
 /**
  * Save the given base64 data chunk as a binary file on the device under test.
  *
- * @param {import('../real-device').RealDevice} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The remote path on the device. This variable can be prefixed with
  *                              bundle id, so then the file will be uploaded to the corresponding
  *                              application container instead of the default media folder. Use
@@ -149,31 +170,35 @@ async function pushFileToSimulator(device, remotePath, base64Data) {
  *                                   as base64 decoded data.
  * @param {string} base64Data - Base-64 encoded content of the file to be uploaded.
  */
-async function pushFileToRealDevice(device, remotePath, base64Data) {
-    const { service, relativePath } = await createService(device.udid, remotePath);
+async function pushFileToRealDevice(remotePath, base64Data) {
+    const { service, relativePath } = await createService.bind(this)(remotePath);
     try {
         await (0, ios_fs_helpers_1.pushFile)(service, Buffer.from(base64Data, 'base64'), relativePath);
     }
     catch (e) {
-        logger_1.default.debug(e.stack);
-        throw new Error(`Could not push the file to '${remotePath}'.  Original error: ${e.message}`);
+        this.log.debug(e.stack);
+        throw new Error(`Could not push the file to '${remotePath}'. Original error: ${e.message}`);
     }
     finally {
         service.close();
     }
 }
-async function deleteFileOrFolder(device, remotePath, isSimulator) {
-    return isSimulator
-        ? await deleteFromSimulator(device, remotePath)
-        : await deleteFromRealDevice(device, remotePath);
+/**
+ *
+ * @this {XCUITestDriver}
+ * @param {string} remotePath
+ * @returns {Promise<void>}
+ */
+async function deleteFileOrFolder(remotePath) {
+    return this.isSimulator()
+        ? await deleteFromSimulator.bind(this)(remotePath)
+        : await deleteFromRealDevice.bind(this)(remotePath);
 }
 /**
  * Get the content of given file or folder from iOS Simulator and return it as base-64 encoded string.
  * Folder content is recursively packed into a zip archive.
  *
- * @param {import('../driver').Simulator} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The path to a file or a folder, which exists in the corresponding application
  *                              container on Simulator. Use
  *                              `@<app_bundle_id>:<optional_container_type>/<path_to_the_file_or_folder_inside_container>`
@@ -183,11 +208,12 @@ async function deleteFileOrFolder(device, remotePath, isSimulator) {
  * @param {boolean} isFile - Whether the destination item is a file or a folder
  * @returns {Promise<string>} Base-64 encoded content of the file.
  */
-async function pullFromSimulator(device, remotePath, isFile) {
+async function pullFromSimulator(remotePath, isFile) {
     let pathOnServer;
+    const device = /** @type {import('../driver').Simulator} */ (this.device);
     if (CONTAINER_PATH_PATTERN.test(remotePath)) {
-        const { bundleId, pathInContainer: dstPath } = await parseContainerPath(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
-        logger_1.default.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
+        const { bundleId, pathInContainer: dstPath } = await parseContainerPath.bind(this)(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
+        this.log.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
             `Will get the data from '${dstPath}'`);
         pathOnServer = dstPath;
     }
@@ -195,10 +221,10 @@ async function pullFromSimulator(device, remotePath, isFile) {
         const simRoot = device.getDir();
         pathOnServer = path_1.default.posix.join(simRoot, remotePath);
         verifyIsSubPath(pathOnServer, simRoot);
-        logger_1.default.info(`Got the full item path: ${pathOnServer}`);
+        this.log.info(`Got the full item path: ${pathOnServer}`);
     }
     if (!(await support_1.fs.exists(pathOnServer))) {
-        logger_1.default.errorAndThrow(`The remote ${isFile ? 'file' : 'folder'} at '${pathOnServer}' does not exist`);
+        throw this.log.errorWithException(`The remote ${isFile ? 'file' : 'folder'} at '${pathOnServer}' does not exist`);
     }
     const buffer = isFile
         ? await support_1.util.toInMemoryBase64(pathOnServer)
@@ -209,9 +235,7 @@ async function pullFromSimulator(device, remotePath, isFile) {
  * Get the content of given file or folder from the real device under test and return it as base-64 encoded string.
  * Folder content is recursively packed into a zip archive.
  *
- * @param {import('../real-device').RealDevice} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The path to an existing remote file on the device. This variable can be prefixed with
  *                              bundle id, so then the file will be downloaded from the corresponding
  *                              application container instead of the default media folder. Use
@@ -228,8 +252,8 @@ async function pullFromSimulator(device, remotePath, isFile) {
  * @param {boolean} isFile - Whether the destination item is a file or a folder
  * @returns {Promise<string>} Base-64 encoded content of the remote file
  */
-async function pullFromRealDevice(device, remotePath, isFile) {
-    const { service, relativePath } = await createService(device.udid, remotePath);
+async function pullFromRealDevice(remotePath, isFile) {
+    const { service, relativePath } = await createService.bind(this)(remotePath);
     try {
         const fileInfo = await service.getFileInfo(relativePath);
         if (isFile && fileInfo.isDirectory()) {
@@ -249,21 +273,21 @@ async function pullFromRealDevice(device, remotePath, isFile) {
 /**
  * Remove the file or folder from the device
  *
- * @param {import('../driver').Simulator} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The path to a file or a folder, which exists in the corresponding application
  *                              container on Simulator. Use
  *                              `@<app_bundle_id>:<optional_container_type>/<path_to_the_file_or_folder_inside_container>`
  *                              format to pull a file or a folder from an application container of the given type.
  *                              Possible container types are 'app', 'data', 'groups', '<A specific App Group container>'.
  *                              The default type is 'app'.
+ * @returns {Promise<void>}
  */
-async function deleteFromSimulator(device, remotePath) {
+async function deleteFromSimulator(remotePath) {
     let pathOnServer;
+    const device = /** @type {import('../driver').Simulator} */ (this.device);
     if (CONTAINER_PATH_PATTERN.test(remotePath)) {
-        const { bundleId, pathInContainer: dstPath } = await parseContainerPath(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
-        logger_1.default.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
+        const { bundleId, pathInContainer: dstPath } = await parseContainerPath.bind(this)(remotePath, async (appBundle, containerType) => await device.simctl.getAppContainer(appBundle, containerType));
+        this.log.info(`Parsed bundle identifier '${bundleId}' from '${remotePath}'. ` +
             `'${dstPath}' will be deleted`);
         pathOnServer = dstPath;
     }
@@ -271,7 +295,7 @@ async function deleteFromSimulator(device, remotePath) {
         const simRoot = device.getDir();
         pathOnServer = path_1.default.posix.join(simRoot, remotePath);
         verifyIsSubPath(pathOnServer, simRoot);
-        logger_1.default.info(`Got the full path: ${pathOnServer}`);
+        this.log.info(`Got the full path: ${pathOnServer}`);
     }
     if (!(await support_1.fs.exists(pathOnServer))) {
         throw new driver_1.errors.InvalidArgumentError(`The remote path at '${pathOnServer}' does not exist`);
@@ -281,9 +305,7 @@ async function deleteFromSimulator(device, remotePath) {
 /**
  * Remove the file or folder from the device
  *
- * @param {import('../real-device').RealDevice} device - The device object, which represents the device under test.
- *                          This object is expected to have the `udid` property containing the
- *                          valid device ID.
+ * @this {XCUITestDriver}
  * @param {string} remotePath - The path to an existing remote file on the device. This variable can be prefixed with
  *                              bundle id, so then the file will be downloaded from the corresponding
  *                              application container instead of the default media folder. Use
@@ -297,9 +319,10 @@ async function deleteFromSimulator(device, remotePath) {
  *                                   `On My iPhone/<app name>/111.png` wil be pulled into the mounted host machine
  *                                   and Appium returns the data as base64-encoded string to client.
  *                                   `@com.myapp.bla:documents/` means `On My iPhone/<app name>`.
+ * @returns {Promise<void>}
  */
-async function deleteFromRealDevice(device, remotePath) {
-    const { service, relativePath } = await createService(device.udid, remotePath);
+async function deleteFromRealDevice(remotePath) {
+    const { service, relativePath } = await createService.bind(this)(remotePath);
     try {
         await service.deleteDirectory(relativePath);
     }
@@ -337,8 +360,8 @@ exports.default = {
             base64Data = Buffer.from(base64Data).toString('utf8');
         }
         return this.isSimulator()
-            ? await pushFileToSimulator(/** @type {import('../driver').Simulator} */ (this.device), remotePath, base64Data)
-            : await pushFileToRealDevice(/** @type {import('../real-device').RealDevice} */ (this.device), remotePath, base64Data);
+            ? await pushFileToSimulator.bind(this)(remotePath, base64Data)
+            : await pushFileToRealDevice.bind(this)(remotePath, base64Data);
     },
     /**
      * Pushes the given data to a file on the remote device.
@@ -368,8 +391,8 @@ exports.default = {
                 `'${remotePath}' is given instead`);
         }
         return this.isSimulator()
-            ? await pullFromSimulator(/** @type {import('../driver').Simulator} */ (this.device), remotePath, true)
-            : await pullFromRealDevice(/** @type {import('../real-device').RealDevice} */ (this.device), remotePath, true);
+            ? await pullFromSimulator.bind(this)(remotePath, true)
+            : await pullFromRealDevice.bind(this)(remotePath, true);
     },
     /**
      * Pulls a remote file from the device.
@@ -393,7 +416,7 @@ exports.default = {
         if (!remotePath.endsWith('/')) {
             remotePath = `${remotePath}/`;
         }
-        await deleteFileOrFolder(this.device, remotePath, this.isSimulator());
+        await deleteFileOrFolder.bind(this)(remotePath);
     },
     /**
      * Delete a remote file from the device.
@@ -407,7 +430,7 @@ exports.default = {
             throw new driver_1.errors.InvalidArgumentError(`It is expected that remote path points to a file and not to a folder. ` +
                 `'${remotePath}' is given instead`);
         }
-        await deleteFileOrFolder(this.device, remotePath, this.isSimulator());
+        await deleteFileOrFolder.bind(this)(remotePath);
     },
     /**
      * Pulls the whole folder from the remote device
@@ -423,8 +446,8 @@ exports.default = {
             remotePath = `${remotePath}/`;
         }
         return this.isSimulator()
-            ? await pullFromSimulator(/** @type {import('../driver').Simulator} */ (this.device), remotePath, false)
-            : await pullFromRealDevice(/** @type {import('../real-device').RealDevice} */ (this.device), remotePath, false);
+            ? await pullFromSimulator.bind(this)(remotePath, false)
+            : await pullFromRealDevice.bind(this)(remotePath, false);
     },
     /**
      * Pulls the whole folder from the device under test.

package/build/lib/commands/file-movement.js.map

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

package/build/lib/commands/pcap.js

@@ -69,7 +69,7 @@ exports.default = {
      */
     async mobileStartPcap(timeLimitSec = 180, forceRestart = false) {
         if (this.isSimulator()) {
-            this.log.errorAndThrow('Network traffic capture only works on real devices');
+            throw this.log.errorWithException('Network traffic capture only works on real devices');
         }
         if (this._trafficCapture?.isCapturing()) {
             this.log.info(`There is an active traffic capture process`);
@@ -128,7 +128,7 @@ exports.default = {
         try {
             resultPath = await this._trafficCapture.finish();
             if (!(await support_1.fs.exists(resultPath))) {
-                this.log.errorAndThrow(`The network traffic capture utility has failed ` +
+                throw this.log.errorWithException(`The network traffic capture utility has failed ` +
                     `to store the actual traffic capture at '${resultPath}'`);
             }
         }

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

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

package/build/lib/commands/performance.js

@@ -190,7 +190,7 @@ class PerfRecorder {
         catch (e) {
             await this._enforceTermination();
             const listProfilesCommand = toolName === XCTRACE ? `${xcrun_1.XCRUN} ${XCTRACE} list templates` : `${INSTRUMENTS} -s`;
-            this._logger.errorAndThrow(`There is no ${DEFAULT_EXT} file found for performance profile ` +
+            throw this._logger.errorWithException(`There is no ${DEFAULT_EXT} file found for performance profile ` +
                 `'${this._profileName}'. Make sure the profile is supported on this device. ` +
                 `You could use '${listProfilesCommand}' command to see the list of all available profiles. ` +
                 `Check the server log for more details`);
@@ -209,7 +209,7 @@ class PerfRecorder {
             await this._process?.stop('SIGINT', STOP_TIMEOUT_MS);
         }
         catch (e) {
-            this._logger.errorAndThrow(`Performance recording has failed to exit after ${STOP_TIMEOUT_MS}ms`);
+            throw this._logger.errorWithException(`Performance recording has failed to exit after ${STOP_TIMEOUT_MS}ms`);
         }
         return await this.getZippedReportPath();
     }
@@ -236,7 +236,7 @@ exports.default = {
      */
     async mobileStartPerfRecord(timeout = DEFAULT_TIMEOUT_MS, profileName = DEFAULT_PROFILE_NAME, pid) {
         if (!this.isFeatureEnabled(PERF_RECORD_FEAT_NAME) && !this.isRealDevice()) {
-            this.log.errorAndThrow(PERF_RECORD_SECURITY_MESSAGE);
+            throw this.log.errorWithException(PERF_RECORD_SECURITY_MESSAGE);
         }
         if (!lodash_1.default.isEmpty(this._perfRecorders)) {
             for (const recorder of this._perfRecorders.filter((x) => x.profileName === profileName)) {
@@ -290,7 +290,7 @@ exports.default = {
      */
     async mobileStopPerfRecord(remotePath, user, pass, method, profileName = DEFAULT_PROFILE_NAME, headers, fileFieldName, formFields) {
         if (!this.isFeatureEnabled(PERF_RECORD_FEAT_NAME) && !this.isRealDevice()) {
-            this.log.errorAndThrow(PERF_RECORD_SECURITY_MESSAGE);
+            throw this.log.errorWithException(PERF_RECORD_SECURITY_MESSAGE);
         }
         if (lodash_1.default.isEmpty(this._perfRecorders)) {
             this.log.info('No performance recorders have been started. Doing nothing');
@@ -298,13 +298,13 @@ exports.default = {
         }
         const recorders = this._perfRecorders.filter((x) => x.profileName === profileName);
         if (lodash_1.default.isEmpty(recorders)) {
-            this.log.errorAndThrow(`There are no records for performance profile '${profileName}' ` +
+            throw this.log.errorWithException(`There are no records for performance profile '${profileName}' ` +
                 `and device ${this.device.udid}. Have you started the profiling before?`);
         }
         const recorder = lodash_1.default.first(recorders);
         const resultPath = await /** @type {PerfRecorder} */ (recorder).stop();
         if (!(await support_1.fs.exists(resultPath))) {
-            this.log.errorAndThrow(`There is no ${DEFAULT_EXT} file found for performance profile '${profileName}' ` +
+            throw this.log.errorWithException(`There is no ${DEFAULT_EXT} file found for performance profile '${profileName}' ` +
                 `and device ${this.device.udid}. Make sure the selected profile is supported on this device`);
         }
         const result = await (0, utils_1.encodeBase64OrUpload)(resultPath, remotePath, {