react-native-update-cli 2.5.0 → 2.7.0

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

@@ -1,16 +1,25 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "Zip", {
+    enumerable: true,
+    get: function() {
+        return Zip;
+    }
+});
+const _utils = require("./utils");
 const Unzip = require('isomorphic-unzip');
-const { isBrowser, decodeNullUnicode } = require('./utils');
-const { enumZipEntries, readEntry } = require('../../bundle');
+let bundleZipUtils;
 class Zip {
     /**
    * get entries by regexps, the return format is: { <filename>: <Buffer|Blob> }
    * @param {Array} regexps // regexps for matching files
    * @param {String} type // return type, can be buffer or blob, default buffer
    */ getEntries(regexps, type = 'buffer') {
-        regexps = regexps.map((regex)=>decodeNullUnicode(regex));
+        const decoded = regexps.map((regex)=>(0, _utils.decodeNullUnicode)(regex));
         return new Promise((resolve, reject)=>{
-            this.unzip.getBuffer(regexps, {
+            this.unzip.getBuffer(decoded, {
                 type
             }, (err, buffers)=>{
                 err ? reject(err) : resolve(buffers);
@@ -22,24 +31,26 @@ class Zip {
    * @param {Regex} regex // regex for matching file
    * @param {String} type // return type, can be buffer or blob, default buffer
    */ getEntry(regex, type = 'buffer') {
-        regex = decodeNullUnicode(regex);
+        const decoded = (0, _utils.decodeNullUnicode)(regex);
         return new Promise((resolve, reject)=>{
             this.unzip.getBuffer([
-                regex
+                decoded
             ], {
                 type
             }, (err, buffers)=>{
-                // console.log(buffers);
-                err ? reject(err) : resolve(buffers[regex]);
+                err ? reject(err) : resolve(buffers[decoded]);
             });
         });
     }
     async getEntryFromHarmonyApp(regex) {
         try {
+            const { enumZipEntries, readEntry } = bundleZipUtils != null ? bundleZipUtils : bundleZipUtils = require('../../bundle');
             let originSource;
             await enumZipEntries(this.file, (entry, zipFile)=>{
                 if (regex.test(entry.fileName)) {
-                    return readEntry(entry, zipFile).then((v)=>originSource = v);
+                    return readEntry(entry, zipFile).then((value)=>{
+                        originSource = value;
+                    });
                 }
             });
             return originSource;
@@ -48,7 +59,7 @@ class Zip {
         }
     }
     constructor(file){
-        if (isBrowser()) {
+        if ((0, _utils.isBrowser)()) {
             if (!(file instanceof window.Blob || typeof file.size !== 'undefined')) {
                 throw new Error('Param error: [file] must be an instance of Blob or File in browser.');
             }
@@ -62,4 +73,3 @@ class Zip {
         this.unzip = new Unzip(this.file);
     }
 }
-module.exports = Zip;

package/lib/utils/http-helper.js

@@ -22,8 +22,8 @@ _export(exports, {
         return testUrls;
     }
 });
-const _constants = require("./constants");
 const _nodefetch = /*#__PURE__*/ _interop_require_default(require("node-fetch"));
+const _constants = require("./constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj

package/package.json

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

package/src/api.ts

@@ -6,30 +6,44 @@ import FormData from 'form-data';
 import fetch from 'node-fetch';
 import ProgressBar from 'progress';
 import tcpp from 'tcp-ping';
+import { getBaseUrl } from 'utils/http-helper';
 import packageJson from '../package.json';
 import type { Package, Session } from './types';
-import {
-  credentialFile,
-  pricingPageUrl,
-} from './utils/constants';
+import { credentialFile, pricingPageUrl, IS_CRESC } from './utils/constants';
 import { t } from './utils/i18n';
-import { getBaseUrl } from 'utils/http-helper';
 
 const tcpPing = util.promisify(tcpp.ping);
 
 let session: Session | undefined;
 let savedSession: Session | undefined;
-
+let apiToken: string | undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
 export const getSession = () => session;
 
+export const getApiToken = () => apiToken;
+
+export const setApiToken = (token: string) => {
+  apiToken = token;
+};
+
+const loadApiTokenFromEnv = () => {
+  // Use CRESC_API_TOKEN for cresc, PUSHY_API_TOKEN for pushy
+  const envToken = IS_CRESC
+    ? process.env.CRESC_API_TOKEN
+    : process.env.PUSHY_API_TOKEN;
+  if (envToken) {
+    apiToken = envToken;
+  }
+};
+
 export const replaceSession = (newSession: { token: string }) => {
   session = newSession;
 };
 
 export const loadSession = async () => {
+  loadApiTokenFromEnv();
   if (fs.existsSync(credentialFile)) {
     try {
       replaceSession(JSON.parse(fs.readFileSync(credentialFile, 'utf8')));
@@ -82,27 +96,39 @@ async function query(url: string, options: fetch.RequestInit) {
 }
 
 function queryWithoutBody(method: string) {
-  return (api: string) =>
-    query(api, {
+  return (api: string) => {
+    const headers: Record<string, string> = {
+      'User-Agent': userAgent,
+    };
+    if (apiToken) {
+      headers['x-api-token'] = apiToken;
+    } else if (session?.token) {
+      headers['X-AccessToken'] = session.token;
+    }
+    return query(api, {
       method,
-      headers: {
-        'User-Agent': userAgent,
-        'X-AccessToken': session ? session.token : '',
-      },
+      headers,
     });
+  };
 }
 
 function queryWithBody(method: string) {
-  return (api: string, body?: Record<string, any>) =>
-    query(api, {
+  return (api: string, body?: Record<string, any>) => {
+    const headers: Record<string, string> = {
+      'User-Agent': userAgent,
+      'Content-Type': 'application/json',
+    };
+    if (apiToken) {
+      headers['x-api-token'] = apiToken;
+    } else if (session?.token) {
+      headers['X-AccessToken'] = session.token;
+    }
+    return query(api, {
       method,
-      headers: {
-        'User-Agent': userAgent,
-        'Content-Type': 'application/json',
-        'X-AccessToken': session ? session.token : '',
-      },
+      headers,
       body: JSON.stringify(body),
     });
+  };
 }
 
 export const get = queryWithoutBody('GET');

package/src/locales/en.ts

@@ -2,6 +2,18 @@ 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',
+  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}}',
@@ -116,10 +128,14 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   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:
@@ -147,4 +163,5 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     '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',
+  apkExtracted: 'APK extracted to {{output}}',
 };

package/src/locales/zh.ts

@@ -2,6 +2,16 @@ 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',
+  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}}',
@@ -110,9 +120,13 @@ export default {
   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:
@@ -138,4 +152,5 @@ export default {
     '此功能需要 "node-bsdiff"。请运行 "{{scriptName}} install node-bsdiff" 来安装',
   nodeHdiffpatchRequired:
     '此功能需要 "node-hdiffpatch"。请运行 "{{scriptName}} install node-hdiffpatch" 来安装',
+  apkExtracted: 'APK 已提取到 {{output}}',
 };

package/src/modules/version-module.ts

@@ -1,4 +1,4 @@
-import type { CLIModule} from '../types';
+import type { CLIModule } from '../types';
 
 export const versionModule: CLIModule = {
   name: 'version',

package/src/package.ts

@@ -1,17 +1,25 @@
-import { get, getAllPackages, post, uploadFile, doDelete } from './api';
-import { question, saveToLocal } from './utils';
-import { t } from './utils/i18n';
-
-import { getPlatform, getSelectedApp } from './app';
-
+import os from 'os';
+import path from 'path';
+import fs from 'fs-extra';
 import Table from 'tty-table';
+import { doDelete, getAllPackages, post, uploadFile } from './api';
+import { getPlatform, getSelectedApp } from './app';
 import type { Platform } from './types';
-import { getApkInfo, getAppInfo, getIpaInfo, getAabInfo } from './utils';
+import {
+  getAabInfo,
+  getApkInfo,
+  getAppInfo,
+  getIpaInfo,
+  question,
+  saveToLocal,
+} from './utils';
+import { AabParser } from './utils/app-info-parser/aab';
 import { depVersions } from './utils/dep-versions';
 import { getCommitInfo } from './utils/git';
+import { t } from './utils/i18n';
 
 export async function listPackage(appId: string) {
-  const allPkgs = await getAllPackages(appId);
+  const allPkgs = (await getAllPackages(appId)) || [];
 
   const header = [
     { value: t('nativePackageId') },
@@ -49,7 +57,7 @@ export async function choosePackage(appId: string) {
 
   while (true) {
     const id = await question(t('enterNativePackageId'));
-    const app = list.find((v) => v.id.toString() === id);
+    const app = list?.find((v) => v.id.toString() === id);
     if (app) {
       return app;
     }
@@ -143,6 +151,48 @@ export const packageCommands = {
     saveToLocal(fn, `${appId}/package/${id}.apk`);
     console.log(t('apkUploadSuccess', { id, version: versionName, buildTime }));
   },
+  uploadAab: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: Record<string, any>;
+  }) => {
+    const source = args[0];
+    if (!source || !source.endsWith('.aab')) {
+      throw new Error(t('usageUploadAab'));
+    }
+
+    const output = path.join(
+      os.tmpdir(),
+      `${path.basename(source, path.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 AabParser(source);
+    try {
+      await parser.extractApk(output, {
+        includeAllSplits,
+        splits,
+      });
+      await packageCommands.uploadApk({
+        args: [output],
+        options,
+      });
+    } finally {
+      if (await fs.pathExists(output)) {
+        await fs.remove(output);
+      }
+    }
+  },
   uploadApp: async ({
     args,
     options,
@@ -214,6 +264,42 @@ export const packageCommands = {
     }
     console.log(await getAabInfo(fn));
   },
+  extractApk: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: Record<string, any>;
+  }) => {
+    const source = args[0];
+    if (!source || !source.endsWith('.aab')) {
+      throw new Error(t('usageExtractApk'));
+    }
+
+    const output =
+      options.output ||
+      path.join(
+        path.dirname(source),
+        `${path.basename(source, path.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 AabParser(source);
+    await parser.extractApk(output, {
+      includeAllSplits,
+      splits,
+    });
+
+    console.log(t('apkExtracted', { output }));
+  },
   packages: async ({ options }: { options: { platform: Platform } }) => {
     const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
@@ -224,12 +310,17 @@ export const packageCommands = {
     options,
   }: {
     args: string[];
-    options: { appId?: string; packageId?: string; packageVersion?: string };
+    options: {
+      appId?: string;
+      packageId?: string;
+      packageVersion?: string;
+      platform?: Platform;
+    };
   }) => {
     let { appId, packageId, packageVersion } = options;
 
     if (!appId) {
-      const platform = await getPlatform();
+      const platform = await getPlatform(options.platform);
       appId = (await getSelectedApp(platform)).appId as string;
     }
 

package/src/provider.ts

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

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

@@ -0,0 +1,240 @@
+import { spawn } from 'child_process';
+import os from 'os';
+import path from 'path';
+import fs from 'fs-extra';
+import { open as openZipFile } from 'yauzl';
+import { t } from '../i18n';
+import { ResourceFinder } from './resource-finder';
+import { mapInfoResource } from './utils';
+import { ManifestParser } from './xml-parser/manifest';
+import { Zip } from './zip';
+
+export class AabParser extends Zip {
+  file: string | File;
+
+  constructor(file: string | File) {
+    super(file);
+    this.file = file;
+  }
+
+  async extractApk(
+    outputPath: string,
+    {
+      includeAllSplits,
+      splits,
+    }: { includeAllSplits?: boolean; splits?: string[] | null },
+  ) {
+    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: string,
+      args: string[],
+      options: { stdio?: 'inherit'; env?: NodeJS.ProcessEnv } = {},
+    ) =>
+      new Promise<void>((resolve, reject) => {
+        const inheritStdio = options.stdio === 'inherit';
+        const child = spawn(command, args, {
+          stdio: inheritStdio ? 'inherit' : ['ignore', 'pipe', 'pipe'],
+          env: options.env,
+        });
+        let stderr = '';
+        if (!inheritStdio) {
+          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.tmpdir();
+    const tempApksPath = path.join(tempDir, `temp-${Date.now()}.apks`);
+
+    const needsNpxDownload = async () => {
+      try {
+        await runCommand('npx', [
+          '--no-install',
+          'node-bundletool',
+          '--version',
+        ]);
+        return false;
+      } catch {
+        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(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<void>((resolve, reject) => {
+        openZipFile(tempApksPath, { lazyEntries: true }, (err, zipfile) => {
+          if (err || !zipfile) {
+            reject(err || new Error(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(t('aabReadUniversalApkFailed')));
+                  return;
+                }
+                const writeStream = fs.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(t('aabUniversalApkNotFound')));
+          });
+          zipfile.on('error', reject);
+        });
+      });
+    } finally {
+      // Cleanup
+      if (await fs.pathExists(tempApksPath)) {
+        await fs.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(t('aabManifestNotFound'));
+      }
+
+      let apkInfo = this._parseManifest(manifestBuffer as Buffer);
+
+      try {
+        const resourceBuffer = await this.getEntry(ResourceName);
+        if (resourceBuffer) {
+          const resourceMap = this._parseResourceMap(resourceBuffer as Buffer);
+          apkInfo = mapInfoResource(apkInfo, resourceMap);
+        }
+      } catch (e: any) {
+        console.warn(t('aabParseResourcesWarning', { error: e?.message ?? e }));
+      }
+
+      return apkInfo;
+    } catch (error: any) {
+      throw new Error(t('aabParseFailed', { error: error.message ?? error }));
+    }
+  }
+  /**
+   * Parse manifest
+   * @param {Buffer} buffer // manifest file's buffer
+   */
+  private _parseManifest(buffer: Buffer) {
+    try {
+      const parser = new ManifestParser(buffer, {
+        ignore: [
+          'application.activity',
+          'application.service',
+          'application.receiver',
+          'application.provider',
+          'permission-group',
+        ],
+      });
+      return parser.parse();
+    } catch (e: any) {
+      throw new Error(t('aabParseManifestError', { error: e?.message ?? e }));
+    }
+  }
+
+  /**
+   * Parse resourceMap
+   * @param {Buffer} buffer // resourceMap file's buffer
+   */
+  private _parseResourceMap(buffer: Buffer) {
+    try {
+      return new ResourceFinder().processResourceTable(buffer);
+    } catch (e: any) {
+      throw new Error(t('aabParseResourcesError', { error: e?.message ?? e }));
+    }
+  }
+}
+
+const escapeRegExp = (value: string) =>
+  value.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');