react-native-update-cli 2.4.2 → 2.6.0

package/README.md

@@ -223,10 +223,12 @@ Each workflow step contains:
 
 - `uploadIpa`: Upload IPA files (supports `--version` to override extracted version)
 - `uploadApk`: Upload APK files (supports `--version` to override extracted version)
+- `uploadAab`: Upload AAB files (converted to APK, supports `--version`, `--includeAllSplits`, `--splits`)
 - `uploadApp`: Upload APP files (supports `--version` to override extracted version)
 - `parseApp`: Parse APP file information
 - `parseIpa`: Parse IPA file information
 - `parseApk`: Parse APK file information
+- `extractApk`: Extract a universal APK from an AAB (supports `--output`, `--includeAllSplits`, `--splits`)
 - `packages`: List packages
 
 ### User Module (`user`)

package/README.zh-CN.md

@@ -221,10 +221,12 @@ const workflowResult = await moduleManager.executeWorkflow('my-workflow', {
 
 - `uploadIpa`: 上传 IPA 文件（支持 `--version` 参数覆盖提取的版本）
 - `uploadApk`: 上传 APK 文件（支持 `--version` 参数覆盖提取的版本）
+- `uploadAab`: 上传 AAB 文件（转换为 APK，支持 `--version`、`--includeAllSplits`、`--splits`）
 - `uploadApp`: 上传 APP 文件（支持 `--version` 参数覆盖提取的版本）
 - `parseApp`: 解析 APP 文件信息
 - `parseIpa`: 解析 IPA 文件信息
 - `parseApk`: 解析 APK 文件信息
+- `extractApk`: 从 AAB 提取通用 APK（支持 `--output`、`--includeAllSplits`、`--splits`）
 - `packages`: 列出包
 
 ### User 模块 (`user`)

package/cli.json

@@ -45,6 +45,19 @@
         }
       }
     },
