react-native-update-cli 1.44.1 → 1.44.3

package/lib/package.js

@@ -35,10 +35,10 @@ async function listPackage(appId) {
     const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
     const header = [
         {
-            value: '原生包 Id'
+            value: (0, _i18n.t)('nativePackageId')
         },
         {
-            value: '原生版本'
+            value: (0, _i18n.t)('nativeVersion')
         }
     ];
     const rows = [];
@@ -46,16 +46,17 @@ async function listPackage(appId) {
         const { version } = pkg;
         let versionInfo = '';
         if (version) {
-            versionInfo = `, 已绑定：${version.name} (${version.id})`;
-        } else {
-        // versionInfo = ' (newest)';
+            versionInfo = (0, _i18n.t)('boundTo', {
+                name: version.name,
+                id: version.id
+            });
         }
         let output = pkg.name;
         if (pkg.status === 'paused') {
-            output += '(已暂停)';
+            output += (0, _i18n.t)('pausedStatus');
         }
         if (pkg.status === 'expired') {
-            output += '(已过期)';
+            output += (0, _i18n.t)('expiredStatus');
         }
         output += versionInfo;
         rows.push([
@@ -72,7 +73,7 @@ async function listPackage(appId) {
 async function choosePackage(appId) {
     const list = await listPackage(appId);
     while(true){
-        const id = await (0, _utils.question)('输入原生包 id:');
+        const id = await (0, _utils.question)((0, _i18n.t)('enterNativePackageId'));
         const app = list.find((v)=>v.id === Number(id));
         if (app) {
             return app;
@@ -88,10 +89,16 @@ const commands = {
         const { versionName, buildTime, appId: appIdInPkg, appKey: appKeyInPkg } = await (0, _utils.getIpaInfo)(fn);
         const { appId, appKey } = await (0, _app.getSelectedApp)('ios');
         if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error(`appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`);
+            throw new Error((0, _i18n.t)('appIdMismatchIpa', {
+                appIdInPkg,
+                appId
+            }));
         }
         if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error(`appKey不匹配！当前ipa: ${appKeyInPkg}, 当前update.json: ${appKey}`);
+            throw new Error((0, _i18n.t)('appKeyMismatchIpa', {
+                appKeyInPkg,
+                appKey
+            }));
         }
         const { hash } = await (0, _api.uploadFile)(fn);
         const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
@@ -102,7 +109,11 @@ const commands = {
             commit: await (0, _git.getCommitInfo)()
         });
         (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.ipa`);
-        console.log(`已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
+        console.log((0, _i18n.t)('ipaUploadSuccess', {
+            id,
+            version: versionName,
+            buildTime
+        }));
     },
     uploadApk: async ({ args })=>{
         const fn = args[0];
@@ -112,10 +123,16 @@ const commands = {
         const { versionName, buildTime, appId: appIdInPkg, appKey: appKeyInPkg } = await (0, _utils.getApkInfo)(fn);
         const { appId, appKey } = await (0, _app.getSelectedApp)('android');
         if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error(`appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`);
+            throw new Error((0, _i18n.t)('appIdMismatchApk', {
+                appIdInPkg,
+                appId
+            }));
         }
         if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error(`appKey不匹配！当前apk: ${appKeyInPkg}, 当前update.json: ${appKey}`);
+            throw new Error((0, _i18n.t)('appKeyMismatchApk', {
+                appKeyInPkg,
+                appKey
+            }));
         }
         const { hash } = await (0, _api.uploadFile)(fn);
         const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
@@ -126,7 +143,11 @@ const commands = {
             commit: await (0, _git.getCommitInfo)()
         });
         (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.apk`);
-        console.log(`已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
+        console.log((0, _i18n.t)('apkUploadSuccess', {
+            id,
+            version: versionName,
+            buildTime
+        }));
     },
     uploadApp: async ({ args })=>{
         const fn = args[0];
@@ -136,10 +157,16 @@ const commands = {
         const { versionName, buildTime, appId: appIdInPkg, appKey: appKeyInPkg } = await (0, _utils.getAppInfo)(fn);
         const { appId, appKey } = await (0, _app.getSelectedApp)('harmony');
         if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error(`appId不匹配！当前app: ${appIdInPkg}, 当前update.json: ${appId}`);
+            throw new Error((0, _i18n.t)('appIdMismatchApp', {
+                appIdInPkg,
+                appId
+            }));
         }
         if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error(`appKey不匹配！当前app: ${appKeyInPkg}, 当前update.json: ${appKey}`);
+            throw new Error((0, _i18n.t)('appKeyMismatchApp', {
+                appKeyInPkg,
+                appKey
+            }));
         }
         const { hash } = await (0, _api.uploadFile)(fn);
         const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
@@ -150,7 +177,11 @@ const commands = {
             commit: await (0, _git.getCommitInfo)()
         });
         (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.app`);
-        console.log(`已成功上传app原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
+        console.log((0, _i18n.t)('appUploadSuccess', {
+            id,
+            version: versionName,
+            buildTime
+        }));
     },
     parseApp: async ({ args })=>{
         const fn = args[0];
@@ -174,7 +205,7 @@ const commands = {
         console.log(await (0, _utils.getApkInfo)(fn));
     },
     packages: async ({ options })=>{
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)((0, _i18n.t)('platformPrompt')));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         await listPackage(appId);
     }

package/lib/utils/i18n.js

@@ -28,6 +28,9 @@ _i18next.default.init({
         zh: {
             translation: _zh.default
         }
+    },
+    interpolation: {
+        escapeValue: false
     }
 });
 const t = _i18next.default.t;

package/lib/utils/index.js

@@ -194,13 +194,12 @@ async function printVersionCommand() {
         version: _chalk.default.green(latestRnuCliVersion)
     })}` : '';
     console.log(`react-native-update-cli: ${_packagejson.default.version}${latestRnuCliVersion}`);
-    let rnuVersion = '';
-    rnuVersion = _depversions.depVersions['react-native-update'];
-    latestRnuVersion = latestRnuVersion ? ` ${(0, _i18n.t)('latestVersionTag', {
-        version: _chalk.default.green(latestRnuVersion)
-    })}` : '';
-    console.log(`react-native-update: ${rnuVersion}${latestRnuVersion}`);
+    const rnuVersion = _depversions.depVersions['react-native-update'];
     if (rnuVersion) {
+        latestRnuVersion = latestRnuVersion ? ` ${(0, _i18n.t)('latestVersionTag', {
+            version: _chalk.default.green(latestRnuVersion)
+        })}` : '';
+        console.log(`react-native-update: ${rnuVersion}${latestRnuVersion}`);
         if (_constants.IS_CRESC) {
             if ((0, _satisfies.default)(rnuVersion, '<10.27.0')) {
                 console.error('Unsupported version, please update to the latest version: npm i react-native-update@latest');

package/lib/versions.js

@@ -91,7 +91,7 @@ const commands = {
         const fn = args[0];
         const { name, description, metaInfo } = options;
         if (!fn || !fn.endsWith('.ppk')) {
-            throw new Error('使用方法: pushy publish ppk后缀文件 --platform ios|android|harmony');
+            throw new Error((0, _i18n.t)('publishUsage'));
         }
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.44.1",
+  "version": "1.44.3",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {
@@ -14,7 +14,7 @@
   ],
   "scripts": {
     "build": "swc src -d lib --strip-leading-paths",
-    "prepare": "npm run build && chmod +x lib/index.js",
+    "prepublishOnly": "npm run build && chmod +x lib/index.js",
     "lint": "tsc --noEmit & biome check --write ."
   },
   "repository": {
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "@badisi/latest-version": "^7.0.13",
+    "@badisi/latest-version": "^7.0.14",
     "bplist-parser": "^0.3.2",
     "bytebuffer": "^5.0.1",
     "cgbi-to-png": "^1.0.7",
@@ -66,8 +66,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@swc/cli": "^0.7.2",
-    "@swc/core": "^1.11.21",
+    "@swc/cli": "0.7.3",
+    "@swc/core": "^1.11.24",
     "@types/filesize-parser": "^1.5.3",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.14.1",
@@ -82,5 +82,8 @@
   "trustedDependencies": [
     "@biomejs/biome",
     "@swc/core"
-  ]
+  ],
+  "patchedDependencies": {
+    "@badisi/latest-version@7.0.14": "patches/@badisi%2Flatest-version@7.0.14.patch"
+  }
 }

package/src/bundle.ts

@@ -1,8 +1,12 @@
 import path from 'node:path';
 import { translateOptions } from './utils';
 import * as fs from 'fs-extra';
-import { ZipFile } from 'yazl';
-import { open as openZipFile } from 'yauzl';
+import { ZipFile as YazlZipFile } from 'yazl';
+import {
+  type Entry,
+  open as openZipFile,
+  type ZipFile as YauzlZipFile,
+} from 'yauzl';
 import { question, checkPlugins } from './utils';
 import { checkPlatform } from './app';
 import { spawn, spawnSync } from 'node:child_process';
@@ -15,10 +19,13 @@ import { t } from './utils/i18n';
 import { tempDir } from './utils/constants';
 import { checkLockFiles } from './utils/check-lockfile';
 import { addGitIgnore } from './utils/add-gitignore';
+import { commands as versionCommands } from './versions';
 
-let bsdiff;
-let hdiff;
-let diff;
+type Diff = (oldSource?: Buffer, newSource?: Buffer) => Buffer;
+
+let bsdiff: Diff;
+let hdiff: Diff;
+let diff: Diff;
 try {
   bsdiff = require('node-bsdiff').diff;
 } catch (e) {}
@@ -59,9 +66,7 @@ async function runReactNativeBundleCommand({
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
     if (gradleConfig.crunchPngs !== false) {
-      console.warn(
-        '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',
-      );
+      console.warn(t('androidCrunchPngsWarning'));
     }
   }
 
@@ -321,7 +326,7 @@ async function compileHermesByteCode(
   sourcemapOutput: string,
   shouldCleanSourcemap: boolean,
 ) {
-  console.log('Hermes enabled, now compiling to hermes bytecode:\n');
+  console.log(t('hermesEnabledCompiling'));
   // >= rn 0.69
   const rnDir = path.dirname(
     require.resolve('react-native', {
@@ -351,7 +356,9 @@ async function compileHermesByteCode(
     );
     args.push('-output-source-map');
   }
-  console.log(t('runningHermesc', { command: hermesCommand, args: args.join(' ') }));
+  console.log(
+    t('runningHermesc', { command: hermesCommand, args: args.join(' ') }),
+  );
   spawnSync(hermesCommand, args, {
     stdio: 'ignore',
   });
@@ -387,7 +394,7 @@ async function copyDebugidForSentry(
   sourcemapOutput: string,
 ) {
   if (sourcemapOutput) {
-    let copyDebugidPath;
+    let copyDebugidPath: string | undefined;
     try {
       copyDebugidPath = require.resolve(
         '@sentry/react-native/scripts/copy-debugid.js',
@@ -426,13 +433,13 @@ async function uploadSourcemapForSentry(
   version: string,
 ) {
   if (sourcemapOutput) {
-    let sentryCliPath;
+    let sentryCliPath: string | undefined;
     try {
       sentryCliPath = require.resolve('@sentry/cli/bin/sentry-cli', {
         paths: [process.cwd()],
       });
     } catch (error) {
-      console.error('无法找到 Sentry CLI 工具，请确保已正确安装 @sentry/cli');
+      console.error(t('sentryCliNotFound'));
       return;
     }
 
@@ -471,12 +478,12 @@ async function uploadSourcemapForSentry(
 }
 
 const ignorePackingFileNames = ['.', '..', 'index.bundlejs.map'];
-const ignorePackingExtensions = ['DS_Store','txt.map'];
+const ignorePackingExtensions = ['DS_Store', 'txt.map'];
 async function pack(dir: string, output: string) {
   console.log(t('packing'));
   fs.ensureDirSync(path.dirname(output));
   await new Promise<void>((resolve, reject) => {
-    const zipfile = new ZipFile();
+    const zipfile = new YazlZipFile();
 
     function addDirectory(root: string, rel: string) {
       if (rel) {
@@ -513,10 +520,13 @@ async function pack(dir: string, output: string) {
   console.log(t('fileGenerated', { file: output }));
 }
 
-export function readEntire(entry: string, zipFile: ZipFile) {
+export function readEntry(
+  entry: Entry,
+  zipFile: YauzlZipFile,
+): Promise<Buffer> {
   const buffers: Buffer[] = [];
   return new Promise((resolve, reject) => {
-    zipFile.openReadStream(entry, (err: any, stream: any) => {
+    zipFile.openReadStream(entry, (err, stream) => {
       stream.pipe({
         write(chunk: Buffer) {
           buffers.push(chunk);
@@ -544,7 +554,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
   const originEntries = {};
   const originMap = {};
 
-  let originSource;
+  let originSource: Buffer | undefined;
 
   await enumZipEntries(origin, (entry, zipFile) => {
     originEntries[entry.fileName] = entry;
@@ -557,7 +567,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
         entry.fileName === 'bundle.harmony.js'
       ) {
         // This is source.
-        return readEntire(entry, zipFile).then((v) => (originSource = v));
+        return readEntry(entry, zipFile).then((v) => (originSource = v));
       }
     }
   });
@@ -570,7 +580,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
 
   const copies = {};
 
-  const zipfile = new ZipFile();
+  const zipfile = new YazlZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {
@@ -607,7 +617,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
       }
     } else if (entry.fileName === 'index.bundlejs') {
       //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
+      return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
@@ -617,7 +627,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
       });
     } else if (entry.fileName === 'bundle.harmony.js') {
       //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
+      return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
@@ -691,9 +701,9 @@ async function diffFromPackage(
   const originEntries = {};
   const originMap = {};
 
-  let originSource;
+  let originSource: Buffer | undefined;
 
-  await enumZipEntries(origin, (entry: any, zipFile: any) => {
+  await enumZipEntries(origin, (entry, zipFile) => {
     if (!/\/$/.test(entry.fileName)) {
       const fn = transformPackagePath(entry.fileName);
       if (!fn) {
@@ -707,7 +717,7 @@ async function diffFromPackage(
 
       if (fn === originBundleName) {
         // This is source.
-        return readEntire(entry, zipFile).then((v) => (originSource = v));
+        return readEntry(entry, zipFile).then((v) => (originSource = v));
       }
     }
   });
@@ -720,7 +730,7 @@ async function diffFromPackage(
 
   const copies = {};
 
-  const zipfile = new ZipFile();
+  const zipfile = new YazlZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {
@@ -737,7 +747,7 @@ async function diffFromPackage(
       zipfile.addEmptyDirectory(entry.fileName);
     } else if (entry.fileName === 'index.bundlejs') {
       //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
+      return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
@@ -747,7 +757,7 @@ async function diffFromPackage(
       });
     } else if (entry.fileName === 'bundle.harmony.js') {
       //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
+      return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
@@ -789,14 +799,18 @@ async function diffFromPackage(
 
 export async function enumZipEntries(
   zipFn: string,
-  callback: (entry: any, zipFile: any) => void,
+  callback: (
+    entry: Entry,
+    zipFile: YauzlZipFile,
+    nestedPath?: string,
+  ) => Promise<any>,
   nestedPath = '',
 ) {
   return new Promise((resolve, reject) => {
     openZipFile(
       zipFn,
       { lazyEntries: true },
-      async (err: any, zipfile: ZipFile) => {
+      async (err: any, zipfile: YauzlZipFile) => {
         if (err) {
           return reject(err);
         }
@@ -850,7 +864,7 @@ export async function enumZipEntries(
   });
 }
 
-function diffArgsCheck(args, options, diffFn) {
+function diffArgsCheck(args: string[], options: any, diffFn: string) {
   const [origin, next] = args;
 
   if (!origin || !next) {
@@ -889,7 +903,7 @@ function diffArgsCheck(args, options, diffFn) {
 export const commands = {
   bundle: async function ({ options }) {
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android/harmony):')),
+      options.platform || (await question(t('platformPrompt'))),
     );
 
     const {
@@ -903,6 +917,9 @@ export const commands = {
       expo,
       rncli,
       disableHermes,
+      name,
+      description,
+      metaInfo,
     } = translateOptions({
       ...options,
       tempDir,
@@ -943,14 +960,17 @@ export const commands = {
 
     await pack(path.resolve(intermediaDir), realOutput);
 
-    const v = await question('是否现在上传此热更包?(Y/N)');
-    if (v.toLowerCase() === 'y') {
-      const versionName = await this.publish({
+    if (name) {
+      const versionName = await versionCommands.publish({
         args: [realOutput],
         options: {
           platform,
+          name,
+          description,
+          metaInfo,
         },
       });
+      
       if (isSentry) {
         await copyDebugidForSentry(bundleName, intermediaDir, sourcemapOutput);
         await uploadSourcemapForSentry(
@@ -960,6 +980,25 @@ export const commands = {
           versionName,
         );
       }
+    } else if (!options['no-interactive']) {
+      const v = await question(t('uploadBundlePrompt'));
+      if (v.toLowerCase() === 'y') {
+        const versionName = await versionCommands.publish({
+          args: [realOutput],
+          options: {
+            platform,
+          },
+        });
+        if (isSentry) {
+          await copyDebugidForSentry(bundleName, intermediaDir, sourcemapOutput);
+          await uploadSourcemapForSentry(
+            bundleName,
+            intermediaDir,
+            sourcemapOutput,
+            versionName,
+          );
+        }
+      }
     }
   },
 

package/src/index.ts

@@ -8,7 +8,6 @@ function printUsage() {
   // const commandName = args[0];
   // TODO: print usage of commandName, or print global usage.
 
-  console.log('Usage is under development now.');
   console.log(
     'Visit `https://github.com/reactnativecn/react-native-update` for document.',
   );