Refactor command exports to use specific command groups for app, bundle, package, user, and version modules

cli.json

@@ -57,6 +57,27 @@
         },
         "metaInfo": {
           "hasValue": true
+        },
+        "packageId": {
+          "hasValue": true
+        },
+        "packageVersion": {
+          "hasValue": true
+        },
+        "minPackageVersion": {
+          "hasValue": true
+        },
+        "maxPackageVersion": {
+          "hasValue": true
+        },
+        "packageVersionRange": {
+          "hasValue": true
+        },
+        "rollout": {
+          "hasValue": true
+        },
+        "dryRun": {
+          "default": false
         }
       }
     },
@@ -175,6 +196,27 @@
         "metaInfo": {
           "hasValue": true,
           "description": "Meta information for publishing"
+        },
+        "packageId": {
+          "hasValue": true
+        },
+        "packageVersion": {
+          "hasValue": true
+        },
+        "minPackageVersion": {
+          "hasValue": true
+        },
+        "maxPackageVersion": {
+          "hasValue": true
+        },
+        "packageVersionRange": {
+          "hasValue": true
+        },
+        "rollout": {
+          "hasValue": true
+        },
+        "dryRun": {
+          "default": false
         }
       }
     },

package.json

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

src/app.ts

@@ -66,7 +66,7 @@ export async function chooseApp(platform: Platform) {
   }
 }
 
