react-native-update-cli 1.42.1 → 1.43.0

package/cli.json

@@ -136,11 +136,11 @@
           "hasValue": true
         },
         "intermediaDir": {
-          "default": ".pushy/intermedia/${platform}",
+          "default": "${tempDir}/intermedia/${platform}",
           "hasValue": true
         },
         "output": {
-          "default": ".pushy/output/${platform}.${time}.ppk",
+          "default": "${tempDir}/output/${platform}.${time}.ppk",
           "hasValue": true
         },
         "sourcemap": {
@@ -167,7 +167,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": ".pushy/output/diff",
+          "default": "${tempDir}/output/diff",
           "hasValue": true
         }
       }
@@ -176,7 +176,7 @@
       "description": "Create diff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": ".pushy/output/diff-${time}.apk-patch",
+          "default": "${tempDir}/output/diff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -185,7 +185,7 @@
       "description": "Create diff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": ".pushy/output/diff-${time}.ipa-patch",
+          "default": "${tempDir}/output/diff-${time}.ipa-patch",
           "hasValue": true
         }
       }
@@ -194,7 +194,7 @@
       "description": "Create hdiff patch",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff",
+          "default": "${tempDir}/output/hdiff",
           "hasValue": true
         }
       }
@@ -203,7 +203,7 @@
       "description": "Create hdiff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.apk-patch",
+          "default": "${tempDir}/output/hdiff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -212,7 +212,7 @@
       "description": "Create hdiff patch from a Prepare package(.ppk)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.ppk-patch",
+          "default": "${tempDir}/output/hdiff-${time}.ppk-patch",
           "hasValue": true
         }
       }
@@ -221,7 +221,7 @@
       "description": "Create hdiff patch from a Harmony package(.app)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.app-patch",
+          "default": "${tempDir}/output/hdiff-${time}.app-patch",
           "hasValue": true
         }
       }
@@ -230,7 +230,7 @@
       "description": "Create hdiff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": ".pushy/output/hdiff-${time}.ipa-patch",
+          "default": "${tempDir}/output/hdiff-${time}.ipa-patch",
           "hasValue": true
         }
       }
@@ -241,4 +241,4 @@
       "default": false
     }
   }
-}
+}

package/lib/api.js

@@ -50,6 +50,7 @@ const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
 const _filesizeparser = /*#__PURE__*/ _interop_require_default(require("filesize-parser"));
 const _constants = require("./utils/constants");
 const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
