npm - appium-xcuitest-driver - Versions diffs - 7.15.1 → 7.15.2 - Mend

appium-xcuitest-driver 7.15.1 → 7.15.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/CHANGELOG.md +7 -0
package/build/lib/app-infos-cache.d.ts +28 -12
package/build/lib/app-infos-cache.d.ts.map +1 -1
package/build/lib/app-infos-cache.js +93 -74
package/build/lib/app-infos-cache.js.map +1 -1
package/lib/app-infos-cache.js +94 -72
package/npm-shrinkwrap.json +32 -27
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,10 @@
+## [7.15.2](https://github.com/appium/appium-xcuitest-driver/compare/v7.15.1...v7.15.2) (2024-05-07)
+### Bug Fixes
+* Properly cache manifests for .ipa bundles containing multiple apps ([#2394](https://github.com/appium/appium-xcuitest-driver/issues/2394)) ([ffd3bbb](https://github.com/appium/appium-xcuitest-driver/commit/ffd3bbbe8ef3e9ef80c2b9af327d88be6e0f367a))
 ## [7.15.1](https://github.com/appium/appium-xcuitest-driver/compare/v7.15.0...v7.15.1) (2024-04-27)

package/build/lib/app-infos-cache.d.ts CHANGED Viewed

@@ -6,41 +6,57 @@ export class AppInfosCache {
     log: import("@appium/types").AppiumLogger;
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @param {string} propertyName
      * @returns {Promise<any>}
      */
-    extractManifestProperty(appPath: string, propertyName: string): Promise<any>;
+    extractManifestProperty(bundlePath: string, propertyName: string): Promise<any>;
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    extractBundleId(appPath: string): Promise<string>;
+    extractBundleId(bundlePath: string): Promise<string>;
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    extractBundleVersion(appPath: string): Promise<string>;
+    extractBundleVersion(bundlePath: string): Promise<string>;
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string[]>}
      */
-    extractAppPlatforms(appPath: string): Promise<string[]>;
+    extractAppPlatforms(bundlePath: string): Promise<string[]>;
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    extractExecutableName(appPath: string): Promise<string>;
+    extractExecutableName(bundlePath: string): Promise<string>;
     /**
      *
-     * @param {string} appPath Full path to the .ipa or .app bundle
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
      * @throws {Error} If the given app is not a valid bundle
      */
-    put(appPath: string): Promise<import('@appium/types').StringRecord>;
+    put(bundlePath: string): Promise<import('@appium/types').StringRecord>;
+    /**
+     * @param {string} ipaPath Fill path to the .ipa bundle
+     * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+     */
+    _putIpa(ipaPath: string): Promise<import('@appium/types').StringRecord>;
+    /**
+     * @param {string} appPath Fill path to the .app bundle
+     * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+     */
+    _putApp(appPath: string): Promise<import('@appium/types').StringRecord>;
+    /**
+     * @param {string} plistPath Full path to the plist
+     * @param {string} bundlePath Full path to .ipa or .app bundle
+     * @returns {Promise<any>} The payload of the plist file
+     */
+    _readPlist(plistPath: string, bundlePath: string): Promise<any>;
 }
 //# sourceMappingURL=app-infos-cache.d.ts.map

package/build/lib/app-infos-cache.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"app-infos-cache.d.ts","sourceRoot":"","sources":["../../lib/app-infos-cache.js"],"names":[],"mappings":"~~AAcA~~;IACE;;OAEG;IACH,iBAFW,OAAO,eAAe,EAAE,YAAY,EAI9C;IADC,0CAAc;IAGhB;;;;;OAKG;IACH,~~iCAJW~~,MAAM,gBACN,MAAM,GACJ,QAAQ,GAAG,CAAC,CAMxB;IAED;;;;OAIG;IACH,~~yBAHW~~,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;OAIG;IACH,~~8BAHW~~,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;OAIG;IACH,~~6BAHW~~,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAQ7B;IAED;;;;OAIG;IACH~~,+BAHW~~,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;;OAKG;IACH,~~aAJW~~,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,YAAY,CAAC,~~CAgFzD~~;CACF"}
1	+ {"version":3,"file":"app-infos-cache.d.ts","sourceRoot":"","sources":["../../lib/app-infos-cache.js"],"names":[],"mappings":"AAiBA;IACE;;OAEG;IACH,iBAFW,OAAO,eAAe,EAAE,YAAY,EAI9C;IADC,0CAAc;IAGhB;;;;;OAKG;IACH,oCAJW,MAAM,gBACN,MAAM,GACJ,QAAQ,GAAG,CAAC,CAMxB;IAED;;;;OAIG;IACH,4BAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;OAIG;IACH,iCAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAQ7B;IAED;;;;OAIG;IACH,kCAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;;OAKG;IACH,gBAJW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,YAAY,CAAC,CAOzD;IAED;;;OAGG;IACH,iBAHW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,YAAY,CAAC,CAmDzD;IAED;;;OAGG;IACH,iBAHW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,YAAY,CAAC,CAmBzD;IAED;;;;OAIG;IACH,sBAJW,MAAM,cACN,MAAM,GACJ,QAAQ,GAAG,CAAC,CASxB;CACF"}