-export const commands = {
+export const appCommands = {
   createApp: async function ({
     options,
   }: {

src/bundle.ts

@@ -19,7 +19,7 @@ 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';
+import { versionCommands } from './versions';
 
 type Diff = (oldSource?: Buffer, newSource?: Buffer) => Buffer;
 
@@ -149,6 +149,14 @@ async function runReactNativeBundleCommand({
   const bundleParams = await checkPlugins();
   const isSentry = bundleParams.sentry;
 
+  if (isSentry) {
+    if (platform === 'ios') {
+      process.env.SENTRY_PROPERTIES = 'ios/sentry.properties';
+    } else if (platform === 'android') {
+      process.env.SENTRY_PROPERTIES = 'android/sentry.properties';
+    }
+  }
+
   let bundleCommand = 'bundle';
   if (usingExpo) {
     bundleCommand = 'export:embed';
@@ -900,7 +908,7 @@ function diffArgsCheck(args: string[], options: any, diffFn: string) {
   };
 }
 
-export const commands = {
+export const bundleCommands = {
   bundle: async ({ options }) => {
     const platform = await getPlatform(options.platform);
 
@@ -918,6 +926,13 @@ export const commands = {
       name,
       description,
       metaInfo,
+      packageId,
+      packageVersion,
+      minPackageVersion,
+      maxPackageVersion,
+      packageVersionRange,
+      rollout,
+      dryRun,
     } = translateOptions({
       ...options,
       tempDir,
@@ -966,6 +981,13 @@ export const commands = {
           name,
           description,
           metaInfo,
+          packageId,
+          packageVersion,
+          minPackageVersion,
+          maxPackageVersion,
+          packageVersionRange,
+          rollout,
+          dryRun: Boolean(dryRun),
         },
       });
 

src/index.ts

@@ -3,6 +3,11 @@
 import { loadSession } from './api';
 import { printVersionCommand } from './utils';
 import { t } from './utils/i18n';
+import { bundleCommands } from './bundle';
+import { versionCommands } from './versions';
+import { userCommands } from './user';
+import { appCommands } from './app';
+import { packageCommands } from './package';
 
 function printUsage() {
   // const commandName = args[0];
@@ -15,11 +20,11 @@ function printUsage() {
 }
 
 const commands = {
-  ...require('./user').commands,
-  ...require('./bundle').commands,
-  ...require('./app').commands,
-  ...require('./package').commands,
-  ...require('./versions').commands,
+  ...userCommands,
+  ...bundleCommands,
+  ...appCommands,
+  ...packageCommands,
+  ...versionCommands,
   help: printUsage,
 };
 

src/locales/en.ts

@@ -101,7 +101,7 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   rnuVersionNotFound:
     'react-native-update: Cannot get the version number. Please run the command in the project directory',
   rolloutConfigSet:
-    'Set {{rollout}}% rollout for version {{version}} on native version(s) {{versions}}',
+    'Set {{rollout}}% rollout for OTA update {{version}} on native version(s) {{versions}}',
   rolloutRangeError: 'rollout must be an integer between 1-100',
   runningHermesc: 'Running hermesc: {{- command}} {{- args}}',
   sentryCliNotFound:
@@ -122,10 +122,10 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   usageUploadApp: 'Usage: cresc uploadApp <app file>',
   usageUploadIpa: 'Usage: cresc uploadIpa <ipa file>',
   versionBind:
-    'Bound version {{version}} to native version {{nativeVersion}} (id: {{id}})',
+    'Bound hot update {{version}} to native version {{nativeVersion}} (id: {{id}})',
   welcomeMessage: 'Welcome to Cresc hot update service, {{name}}.',
-  versionNameQuestion: 'Enter version name:',
-  versionDescriptionQuestion: 'Enter version description:',
+  versionNameQuestion: 'Enter OTA update name:',
+  versionDescriptionQuestion: 'Enter OTA update description:',
   versionMetaInfoQuestion: 'Enter custom meta info:',
   updateNativePackageQuestion: 'Bind to native package now?(Y/N)',
   unnamed: '(Unnamed)',

src/locales/zh.ts

@@ -96,7 +96,7 @@ export default {
   rnuVersionNotFound:
     'react-native-update: 无法获取版本号。请在项目目录中运行命令',
   rolloutConfigSet:
-    '已在原生版本 {{versions}} 上设置灰度发布 {{rollout}}% 热更版本 {{version}}',
+    '已在原生版本 {{versions}} 上设置灰度发布 {{rollout}}% 热更包 {{version}}',
   rolloutRangeError: 'rollout 必须是 1-100 的整数',
   runningHermesc: '运行 hermesc：{{- command}} {{- args}}',
   sentryCliNotFound: '无法找到 Sentry CLI 工具，请确保已正确安装 @sentry/cli',
@@ -115,7 +115,7 @@ export default {
   usageUploadApp: '使用方法: pushy uploadApp app后缀文件',
   usageUploadIpa: '使用方法: pushy uploadIpa ipa后缀文件',
   versionBind:
-    '已将热更版本 {{version}} 绑定到原生版本 {{nativeVersion}} (id: {{id}})',
+    '已将热更包 {{version}} 绑定到原生版本 {{nativeVersion}} (id: {{id}})',
   welcomeMessage: '欢迎使用 pushy 热更新服务，{{name}}。',
   versionNameQuestion: '输入版本名称:',
   versionDescriptionQuestion: '输入版本描述:',

src/package.ts

@@ -2,7 +2,7 @@ import { get, getAllPackages, post, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 import { t } from './utils/i18n';
 
-import { checkPlatform, getPlatform, getSelectedApp } from './app';
+import { getPlatform, getSelectedApp } from './app';
 
 import { getApkInfo, getIpaInfo, getAppInfo } from './utils';
 import Table from 'tty-table';
@@ -52,7 +52,7 @@ export async function choosePackage(appId: string) {
   }
 }
 
-export const commands = {
+export const packageCommands = {
   uploadIpa: async ({ args }: { args: string[] }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {

src/user.ts

@@ -7,7 +7,7 @@ function md5(str: string) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
-export const commands = {
+export const userCommands = {
   login: async ({ args }: { args: string[] }) => {
     const email = args[0] || (await question('email:'));
     const pwd = args[1] || (await question('password:', true));

src/versions.ts

@@ -10,7 +10,8 @@ import type { Package, Platform, Version } from 'types';
 import { satisfies } from 'compare-versions';
 import chalk from 'chalk';
 
-interface CommandOptions {
+interface VersionCommandOptions {
+  appId?: string;
   name?: string;
   description?: string;
   metaInfo?: string;
@@ -156,13 +157,13 @@ export const bindVersionToPackages = async ({
   console.log(t('operationComplete', { count: pkgs.length }));
 };
 
-export const commands = {
+export const versionCommands = {
   publish: async function ({
     args,
     options,
   }: {
     args: string[];
-    options: CommandOptions;
+    options: VersionCommandOptions;
   }) {
     const fn = args[0];
     const { name, description, metaInfo } = options;
@@ -191,26 +192,52 @@ export const commands = {
     saveToLocal(fn, `${appId}/ppk/${id}.ppk`);
     console.log(t('packageUploadSuccess', { id }));
 
-    const v = await question(t('updateNativePackageQuestion'));
-    if (v.toLowerCase() === 'y') {
-      await this.update({ args: [], options: { versionId: id, platform } });
+    const {
+      packageId,
+      packageVersion,
+      packageVersionRange,
+      minPackageVersion,
+      maxPackageVersion,
+      rollout,
+      dryRun,
+    } = options;
+
+    if (
+      packageId ||
+      packageVersion ||
+      packageVersionRange ||
+      minPackageVersion ||
+      maxPackageVersion
+    ) {
+      await this.update({
+        options: {
+          versionId: id,
+          platform,
+          packageId,
+          packageVersion,
+          packageVersionRange,
+          minPackageVersion,
+          maxPackageVersion,
+          rollout,
+          dryRun,
+        },
+      });
+    } else {
+      const q = await question(t('updateNativePackageQuestion'));
+      if (q.toLowerCase() === 'y') {
+        await this.update({ options: { versionId: id, platform } });
+      }
     }
     return versionName;
   },
-  versions: async ({ options }: { options: CommandOptions }) => {
+  versions: async ({ options }: { options: VersionCommandOptions }) => {
     const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
     await listVersions(appId);
   },
-  update: async ({
-    args,
-    options,
-  }: {
-    args: string[];
-    options: CommandOptions;
-  }) => {
+  update: async ({ options }: { options: VersionCommandOptions }) => {
     const platform = await getPlatform(options.platform);
-    const { appId } = await getSelectedApp(platform);
+    const appId = options.appId || (await getSelectedApp(platform)).appId;
     let versionId = options.versionId || (await chooseVersion(appId)).id;
     if (versionId === 'null') {
       versionId = undefined;
@@ -307,14 +334,11 @@ export const commands = {
       rollout,
       dryRun: options.dryRun,
     });
-    console.log(t('operationSuccess'));
   },
   updateVersionInfo: async ({
-    args,
     options,
   }: {
-    args: string[];
-    options: CommandOptions;
+    options: VersionCommandOptions;
   }) => {
     const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);