@expo/repack-app 0.1.7 → 0.1.8

package/build/android/build-tools.d.ts

@@ -8,7 +8,7 @@ export interface AndroidTools {
 /**
  * Get the paths to the Android build-tools.
  */
-export declare function getAndroidBuildToolsAsync(options?: NormalizedOptions): Promise<AndroidTools>;
+export declare function getAndroidBuildToolsAsync(options: NormalizedOptions): Promise<AndroidTools>;
 /**
  * Create a resigned & updated APK.
  * @param unzippedApkRoot The root directory of the unzipped APK working directory.
@@ -18,8 +18,8 @@ export declare function createResignedApkAsync(unzippedApkRoot: string, options:
 /**
  * Find the latest build-tools directory in the `ANDROID_SDK_ROOT` directory.
  */
-export declare function findLatestBuildToolsDirAsync(): Promise<string | null>;
+export declare function findLatestBuildToolsDirAsync(options: NormalizedOptions): Promise<string | null>;
 /**
  * Search for classes in the APK with the given app ID pattern passing to grep.
  */
-export declare function searchDexClassesAsync(unzipApkRoot: string, grepAppIdPattern: string, options: NormalizedOptions): Promise<Set<string>>;
+export declare function searchDexClassesAsync(unzipApkRoot: string, grepAppIdPattern: string, options: NormalizedOptions): Promise<Set<string> | null>;

package/build/android/build-tools.js

@@ -16,7 +16,7 @@ let cachedAndroidTools = null;
  */
 async function getAndroidBuildToolsAsync(options) {
     if (cachedAndroidTools == null) {
-        const androidBuildToolsDir = options?.androidBuildToolsDir ?? (await findLatestBuildToolsDirAsync());
+        const androidBuildToolsDir = options?.androidBuildToolsDir ?? (await findLatestBuildToolsDirAsync(options));
         (0, node_assert_1.default)(androidBuildToolsDir != null, 'Unable to find the Android build-tools directory.');
         cachedAndroidTools = {
             aapt2Path: node_path_1.default.join(androidBuildToolsDir, 'aapt2'),
@@ -62,7 +62,8 @@ async function createResignedApkAsync(unzippedApkRoot, options, signingOptions)
 /**
  * Find the latest build-tools directory in the `ANDROID_SDK_ROOT` directory.
  */
-async function findLatestBuildToolsDirAsync() {
+async function findLatestBuildToolsDirAsync(options) {
+    const { logger } = options;
     const androidSdkRoot = process.env['ANDROID_SDK_ROOT'];
     (0, node_assert_1.default)(androidSdkRoot != null, 'ANDROID_SDK_ROOT environment variable is not set');
     const buildToolsDir = node_path_1.default.join(androidSdkRoot, 'build-tools');
@@ -86,12 +87,12 @@ async function findLatestBuildToolsDirAsync() {
             return node_path_1.default.join(buildToolsDir, dirs[0]);
         }
         else {
-            console.error('No build-tools directories found.');
+            logger.error('No build-tools directories found.');
             return null;
         }
     }
     catch (error) {
-        console.error(`Failed to read the build-tools directory: ${error}`);
+        logger.error(`Failed to read the build-tools directory: ${error}`);
         return null;
     }
 }
@@ -99,17 +100,23 @@ async function findLatestBuildToolsDirAsync() {
  * Search for classes in the APK with the given app ID pattern passing to grep.
  */
 async function searchDexClassesAsync(unzipApkRoot, grepAppIdPattern, options) {
-    const { spawnAsync } = options;
-    const { dexdumpPath } = await getAndroidBuildToolsAsync();
+    const { logger, spawnAsync } = options;
+    const { dexdumpPath } = await getAndroidBuildToolsAsync(options);
     const grepPattern = `"^  Class descriptor  : 'L${grepAppIdPattern.replace(/\./g, '/')}\\/"`;
-    const { stdout } = await spawnAsync(dexdumpPath, ['classes*.dex', '|', 'grep', grepPattern], {
-        cwd: unzipApkRoot,
-        shell: true,
-        stdio: 'pipe',
-    });
-    const classes = stdout
-        .split('\n')
-        .map((line) => line.match(/Class descriptor\s+?:\s+?'L(.+);'/)?.[1].replace(/\//g, '.'))
-        .filter(Boolean);
-    return new Set(classes);
+    try {
+        const { stdout } = await spawnAsync(dexdumpPath, ['classes*.dex', '|', 'grep', grepPattern], {
+            cwd: unzipApkRoot,
+            shell: true,
+            stdio: 'pipe',
+        });
+        const classes = stdout
+            .split('\n')
+            .map((line) => line.match(/Class descriptor\s+?:\s+?'L(.+);'/)?.[1].replace(/\//g, '.'))
+            .filter(Boolean);
+        return new Set(classes);
+    }
+    catch (error) {
+        logger.info(`Failed to search for classes in the APK - grepAppIdPattern[${grepAppIdPattern}]: ${error}`);
+        return null;
+    }
 }

package/build/android/index.js

@@ -53,13 +53,20 @@ async function repackAppAndroidAsync(_options) {
     logger.time(`Updating Androidmanifest.xml`);
     const androidManiestFilePath = node_path_1.default.join(decodedApkRoot, 'AndroidManifest.xml');
     const androidManiestXml = await (0, resources_1.parseXmlFileAsync)(androidManiestFilePath);
-    const originalAppId = await (0, resources_1.queryAppIdFromManifestAsync)(androidManiestXml);
-    const dexClasses = await (0, build_tools_1.searchDexClassesAsync)(decodedApkRoot, originalAppId, options);
+    const originalAppId = (0, resources_1.queryAppIdFromManifest)(androidManiestXml);
+    const grepAppIdPatterns = new Set([originalAppId]);
+    const originalAppIdFallback = (0, resources_1.queryAppIdFallbackFromManifest)(androidManiestXml, originalAppId);
+    if (originalAppIdFallback != null) {
+        grepAppIdPatterns.add(originalAppIdFallback);
+    }
+    const dexClasses = await Promise.any(Array.from(grepAppIdPatterns).map((appId) => (0, build_tools_1.searchDexClassesAsync)(decodedApkRoot, appId, options)));
+    (0, node_assert_1.default)(dexClasses != null, 'Failed to search for dex classes with appId in the APK');
     await (0, resources_1.updateAndroidManifestAsync)({
         config: exp,
         androidManiestXml,
         dexClasses,
         originalAppId,
+        originalAppIdFallback,
         options,
         updatesRuntimeVersion,
     });

package/build/android/resources.d.ts

@@ -39,11 +39,12 @@ export declare function updateResourcesAsync({ config, decodedApkRoot, }: {
 /**
  * Update the proto-based AndroidManiest.xml.
  */
-export declare function updateAndroidManifestAsync({ config, androidManiestXml, dexClasses, originalAppId, updatesRuntimeVersion, }: {
+export declare function updateAndroidManifestAsync({ config, androidManiestXml, dexClasses, originalAppId, originalAppIdFallback, updatesRuntimeVersion, }: {
     config: ExpoConfig;
     androidManiestXml: AndroidManifestType;
     dexClasses: Set<string>;
     originalAppId: string;
+    originalAppIdFallback: string | null;
     options: NormalizedOptions;
     updatesRuntimeVersion: string | null;
 }): Promise<void>;
@@ -58,4 +59,11 @@ export declare function buildXmlFileAsync(rootNode: XmlNode, filePath: string):
 /**
  * Query the app ID from the AndroidManiest.xml.
  */
-export declare function queryAppIdFromManifestAsync(androidManiestXml: XmlNode): Promise<string>;
+export declare function queryAppIdFromManifest(androidManiestXml: XmlNode): string;
+/**
+ * Query the fallback original app ID from the AndroidManiest.xml.
+ * Sometimes if the app were using `appIdSuffix` or overriding `applicationId` from build variants,
+ * the app ID in the `package` attribute will not be the original app ID for dex files
+ * As a fallback, we use a heuristic to retrieve original app ID from application class name.
+ */
+export declare function queryAppIdFallbackFromManifest(androidManiestXml: XmlNode, appId: string): string | null;

package/build/android/resources.js

@@ -7,7 +7,8 @@ exports.updateResourcesAsync = updateResourcesAsync;
 exports.updateAndroidManifestAsync = updateAndroidManifestAsync;
 exports.parseXmlFileAsync = parseXmlFileAsync;
 exports.buildXmlFileAsync = buildXmlFileAsync;
-exports.queryAppIdFromManifestAsync = queryAppIdFromManifestAsync;
+exports.queryAppIdFromManifest = queryAppIdFromManifest;
+exports.queryAppIdFallbackFromManifest = queryAppIdFallbackFromManifest;
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -26,7 +27,7 @@ async function updateResourcesAsync({ config, decodedApkRoot, }) {
 /**
  * Update the proto-based AndroidManiest.xml.
  */
-async function updateAndroidManifestAsync({ config, androidManiestXml, dexClasses, originalAppId, updatesRuntimeVersion, }) {
+async function updateAndroidManifestAsync({ config, androidManiestXml, dexClasses, originalAppId, originalAppIdFallback, updatesRuntimeVersion, }) {
     // [0] Update the package name
     const appId = (0, utils_1.requireNotNull)(config.android?.package);
     androidManiestXml.manifest.$.package = appId;
@@ -49,7 +50,11 @@ async function updateAndroidManifestAsync({ config, androidManiestXml, dexClasse
                 .replace(/^exp\+.+$/g, `exp+${(0, utils_1.requireNotNull)(config.slug)}`);
             // scheme in app.json
             if (firstScheme) {
-                newValue = value.replace(/^myapp$/g, firstScheme);
+                newValue = newValue.replace(/^myapp$/g, firstScheme);
+            }
+            // android.package in app.json (fallback for applicationIdSuffix)
+            if (originalAppIdFallback != null) {
+                newValue = newValue.replace(originalAppIdFallback, appId);
             }
             return newValue;
         });
@@ -81,11 +86,27 @@ async function buildXmlFileAsync(rootNode, filePath) {
 /**
  * Query the app ID from the AndroidManiest.xml.
  */
-async function queryAppIdFromManifestAsync(androidManiestXml) {
+function queryAppIdFromManifest(androidManiestXml) {
     const packageAttr = androidManiestXml.manifest.$.package;
     (0, node_assert_1.default)(packageAttr != null, 'Expected package attribute to be present in AndroidManifest.xml');
     return packageAttr;
 }
+/**
+ * Query the fallback original app ID from the AndroidManiest.xml.
+ * Sometimes if the app were using `appIdSuffix` or overriding `applicationId` from build variants,
+ * the app ID in the `package` attribute will not be the original app ID for dex files
+ * As a fallback, we use a heuristic to retrieve original app ID from application class name.
+ */
+function queryAppIdFallbackFromManifest(androidManiestXml, appId) {
+    const applicationClassName = androidManiestXml.manifest.application?.[0]?.$?.['android:name'];
+    if (applicationClassName) {
+        const appIdWithoutSuffix = applicationClassName.replace(/\.[^.]+$/, '');
+        if (appIdWithoutSuffix !== applicationClassName && appIdWithoutSuffix !== appId) {
+            return appIdWithoutSuffix;
+        }
+    }
+    return null;
+}
 //#region Internals
 /**
  * Update the `expo-updates` configuration in the Android project.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/repack-app",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Repacking tool for Expo apps",
   "main": "build/index.js",
   "types": "build/index.d.ts",