package/build/lib/app-infos-cache.js CHANGED Viewed

@@ -15,6 +15,7 @@ const MANIFEST_CACHE = new lru_cache_1.LRUCache({
     updateAgeOnHas: true,
 });
 const MANIFEST_FILE_NAME = 'Info.plist';
+const IPA_ROOT_PLIST_PATH_PATTERN = new RegExp(`^Payload/[^./]+\\.app/${lodash_1.default.escapeRegExp(MANIFEST_FILE_NAME)}$`);
 const MAX_MANIFEST_SIZE = 1024 * 1024; // 1 MiB
 class AppInfosCache {
     /**
@@ -25,124 +26,128 @@ class AppInfosCache {
     }
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @param {string} propertyName
      * @returns {Promise<any>}
      */
-    async extractManifestProperty(appPath, propertyName) {
-        const result = (await this.put(appPath))[propertyName];
+    async extractManifestProperty(bundlePath, propertyName) {
+        const result = (await this.put(bundlePath))[propertyName];
         this.log.debug(`${propertyName}: ${JSON.stringify(result)}`);
         return result;
     }
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    async extractBundleId(appPath) {
-        return await this.extractManifestProperty(appPath, 'CFBundleIdentifier');
+    async extractBundleId(bundlePath) {
+        return await this.extractManifestProperty(bundlePath, 'CFBundleIdentifier');
     }
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    async extractBundleVersion(appPath) {
-        return await this.extractManifestProperty(appPath, 'CFBundleVersion');
+    async extractBundleVersion(bundlePath) {
+        return await this.extractManifestProperty(bundlePath, 'CFBundleVersion');
     }
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string[]>}
      */
-    async extractAppPlatforms(appPath) {
-        const result = await this.extractManifestProperty(appPath, 'CFBundleSupportedPlatforms');
+    async extractAppPlatforms(bundlePath) {
+        const result = await this.extractManifestProperty(bundlePath, 'CFBundleSupportedPlatforms');
         if (!Array.isArray(result)) {
-            throw new Error(`${path_1.default.basename(appPath)}': CFBundleSupportedPlatforms is not a valid list`);
+            throw new Error(`${path_1.default.basename(bundlePath)}': CFBundleSupportedPlatforms is not a valid list`);
         }
         return result;
     }
     /**
      *
-     * @param {string} appPath
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<string>}
      */
-    async extractExecutableName(appPath) {
-        return await this.extractManifestProperty(appPath, 'CFBundleExecutable');
+    async extractExecutableName(bundlePath) {
+        return await this.extractManifestProperty(bundlePath, 'CFBundleExecutable');
     }
     /**
      *
-     * @param {string} appPath Full path to the .ipa or .app bundle
+     * @param {string} bundlePath Full path to the .ipa or .app bundle
      * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
      * @throws {Error} If the given app is not a valid bundle
      */
-    async put(appPath) {
-        const readPlist = async (/** @type {string} */ plistPath) => {
-            try {
-                return await support_1.plist.parsePlistFile(plistPath);
-            }
-            catch (e) {
-                this.log.debug(e.stack);
-                throw new Error(`Cannot parse ${MANIFEST_FILE_NAME} of '${appPath}'. Is it a valid application bundle?`);
-            }
-        };
-        if ((await support_1.fs.stat(appPath)).isFile()) {
-            /** @type {import('@appium/types').StringRecord|undefined} */
-            let manifestPayload;
-            /** @type {Error|undefined} */
-            let lastError;
-            try {
-                await support_1.zip.readEntries(appPath, async ({ entry, extractEntryTo }) => {
-                    if (!lodash_1.default.endsWith(entry.fileName, `.app/${MANIFEST_FILE_NAME}`)) {
-                        return true;
-                    }
-                    const hash = `${entry.crc32}`;
-                    if (MANIFEST_CACHE.has(hash)) {
-                        manifestPayload = MANIFEST_CACHE.get(hash);
-                        return false;
-                    }
-                    const tmpRoot = await support_1.tempDir.openDir();
-                    try {
-                        await extractEntryTo(tmpRoot);
-                        const plistPath = path_1.default.resolve(tmpRoot, entry.fileName);
-                        manifestPayload = await readPlist(plistPath);
-                        if (entry.uncompressedSize <= MAX_MANIFEST_SIZE && lodash_1.default.isPlainObject(manifestPayload)) {
-                            this.log.debug(`Caching the manifest for ${manifestPayload?.CFBundleIdentifier} app ` +
-                                `from an archived source using the key '${hash}'`);
-                            MANIFEST_CACHE.set(hash, manifestPayload);
-                        }
-                    }
-                    catch (e) {
-                        this.log.debug(e.stack);
-                        lastError = e;
-                    }
-                    finally {
-                        await support_1.fs.rimraf(tmpRoot);
-                    }
+    async put(bundlePath) {
+        return (await support_1.fs.stat(bundlePath)).isFile()
+            ? await this._putIpa(bundlePath)
+            : await this._putApp(bundlePath);
+    }
+    /**
+     * @param {string} ipaPath Fill path to the .ipa bundle
+     * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+     */
+    async _putIpa(ipaPath) {
+        /** @type {import('@appium/types').StringRecord|undefined} */
+        let manifestPayload;
+        /** @type {Error|undefined} */
+        let lastError;
+        try {
+            await support_1.zip.readEntries(ipaPath, async ({ entry, extractEntryTo }) => {
+                // https://github.com/appium/appium/issues/20075
+                if (!IPA_ROOT_PLIST_PATH_PATTERN.test(entry.fileName)) {
+                    return true;
+                }
+                const hash = `${entry.crc32}`;
+                if (MANIFEST_CACHE.has(hash)) {
+                    manifestPayload = MANIFEST_CACHE.get(hash);
                     return false;
-                });
-            }
-            catch (e) {
-                this.log.debug(e.stack);
-                throw new Error(`Cannot find ${MANIFEST_FILE_NAME} in '${appPath}'. Is it a valid application bundle?`);
-            }
-            if (!manifestPayload) {
-                let errorMessage = `Cannot extract ${MANIFEST_FILE_NAME} from '${appPath}'. Is it a valid application bundle?`;
-                if (lastError) {
-                    errorMessage += ` Original error: ${lastError.message}`;
                 }
-                throw new Error(errorMessage);
+                const tmpRoot = await support_1.tempDir.openDir();
+                try {
+                    await extractEntryTo(tmpRoot);
+                    const plistPath = path_1.default.resolve(tmpRoot, entry.fileName);
+                    manifestPayload = await this._readPlist(plistPath, ipaPath);
+                    if (lodash_1.default.isPlainObject(manifestPayload) && entry.uncompressedSize <= MAX_MANIFEST_SIZE) {
+                        this.log.debug(`Caching the manifest '${entry.fileName}' for ${manifestPayload?.CFBundleIdentifier} app ` +
+                            `from the compressed source using the key '${hash}'`);
+                        MANIFEST_CACHE.set(hash, manifestPayload);
+                    }
+                }
+                catch (e) {
+                    this.log.debug(e.stack);
+                    lastError = e;
+                }
+                finally {
+                    await support_1.fs.rimraf(tmpRoot);
+                }
+                return false;
+            });
+        }
+        catch (e) {
+            this.log.debug(e.stack);
+            throw new Error(`Cannot find ${MANIFEST_FILE_NAME} in '${ipaPath}'. Is it a valid application bundle?`);
+        }
+        if (!manifestPayload) {
+            let errorMessage = `Cannot extract ${MANIFEST_FILE_NAME} from '${ipaPath}'. Is it a valid application bundle?`;
+            if (lastError) {
+                errorMessage += ` Original error: ${lastError.message}`;
             }
-            return manifestPayload;
+            throw new Error(errorMessage);
         }
-        // appPath points to a folder
+        return manifestPayload;
+    }
+    /**
+     * @param {string} appPath Fill path to the .app bundle
+     * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+     */
+    async _putApp(appPath) {
         const manifestPath = path_1.default.join(appPath, MANIFEST_FILE_NAME);
         const hash = await support_1.fs.hash(manifestPath);
         if (MANIFEST_CACHE.has(hash)) {
             return /** @type {import('@appium/types').StringRecord} */ (MANIFEST_CACHE.get(hash));
         }
         const [payload, stat] = await bluebird_1.default.all([
-            readPlist(manifestPath),
+            this._readPlist(manifestPath, appPath),
             support_1.fs.stat(manifestPath),
         ]);
         if (stat.size <= MAX_MANIFEST_SIZE && lodash_1.default.isPlainObject(payload)) {
@@ -151,6 +156,20 @@ class AppInfosCache {
         }
         return payload;
     }
+    /**
+     * @param {string} plistPath Full path to the plist
+     * @param {string} bundlePath Full path to .ipa or .app bundle
+     * @returns {Promise<any>} The payload of the plist file
+     */
+    async _readPlist(plistPath, bundlePath) {
+        try {
+            return await support_1.plist.parsePlistFile(plistPath);
+        }
+        catch (e) {
+            this.log.debug(e.stack);
+            throw new Error(`Cannot parse ${MANIFEST_FILE_NAME} of '${bundlePath}'. Is it a valid application bundle?`);
+        }
+    }
 }
 exports.AppInfosCache = AppInfosCache;
 //# sourceMappingURL=app-infos-cache.js.map

package/build/lib/app-infos-cache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"app-infos-cache.js","sourceRoot":"","sources":["../../lib/app-infos-cache.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,gDAAwB;AACxB,4CAAuD;AACvD,yCAAmC;AACnC,wDAAyB;AAEzB,qEAAqE;AACrE,MAAM,cAAc,GAAG,IAAI,oBAAQ,CAAC;IAClC,GAAG,EAAE,EAAE;IACP,cAAc,EAAE,IAAI;CACrB,CAAC,CAAC;AACH,MAAM,kBAAkB,GAAG,YAAY,CAAC;AACxC,MAAM,iBAAiB,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ;AAE/C,MAAa,aAAa;IACxB;;OAEG;IACH,YAAa,GAAG;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAAE,~~OAAO~~,EAAE,YAAY;~~QAClD~~,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,~~OAAO~~,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;~~QACvD~~,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAE,~~OAAO~~;~~QAC5B~~,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,~~OAAO~~,EAAE,oBAAoB,CAAC,CAAC;~~IAC3E~~,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAE,~~OAAO~~;~~QACjC~~,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,~~OAAO~~,EAAE,iBAAiB,CAAC,CAAC;~~IACxE~~,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAE,~~OAAO~~;~~QAChC~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,~~OAAO~~,EAAE,4BAA4B,CAAC,CAAC;~~QACzF~~,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,GAAG,cAAI,CAAC,QAAQ,CAAC,~~OAAO~~,CAAC,mDAAmD,CAAC,CAAC;~~QAChG~~,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAE,~~OAAO~~;~~QAClC~~,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,~~OAAO~~,EAAE,oBAAoB,CAAC,CAAC;~~IAC3E~~,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAE,~~OAAO~~;~~QAChB~~,~~MAAM~~,~~SAAS~~,~~GAAG~~,~~KAAK~~,~~EAAE,qBAAqB,~~CAAC,~~SAAS,EAAE,EAAE;YAC1D,~~IAAI,CAAC~~;gBACH~~,~~OAAO~~,~~MAAM~~,~~eAAK,~~CAAC,~~cAAc,~~CAAC,~~SAAS~~,~~CAAC,CAAC~~;~~YAC/C~~,CAAC~~;YAAC~~,~~OAAO,~~CAAC,~~EAAE~~,~~CAAC;gBACX,~~IAAI,CAAC,~~GAAG~~,CAAC,~~KAAK~~,CAAC,CAAC,CAAC,~~KAAK,CAAC,CAAC;gBACxB,~~MAAM,IAAI,~~KAAK,~~CAAC,~~gBAAgB,kBAAkB,QAAQ,~~OAAO,~~sCAAsC,~~CAAC,CAAC~~;YAC3G~~,CAAC;~~QACH~~,CAAC~~,CAAC~~;~~QAEF~~,~~IAAI~~,CAAC,~~MAAM~~,~~YAAE,~~CAAC,~~IAAI,CAAC,~~OAAO~~,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC~~;~~YACtC~~,6DAA6D;~~YAC7D~~,IAAI,eAAe,CAAC;~~YACpB~~,8BAA8B;~~YAC9B~~,IAAI,SAAS,CAAC;~~YACd~~,IAAI,CAAC;~~gBACH~~,MAAM,aAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,cAAc,EAAC,EAAE,EAAE;~~oBAC~~/D,IAAI,CAAC,~~gBAAC~~,CAAC,~~QAAQ~~,CAAC,KAAK,CAAC,QAAQ,~~EAAE,QAAQ,kBAAkB,EAAE,~~CAAC,EAAE,CAAC;~~wBAC9D~~,OAAO,IAAI,CAAC;~~oBACd~~,CAAC;~~oBAED~~,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;~~oBAC9B~~,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;~~wBAC7B~~,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;~~wBAC3C~~,OAAO,KAAK,CAAC;~~oBACf~~,CAAC;~~oBACD~~,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;~~oBACxC~~,IAAI,CAAC;~~wBACH~~,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;~~wBAC9B~~,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;~~wBACxD~~,eAAe,GAAG,MAAM,~~SAAS~~,CAAC,SAAS,CAAC,CAAC;~~wBAC7C~~,IAAI,~~KAAK~~,CAAC,~~gBAAgB~~,~~IAAI~~,~~iBAAiB~~,IAAI,~~gBAAC~~,CAAC,~~aAAa~~,~~CAAC~~,~~eAAe~~,~~CAAC,~~EAAE,CAAC;~~4BACpF~~,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,~~4BAA4B~~,eAAe,EAAE,kBAAkB,OAAO;~~gCACtE~~,~~0CAA0C~~,IAAI,GAAG,~~CAClD~~,CAAC;~~4BACF~~,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;~~wBAC5C~~,CAAC;~~oBACH~~,CAAC;~~oBAAC~~,OAAO,CAAC,EAAE,CAAC;~~wBACX~~,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;~~wBACxB~~,SAAS,GAAG,CAAC,CAAC;~~oBAChB~~,CAAC;~~4BAAS~~,CAAC;~~wBACT~~,MAAM,YAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;~~oBAC3B~~,CAAC;~~oBACD~~,OAAO,KAAK,CAAC;~~gBACf~~,CAAC,CAAC,CAAC;~~YACL~~,CAAC;~~YAAC~~,OAAO,CAAC,EAAE,CAAC;~~gBACX~~,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;~~gBACxB~~,MAAM,IAAI,KAAK,CAAC,eAAe,kBAAkB,QAAQ,OAAO,sCAAsC,CAAC,CAAC;~~YAC1G~~,CAAC;~~YACD~~,IAAI,CAAC,eAAe,EAAE,CAAC;~~gBACrB~~,IAAI,YAAY,GAAG,kBAAkB,kBAAkB,UAAU,OAAO,sCAAsC,CAAC;~~gBAC~~/G,IAAI,SAAS,EAAE,CAAC;~~oBACd~~,YAAY,IAAI,oBAAoB,SAAS,CAAC,OAAO,EAAE,CAAC;~~gBAC1D~~,CAAC;~~gBACD~~,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;~~YAChC~~,CAAC;~~YACD~~,OAAO,eAAe,CAAC;~~QACzB~~,CAAC;~~QAED~~,~~6BAA6B~~;~~QAC7B~~,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,mDAAmD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,CAAC;QACD,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,MAAM,kBAAC,CAAC,GAAG,CAAC;YAClC,~~SAAS~~,CAAC,YAAY,CAAC;~~YACvB~~,YAAE,CAAC,IAAI,CAAC,YAAY,CAAC;SACtB,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,IAAI,IAAI,iBAAiB,IAAI,gBAAC,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4BAA4B,OAAO,CAAC,kBAAkB,0CAA0C,IAAI,GAAG,CACxG,CAAC;YACF,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;~~AAhJD~~,~~sCAgJC~~"}
1	+ {"version":3,"file":"app-infos-cache.js","sourceRoot":"","sources":["../../lib/app-infos-cache.js"],"names":[],"mappings":"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"}

package/lib/app-infos-cache.js CHANGED Viewed

@@ -10,6 +10,9 @@ const MANIFEST_CACHE = new LRUCache({
   updateAgeOnHas: true,
 });
 const MANIFEST_FILE_NAME = 'Info.plist';
+const IPA_ROOT_PLIST_PATH_PATTERN = new RegExp(
+  `^Payload/[^./]+\\.app/${_.escapeRegExp(MANIFEST_FILE_NAME)}$`
+);
 const MAX_MANIFEST_SIZE = 1024 * 1024; // 1 MiB
 export class AppInfosCache {
@@ -22,130 +25,135 @@ export class AppInfosCache {
   /**
    *
-   * @param {string} appPath
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @param {string} propertyName
    * @returns {Promise<any>}
    */
-  async extractManifestProperty (appPath, propertyName) {
-    const result = (await this.put(appPath))[propertyName];
+  async extractManifestProperty (bundlePath, propertyName) {
+    const result = (await this.put(bundlePath))[propertyName];
     this.log.debug(`${propertyName}: ${JSON.stringify(result)}`);
     return result;
   }
   /**
    *
-   * @param {string} appPath
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @returns {Promise<string>}
    */
-  async extractBundleId (appPath) {
-    return await this.extractManifestProperty(appPath, 'CFBundleIdentifier');
+  async extractBundleId (bundlePath) {
+    return await this.extractManifestProperty(bundlePath, 'CFBundleIdentifier');
   }
   /**
    *
-   * @param {string} appPath
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @returns {Promise<string>}
    */
-  async extractBundleVersion (appPath) {
-    return await this.extractManifestProperty(appPath, 'CFBundleVersion');
+  async extractBundleVersion (bundlePath) {
+    return await this.extractManifestProperty(bundlePath, 'CFBundleVersion');
   }
   /**
    *
-   * @param {string} appPath
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @returns {Promise<string[]>}
    */
-  async extractAppPlatforms (appPath) {
-    const result = await this.extractManifestProperty(appPath, 'CFBundleSupportedPlatforms');
+  async extractAppPlatforms (bundlePath) {
+    const result = await this.extractManifestProperty(bundlePath, 'CFBundleSupportedPlatforms');
     if (!Array.isArray(result)) {
-      throw new Error(`${path.basename(appPath)}': CFBundleSupportedPlatforms is not a valid list`);
+      throw new Error(`${path.basename(bundlePath)}': CFBundleSupportedPlatforms is not a valid list`);
     }
     return result;
   }
   /**
    *
-   * @param {string} appPath
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @returns {Promise<string>}
    */
-  async extractExecutableName (appPath) {
-    return await this.extractManifestProperty(appPath, 'CFBundleExecutable');
+  async extractExecutableName (bundlePath) {
+    return await this.extractManifestProperty(bundlePath, 'CFBundleExecutable');
   }
   /**
    *
-   * @param {string} appPath Full path to the .ipa or .app bundle
+   * @param {string} bundlePath Full path to the .ipa or .app bundle
    * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
    * @throws {Error} If the given app is not a valid bundle
    */
-  async put (appPath) {
-    const readPlist = async (/** @type {string} */ plistPath) => {
-      try {
-        return await plist.parsePlistFile(plistPath);
-      } catch (e) {
-        this.log.debug(e.stack);
-        throw new Error(`Cannot parse ${MANIFEST_FILE_NAME} of '${appPath}'. Is it a valid application bundle?`);
-      }
-    };
+  async put (bundlePath) {
+    return (await fs.stat(bundlePath)).isFile()
+      ? await this._putIpa(bundlePath)
+      : await this._putApp(bundlePath);
+  }
-    if ((await fs.stat(appPath)).isFile()) {
-      /** @type {import('@appium/types').StringRecord|undefined} */
-      let manifestPayload;
-      /** @type {Error|undefined} */
-      let lastError;
-      try {
-        await zip.readEntries(appPath, async ({entry, extractEntryTo}) => {
-          if (!_.endsWith(entry.fileName, `.app/${MANIFEST_FILE_NAME}`)) {
-            return true;
-          }
+  /**
+   * @param {string} ipaPath Fill path to the .ipa bundle
+   * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+   */
+  async _putIpa(ipaPath) {
+    /** @type {import('@appium/types').StringRecord|undefined} */
+    let manifestPayload;
+    /** @type {Error|undefined} */
+    let lastError;
+    try {
+      await zip.readEntries(ipaPath, async ({entry, extractEntryTo}) => {
+        // https://github.com/appium/appium/issues/20075
+        if (!IPA_ROOT_PLIST_PATH_PATTERN.test(entry.fileName)) {
+          return true;
+        }
-          const hash = `${entry.crc32}`;
-          if (MANIFEST_CACHE.has(hash)) {
-            manifestPayload = MANIFEST_CACHE.get(hash);
-            return false;
-          }
-          const tmpRoot = await tempDir.openDir();
-          try {
-            await extractEntryTo(tmpRoot);
-            const plistPath = path.resolve(tmpRoot, entry.fileName);
-            manifestPayload = await readPlist(plistPath);
-            if (entry.uncompressedSize <= MAX_MANIFEST_SIZE && _.isPlainObject(manifestPayload)) {
-              this.log.debug(
-                `Caching the manifest for ${manifestPayload?.CFBundleIdentifier} app ` +
-                `from an archived source using the key '${hash}'`
-              );
-              MANIFEST_CACHE.set(hash, manifestPayload);
-            }
-          } catch (e) {
-            this.log.debug(e.stack);
-            lastError = e;
-          } finally {
-            await fs.rimraf(tmpRoot);
-          }
+        const hash = `${entry.crc32}`;
+        if (MANIFEST_CACHE.has(hash)) {
+          manifestPayload = MANIFEST_CACHE.get(hash);
           return false;
-        });
-      } catch (e) {
-        this.log.debug(e.stack);
-        throw new Error(`Cannot find ${MANIFEST_FILE_NAME} in '${appPath}'. Is it a valid application bundle?`);
-      }
-      if (!manifestPayload) {
-        let errorMessage = `Cannot extract ${MANIFEST_FILE_NAME} from '${appPath}'. Is it a valid application bundle?`;
-        if (lastError) {
-          errorMessage += ` Original error: ${lastError.message}`;
         }
-        throw new Error(errorMessage);
+        const tmpRoot = await tempDir.openDir();
+        try {
+          await extractEntryTo(tmpRoot);
+          const plistPath = path.resolve(tmpRoot, entry.fileName);
+          manifestPayload = await this._readPlist(plistPath, ipaPath);
+          if (_.isPlainObject(manifestPayload) && entry.uncompressedSize <= MAX_MANIFEST_SIZE) {
+            this.log.debug(
+              `Caching the manifest '${entry.fileName}' for ${manifestPayload?.CFBundleIdentifier} app ` +
+              `from the compressed source using the key '${hash}'`
+            );
+            MANIFEST_CACHE.set(hash, manifestPayload);
+          }
+        } catch (e) {
+          this.log.debug(e.stack);
+          lastError = e;
+        } finally {
+          await fs.rimraf(tmpRoot);
+        }
+        return false;
+      });
+    } catch (e) {
+      this.log.debug(e.stack);
+      throw new Error(`Cannot find ${MANIFEST_FILE_NAME} in '${ipaPath}'. Is it a valid application bundle?`);
+    }
+    if (!manifestPayload) {
+      let errorMessage = `Cannot extract ${MANIFEST_FILE_NAME} from '${ipaPath}'. Is it a valid application bundle?`;
+      if (lastError) {
+        errorMessage += ` Original error: ${lastError.message}`;
       }
-      return manifestPayload;
+      throw new Error(errorMessage);
     }
+    return manifestPayload;
+  }
-    // appPath points to a folder
+  /**
+   * @param {string} appPath Fill path to the .app bundle
+   * @returns {Promise<import('@appium/types').StringRecord>} The payload of the manifest plist
+   */
+  async _putApp(appPath) {
     const manifestPath = path.join(appPath, MANIFEST_FILE_NAME);
     const hash = await fs.hash(manifestPath);
     if (MANIFEST_CACHE.has(hash)) {
       return /** @type {import('@appium/types').StringRecord} */ (MANIFEST_CACHE.get(hash));
     }
     const [payload, stat] = await B.all([
-      readPlist(manifestPath),
+      this._readPlist(manifestPath, appPath),
       fs.stat(manifestPath),
     ]);
     if (stat.size <= MAX_MANIFEST_SIZE && _.isPlainObject(payload)) {
@@ -156,4 +164,18 @@ export class AppInfosCache {
     }
     return payload;
   }
+  /**
+   * @param {string} plistPath Full path to the plist
+   * @param {string} bundlePath Full path to .ipa or .app bundle
+   * @returns {Promise<any>} The payload of the plist file
+   */
+  async _readPlist(plistPath, bundlePath) {
+    try {
+      return await plist.parsePlistFile(plistPath);
+    } catch (e) {
+      this.log.debug(e.stack);
+      throw new Error(`Cannot parse ${MANIFEST_FILE_NAME} of '${bundlePath}'. Is it a valid application bundle?`);
+    }
+  }
 }

package/npm-shrinkwrap.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.15.1",
+  "version": "7.15.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.15.1",
+      "version": "7.15.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@colors/colors": "^1.6.0",
@@ -125,6 +125,11 @@
         "spdy": "4.0.2"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/@types/lodash": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
+    },
     "node_modules/@appium/base-driver/node_modules/lru-cache": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
@@ -347,19 +352,19 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+      "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
+      "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.5",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -674,9 +679,9 @@
       "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ=="
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
-      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz",
+      "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q=="
     },
     "node_modules/@types/method-override": {
       "version": "0.0.35",
@@ -705,9 +710,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.12.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
-      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+      "version": "20.12.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.10.tgz",
+      "integrity": "sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -1972,9 +1977,9 @@
       }
     },
     "node_modules/gauge": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz",
-      "integrity": "sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
+      "integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==",
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
         "color-support": "^1.1.3",
@@ -2540,9 +2545,9 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.1.tgz",
-      "integrity": "sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -2657,9 +2662,9 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz",
+      "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -4130,9 +4135,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
       "engines": {
         "node": ">=10.0.0"
       },

package/package.json CHANGED Viewed

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.15.1",
+  "version": "7.15.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {