appium-xcuitest-driver 7.14.0 → 7.15.1

package/lib/app-utils.js

@@ -2,20 +2,19 @@ import _ from 'lodash';
 import path from 'path';
 import {plist, fs, util, tempDir, zip, timing} from 'appium/support';
 import log from './logger.js';
-import {LRUCache} from 'lru-cache';
 import os from 'node:os';
 import {exec} from 'teen_process';
 import B from 'bluebird';
 import {spawn} from 'node:child_process';
 import assert from 'node:assert';
+import { isTvOs } from './utils.js';
 
 const STRINGSDICT_RESOURCE = '.stringsdict';
 const STRINGS_RESOURCE = '.strings';
 export const SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
 export const APP_EXT = '.app';
 export const IPA_EXT = '.ipa';
-/** @type {LRUCache<string, import('@appium/types').StringRecord>} */
-const PLIST_CACHE = new LRUCache({max: 20});
+const ZIP_EXT = '.zip';
 const SAFARI_OPTS_ALIASES_MAP = /** @type {const} */ ({
   safariAllowPopups: [
     ['WebKitJavaScriptCanOpenWindowsAutomatically', 'JavaScriptCanOpenWindowsAutomatically'],
@@ -27,146 +26,64 @@ const SAFARI_OPTS_ALIASES_MAP = /** @type {const} */ ({
 const MAX_ARCHIVE_SCAN_DEPTH = 1;
 export const SUPPORTED_EXTENSIONS = [IPA_EXT, APP_EXT];
 const MACOS_RESOURCE_FOLDER = '__MACOSX';
-
-
-/**
- * Retrieves the value of the given entry name from the application's Info.plist.
- *
- * @this {Object} Optinal instance used for caching. Ususally the driver instance.
- * @param {string} app Full path to the app bundle root.
- * @param {string} entryName Key name in the plist.
- * @returns {Promise<any | undefined>} Either the extracted value or undefined if no such key has been found in the plist.
- * @throws {Error} If the application's Info.plist cannot be parsed.
- */
-async function extractPlistEntry(app, entryName) {
-  const plistPath = path.resolve(app, 'Info.plist');
-
-  const parseFile = async () => {
-    try {
-      return await plist.parsePlistFile(plistPath);
-    } catch (err) {
-      throw new Error(`Could not extract Info.plist from '${path.basename(app)}': ${err.message}`);
-    }
-  };
-
-  let plistObj = PLIST_CACHE.get(app);
-  if (!plistObj) {
-    plistObj = await parseFile();
-    PLIST_CACHE.set(app, plistObj);
-  }
-  return /** @type {import('@appium/types').StringRecord} */ (plistObj)[entryName];
-}
-
-/**
- *
- * @param {string} app
- * @returns {Promise<string>}
- */
-export async function extractBundleId(app) {
-  const bundleId = await extractPlistEntry(app, 'CFBundleIdentifier');
-  log.debug(`Getting bundle ID from app '${app}': '${bundleId}'`);
-  return bundleId;
-}
-
-/**
- *
- * @param {string} app
- * @returns {Promise<string>}
- */
-export async function extractBundleVersion(app) {
-  return await extractPlistEntry(app, 'CFBundleVersion');
-}
-
-/**
- *
- * @param {string} app
- * @returns {Promise<string>}
- */
-async function extractExecutableName(app) {
-  return await extractPlistEntry(app, 'CFBundleExecutable');
-}
-
-/**
- *
- * @param {string} app
- * @returns {Promise<string[]>}
- */
-export async function fetchSupportedAppPlatforms(app) {
-  try {
-    const result = await extractPlistEntry(app, 'CFBundleSupportedPlatforms');
-    if (!_.isArray(result)) {
-      log.warn(`${path.basename(app)}': CFBundleSupportedPlatforms is not a valid list`);
-      return [];
-    }
-    return result;
-  } catch (err) {
-    log.warn(
-      `Cannot extract the list of supported platforms from '${path.basename(app)}': ${err.message}`,
-    );
-    return [];
-  }
-}
-
-/**
- * @typedef {Object} PlatformOpts
- *
- * @property {boolean} isSimulator - Whether the destination platform is a Simulator
- * @property {boolean} isTvOS - Whether the destination platform is a Simulator
- */
+const SANITIZE_REPLACEMENT = '-';
 
 /**
  * Verify whether the given application is compatible to the
  * platform where it is going to be installed and tested.
  *
- * @param {string} app - The actual path to the application bundle
- * @param {PlatformOpts} expectedPlatform
+ * @this {XCUITestDriver}
+ * @returns {Promise<void>}
  * @throws {Error} If bundle architecture does not match the expected device architecture.
  */
-export async function verifyApplicationPlatform(app, expectedPlatform) {
-  log.debug('Verifying application platform');
+export async function verifyApplicationPlatform() {
+  this.log.debug('Verifying application platform');
 
-  const supportedPlatforms = await fetchSupportedAppPlatforms(app);
-  log.debug(`CFBundleSupportedPlatforms: ${JSON.stringify(supportedPlatforms)}`);
-
-  const {isSimulator, isTvOS} = expectedPlatform;
+  const supportedPlatforms = await this.appInfosCache.extractAppPlatforms(this.opts.app);
+  const isTvOS = isTvOs(this.opts.platformName);
   const prefix = isTvOS ? 'AppleTV' : 'iPhone';
-  const suffix = isSimulator ? 'Simulator' : 'OS';
+  const suffix = this.isSimulator() ? 'Simulator' : 'OS';
   const dstPlatform = `${prefix}${suffix}`;
-  const appFileName = path.basename(app);
   if (!supportedPlatforms.includes(dstPlatform)) {
     throw new Error(
       `${
-        isSimulator ? 'Simulator' : 'Real device'
-      } architecture is not supported by the '${appFileName}' application. ` +
+        this.isSimulator() ? 'Simulator' : 'Real device'
+      } architecture is not supported by the ${this.opts.bundleId} application. ` +
         `Make sure the correct deployment target has been selected for its compilation in Xcode.`,
     );
   }
-  if (isSimulator) {
-    const executablePath = path.resolve(app, await extractExecutableName(app));
-    const [resFile, resUname] = await B.all([
-      exec('file', [executablePath]),
-      exec('uname', ['-m']),
-    ]);
-    const bundleExecutableInfo = _.trim(resFile.stdout);
-    log.debug(bundleExecutableInfo);
-    const arch = _.trim(resUname.stdout);
-    const isAppleSilicon = os.cpus()[0].model.includes('Apple');
-    // We cannot run Simulator builds compiled for arm64 on Intel machines
-    // Rosetta allows only to run Intel ones on arm64
-    if (
-      !_.includes(bundleExecutableInfo, `executable ${arch}`) &&
-      !(isAppleSilicon && _.includes(bundleExecutableInfo, 'executable x86_64'))
-    ) {
-      const bundleId = await extractBundleId(app);
-      throw new Error(
-        `The ${bundleId} application does not support the ${arch} Simulator ` +
-          `architecture:\n${bundleExecutableInfo}\n\n` +
-          `Please rebuild your application to support the ${arch} platform.`,
-      );
-    }
+  if (this.isRealDevice()) {
+    return;
+  }
+
+  const executablePath = path.resolve(this.opts.app, await this.appInfosCache.extractExecutableName(this.opts.app));
+  const [resFile, resUname] = await B.all([
+    exec('file', [executablePath]),
+    exec('uname', ['-m']),
+  ]);
+  const bundleExecutableInfo = _.trim(resFile.stdout);
+  this.log.debug(bundleExecutableInfo);
+  const arch = _.trim(resUname.stdout);
+  const isAppleSilicon = os.cpus()[0].model.includes('Apple');
+  // We cannot run Simulator builds compiled for arm64 on Intel machines
+  // Rosetta allows only to run Intel ones on arm64
+  if (
+    !_.includes(bundleExecutableInfo, `executable ${arch}`) &&
+    !(isAppleSilicon && _.includes(bundleExecutableInfo, 'executable x86_64'))
+  ) {
+    throw new Error(
+      `The ${this.opts.bundleId} application does not support the ${arch} Simulator ` +
+        `architecture:\n${bundleExecutableInfo}\n\n` +
+        `Please rebuild your application to support the ${arch} platform.`,
+    );
   }
 }
 
+/**
+ *
+ * @param {string} resourcePath
+ * @returns {Promise<import('@appium/types').StringRecord>}
+ */
 async function readResource(resourcePath) {
   const data = await plist.parsePlistFile(resourcePath);
   const result = {};
@@ -176,79 +93,113 @@ async function readResource(resourcePath) {
   return result;
 }
 
-export async function parseLocalizableStrings(opts) {
-  const {app, language = 'en', localizableStringsDir, stringFile, strictMode} = opts;
+/**
+ * @typedef {Object} LocalizableStringsOptions
+ * @property {string} [app]
+ * @property {string} [language='en']
+ * @property {string} [localizableStringsDir]
+ * @property {string} [stringFile]
+ * @property {boolean} [strictMode]
+ */
 
+/**
+ * Extracts string resources from an app
+ *
+ * @this {XCUITestDriver}
+ * @param {LocalizableStringsOptions} opts
+ * @returns {Promise<import('@appium/types').StringRecord>}
+ */
+export async function parseLocalizableStrings(opts = {}) {
+  const {app, language = 'en', localizableStringsDir, stringFile, strictMode} = opts;
   if (!app) {
     const message = `Strings extraction is not supported if 'app' capability is not set`;
     if (strictMode) {
       throw new Error(message);
     }
-    log.info(message);
+    this.log.info(message);
     return {};
   }
 
-  let lprojRoot;
-  for (const subfolder of [`${language}.lproj`, localizableStringsDir, '']) {
-    lprojRoot = path.resolve(app, subfolder);
-    if (await fs.exists(lprojRoot)) {
-      break;
-    }
-    const message = `No '${lprojRoot}' resources folder has been found`;
-    if (strictMode) {
-      throw new Error(message);
+  let bundleRoot = app;
+  const isArchive = (await fs.stat(app)).isFile();
+  let tmpRoot;
+  try {
+    if (isArchive) {
+      tmpRoot = await tempDir.openDir();
+      this.log.info(`Extracting '${app}' into a temporary location to parse its resources`);
+      await zip.extractAllTo(app, tmpRoot);
+      const relativeBundleRoot = /** @type {string} */ (_.first(await findApps(tmpRoot, [APP_EXT])));
+      this.log.info(`Selecting '${relativeBundleRoot}'`);
+      bundleRoot = path.join(tmpRoot, relativeBundleRoot);
     }
-    log.debug(message);
-  }
-  log.info(`Will extract resource strings from '${lprojRoot}'`);
 
-  const resourcePaths = [];
-  if (stringFile) {
-    const dstPath = path.resolve(String(lprojRoot), stringFile);
-    if (await fs.exists(dstPath)) {
-      resourcePaths.push(dstPath);
-    } else {
-      const message = `No '${dstPath}' resource file has been found for '${app}'`;
+    /** @type {string|undefined} */
+    let lprojRoot;
+    for (const subfolder of [`${language}.lproj`, localizableStringsDir, ''].filter(_.isString)) {
+      lprojRoot = path.resolve(bundleRoot, /** @type {string} */ (subfolder));
+      if (await fs.exists(lprojRoot)) {
+        break;
+      }
+      const message = `No '${lprojRoot}' resources folder has been found`;
       if (strictMode) {
         throw new Error(message);
       }
-      log.info(message);
-      log.info(`Getting all the available strings from '${lprojRoot}'`);
+      this.log.debug(message);
+    }
+    if (!lprojRoot) {
+      return {};
     }
-  }
 
-  if (_.isEmpty(resourcePaths) && (await fs.exists(String(lprojRoot)))) {
-    const resourceFiles = (await fs.readdir(String(lprojRoot)))
-      .filter((name) => _.some([STRINGS_RESOURCE, STRINGSDICT_RESOURCE], (x) => name.endsWith(x)))
-      .map((name) => path.resolve(lprojRoot, name));
-    resourcePaths.push(...resourceFiles);
-  }
-  log.info(`Got ${resourcePaths.length} resource file(s) in '${lprojRoot}'`);
+    this.log.info(`Retrieving resource strings from '${lprojRoot}'`);
+    const resourcePaths = [];
+    if (stringFile) {
+      const dstPath = path.resolve(/** @type {string} */ (lprojRoot), stringFile);
+      if (await fs.exists(dstPath)) {
+        resourcePaths.push(dstPath);
+      } else {
+        const message = `No '${dstPath}' resource file has been found for '${app}'`;
+        if (strictMode) {
+          throw new Error(message);
+        }
+        this.log.info(message);
+      }
+    }
 
-  if (_.isEmpty(resourcePaths)) {
-    return {};
-  }
+    if (_.isEmpty(resourcePaths) && (await fs.exists(lprojRoot))) {
+      const resourceFiles = (await fs.readdir(lprojRoot))
+        .filter((name) => _.some([STRINGS_RESOURCE, STRINGSDICT_RESOURCE], (x) => name.endsWith(x)))
+        .map((name) => path.resolve(lprojRoot, name));
+      resourcePaths.push(...resourceFiles);
+    }
+    this.log.info(`Got ${util.pluralize('resource file', resourcePaths.length, true)} in '${lprojRoot}'`);
 
-  const resultStrings = {};
-  const toAbsolutePath = function (p) {
-    return path.isAbsolute(p) ? p : path.resolve(process.cwd(), p);
-  };
-  for (const resourcePath of resourcePaths) {
-    if (!util.isSubPath(toAbsolutePath(resourcePath), toAbsolutePath(app))) {
-      // security precaution
-      throw new Error(`'${resourcePath}' is expected to be located under '${app}'`);
+    if (_.isEmpty(resourcePaths)) {
+      return {};
     }
-    try {
-      const data = await readResource(resourcePath);
-      log.debug(`Parsed ${_.keys(data).length} string(s) from '${resourcePath}'`);
-      _.merge(resultStrings, data);
-    } catch (e) {
-      log.warn(`Cannot parse '${resourcePath}' resource. Original error: ${e.message}`);
+
+    const resultStrings = {};
+    const toAbsolutePath = (/** @type {string} */ p) => path.isAbsolute(p) ? p : path.resolve(process.cwd(), p);
+    for (const resourcePath of resourcePaths) {
+      if (!util.isSubPath(toAbsolutePath(resourcePath), toAbsolutePath(bundleRoot))) {
+        // security precaution
+        throw new Error(`'${resourcePath}' is expected to be located under '${bundleRoot}'`);
+      }
+      try {
+        const data = await readResource(resourcePath);
+        this.log.debug(`Parsed ${util.pluralize('string', _.keys(data).length, true)} from '${resourcePath}'`);
+        _.merge(resultStrings, data);
+      } catch (e) {
+        this.log.warn(`Cannot parse '${resourcePath}' resource. Original error: ${e.message}`);
+      }
     }
-  }
 
-  log.info(`Got ${_.keys(resultStrings).length} string(s) from '${lprojRoot}'`);
-  return resultStrings;
+    this.log.info(`Retrieved ${util.pluralize('string', _.keys(resultStrings).length, true)} from '${lprojRoot}'`);
+    return resultStrings;
+  } finally {
+    if (tmpRoot) {
+      await fs.rimraf(tmpRoot);
+    }
+  }
 }
 
 /**
@@ -257,7 +208,7 @@ export async function parseLocalizableStrings(opts) {
  * @param {string} appPath Possible .app bundle root
  * @returns {Promise<boolean>} Whether the given path points to an .app bundle
  */
-export async function isAppBundle(appPath) {
+async function isAppBundle(appPath) {
   return (
     _.endsWith(_.toLower(appPath), APP_EXT) &&
     (await fs.stat(appPath)).isDirectory() &&
@@ -265,6 +216,16 @@ export async function isAppBundle(appPath) {
   );
 }
 
+/**
+ * Check whether the given path on the file system points to the .ipa file
+ *
+ * @param {string} appPath Possible .ipa file
+ * @returns {Promise<boolean>} Whether the given path points to an .ipa bundle
+ */
+async function isIpaBundle(appPath) {
+  return _.endsWith(_.toLower(appPath), IPA_EXT) && (await fs.stat(appPath)).isFile();
+}
+
 /**
  * @typedef {Object} UnzipInfo
  * @property {string} rootDir
@@ -355,6 +316,111 @@ export async function unzipStream(zipStream) {
   };
 }
 
+/**
+ * Used to parse the file name value from response headers
+ *
+ * @param {import('@appium/types').HTTPHeaders} headers
+ * @returns {string?}
+ */
+function parseFileName(headers) {
+  const contentDisposition = headers['content-disposition'];
+  if (!_.isString(contentDisposition)) {
+    return null;
+  }
+
+  if (/^attachment/i.test(/** @type {string} */ (contentDisposition))) {
+    const match = /filename="([^"]+)/i.exec(/** @type {string} */ (contentDisposition));
+    if (match) {
+      return fs.sanitizeName(match[1], {replacement: SANITIZE_REPLACEMENT});
+    }
+  }
+  return null;
+}
+
+/**
+ * Downloads and verifies remote applications for real devices
+ *
+ * @this {XCUITestDriver}
+ * @param {import('node:stream').Readable} stream
+ * @param {import('@appium/types').HTTPHeaders} headers
+ * @returns {Promise<string>}
+ */
+async function downloadIpa(stream, headers) {
+  const timer = new timing.Timer().start();
+
+  const logPerformance = (/** @type {string} */ dstPath, /** @type {number} */ fileSize, /** @type {string} */ action) => {
+    const secondsElapsed = timer.getDuration().asSeconds;
+    this.log.info(
+      `The remote file (${util.toReadableSizeString(fileSize)}) ` +
+      `has been ${action} to '${dstPath}' in ${secondsElapsed.toFixed(3)}s`
+    );
+    if (secondsElapsed >= 1) {
+      const bytesPerSec = Math.floor(fileSize / secondsElapsed);
+      this.log.debug(`Approximate speed: ${util.toReadableSizeString(bytesPerSec)}/s`);
+    }
+  };
+
+  // Check if the file to be downloaded is a .zip rather than .ipa
+  const fileName = parseFileName(headers) ?? `appium-app-${new Date().getTime()}${IPA_EXT}`;
+  if (fileName.toLowerCase().endsWith(ZIP_EXT)) {
+    const {rootDir, archiveSize} = await unzipStream(stream);
+    logPerformance(rootDir, archiveSize, 'downloaded and unzipped');
+    try {
+      const matchedPaths = await findApps(rootDir, [IPA_EXT]);
+      if (!_.isEmpty(matchedPaths)) {
+        this.log.debug(
+          `Found ${util.pluralize(`${IPA_EXT} applicaition`, matchedPaths.length, true)} in ` +
+          `'${path.basename(rootDir)}': ${matchedPaths}`
+        );
+      }
+      for (const matchedPath of matchedPaths) {
+        try {
+          await this.appInfosCache.put(matchedPath);
+        } catch (e) {
+          this.log.info(e.message);
+          continue;
+        }
+        this.log.debug(`Selecting the application at '${matchedPath}'`);
+        const isolatedPath = path.join(await tempDir.openDir(), path.basename(matchedPath));
+        await fs.mv(matchedPath, isolatedPath);
+        return isolatedPath;
+      }
+      throw new Error(`The remote archive does not contain any valid ${IPA_EXT} applications`);
+    } finally {
+      await fs.rimraf(rootDir);
+    }
+  }
+
+  const ipaPath = await tempDir.path({
+    prefix: fileName,
+    suffix: fileName.toLowerCase().endsWith(IPA_EXT) ? '' : IPA_EXT,
+  });
+  try {
+    const writer = fs.createWriteStream(ipaPath);
+    stream.pipe(writer);
+
+    await new B((resolve, reject) => {
+      stream.once('error', reject);
+      writer.once('finish', resolve);
+      writer.once('error', (e) => {
+        stream.unpipe(writer);
+        reject(e);
+      });
+    });
+  } catch (err) {
+    throw new Error(`Cannot fetch the remote file: ${err.message}`);
+  }
+  const {size} = await fs.stat(ipaPath);
+  logPerformance(ipaPath, size, 'downloaded');
+  try {
+    await this.appInfosCache.put(ipaPath);
+  } catch (e) {
+    await fs.rimraf(ipaPath);
+    throw e;
+  }
+  return ipaPath;
+}
+
 /**
  * Looks for items with given extensions in the given folder
  *
@@ -375,15 +441,25 @@ async function findApps(appPath, appExtensions) {
 /**
  * Moves the application bundle to a newly created temporary folder
  *
- * @param {string} appRoot Full path to the .app bundle
+ * @param {string} appPath Full path to the .app or .ipa bundle
  * @returns {Promise<string>} The new path to the app bundle.
- * The name of the app bundle remains though
+ * The name of the app bundle remains the same
  */
-export async function isolateAppBundle(appRoot) {
+async function isolateApp(appPath) {
+  const appFileName = path.basename(appPath);
+  if ((await fs.stat(appPath)).isFile()) {
+    const isolatedPath = await tempDir.path({
+      prefix: appFileName,
+      suffix: '',
+    });
+    await fs.mv(appPath, isolatedPath, {mkdirp: true});
+    return isolatedPath;
+  }
+
   const tmpRoot = await tempDir.openDir();
-  const dstRoot = path.join(tmpRoot, path.basename(appRoot));
-  await fs.mv(appRoot, dstRoot, {mkdirp: true});
-  return dstRoot;
+  const isolatedRoot = path.join(tmpRoot, appFileName);
+  await fs.mv(appPath, isolatedRoot, {mkdirp: true});
+  return isolatedRoot;
 }
 
 /**
@@ -410,7 +486,7 @@ export function buildSafariPreferences(opts) {
 /**
  * Unzip the given archive and find a matching .app bundle in it
  *
- * @this {import('./driver').XCUITestDriver}
+ * @this {XCUITestDriver}
  * @param {string|import('node:stream').Readable} appPathOrZipStream The path to the archive.
  * @param {number} depth [0] the current nesting depth. App bundles whose nesting level
  * is greater than 1 are not supported.
@@ -418,7 +494,7 @@ export function buildSafariPreferences(opts) {
  * @throws If no matching .app bundles were found in the provided archive.
  */
 async function unzipApp(appPathOrZipStream, depth = 0) {
-  const errMsg = `The archive '${this.opts.app}' did not have any matching ${APP_EXT} or ${IPA_EXT} ` +
+  const errMsg = `The archive did not have any matching ${APP_EXT} or ${IPA_EXT} ` +
     `bundles. Please make sure the provided package is valid and contains at least one matching ` +
     `application bundle which is not nested.`;
   if (depth > MAX_ARCHIVE_SCAN_DEPTH) {
@@ -432,22 +508,24 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
   let archiveSize;
   try {
     if (_.isString(appPathOrZipStream)) {
-      ({rootDir, archiveSize} = await unzipFile(appPathOrZipStream));
+      ({rootDir, archiveSize} = await unzipFile(/** @type {string} */ (appPathOrZipStream)));
     } else {
       if (depth > 0) {
         assert.fail('Streaming unzip cannot be invoked for nested archive items');
       }
-      ({rootDir, archiveSize} = await unzipStream(appPathOrZipStream));
+      ({rootDir, archiveSize} = await unzipStream(
+        /** @type {import('node:stream').Readable} */ (appPathOrZipStream))
+      );
     }
   } catch (e) {
     this.log.debug(e.stack);
     throw new Error(
-      `Cannot prepare the application at '${this.opts.app}' for testing. Original error: ${e.message}`
+      `Cannot prepare the application for testing. Original error: ${e.message}`
     );
   }
   const secondsElapsed = timer.getDuration().asSeconds;
   this.log.info(
-    `The app '${this.opts.app}' (${util.toReadableSizeString(archiveSize)}) ` +
+    `The file (${util.toReadableSizeString(archiveSize)}) ` +
       `has been ${_.isString(appPathOrZipStream) ? 'extracted' : 'downloaded and extracted'} ` +
       `to '${rootDir}' in ${secondsElapsed.toFixed(3)}s`
   );
@@ -457,6 +535,31 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
     this.log.debug(`Approximate decompression speed: ${util.toReadableSizeString(bytesPerSec)}/s`);
   }
 
+  const isCompatibleWithCurrentPlatform = async (/** @type {string} */ appPath) => {
+    let platforms;
+    try {
+      platforms = await this.appInfosCache.extractAppPlatforms(appPath);
+    } catch (e) {
+      this.log.info(e.message);
+      return false;
+    }
+    if (this.isSimulator() && !platforms.some((p) => _.includes(p, 'Simulator'))) {
+      this.log.info(
+        `'${appPath}' does not have Simulator devices in the list of supported platforms ` +
+        `(${platforms.join(',')}). Skipping it`
+      );
+      return false;
+    }
+    if (this.isRealDevice() && !platforms.some((p) => _.includes(p, 'OS'))) {
+      this.log.info(
+        `'${appPath}' does not have real devices in the list of supported platforms ` +
+        `(${platforms.join(',')}). Skipping it`
+      );
+      return false;
+    }
+    return true;
+  };
+
   const matchedPaths = await findApps(rootDir, SUPPORTED_EXTENSIONS);
   if (_.isEmpty(matchedPaths)) {
     this.log.debug(`'${path.basename(rootDir)}' has no bundles`);
@@ -469,32 +572,12 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
   try {
     for (const matchedPath of matchedPaths) {
       const fullPath = path.join(rootDir, matchedPath);
-      if (await isAppBundle(fullPath)) {
-        const supportedPlatforms = await fetchSupportedAppPlatforms(fullPath);
-        if (this.isSimulator() && !supportedPlatforms.some((p) => _.includes(p, 'Simulator'))) {
-          this.log.info(
-            `'${matchedPath}' does not have Simulator devices in the list of supported platforms ` +
-              `(${supportedPlatforms.join(',')}). Skipping it`,
-          );
-          continue;
-        }
-        if (this.isRealDevice() && !supportedPlatforms.some((p) => _.includes(p, 'OS'))) {
-          this.log.info(
-            `'${matchedPath}' does not have real devices in the list of supported platforms ` +
-              `(${supportedPlatforms.join(',')}). Skipping it`,
-          );
-          continue;
-        }
-        this.log.info(
-          `'${matchedPath}' is the resulting application bundle selected from '${rootDir}'`,
-        );
-        return await isolateAppBundle(fullPath);
-      } else if (_.endsWith(_.toLower(fullPath), IPA_EXT) && (await fs.stat(fullPath)).isFile()) {
-        try {
-          return await unzipApp.bind(this)(fullPath, depth + 1);
-        } catch (e) {
-          this.log.warn(`Skipping processing of '${matchedPath}': ${e.message}`);
-        }
+      if (
+        (await isAppBundle(fullPath) || (this.isRealDevice() && await isIpaBundle(fullPath)))
+        && await isCompatibleWithCurrentPlatform(fullPath)
+      ) {
+        this.log.debug(`Selecting the application at '${matchedPath}'`);
+        return await isolateApp(fullPath);
       }
     }
   } finally {
@@ -504,16 +587,24 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
 }
 
 /**
- * @this {import('./driver').XCUITestDriver}
+ * The callback invoked by configureApp helper
+ * when it is necessary to download the remote application.
+ * We assume the remote file could be anythingm, but only
+ * .zip and .ipa formats are supported.
+ * A .zip archive can contain one or more
+ *
+ * @this {XCUITestDriver}
  * @param {import('@appium/types').DownloadAppOptions} opts
  * @returns {Promise<string>}
  */
-export async function onDownloadApp({stream}) {
-  return await unzipApp.bind(this)(stream);
+export async function onDownloadApp({stream, headers}) {
+  return this.isRealDevice()
+    ? await downloadIpa.bind(this)(stream, headers)
+    : await unzipApp.bind(this)(stream);
 }
 
 /**
- * @this {import('./driver').XCUITestDriver}
+ * @this {XCUITestDriver}
  * @param {import('@appium/types').PostProcessOptions} opts
  * @returns {Promise<import('@appium/types').PostProcessResult|false>}
  */
@@ -522,32 +613,59 @@ export async function onPostConfigureApp({cachedAppInfo, isUrl, appPath}) {
   /** @type {import('@appium/types').CachedAppInfo|undefined} */
   const appInfo = _.isPlainObject(cachedAppInfo) ? cachedAppInfo : undefined;
   const cachedPath = appInfo ? /** @type {string} */ (appInfo.fullPath) : undefined;
-  if (
-    // If cache is present
-    appInfo && cachedPath
-    // And if the path exists
-    && await fs.exists(cachedPath)
-    // And if hash matches to the cached one if this is a file
-    // Or count of files >= of the cached one if this is a folder
-    && (
-      ((await fs.stat(cachedPath)).isFile()
-        && await fs.hash(cachedPath) === /** @type {any} */ (appInfo.integrity)?.file)
-      || (await fs.glob('**/*', {cwd: cachedPath})).length >= /** @type {any} */ (
-        appInfo.integrity
-      )?.folder
-    )
-  ) {
+
+  const shouldUseCachedApp = async () => {
+    if (!appInfo || !cachedPath || !await fs.exists(cachedPath)) {
+      return false;
+    }
+
+    const isCachedPathAFile = (await fs.stat(cachedPath)).isFile();
+    if (isCachedPathAFile) {
+      return await fs.hash(cachedPath) === /** @type {any} */ (appInfo.integrity)?.file;
+    }
+    // If the cached path is a folder then it is expected to be previously extracted from
+    // an archive located under appPath whose hash is stored as `cachedAppInfo.packageHash`
+    if (
+      !isCachedPathAFile
+      && cachedAppInfo?.packageHash
+      && await fs.exists(/** @type {string} */ (appPath))
+      && (await fs.stat(/** @type {string} */ (appPath))).isFile()
+      && cachedAppInfo.packageHash === await fs.hash(/** @type {string} */ (appPath))
+    ) {
+      /** @type {number|undefined} */
+      const nestedItemsCountInCache = /** @type {any} */ (appInfo.integrity)?.folder;
+      if (nestedItemsCountInCache !== undefined) {
+        return (await fs.glob('**/*', {cwd: cachedPath})).length >= nestedItemsCountInCache;
+      }
+    }
+
+    return false;
+  };
+
+  if (await shouldUseCachedApp()) {
     this.log.info(`Using '${cachedPath}' which was cached from '${appPath}'`);
-    return {appPath: cachedPath};
+    return {appPath: /** @type {string} */ (cachedPath)};
   }
 
-  const isBundleAlreadyUnpacked = await isAppBundle(/** @type {string} */(appPath));
-  // Only local .app bundles that are available in-place should not be cached
-  if (!isUrl && isBundleAlreadyUnpacked) {
+  const isLocalIpa = await isIpaBundle(/** @type {string} */(appPath));
+  const isLocalApp = !isLocalIpa && await isAppBundle(/** @type {string} */(appPath));
+  const isPackageReadyForInstall = isLocalApp || (this.isRealDevice() && isLocalIpa);
+  if (isPackageReadyForInstall) {
+    await this.appInfosCache.put(/** @type {string} */(appPath));
+  }
+  // Only local .app bundles (real device/Simulator)
+  // and .ipa packages for real devices should not be cached
+  if (!isUrl && isPackageReadyForInstall) {
     return false;
   }
   // Cache the app while unpacking the bundle if necessary
   return {
-    appPath: isBundleAlreadyUnpacked ? appPath : await unzipApp.bind(this)(/** @type {string} */(appPath))
+    appPath: isPackageReadyForInstall
+      ? appPath
+      : await unzipApp.bind(this)(/** @type {string} */(appPath))
   };
 }
+
+/**
+ * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
+ */