+const _i18n = require("./utils/i18n");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -58,8 +59,7 @@ function _interop_require_default(obj) {
 const tcpPing = _nodeutil.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
-const defaultEndpoint = _constants.IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
-const host = process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
+const host = process.env.PUSHY_REGISTRY || process.env.RNU_API || _constants.defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
 const replaceSession = (newSession)=>{
@@ -102,7 +102,7 @@ async function query(url, options) {
     if (resp.status !== 200) {
         const message = (json == null ? void 0 : json.message) || resp.statusText;
         if (resp.status === 401) {
-            throw new Error('登录信息已过期，请使用 pushy login 命令重新登录');
+            throw new Error((0, _i18n.t)('loginExpired'));
         }
         throw new Error(message);
     }
@@ -155,7 +155,12 @@ async function uploadFile(fn, key) {
     }
     const fileSize = _nodefs.default.statSync(fn).size;
     if (maxSize && fileSize > (0, _filesizeparser.default)(maxSize)) {
-        throw new Error(`此文件大小 ${(fileSize / 1048576).toFixed(1)}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${_constants.pricingPageUrl}`);
+        const readableFileSize = `${(fileSize / 1048576).toFixed(1)}m`;
+        throw new Error((0, _i18n.t)('fileSizeExceeded', {
+            fileSize: readableFileSize,
+            maxSize,
+            pricingPageUrl: _constants.pricingPageUrl
+        }));
     }
     const bar = new _progress.default('  Uploading [:bar] :percent :etas', {
         complete: '=',

package/lib/app.js

@@ -29,45 +29,52 @@ const _utils = require("./utils");
 const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
 const _ttytable = /*#__PURE__*/ _interop_require_default(require("tty-table"));
 const _api = require("./api");
+const _i18n = require("./utils/i18n");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-const validPlatforms = {
-    ios: 1,
-    android: 1,
-    harmony: 1
-};
+const validPlatforms = [
+    'ios',
+    'android',
+    'harmony'
+];
 function checkPlatform(platform) {
-    if (!validPlatforms[platform]) {
-        throw new Error(`无法识别的平台 '${platform}'`);
+    if (!validPlatforms.includes(platform)) {
+        throw new Error((0, _i18n.t)('unsupportedPlatform', {
+            platform
+        }));
     }
     return platform;
 }
 function getSelectedApp(platform) {
     checkPlatform(platform);
     if (!_nodefs.default.existsSync('update.json')) {
-        throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+        throw new Error((0, _i18n.t)('appNotSelected', {
+            platform
+        }));
     }
     const updateInfo = JSON.parse(_nodefs.default.readFileSync('update.json', 'utf8'));
     if (!updateInfo[platform]) {
-        throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+        throw new Error((0, _i18n.t)('appNotSelected', {
+            platform
+        }));
     }
     return updateInfo[platform];
 }
-async function listApp(platform) {
+async function listApp(platform = '') {
     const { data } = await (0, _api.get)('/app/list');
     const list = platform ? data.filter((v)=>v.platform === platform) : data;
     const header = [
         {
-            value: '应用 id'
+            value: (0, _i18n.t)('appId')
         },
         {
-            value: '应用名称'
+            value: (0, _i18n.t)('appName')
         },
         {
-            value: '平台'
+            value: (0, _i18n.t)('platform')
         }
     ];
     const rows = [];
@@ -79,17 +86,16 @@ async function listApp(platform) {
         ]);
     }
     console.log((0, _ttytable.default)(header, rows).render());
-    if (platform) {
-        console.log(`\共 ${list.length} ${platform} 个应用`);
-    } else {
-        console.log(`\共 ${list.length} 个应用`);
-    }
+    console.log(`\n${(0, _i18n.t)('totalApps', {
+        count: list.length,
+        platform
+    })}`);
     return list;
 }
 async function chooseApp(platform) {
     const list = await listApp(platform);
     while(true){
-        const id = await (0, _utils.question)('输入应用 id:');
+        const id = await (0, _utils.question)((0, _i18n.t)('enterAppIdQuestion'));
         const app = list.find((v)=>v.id === Number(id));
         if (app) {
             return app;
@@ -98,15 +104,17 @@ async function chooseApp(platform) {
 }
 const commands = {
     createApp: async function({ options }) {
-        const name = options.name || await (0, _utils.question)('应用名称:');
+        const name = options.name || await (0, _utils.question)((0, _i18n.t)('appNameQuestion'));
         const { downloadUrl } = options;
-        const platform = checkPlatform(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = checkPlatform(options.platform || await (0, _utils.question)((0, _i18n.t)('platformQuestion')));
         const { id } = await (0, _api.post)('/app/create', {
             name,
             platform,
             downloadUrl
         });
-        console.log(`已成功创建应用（id: ${id}）`);
+        console.log((0, _i18n.t)('createAppSuccess', {
+            id
+        }));
         await this.selectApp({
             args: [
                 id
@@ -120,24 +128,24 @@ const commands = {
         const { platform } = options;
         const id = args[0] || chooseApp(platform);
         if (!id) {
-            console.log('已取消');
+            console.log((0, _i18n.t)('cancelled'));
         }
         await (0, _api.doDelete)(`/app/${id}`);
-        console.log('操作成功');
+        console.log((0, _i18n.t)('operationSuccess'));
     },
     apps: async ({ options })=>{
         const { platform } = options;
         listApp(platform);
     },
     selectApp: async ({ args, options })=>{
-        const platform = checkPlatform(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = checkPlatform(options.platform || await (0, _utils.question)((0, _i18n.t)('platformQuestion')));
         const id = args[0] ? Number.parseInt(args[0]) : (await chooseApp(platform)).id;
         let updateInfo = {};
         if (_nodefs.default.existsSync('update.json')) {
             try {
                 updateInfo = JSON.parse(_nodefs.default.readFileSync('update.json', 'utf8'));
             } catch (e) {
-                console.error('Failed to parse file `update.json`. Try to remove it manually.');
+                console.error((0, _i18n.t)('failedToParseUpdateJson'));
                 throw e;
             }
         }

package/lib/bundle.js

@@ -29,6 +29,10 @@ const _nodechild_process = require("node:child_process");
 const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
 const _nodeos = /*#__PURE__*/ _interop_require_default(require("node:os"));
 const _depversions = require("./utils/dep-versions");
+const _i18n = require("./utils/i18n");
+const _constants = require("./utils/constants");
+const _checklockfile = require("./utils/check-lockfile");
+const _addgitignore = require("./utils/add-gitignore");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -464,7 +468,9 @@ async function pack(dir, output) {
         });
         zipfile.end();
     });
-    console.log(`ppk热更包已生成并保存到: ${output}`);
+    console.log((0, _i18n.t)('ppkPackageGenerated', {
+        output
+    }));
 }
 function readEntire(entry, zipFile) {
     const buffers = [];
@@ -757,8 +763,11 @@ const commands = {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli, disableHermes } = (0, _utils.translateOptions)({
             ...options,
+            tempDir: _constants.tempDir,
             platform
         });
+        (0, _checklockfile.checkLockFiles)();
+        (0, _addgitignore.addGitIgnore)();
         const bundleParams = await (0, _utils.checkPlugins)();
         const sourcemapPlugin = bundleParams.sourcemap;
         const isSentry = bundleParams.sentry;

package/lib/locales/en.js

@@ -12,12 +12,32 @@ const _default = {
     updateNotifier: 'Run `{updateCommand}` to update the CLI to get continuous improvements in features, performance, and security.',
     loginFirst: 'Not logged in.\nPlease run `cresc login` in the project directory to login.',
     lockNotFound: 'No lock file detected, which may cause inconsistent dependencies and hot-updating issues.',
-    multipleLocksFound: 'Multiple lock files detected ({lockFiles}), which may cause inconsistent dependencies and hot-updating issues.',
+    multipleLocksFound: 'Multiple lock files detected ({{lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
     lockBestPractice: `
 Best practices for lock files:
 1. All members of the development team should use the same package manager to maintain a single lock file.
 2. Add the lock file to version control (but do not commit multiple lock files of different formats).
 3. Pay attention to changes in the lock file during code review.
 This can reduce the risk of inconsistent dependencies and supply chain attacks.
-`
+`,
+    loginExpired: 'Login information has expired. Please use `cresc login` command to re-login',
+    fileSizeExceeded: 'This file size is {{fileSize}} , exceeding the current quota {{maxSize}} . You may consider upgrading to a higher plan to increase this quota. Details can be found at: {{pricingPageUrl}}',
+    bundleNotFound: 'Bundle file not found. Please ensure that this {{packageType}} is a release version and the bundle file name is the default `{{entryFile}}`',
+    buildTimeNotFound: 'Cannot get the build timestamp of this package. Please update `react-native-update` to the latest version and re-package and upload.',
+    latestVersionTag: '(latest: {{version}})',
+    rnuVersionNotFound: 'react-native-update: Cannot get the version number. Please run the command in the project directory',
+    unsupportedPlatform: 'Unsupported platform `{{platform}}`',
+    appId: 'App ID',
+    appName: 'App Name',
+    platform: 'Platform',
+    totalApps: 'Total {{count}} apps',
+    appNotSelected: 'App not selected. run `cresc selectApp --platform {{platform}}` first!',
+    enterAppIdQuestion: 'Enter AppId:',
+    appNameQuestion: 'App Name:',
+    platformQuestion: 'Platform(ios/android/harmony):',
+    createAppSuccess: 'App created successfully (id: {{id}})',
+    cancelled: 'Cancelled',
+    operationSuccess: 'Operation successful',
+    failedToParseUpdateJson: 'Failed to parse file `update.json`. Try to remove it manually.',
+    ppkPackageGenerated: 'ppk package generated and saved to: {{output}}'
 };

package/lib/locales/zh.js

@@ -19,5 +19,25 @@ const _default = {
 3. 代码审核时应关注 lock 文件的变化。
 这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
 `,
-    multipleLocksFound: '检测到多种不同格式的锁文件({lockFiles})，这可能导致依赖关系不一致而使热更异常。'
+    multipleLocksFound: '检测到多种不同格式的锁文件({{lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
+    loginExpired: '登录信息已过期，请使用 `pushy login` 命令重新登录',
+    fileSizeExceeded: '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{pricingPageUrl}}',
+    bundleNotFound: '找不到 bundle 文件。请确保此 {{packageType}} 为 release 版本，且 bundle 文件名为默认的 `{{entryFile}}`',
+    buildTimeNotFound: '无法获取此包的编译时间戳。请更新 `react-native-update` 到最新版本后重新打包上传。',
+    latestVersionTag: '（最新：{{version}}）',
+    rnuVersionNotFound: 'react-native-update: 无法获取版本号。请在项目目录中运行命令',
+    unsupportedPlatform: '无法识别的平台 `{{platform}}`',
+    appId: '应用 id',
+    appName: '应用名称',
+    platform: '平台',
+    totalApps: '共 {{count}} 个{{platform}}应用',
+    appNotSelected: '尚未选择应用。请先运行 `pushy selectApp --platform {{platform}}` 来选择应用',
+    enterAppIdQuestion: '输入应用 id:',
+    appNameQuestion: '应用名称:',
+    platformQuestion: '平台(ios/android/harmony):',
+    createAppSuccess: '已成功创建应用（id: {{id}}）',
+    cancelled: '已取消',
+    operationSuccess: '操作成功',
+    failedToParseUpdateJson: '无法解析文件 `update.json`。请手动删除它。',
+    ppkPackageGenerated: 'ppk 热更包已生成并保存到: {{output}}'
 };

package/lib/utils/add-gitignore.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "addGitIgnore", {
+    enumerable: true,
+    get: function() {
+        return addGitIgnore;
+    }
+});
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _constants = require("./constants");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function addGitIgnore() {
+    const shouldIgnore = [
+        _constants.credentialFile,
+        _constants.tempDir
+    ];
+    const gitignorePath = '.gitignore';
+    if (!_nodefs.default.existsSync(gitignorePath)) {
+        return;
+    }
+    const gitignoreContent = _nodefs.default.readFileSync(gitignorePath, 'utf-8');
+    const gitignoreLines = gitignoreContent.split('\n');
+    for (const line of gitignoreLines){
+        const index = shouldIgnore.indexOf(line.trim());
+        if (index !== -1) {
+            shouldIgnore.splice(index, 1);
+        }
+    }
+    if (shouldIgnore.length > 0) {
+        gitignoreLines.push('# react-native-update');
+        for (const line of shouldIgnore){
+            gitignoreLines.push(line);
+            console.log(`Added ${line} to .gitignore`);
+        }
+        _nodefs.default.writeFileSync(gitignorePath, gitignoreLines.join('\n'));
+    }
+}

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

@@ -1,4 +1,13 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
 const ApkParser = require('./apk');
 const IpaParser = require('./ipa');
 const AppParser = require('./app');
@@ -13,12 +22,12 @@ class AppInfoParser {
     }
     /**
    * parser for parsing .ipa or .apk file
-   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   * @param {String | File} file // file's path in Node, instance of File in Browser
    */ constructor(file){
         if (!file) {
-            throw new Error("Param miss: file(file's path in Node, instance of File or Blob in browser).");
+            throw new Error("Param miss: file(file's path in Node, instance of File in browser).");
         }
-        const splits = (file.name || file).split('.');
+        const splits = (typeof file === 'string' ? file : file.name).split('.');
         const fileType = splits[splits.length - 1].toLowerCase();
         if (!supportFileTypes.includes(fileType)) {
             throw new Error('Unsupported file type, only support .ipa or .apk or .app file.');
@@ -37,4 +46,4 @@ class AppInfoParser {
         }
     }
 }
-module.exports = AppInfoParser;
+const _default = AppInfoParser;

package/lib/utils/check-lockfile.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "checkLockFiles", {
+    enumerable: true,
+    get: function() {
+        return checkLockFiles;
+    }
+});
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _i18n = require("./i18n");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const lockFiles = [
+    'package-lock.json',
+    'yarn.lock',
+    'pnpm-lock.yaml',
+    'bun.lockb',
+    'bun.lock'
+];
+const existingLockFiles = [];
+function checkLockFiles() {
+    for (const file of lockFiles){
+        if (_nodefs.default.existsSync(file)) {
+            existingLockFiles.push(file);
+        }
+    }
+    if (existingLockFiles.length === 1) {
+        return;
+    }
+    console.warn((0, _i18n.t)('lockBestPractice'));
+    if (existingLockFiles.length === 0) {
+        throw new Error((0, _i18n.t)('lockNotFound'));
+    }
+    throw new Error((0, _i18n.t)('multipleLocksFound', {
+        lockFiles: existingLockFiles.join(', ')
+    }));
+}

package/lib/utils/check-plugin.js

@@ -19,10 +19,10 @@ async function checkPlugins() {
             const isEnabled = await plugin.detect();
             if (isEnabled && plugin.bundleParams) {
                 Object.assign(params, plugin.bundleParams);
-                console.log(`检测到 ${plugin.name} 插件,应用相应打包配置`);
+                console.log(`detected ${plugin.name} plugin`);
             }
         } catch (err) {
-            console.warn(`检测 ${plugin.name} 插件时出错:`, err);
+            console.warn(`error while detecting ${plugin.name} plugin:`, err);
         }
     }
     return params;

package/lib/utils/constants.js

@@ -15,6 +15,9 @@ _export(exports, {
     credentialFile: function() {
         return credentialFile;
     },
+    defaultEndpoint: function() {
+        return defaultEndpoint;
+    },
     pricingPageUrl: function() {
         return pricingPageUrl;
     },
@@ -37,3 +40,4 @@ const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
 const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
 const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';
 const pricingPageUrl = IS_CRESC ? 'https://cresc.dev/pricing' : 'https://pushy.reactnative.cn/pricing.html';
+const defaultEndpoint = IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';

package/lib/utils/i18n.js

@@ -20,9 +20,14 @@ function _interop_require_default(obj) {
 _i18next.default.init({
     lng: _constants.IS_CRESC ? 'en' : 'zh',
     // debug: process.env.NODE_ENV !== 'production',
+    // debug: true,
     resources: {
-        en: _en.default,
-        zh: _zh.default
+        en: {
+            translation: _en.default
+        },
+        zh: {
+            translation: _zh.default
+        }
     }
 });
 const t = _i18next.default.t;