+    "uploadAab": {
+      "options": {
+        "version": {
+          "hasValue": true
+        },
+        "includeAllSplits": {
+          "default": false
+        },
+        "splits": {
+          "hasValue": true
+        }
+      }
+    },
     "uploadApp": {
       "options": {
         "version": {
@@ -55,6 +68,20 @@
     "parseApp": {},
     "parseIpa": {},
     "parseApk": {},
+    "parseAab": {},
+    "extractApk": {
+      "options": {
+        "output": {
+          "hasValue": true
+        },
+        "includeAllSplits": {
+          "default": false
+        },
+        "splits": {
+          "hasValue": true
+        }
+      }
+    },
     "packages": {
       "options": {
         "platform": {
@@ -172,6 +199,19 @@
         }
       }
     },
+    "deleteVersion": {
+      "options": {
+        "platform": {
+          "hasValue": true
+        },
+        "versionId": {
+          "hasValue": true
+        },
+        "appId": {
+          "hasValue": true
+        }
+      }
+    },
     "build": {
       "description": "Bundle javascript and copy assets."
     },

package/lib/api.js

@@ -51,10 +51,10 @@ const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
 const _nodefetch = /*#__PURE__*/ _interop_require_default(require("node-fetch"));
 const _progress = /*#__PURE__*/ _interop_require_default(require("progress"));
 const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
+const _httphelper = require("./utils/http-helper");
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
 const _constants = require("./utils/constants");
 const _i18n = require("./utils/i18n");
-const _httphelper = require("./utils/http-helper");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj

package/lib/locales/en.js

@@ -11,6 +11,15 @@ Object.defineProperty(exports, "default", {
 const _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',
+    aabBundletoolDownloadHint: 'bundletool not found. Downloading node-bundletool via npx (first run may take a while).',
+    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}}',
     appIdMismatchApp: 'App ID mismatch! Current APP: {{appIdInPkg}}, current update.json: {{appId}}',
@@ -100,10 +109,13 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     uploadingSourcemap: 'Uploading sourcemap',
     usageDiff: 'Usage: cresc {{command}} <origin> <next>',
     usageParseApk: 'Usage: cresc parseApk <apk file>',
+    usageParseAab: 'Usage: cresc parseAab <aab file>',
+    usageExtractApk: 'Usage: cresc extractApk <aab file> [--output <apk file>] [--includeAllSplits] [--splits <split names>]',
     usageParseApp: 'Usage: cresc parseApp <app file>',
     usageParseIpa: 'Usage: cresc parseIpa <ipa file>',
     usageUnderDevelopment: 'Usage is under development now.',
     usageUploadApk: 'Usage: cresc uploadApk <apk file>',
+    usageUploadAab: 'Usage: cresc uploadAab <aab file> [--includeAllSplits] [--splits <split names>]',
     usageUploadApp: 'Usage: cresc uploadApp <app file>',
     usageUploadIpa: 'Usage: cresc uploadIpa <ipa file>',
     versionBind: 'Bound hot update {{version}} to native version {{nativeVersion}} (id: {{id}})',
@@ -119,8 +131,11 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     deletePackageSuccess: 'Native package {{packageId}} deleted successfully',
     deletePackageError: 'Failed to delete native package {{packageId}}: {{error}}',
     usageDeletePackage: 'Usage: cresc deletePackage [packageId] --appId [appId]',
+    deleteVersionSuccess: 'Version {{versionId}} deleted successfully',
+    deleteVersionError: 'Failed to delete version {{versionId}}: {{error}}',
     bundleFileNotFound: 'Bundle file not found! Please use default bundle file name and path.',
     diffPackageGenerated: '{{- output}} generated.',
     nodeBsdiffRequired: 'This function needs "node-bsdiff". Please run "{{scriptName}} install node-bsdiff" to install',
-    nodeHdiffpatchRequired: 'This function needs "node-hdiffpatch". Please run "{{scriptName}} install node-hdiffpatch" to install'
+    nodeHdiffpatchRequired: 'This function needs "node-hdiffpatch". Please run "{{scriptName}} install node-hdiffpatch" to install',
+    apkExtracted: 'APK extracted to {{output}}'
 };

package/lib/locales/zh.js

@@ -11,6 +11,15 @@ Object.defineProperty(exports, "default", {
 const _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',
+    aabBundletoolDownloadHint: '未找到 bundletool，正在通过 npx 下载 node-bundletool（首次下载可能需要一些时间）。',
+    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}}',
     appIdMismatchApp: 'appId不匹配！当前app: {{appIdInPkg}}, 当前update.json: {{appId}}',
@@ -100,9 +109,12 @@ const _default = {
     uploadingSourcemap: '正在上传 sourcemap',
     usageDiff: '用法：pushy {{command}} <origin> <next>',
     usageParseApk: '使用方法: pushy parseApk apk后缀文件',
+    usageParseAab: '使用方法: pushy parseAab aab后缀文件',
+    usageExtractApk: '使用方法: pushy extractApk aab后缀文件 [--output apk文件] [--includeAllSplits] [--splits 分包名列表]',
     usageParseApp: '使用方法: pushy parseApp app后缀文件',
     usageParseIpa: '使用方法: pushy parseIpa ipa后缀文件',
     usageUploadApk: '使用方法: pushy uploadApk apk后缀文件',
+    usageUploadAab: '使用方法: pushy uploadAab aab后缀文件 [--includeAllSplits] [--splits 分包名列表]',
     usageUploadApp: '使用方法: pushy uploadApp app后缀文件',
     usageUploadIpa: '使用方法: pushy uploadIpa ipa后缀文件',
     versionBind: '已将热更包 {{version}} 绑定到原生版本 {{nativeVersion}} (id: {{id}})',
@@ -118,8 +130,11 @@ const _default = {
     deletePackageSuccess: '原生包 {{packageId}} 删除成功',
     deletePackageError: '删除原生包 {{packageId}} 失败: {{error}}',
     usageDeletePackage: '使用方法: pushy deletePackage [packageId] --appId [appId]',
+    deleteVersionSuccess: '热更包 {{versionId}} 删除成功',
+    deleteVersionError: '删除热更包 {{versionId}} 失败: {{error}}',
     bundleFileNotFound: '未找到 bundle 文件！请使用默认的 bundle 文件名和路径。',
     diffPackageGenerated: '{{- output}} 已生成。',
     nodeBsdiffRequired: '此功能需要 "node-bsdiff"。请运行 "{{scriptName}} install node-bsdiff" 来安装',
-    nodeHdiffpatchRequired: '此功能需要 "node-hdiffpatch"。请运行 "{{scriptName}} install node-hdiffpatch" 来安装'
+    nodeHdiffpatchRequired: '此功能需要 "node-hdiffpatch"。请运行 "{{scriptName}} install node-hdiffpatch" 来安装',
+    apkExtracted: 'APK 已提取到 {{output}}'
 };

package/lib/package.js

@@ -19,20 +19,24 @@ _export(exports, {
         return packageCommands;
     }
 });
+const _os = /*#__PURE__*/ _interop_require_default(require("os"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _fsextra = /*#__PURE__*/ _interop_require_default(require("fs-extra"));
+const _ttytable = /*#__PURE__*/ _interop_require_default(require("tty-table"));
 const _api = require("./api");
-const _utils = require("./utils");
-const _i18n = require("./utils/i18n");
 const _app = require("./app");
-const _ttytable = /*#__PURE__*/ _interop_require_default(require("tty-table"));
+const _utils = require("./utils");
+const _aab = require("./utils/app-info-parser/aab");
 const _depversions = require("./utils/dep-versions");
 const _git = require("./utils/git");
+const _i18n = require("./utils/i18n");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 async function listPackage(appId) {
-    const allPkgs = await (0, _api.getAllPackages)(appId);
+    const allPkgs = await (0, _api.getAllPackages)(appId) || [];
     const header = [
         {
             value: (0, _i18n.t)('nativePackageId')
@@ -75,7 +79,7 @@ async function choosePackage(appId) {
     const list = await listPackage(appId);
     while(true){
         const id = await (0, _utils.question)((0, _i18n.t)('enterNativePackageId'));
-        const app = list.find((v)=>v.id.toString() === id);
+        const app = list == null ? void 0 : list.find((v)=>v.id.toString() === id);
         if (app) {
             return app;
         }
@@ -170,6 +174,32 @@ const packageCommands = {
             buildTime
         }));
     },
+    uploadAab: async ({ args, options })=>{
+        const source = args[0];
+        if (!source || !source.endsWith('.aab')) {
+            throw new Error((0, _i18n.t)('usageUploadAab'));
+        }
+        const output = _path.default.join(_os.default.tmpdir(), `${_path.default.basename(source, _path.default.extname(source))}-${Date.now()}.apk`);
+        const includeAllSplits = options.includeAllSplits === true || options.includeAllSplits === 'true';
+        const splits = options.splits ? String(options.splits).split(',').map((item)=>item.trim()).filter(Boolean) : null;
+        const parser = new _aab.AabParser(source);
+        try {
+            await parser.extractApk(output, {
+                includeAllSplits,
+                splits
+            });
+            await packageCommands.uploadApk({
+                args: [
+                    output
+                ],
+                options
+            });
+        } finally{
+            if (await _fsextra.default.pathExists(output)) {
+                await _fsextra.default.remove(output);
+            }
+        }
+    },
     uploadApp: async ({ args, options })=>{
         const fn = args[0];
         if (!fn || !fn.endsWith('.app')) {
@@ -235,6 +265,30 @@ const packageCommands = {
         }
         console.log(await (0, _utils.getApkInfo)(fn));
     },
+    parseAab: async ({ args })=>{
+        const fn = args[0];
+        if (!fn || !fn.endsWith('.aab')) {
+            throw new Error((0, _i18n.t)('usageParseAab'));
+        }
+        console.log(await (0, _utils.getAabInfo)(fn));
+    },
+    extractApk: async ({ args, options })=>{
+        const source = args[0];
+        if (!source || !source.endsWith('.aab')) {
+            throw new Error((0, _i18n.t)('usageExtractApk'));
+        }
+        const output = options.output || _path.default.join(_path.default.dirname(source), `${_path.default.basename(source, _path.default.extname(source))}.apk`);
+        const includeAllSplits = options.includeAllSplits === true || options.includeAllSplits === 'true';
+        const splits = options.splits ? String(options.splits).split(',').map((item)=>item.trim()).filter(Boolean) : null;
+        const parser = new _aab.AabParser(source);
+        await parser.extractApk(output, {
+            includeAllSplits,
+            splits
+        });
+        console.log((0, _i18n.t)('apkExtracted', {
+            output
+        }));
+    },
     packages: async ({ options })=>{
         const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
@@ -243,7 +297,7 @@ const packageCommands = {
     deletePackage: async ({ args, options })=>{
         let { appId, packageId, packageVersion } = options;
         if (!appId) {
-            const platform = await (0, _app.getPlatform)();
+            const platform = await (0, _app.getPlatform)(options.platform);
             appId = (await (0, _app.getSelectedApp)(platform)).appId;
         }
         // If no packageId provided as argument, let user choose from list

package/lib/provider.js

@@ -147,6 +147,9 @@ class CLIProviderImpl {
                 case 'apk':
                     await packageCommands.uploadApk(context);
                     break;
+                case 'aab':
+                    await packageCommands.uploadAab(context);
+                    break;
                 case 'app':
                     await packageCommands.uploadApp(context);
                     break;

package/lib/utils/app-info-parser/aab.js

@@ -0,0 +1,230 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "AabParser", {
+    enumerable: true,
+    get: function() {
+        return AabParser;
+    }
+});
+const _child_process = require("child_process");
+const _os = /*#__PURE__*/ _interop_require_default(require("os"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _fsextra = /*#__PURE__*/ _interop_require_default(require("fs-extra"));
+const _yauzl = require("yauzl");
+const _i18n = require("../i18n");
+const _resourcefinder = require("./resource-finder");
+const _utils = require("./utils");
+const _manifest = require("./xml-parser/manifest");
+const _zip = require("./zip");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+class AabParser extends _zip.Zip {
+    async extractApk(outputPath, { includeAllSplits, splits }) {
+        const normalizedSplits = Array.isArray(splits) ? splits.map((item)=>item.trim()).filter(Boolean) : [];
+        const modules = includeAllSplits ? null : Array.from(new Set([
+            'base',
+            ...normalizedSplits
+        ]));
+        const modulesArgs = modules ? [
+            `--modules=${modules.join(',')}`
+        ] : [];
+        const runCommand = (command, args, options = {})=>new Promise((resolve, reject)=>{
+                const inheritStdio = options.stdio === 'inherit';
+                const child = (0, _child_process.spawn)(command, args, {
+                    stdio: inheritStdio ? 'inherit' : [
+                        'ignore',
+                        'pipe',
+                        'pipe'
+                    ],
+                    env: options.env
+                });
+                let stderr = '';
+                if (!inheritStdio) {
+                    var _child_stderr;
+                    (_child_stderr = child.stderr) == null ? void 0 : _child_stderr.on('data', (chunk)=>{
+                        stderr += chunk.toString();
+                    });
+                }
+                child.on('error', reject);
+                child.on('close', (code)=>{
+                    if (code === 0) {
+                        resolve();
+                        return;
+                    }
+                    reject(new Error(stderr.trim() || `Command failed: ${command} (code ${code})`));
+                });
+            });
+        // Create a temp file for the .apks output
+        const tempDir = _os.default.tmpdir();
+        const tempApksPath = _path.default.join(tempDir, `temp-${Date.now()}.apks`);
+        const needsNpxDownload = async ()=>{
+            try {
+                await runCommand('npx', [
+                    '--no-install',
+                    'node-bundletool',
+                    '--version'
+                ]);
+                return false;
+            } catch (e) {
+                return true;
+            }
+        };
+        try {
+            // 1. Build APKS (universal mode)
+            // We assume bundletool is in the path.
+            // 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.
+            try {
+                await runCommand('bundletool', [
+                    'build-apks',
+                    '--mode=universal',
+                    `--bundle=${this.file}`,
+                    `--output=${tempApksPath}`,
+                    '--overwrite',
+                    ...modulesArgs
+                ]);
+            } catch (e) {
+                // Fallback to npx node-bundletool if bundletool is not in PATH
+                // We use -y to avoid interactive prompt for installation
+                if (await needsNpxDownload()) {
+                    console.log((0, _i18n.t)('aabBundletoolDownloadHint'));
+                }
+                await runCommand('npx', [
+                    '-y',
+                    'node-bundletool',
+                    'build-apks',
+                    '--mode=universal',
+                    `--bundle=${this.file}`,
+                    `--output=${tempApksPath}`,
+                    '--overwrite',
+                    ...modulesArgs
+                ], {
+                    stdio: 'inherit',
+                    env: {
+                        ...process.env,
+                        npm_config_progress: 'true'
+                    }
+                });
+            }
+            // 2. Extract universal.apk from the .apks (zip) file
+            await new Promise((resolve, reject)=>{
+                (0, _yauzl.open)(tempApksPath, {
+                    lazyEntries: true
+                }, (err, zipfile)=>{
+                    if (err || !zipfile) {
+                        reject(err || new Error((0, _i18n.t)('aabOpenApksFailed')));
+                        return;
+                    }
+                    let found = false;
+                    zipfile.readEntry();
+                    zipfile.on('entry', (entry)=>{
+                        if (entry.fileName === 'universal.apk') {
+                            found = true;
+                            zipfile.openReadStream(entry, (err, readStream)=>{
+                                if (err || !readStream) {
+                                    reject(err || new Error((0, _i18n.t)('aabReadUniversalApkFailed')));
+                                    return;
+                                }
+                                const writeStream = _fsextra.default.createWriteStream(outputPath);
+                                readStream.pipe(writeStream);
+                                writeStream.on('close', ()=>{
+                                    zipfile.close();
+                                    resolve();
+                                });
+                                writeStream.on('error', reject);
+                            });
+                        } else {
+                            zipfile.readEntry();
+                        }
+                    });
+                    zipfile.on('end', ()=>{
+                        if (!found) reject(new Error((0, _i18n.t)('aabUniversalApkNotFound')));
+                    });
+                    zipfile.on('error', reject);
+                });
+            });
+        } finally{
+            // Cleanup
+            if (await _fsextra.default.pathExists(tempApksPath)) {
+                await _fsextra.default.remove(tempApksPath);
+            }
+        }
+    }
+    /**
+   * 解析 AAB 文件信息（类似 APK parser 的 parse 方法）
+   * 注意：AAB 中的 AndroidManifest.xml 在 base/manifest/AndroidManifest.xml
+   */ async parse() {
+        const manifestPath = 'base/manifest/AndroidManifest.xml';
+        const ResourceName = /^base\/resources\.arsc$/;
+        try {
+            const manifestBuffer = await this.getEntry(new RegExp(`^${escapeRegExp(manifestPath)}$`));
+            if (!manifestBuffer) {
+                throw new Error((0, _i18n.t)('aabManifestNotFound'));
+            }
+            let apkInfo = this._parseManifest(manifestBuffer);
+            try {
+                const resourceBuffer = await this.getEntry(ResourceName);
+                if (resourceBuffer) {
+                    const resourceMap = this._parseResourceMap(resourceBuffer);
+                    apkInfo = (0, _utils.mapInfoResource)(apkInfo, resourceMap);
+                }
+            } catch (e) {
+                var _e_message;
+                console.warn((0, _i18n.t)('aabParseResourcesWarning', {
+                    error: (_e_message = e == null ? void 0 : e.message) != null ? _e_message : e
+                }));
+            }
+            return apkInfo;
+        } catch (error) {
+            var _error_message;
+            throw new Error((0, _i18n.t)('aabParseFailed', {
+                error: (_error_message = error.message) != null ? _error_message : error
+            }));
+        }
+    }
+    /**
+   * Parse manifest
+   * @param {Buffer} buffer // manifest file's buffer
+   */ _parseManifest(buffer) {
+        try {
+            const parser = new _manifest.ManifestParser(buffer, {
+                ignore: [
+                    'application.activity',
+                    'application.service',
+                    'application.receiver',
+                    'application.provider',
+                    'permission-group'
+                ]
+            });
+            return parser.parse();
+        } catch (e) {
+            var _e_message;
+            throw new Error((0, _i18n.t)('aabParseManifestError', {
+                error: (_e_message = e == null ? void 0 : e.message) != null ? _e_message : e
+            }));
+        }
+    }
+    /**
+   * Parse resourceMap
+   * @param {Buffer} buffer // resourceMap file's buffer
+   */ _parseResourceMap(buffer) {
+        try {
+            return new _resourcefinder.ResourceFinder().processResourceTable(buffer);
+        } catch (e) {
+            var _e_message;
+            throw new Error((0, _i18n.t)('aabParseResourcesError', {
+                error: (_e_message = e == null ? void 0 : e.message) != null ? _e_message : e
+            }));
+        }
+    }
+    constructor(file){
+        super(file);
+        this.file = file;
+    }
+}
+const escapeRegExp = (value)=>value.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');

package/lib/utils/app-info-parser/apk.js

@@ -1,34 +1,42 @@
 "use strict";
-const Zip = require('./zip');
-const { mapInfoResource, findApkIconPath, getBase64FromBuffer } = require('./utils');
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ApkParser", {
+    enumerable: true,
+    get: function() {
+        return ApkParser;
+    }
+});
+const _resourcefinder = require("./resource-finder");
+const _utils = require("./utils");
+const _manifest = require("./xml-parser/manifest");
+const _zip = require("./zip");
 const ManifestName = /^androidmanifest\.xml$/;
 const ResourceName = /^resources\.arsc$/;
-const ManifestXmlParser = require('./xml-parser/manifest');
-const ResourceFinder = require('./resource-finder');
-class ApkParser extends Zip {
+class ApkParser extends _zip.Zip {
     parse() {
         return new Promise((resolve, reject)=>{
             this.getEntries([
                 ManifestName,
                 ResourceName
             ]).then((buffers)=>{
-                if (!buffers[ManifestName]) {
+                const manifestBuffer = buffers[ManifestName];
+                if (!manifestBuffer) {
                     throw new Error("AndroidManifest.xml can't be found.");
                 }
-                let apkInfo = this._parseManifest(buffers[ManifestName]);
+                let apkInfo;
                 let resourceMap;
+                apkInfo = this._parseManifest(manifestBuffer);
                 if (!buffers[ResourceName]) {
                     resolve(apkInfo);
                 } else {
-                    // parse resourceMap
                     resourceMap = this._parseResourceMap(buffers[ResourceName]);
-                    // update apkInfo with resourceMap
-                    apkInfo = mapInfoResource(apkInfo, resourceMap);
-                    // find icon path and parse icon
-                    const iconPath = findApkIconPath(apkInfo);
+                    apkInfo = (0, _utils.mapInfoResource)(apkInfo, resourceMap);
+                    const iconPath = (0, _utils.findApkIconPath)(apkInfo);
                     if (iconPath) {
                         this.getEntry(iconPath).then((iconBuffer)=>{
-                            apkInfo.icon = iconBuffer ? getBase64FromBuffer(iconBuffer) : null;
+                            apkInfo.icon = iconBuffer ? (0, _utils.getBase64FromBuffer)(iconBuffer) : null;
                             resolve(apkInfo);
                         }).catch((e)=>{
                             apkInfo.icon = null;
@@ -50,7 +58,7 @@ class ApkParser extends Zip {
    * @param {Buffer} buffer // manifest file's buffer
    */ _parseManifest(buffer) {
         try {
-            const parser = new ManifestXmlParser(buffer, {
+            const parser = new _manifest.ManifestParser(buffer, {
                 ignore: [
                     'application.activity',
                     'application.service',
@@ -61,7 +69,7 @@ class ApkParser extends Zip {
             });
             return parser.parse();
         } catch (e) {
-            throw new Error('Parse AndroidManifest.xml error: ', e);
+            throw new Error(`Parse AndroidManifest.xml error: ${e.message || e}`);
         }
     }
     /**
@@ -69,19 +77,9 @@ class ApkParser extends Zip {
    * @param {Buffer} buffer // resourceMap file's buffer
    */ _parseResourceMap(buffer) {
         try {
-            return new ResourceFinder().processResourceTable(buffer);
+            return new _resourcefinder.ResourceFinder().processResourceTable(buffer);
         } catch (e) {
-            throw new Error('Parser resources.arsc error: ' + e);
-        }
-    }
-    /**
-   * parser for parsing .apk file
-   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
-   */ constructor(file){
-        super(file);
-        if (!(this instanceof ApkParser)) {
-            return new ApkParser(file);
+            throw new Error(`Parser resources.arsc error: ${e}`);
         }
     }
 }
-module.exports = ApkParser;

package/lib/utils/app-info-parser/app.js

@@ -1,14 +1,13 @@
 "use strict";
-const Zip = require('./zip');
-class AppParser extends Zip {
-    /**
-   * parser for parsing .apk file
-   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
-   */ constructor(file){
-        super(file);
-        if (!(this instanceof AppParser)) {
-            return new AppParser(file);
-        }
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "AppParser", {
+    enumerable: true,
+    get: function() {
+        return AppParser;
     }
+});
+const _zip = require("./zip");
+class AppParser extends _zip.Zip {
 }
-module.exports = AppParser;