Update version to 2.6.0 in package.json and enhance AAB parsing error messages with localized strings for better user feedback.

Author: sunnylqm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

src/locales/en.ts

@@ -2,6 +2,15 @@ export default {
   addedToGitignore: 'Added {{line}} to .gitignore',
   androidCrunchPngsWarning:
     'The crunchPngs option of android seems not disabled (Please ignore this warning if already disabled), which may cause abnormal consumption of mobile network traffic. Please refer to https://cresc.dev/docs/getting-started#disable-crunchpngs-on-android \n',
+  aabOpenApksFailed: 'Failed to open generated .apks file',
+  aabReadUniversalApkFailed: 'Failed to read universal.apk',
+  aabUniversalApkNotFound: 'universal.apk not found in generated .apks',
+  aabManifestNotFound:
+    "AndroidManifest.xml can't be found in AAB base/manifest/",
+  aabParseResourcesWarning: '[Warning] Failed to parse resources.arsc: {{error}}',
+  aabParseFailed: 'Failed to parse AAB: {{error}}',
+  aabParseManifestError: 'Parse AndroidManifest.xml error: {{error}}',
+  aabParseResourcesError: 'Parser resources.arsc error: {{error}}',
   appId: 'App ID',
   appIdMismatchApk:
     'App ID mismatch! Current APK: {{appIdInPkg}}, current update.json: {{appId}}',

src/locales/zh.ts

@@ -2,6 +2,14 @@ export default {
   addedToGitignore: '已将 {{line}} 添加到 .gitignore',
   androidCrunchPngsWarning:
     'android 的 crunchPngs 选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
+  aabOpenApksFailed: '无法打开生成的 .apks 文件',
+  aabReadUniversalApkFailed: '无法读取 universal.apk',
+  aabUniversalApkNotFound: '在生成的 .apks 中未找到 universal.apk',
+  aabManifestNotFound: '在 AAB 的 base/manifest/ 中找不到 AndroidManifest.xml',
+  aabParseResourcesWarning: '[警告] 解析 resources.arsc 失败：{{error}}',
+  aabParseFailed: '解析 AAB 失败：{{error}}',
+  aabParseManifestError: '解析 AndroidManifest.xml 出错：{{error}}',
+  aabParseResourcesError: '解析 resources.arsc 出错：{{error}}',
   appId: '应用 id',
   appIdMismatchApk:
     'appId不匹配！当前apk: {{appIdInPkg}}, 当前update.json: {{appId}}',

src/utils/app-info-parser/aab.ts

@@ -1,10 +1,9 @@
 import fs from 'fs-extra';
 import path from 'path';
 import os from 'os';
-import {
-  open as openZipFile,
-} from 'yauzl';
+import { open as openZipFile } from 'yauzl';
 import Zip from './zip';
+import { t } from '../i18n';
 
 class AabParser extends Zip {
   file: string | File;
@@ -14,13 +13,23 @@ class AabParser extends Zip {
     this.file = file;
   }
 
-  /**
-   * 从 AAB 提取 APK（不依赖 bundletool）
-   */
-  async extractApk(outputPath: string) {
+  async extractApk(
+    outputPath: string,
+    {
+      includeAllSplits = true,
+      splits,
+    }: { includeAllSplits?: boolean; splits?: string[] | null },
+  ) {
     const { exec } = require('child_process');
     const util = require('util');
     const execAsync = util.promisify(exec);
+    const normalizedSplits = Array.isArray(splits)
+      ? splits.map((item) => item.trim()).filter(Boolean)
+      : [];
+    const modules = includeAllSplits
+      ? null
+      : Array.from(new Set(['base', ...normalizedSplits]));
+    const modulesArg = modules ? ` --modules="${modules.join(',')}"` : '';
 
     // Create a temp file for the .apks output
     const tempDir = os.tmpdir();
@@ -32,21 +41,21 @@ class AabParser extends Zip {
       // User might need keystore to sign it properly but for simple extraction we stick to default debug key if possible or unsigned?
       // actually bundletool build-apks signs with debug key by default if no keystore provided.
 
-      let cmd = `bundletool build-apks --mode=universal --bundle="${this.file}" --output="${tempApksPath}" --overwrite`;
+      let cmd = `bundletool build-apks --mode=universal --bundle="${this.file}" --output="${tempApksPath}" --overwrite${modulesArg}`;
       try {
         await execAsync(cmd);
       } catch (e) {
         // Fallback to npx node-bundletool if bundletool is not in PATH
         // We use -y to avoid interactive prompt for installation
-        cmd = `npx -y node-bundletool build-apks --mode=universal --bundle="${this.file}" --output="${tempApksPath}" --overwrite`;
+        cmd = `npx -y node-bundletool build-apks --mode=universal --bundle="${this.file}" --output="${tempApksPath}" --overwrite${modulesArg}`;
         await execAsync(cmd);
       }
 
       // 2. Extract universal.apk from the .apks (zip) file
       await new Promise<void>((resolve, reject) => {
         openZipFile(tempApksPath, { lazyEntries: true }, (err, zipfile) => {
           if (err || !zipfile) {
-            reject(err || new Error('Failed to open generated .apks file'));
+            reject(err || new Error(t('aabOpenApksFailed')));
             return;
           }
 
@@ -57,7 +66,7 @@ class AabParser extends Zip {
               found = true;
               zipfile.openReadStream(entry, (err, readStream) => {
                 if (err || !readStream) {
-                  reject(err || new Error('Failed to read universal.apk'));
+                  reject(err || new Error(t('aabReadUniversalApkFailed')));
                   return;
                 }
                 const writeStream = fs.createWriteStream(outputPath);
@@ -74,8 +83,7 @@ class AabParser extends Zip {
           });
 
           zipfile.on('end', () => {
-            if (!found)
-              reject(new Error('universal.apk not found in generated .apks'));
+            if (!found) reject(new Error(t('aabUniversalApkNotFound')));
           });
           zipfile.on('error', reject);
         });
@@ -102,9 +110,7 @@ class AabParser extends Zip {
       );
 
       if (!manifestBuffer) {
-        throw new Error(
-          "AndroidManifest.xml can't be found in AAB base/manifest/",
-        );
+        throw new Error(t('aabManifestNotFound'));
       }
 
       let apkInfo = this._parseManifest(manifestBuffer as Buffer);
@@ -117,15 +123,12 @@ class AabParser extends Zip {
           apkInfo = mapInfoResource(apkInfo, resourceMap);
         }
       } catch (e: any) {
-        console.warn(
-          '[Warning] Failed to parse resources.arsc:',
-          e?.message ?? e,
-        );
+        console.warn(t('aabParseResourcesWarning', { error: e?.message ?? e }));
       }
 
       return apkInfo;
     } catch (error: any) {
-      throw new Error(`Failed to parse AAB: ${error.message ?? error}`);
+      throw new Error(t('aabParseFailed', { error: error.message ?? error }));
     }
   }
   /**
@@ -146,7 +149,7 @@ class AabParser extends Zip {
       });
       return parser.parse();
     } catch (e: any) {
-      throw new Error(`Parse AndroidManifest.xml error: ${e.message}`);
+      throw new Error(t('aabParseManifestError', { error: e?.message ?? e }));
     }
   }
 
@@ -159,7 +162,7 @@ class AabParser extends Zip {
       const ResourceFinder = require('./resource-finder');
       return new ResourceFinder().processResourceTable(buffer);
     } catch (e: any) {
-      throw new Error(`Parser resources.arsc error: ${e.message}`);
+      throw new Error(t('aabParseResourcesError', { error: e?.message ?? e }));
     }
   }
 }