react-native-update-cli 1.44.7 → 1.45.0

package/lib/api.js

@@ -18,6 +18,9 @@ _export(exports, {
     get: function() {
         return get;
     },
+    getAllPackages: function() {
+        return getAllPackages;
+    },
     getSession: function() {
         return getSession;
     },
@@ -191,3 +194,7 @@ async function uploadFile(fn, key) {
         hash: key || formData.key
     };
 }
+const getAllPackages = async (appId)=>{
+    const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+    return data;
+};

package/lib/app.js

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    checkPlatform: function() {
-        return checkPlatform;
+    assertPlatform: function() {
+        return assertPlatform;
     },
     chooseApp: function() {
         return chooseApp;
@@ -18,6 +18,9 @@ _export(exports, {
     commands: function() {
         return commands;
     },
+    getPlatform: function() {
+        return getPlatform;
+    },
     getSelectedApp: function() {
         return getSelectedApp;
     },
@@ -40,7 +43,10 @@ const validPlatforms = [
     'android',
     'harmony'
 ];
-function checkPlatform(platform) {
+async function getPlatform(platform) {
+    return assertPlatform(platform || await (0, _utils.question)((0, _i18n.t)('platformQuestion')));
+}
+function assertPlatform(platform) {
     if (!validPlatforms.includes(platform)) {
         throw new Error((0, _i18n.t)('unsupportedPlatform', {
             platform
@@ -49,7 +55,7 @@ function checkPlatform(platform) {
     return platform;
 }
 function getSelectedApp(platform) {
-    checkPlatform(platform);
+    assertPlatform(platform);
     if (!_fs.default.existsSync('update.json')) {
         throw new Error((0, _i18n.t)('appNotSelected', {
             platform
@@ -106,7 +112,7 @@ const commands = {
     createApp: async function({ options }) {
         const name = options.name || await (0, _utils.question)((0, _i18n.t)('appNameQuestion'));
         const { downloadUrl } = options;
-        const platform = checkPlatform(options.platform || await (0, _utils.question)((0, _i18n.t)('platformQuestion')));
+        const platform = await getPlatform(options.platform);
         const { id } = await (0, _api.post)('/app/create', {
             name,
             platform,
@@ -138,7 +144,7 @@ const commands = {
         listApp(platform);
     },
     selectApp: async ({ args, options })=>{
-        const platform = checkPlatform(options.platform || await (0, _utils.question)((0, _i18n.t)('platformQuestion')));
+        const platform = await getPlatform(options.platform);
         const id = args[0] ? Number.parseInt(args[0]) : (await chooseApp(platform)).id;
         let updateInfo = {};
         if (_fs.default.existsSync('update.json')) {

package/lib/bundle.js

@@ -779,7 +779,7 @@ function diffArgsCheck(args, options, diffFn) {
 }
 const commands = {
     bundle: async ({ options })=>{
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)((0, _i18n.t)('platformPrompt')));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli, disableHermes, name, description, metaInfo } = (0, _utils.translateOptions)({
             ...options,
             tempDir: _constants.tempDir,

package/lib/locales/en.js

@@ -63,9 +63,11 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     multipleLocksFound: 'Multiple lock files detected ({{- lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
     nativePackageId: 'Native Package ID',
     nativeVersion: 'Native Version',
-    nativeVersionNotFound: 'No native version found >= {{version}}',
-    nativeVersionNotFoundLess: 'No native version found <= {{version}}',
+    nativeVersionNotFoundGte: 'No native version found >= {{version}}',
+    nativeVersionNotFoundLte: 'No native version found <= {{version}}',
     nativeVersionNotFoundMatch: 'No matching native version found: {{version}}',
+    nativePackageIdNotFound: 'No native package id found: {{id}}',
+    noPackagesFound: 'No packages found. (appId: {{appId}})',
     offset: 'Offset {{offset}}',
     operationComplete: 'Operation complete, bound to {{count}} native versions',
     operationSuccess: 'Operation successful',
@@ -105,5 +107,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}})',
-    welcomeMessage: 'Welcome to Cresc hot update service, {{name}}.'
+    welcomeMessage: 'Welcome to Cresc hot update service, {{name}}.',
+    versionNameQuestion: 'Enter version name:',
+    versionDescriptionQuestion: 'Enter version description:',
+    versionMetaInfoQuestion: 'Enter custom meta info:',
+    updateNativePackageQuestion: 'Bind to native package now?(Y/N)',
+    unnamed: '(Unnamed)'
 };

package/lib/locales/zh.js

@@ -63,9 +63,11 @@ const _default = {
     multipleLocksFound: '检测到多种不同格式的锁文件({{- lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
     nativePackageId: '原生包 Id',
     nativeVersion: '原生版本',
-    nativeVersionNotFound: '未查询到 >= {{version}} 的原生版本',
-    nativeVersionNotFoundLess: '未查询到 <= {{version}} 的原生版本',
+    nativeVersionNotFoundGte: '未查询到 >= {{version}} 的原生版本',
+    nativeVersionNotFoundLte: '未查询到 <= {{version}} 的原生版本',
     nativeVersionNotFoundMatch: '未查询到匹配原生版本：{{version}}',
+    nativePackageIdNotFound: '未查询到原生包 id: {{id}}',
+    noPackagesFound: '未查询到任何原生包（appId: {{appId}}）',
     offset: '偏移量 {{offset}}',
     operationComplete: '操作完成，共已绑定 {{count}} 个原生版本',
     operationSuccess: '操作成功',
@@ -104,5 +106,10 @@ const _default = {
     usageUploadApp: '使用方法: pushy uploadApp app后缀文件',
     usageUploadIpa: '使用方法: pushy uploadIpa ipa后缀文件',
     versionBind: '已将热更版本 {{version}} 绑定到原生版本 {{nativeVersion}} (id: {{id}})',
-    welcomeMessage: '欢迎使用 pushy 热更新服务，{{name}}。'
+    welcomeMessage: '欢迎使用 pushy 热更新服务，{{name}}。',
+    versionNameQuestion: '输入版本名称:',
+    versionDescriptionQuestion: '输入版本描述:',
+    versionMetaInfoQuestion: '输入自定义的 meta info:',
+    updateNativePackageQuestion: '是否现在将此热更应用到原生包上？(Y/N)',
+    unnamed: '(未命名)'
 };

package/lib/package.js

@@ -32,7 +32,7 @@ function _interop_require_default(obj) {
     };
 }
 async function listPackage(appId) {
-    const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+    const allPkgs = await (0, _api.getAllPackages)(appId);
     const header = [
         {
             value: (0, _i18n.t)('nativePackageId')
@@ -42,7 +42,7 @@ async function listPackage(appId) {
         }
     ];
     const rows = [];
-    for (const pkg of data){
+    for (const pkg of allPkgs){
         const { version } = pkg;
         let versionInfo = '';
         if (version) {
@@ -66,9 +66,9 @@ async function listPackage(appId) {
     }
     console.log((0, _ttytable.default)(header, rows).render());
     console.log((0, _i18n.t)('totalPackages', {
-        count: data.length
+        count: allPkgs.length
     }));
-    return data;
+    return allPkgs;
 }
 async function choosePackage(appId) {
     const list = await listPackage(appId);
@@ -205,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)((0, _i18n.t)('platformPrompt')));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         await listPackage(appId);
     }

package/lib/versions.js

@@ -2,9 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "commands", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    bindVersionToPackages: function() {
+        return bindVersionToPackages;
+    },
+    commands: function() {
         return commands;
     }
 });
@@ -13,9 +21,14 @@ const _utils = require("./utils");
 const _i18n = require("./utils/i18n");
 const _app = require("./app");
 const _package = require("./package");
-const _compareversions = require("compare-versions");
 const _depversions = require("./utils/dep-versions");
 const _git = require("./utils/git");
+const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 async function showVersion(appId, offset) {
     const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
     console.log((0, _i18n.t)('offset', {
@@ -86,6 +99,36 @@ async function chooseVersion(appId) {
         }
     }
 }
+const bindVersionToPackages = async ({ appId, versionId, pkgs, rollout })=>{
+    if (rollout !== undefined) {
+        const rolloutConfig = {};
+        for (const pkg of pkgs){
+            rolloutConfig[pkg.name] = rollout;
+        }
+        await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
+            config: {
+                rollout: rolloutConfig
+            }
+        });
+        console.log(`${(0, _i18n.t)('rolloutConfigSet', {
+            versions: pkgs.map((pkg)=>pkg.name).join(', '),
+            rollout: rollout
+        })}`);
+    }
+    for (const pkg of pkgs){
+        await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
+            versionId
+        });
+        console.log(`${(0, _i18n.t)('versionBind', {
+            version: versionId,
+            nativeVersion: pkg.name,
+            id: pkg.id
+        })}`);
+    }
+    console.log((0, _i18n.t)('operationComplete', {
+        count: pkgs.length
+    }));
+};
 const commands = {
     publish: async function({ args, options }) {
         const fn = args[0];
@@ -93,15 +136,15 @@ const commands = {
         if (!fn || !fn.endsWith('.ppk')) {
             throw new Error((0, _i18n.t)('publishUsage'));
         }
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         const { hash } = await (0, _api.uploadFile)(fn);
-        const versionName = name || await (0, _utils.question)('输入版本名称: ') || '(未命名)';
+        const versionName = name || await (0, _utils.question)((0, _i18n.t)('versionNameQuestion')) || (0, _i18n.t)('unnamed');
         const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
             name: versionName,
             hash,
-            description: description || await (0, _utils.question)('输入版本描述:'),
-            metaInfo: metaInfo || await (0, _utils.question)('输入自定义的 meta info:'),
+            description: description || await (0, _utils.question)((0, _i18n.t)('versionDescriptionQuestion')),
+            metaInfo: metaInfo || await (0, _utils.question)((0, _i18n.t)('versionMetaInfoQuestion')),
             deps: _depversions.depVersions,
             commit: await (0, _git.getCommitInfo)()
         });
@@ -110,7 +153,7 @@ const commands = {
         console.log((0, _i18n.t)('packageUploadSuccess', {
             id
         }));
-        const v = await (0, _utils.question)('是否现在将此热更应用到原生包上？(Y/N)');
+        const v = await (0, _utils.question)((0, _i18n.t)('updateNativePackageQuestion'));
         if (v.toLowerCase() === 'y') {
             await this.update({
                 args: [],
@@ -123,21 +166,22 @@ const commands = {
         return versionName;
     },
     versions: async ({ options })=>{
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         await listVersions(appId);
     },
     update: async ({ args, options })=>{
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         let versionId = options.versionId || (await chooseVersion(appId)).id;
         if (versionId === 'null') {
             versionId = undefined;
         }
-        let pkgId;
+        let pkgId = options.packageId;
         let pkgVersion = options.packageVersion;
         let minPkgVersion = options.minPackageVersion;
         let maxPkgVersion = options.maxPackageVersion;
+        let semverRange = options.semverRange;
         let rollout = undefined;
         if (options.rollout !== undefined) {
             try {
@@ -149,135 +193,77 @@ const commands = {
                 throw new Error((0, _i18n.t)('rolloutRangeError'));
             }
         }
+        const allPkgs = await (0, _api.getAllPackages)(appId);
+        if (!allPkgs) {
+            throw new Error((0, _i18n.t)('noPackagesFound', {
+                appId
+            }));
+        }
+        let pkgsToBind = [];
         if (minPkgVersion) {
             minPkgVersion = String(minPkgVersion).trim();
-            const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-            const pkgs = data.filter((pkg)=>(0, _compareversions.compare)(pkg.name, minPkgVersion, '>='));
-            if (pkgs.length === 0) {
-                throw new Error((0, _i18n.t)('nativeVersionNotFound', {
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, `>=${minPkgVersion}`));
+            if (pkgsToBind.length === 0) {
+                throw new Error((0, _i18n.t)('nativeVersionNotFoundGte', {
                     version: minPkgVersion
                 }));
             }
-            if (rollout !== undefined) {
-                const rolloutConfig = {};
-                for (const pkg of pkgs){
-                    rolloutConfig[pkg.name] = rollout;
-                }
-                await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
-                    config: {
-                        rollout: rolloutConfig
-                    }
-                });
-                console.log(`${(0, _i18n.t)('rolloutConfigSet', {
-                    versions: pkgs.map((pkg)=>pkg.name).join(', '),
-                    rollout: rollout
-                })}`);
-            }
-            for (const pkg of pkgs){
-                await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
-                    versionId
-                });
-                console.log(`${(0, _i18n.t)('versionBind', {
-                    version: versionId,
-                    nativeVersion: pkg.name,
-                    id: pkg.id
-                })}`);
-            }
-            console.log((0, _i18n.t)('operationComplete', {
-                count: pkgs.length
-            }));
-            return;
-        }
-        if (maxPkgVersion) {
+        } else if (maxPkgVersion) {
             maxPkgVersion = String(maxPkgVersion).trim();
-            const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-            const pkgs = data.filter((pkg)=>(0, _compareversions.compare)(pkg.name, maxPkgVersion, '<='));
-            if (pkgs.length === 0) {
-                throw new Error((0, _i18n.t)('nativeVersionNotFoundLess', {
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, `<=${maxPkgVersion}`));
+            if (pkgsToBind.length === 0) {
+                throw new Error((0, _i18n.t)('nativeVersionNotFoundLte', {
                     version: maxPkgVersion
                 }));
             }
-            if (rollout !== undefined) {
-                const rolloutConfig = {};
-                for (const pkg of pkgs){
-                    rolloutConfig[pkg.name] = rollout;
-                }
-                await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
-                    config: {
-                        rollout: rolloutConfig
-                    }
-                });
-                console.log(`${(0, _i18n.t)('rolloutConfigSet', {
-                    versions: pkgs.map((pkg)=>pkg.name).join(', '),
-                    rollout: rollout
-                })}`);
-            }
-            for (const pkg of pkgs){
-                await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
-                    versionId
-                });
-                console.log(`${(0, _i18n.t)('versionBind', {
-                    version: versionId,
-                    nativeVersion: pkg.name,
-                    id: pkg.id
-                })}`);
-            }
-            console.log((0, _i18n.t)('operationComplete', {
-                count: pkgs.length
-            }));
-            return;
-        }
-        const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-        if (pkgVersion) {
+        } else if (pkgVersion) {
             pkgVersion = pkgVersion.trim();
-            const pkg = data.find((pkg)=>pkg.name === pkgVersion);
+            const pkg = allPkgs.find((pkg)=>pkg.name === pkgVersion);
             if (pkg) {
-                pkgId = pkg.id;
+                pkgsToBind = [
+                    pkg
+                ];
             } else {
                 throw new Error((0, _i18n.t)('nativeVersionNotFoundMatch', {
                     version: pkgVersion
                 }));
             }
-        }
-        if (!pkgId) {
-            pkgId = options.packageId || (await (0, _package.choosePackage)(appId)).id;
-        }
-        if (!pkgId) {
-            throw new Error((0, _i18n.t)('packageIdRequired'));
-        }
-        if (!pkgVersion) {
-            const pkg = data.find((pkg)=>String(pkg.id) === String(pkgId));
+        } else if (semverRange) {
+            semverRange = semverRange.trim();
+            pkgsToBind = allPkgs.filter((pkg)=>(0, _satisfies.default)(pkg.name, semverRange));
+            if (pkgsToBind.length === 0) {
+                throw new Error((0, _i18n.t)('nativeVersionNotFoundMatch', {
+                    version: semverRange
+                }));
+            }
+        } else {
+            if (!pkgId) {
+                pkgId = (await (0, _package.choosePackage)(appId)).id;
+            }
+            if (!pkgId) {
+                throw new Error((0, _i18n.t)('packageIdRequired'));
+            }
+            const pkg = allPkgs.find((pkg)=>String(pkg.id) === String(pkgId));
             if (pkg) {
-                pkgVersion = pkg.name;
+                pkgsToBind = [
+                    pkg
+                ];
+            } else {
+                throw new Error((0, _i18n.t)('nativePackageIdNotFound', {
+                    id: pkgId
+                }));
             }
         }
-        if (rollout !== undefined && pkgVersion) {
-            await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
-                config: {
-                    rollout: {
-                        [pkgVersion]: rollout
-                    }
-                }
-            });
-            console.log(`${(0, _i18n.t)('rolloutConfigSet', {
-                versions: pkgVersion,
-                rollout: rollout
-            })}`);
-        }
-        if (versionId !== undefined) {
-            await (0, _api.put)(`/app/${appId}/package/${pkgId}`, {
-                versionId
-            });
-            console.log(`${(0, _i18n.t)('versionBind', {
-                version: versionId,
-                nativeVersion: pkgVersion,
-                id: pkgId
-            })}`);
-        }
+        await bindVersionToPackages({
+            appId,
+            versionId,
+            pkgs: pkgsToBind,
+            rollout
+        });
         console.log((0, _i18n.t)('operationSuccess'));
     },
     updateVersionInfo: async ({ args, options })=>{
-        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
+        const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         const versionId = options.versionId || (await chooseVersion(appId)).id;
         const updateParams = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.44.7",
+  "version": "1.45.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {
@@ -42,7 +42,6 @@
     "chalk": "4",
     "cli-arguments": "^0.2.1",
     "commander": "^13",
-    "compare-versions": "^6.1.1",
     "filesize-parser": "^1.5.1",
     "form-data": "^4.0.2",
     "fs-extra": "8",
@@ -57,7 +56,7 @@
     "properties": "^1.2.1",
     "read": "^4.1.0",
     "registry-auth-token": "^5.1.0",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "tcp-ping": "^0.1.1",
     "tty-table": "4.2",
     "yauzl": "^3.2.0",
@@ -68,11 +67,11 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@swc/cli": "0.7.3",
+    "@swc/cli": "0.7.7",
     "@swc/core": "^1.11.24",
     "@types/filesize-parser": "^1.5.3",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.18",
     "@types/node-fetch": "^2.6.12",
     "@types/progress": "^2.0.7",
     "@types/semver": "^7.7.0",

package/src/api.ts

@@ -11,7 +11,7 @@ import {
   credentialFile,
   defaultEndpoint,
 } from './utils/constants';
-import type { Session } from 'types';
+import type { Session, Package } from 'types';
 import FormData from 'form-data';
 import { t } from './utils/i18n';
 
@@ -177,3 +177,8 @@ export async function uploadFile(fn: string, key?: string) {
   // const body = await response.json();
   return { hash: key || formData.key };
 }
+
+export const getAllPackages = async (appId: string) => {
+  const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+  return data as Package[] | undefined | null;
+};

package/src/app.ts

@@ -8,7 +8,13 @@ import { t } from './utils/i18n';
 
 const validPlatforms = ['ios', 'android', 'harmony'];
 
-export function checkPlatform(platform: Platform) {
+export async function getPlatform(platform?: string) {
+  return assertPlatform(
+    platform || (await question(t('platformQuestion'))),
+  ) as Platform;
+}
+
+export function assertPlatform(platform: string) {
   if (!validPlatforms.includes(platform)) {
     throw new Error(t('unsupportedPlatform', { platform }));
   }
@@ -16,7 +22,7 @@ export function checkPlatform(platform: Platform) {
 }
 
 export function getSelectedApp(platform: Platform) {
-  checkPlatform(platform);
+  assertPlatform(platform);
 
   if (!fs.existsSync('update.json')) {
     throw new Error(t('appNotSelected', { platform }));
@@ -68,9 +74,7 @@ export const commands = {
   }) {
     const name = options.name || (await question(t('appNameQuestion')));
     const { downloadUrl } = options;
-    const platform = checkPlatform(
-      options.platform || (await question(t('platformQuestion'))),
-    );
+    const platform = await getPlatform(options.platform);
     const { id } = await post('/app/create', { name, platform, downloadUrl });
     console.log(t('createAppSuccess', { id }));
     await this.selectApp({
@@ -104,9 +108,7 @@ export const commands = {
     args: string[];
     options: { platform: Platform };
   }) => {
-    const platform = checkPlatform(
-      options.platform || (await question(t('platformQuestion'))),
-    );
+    const platform = await getPlatform(options.platform);
     const id = args[0]
       ? Number.parseInt(args[0])
       : (await chooseApp(platform)).id;

package/src/bundle.ts

@@ -8,7 +8,7 @@ import {
   type ZipFile as YauzlZipFile,
 } from 'yauzl';
 import { question, checkPlugins } from './utils';
-import { checkPlatform } from './app';
+import { checkPlatform, getPlatform } from './app';
 import { spawn, spawnSync } from 'child_process';
 import semverSatisfies from 'semver/functions/satisfies';
 const g2js = require('gradle-to-js/lib/parser');
@@ -902,9 +902,7 @@ function diffArgsCheck(args: string[], options: any, diffFn: string) {
 
 export const commands = {
   bundle: async ({ options }) => {
-    const platform = checkPlatform(
-      options.platform || (await question(t('platformPrompt'))),
-    );
+    const platform = await getPlatform(options.platform);
 
     const {
       bundleName,

package/src/locales/en.ts

@@ -73,9 +73,11 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
     'Multiple lock files detected ({{- lockFiles}}), which may cause inconsistent dependencies and hot-updating issues.',
   nativePackageId: 'Native Package ID',
   nativeVersion: 'Native Version',
-  nativeVersionNotFound: 'No native version found >= {{version}}',
-  nativeVersionNotFoundLess: 'No native version found <= {{version}}',
+  nativeVersionNotFoundGte: 'No native version found >= {{version}}',
+  nativeVersionNotFoundLte: 'No native version found <= {{version}}',
   nativeVersionNotFoundMatch: 'No matching native version found: {{version}}',
+  nativePackageIdNotFound: 'No native package id found: {{id}}',
+  noPackagesFound: 'No packages found. (appId: {{appId}})',
   offset: 'Offset {{offset}}',
   operationComplete: 'Operation complete, bound to {{count}} native versions',
   operationSuccess: 'Operation successful',
@@ -122,4 +124,9 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   versionBind:
     'Bound version {{version}} to native version {{nativeVersion}} (id: {{id}})',
   welcomeMessage: 'Welcome to Cresc hot update service, {{name}}.',
+  versionNameQuestion: 'Enter version name:',
+  versionDescriptionQuestion: 'Enter version description:',
+  versionMetaInfoQuestion: 'Enter custom meta info:',
+  updateNativePackageQuestion: 'Bind to native package now?(Y/N)',
+  unnamed: '(Unnamed)',
 };

package/src/locales/zh.ts

@@ -69,9 +69,11 @@ export default {
     '检测到多种不同格式的锁文件({{- lockFiles}})，这可能导致依赖关系不一致而使热更异常。',
   nativePackageId: '原生包 Id',
   nativeVersion: '原生版本',
-  nativeVersionNotFound: '未查询到 >= {{version}} 的原生版本',
-  nativeVersionNotFoundLess: '未查询到 <= {{version}} 的原生版本',
+  nativeVersionNotFoundGte: '未查询到 >= {{version}} 的原生版本',
+  nativeVersionNotFoundLte: '未查询到 <= {{version}} 的原生版本',
   nativeVersionNotFoundMatch: '未查询到匹配原生版本：{{version}}',
+  nativePackageIdNotFound: '未查询到原生包 id: {{id}}',
+  noPackagesFound: '未查询到任何原生包（appId: {{appId}}）',
   offset: '偏移量 {{offset}}',
   operationComplete: '操作完成，共已绑定 {{count}} 个原生版本',
   operationSuccess: '操作成功',
@@ -115,4 +117,9 @@ export default {
   versionBind:
     '已将热更版本 {{version}} 绑定到原生版本 {{nativeVersion}} (id: {{id}})',
   welcomeMessage: '欢迎使用 pushy 热更新服务，{{name}}。',
+  versionNameQuestion: '输入版本名称:',
+  versionDescriptionQuestion: '输入版本描述:',
+  versionMetaInfoQuestion: '输入自定义的 meta info:',
+  updateNativePackageQuestion: '是否现在将此热更应用到原生包上？(Y/N)',
+  unnamed: '(未命名)',
 };

package/src/package.ts

@@ -1,8 +1,8 @@
-import { get, post, uploadFile } from './api';
+import { get, getAllPackages, post, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 import { t } from './utils/i18n';
 
-import { checkPlatform, getSelectedApp } from './app';
+import { checkPlatform, getPlatform, getSelectedApp } from './app';
 
 import { getApkInfo, getIpaInfo, getAppInfo } from './utils';
 import Table from 'tty-table';
@@ -11,14 +11,14 @@ import { getCommitInfo } from './utils/git';
 import type { Platform } from 'types';
 
 export async function listPackage(appId: string) {
-  const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+  const allPkgs = await getAllPackages(appId);
 
   const header = [
     { value: t('nativePackageId') },
     { value: t('nativeVersion') },
   ];
   const rows = [];
-  for (const pkg of data) {
+  for (const pkg of allPkgs) {
     const { version } = pkg;
     let versionInfo = '';
     if (version) {
@@ -36,8 +36,8 @@ export async function listPackage(appId: string) {
   }
 
   console.log(Table(header, rows).render());
-  console.log(t('totalPackages', { count: data.length }));
-  return data;
+  console.log(t('totalPackages', { count: allPkgs.length }));
+  return allPkgs;
 }
 
 export async function choosePackage(appId: string) {
@@ -174,9 +174,7 @@ export const commands = {
     console.log(await getApkInfo(fn));
   },
   packages: async ({ options }: { options: { platform: Platform } }) => {
-    const platform = checkPlatform(
-      options.platform || (await question(t('platformPrompt'))),
-    );
+    const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
     await listPackage(appId);
   },

package/src/types.ts

@@ -8,3 +8,15 @@ export interface Session {
 }
 
 export type Platform = 'ios' | 'android' | 'harmony';
+
+export interface Package {
+  id: string;
+  name: string;
+}
+
+export interface Version {
+  id: string;
+  hash: string;
+  name: string;
+  packages?: Package[];
+}

package/src/versions.ts

@@ -1,25 +1,13 @@
-import { get, post, put, uploadFile } from './api';
+import { get, getAllPackages, post, put, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 import { t } from './utils/i18n';
 
-import { checkPlatform, getSelectedApp } from './app';
+import { getPlatform, getSelectedApp } from './app';
 import { choosePackage } from './package';
-import { compare } from 'compare-versions';
 import { depVersions } from './utils/dep-versions';
 import { getCommitInfo } from './utils/git';
-import type { Platform } from 'types';
-
-interface Package {
-  id: string;
-  name: string;
-}
-
-interface Version {
-  id: string;
-  hash: string;
-  name: string;
-  packages?: Package[];
-}
+import type { Package, Platform, Version } from 'types';
+import semverSatisfies from 'semver/functions/satisfies';
 
 interface CommandOptions {
   name?: string;
@@ -31,6 +19,7 @@ interface CommandOptions {
   packageVersion?: string;
   minPackageVersion?: string;
   maxPackageVersion?: string;
+  semverRange?: string;
   rollout?: string;
 }
 
@@ -113,6 +102,49 @@ async function chooseVersion(appId: string) {
   }
 }
 
+export const bindVersionToPackages = async ({
+  appId,
+  versionId,
+  pkgs,
+  rollout,
+}: {
+  appId: string;
+  versionId: string;
+  pkgs: Package[];
+  rollout?: number;
+}) => {
+  if (rollout !== undefined) {
+    const rolloutConfig: Record<string, number> = {};
+    for (const pkg of pkgs) {
+      rolloutConfig[pkg.name] = rollout;
+    }
+    await put(`/app/${appId}/version/${versionId}`, {
+      config: {
+        rollout: rolloutConfig,
+      },
+    });
+    console.log(
+      `${t('rolloutConfigSet', {
+        versions: pkgs.map((pkg: Package) => pkg.name).join(', '),
+        rollout: rollout,
+      })}`,
+    );
+  }
+  for (const pkg of pkgs) {
+    await put(`/app/${appId}/package/${pkg.id}`, {
+      versionId,
+    });
+    console.log(
+      `${t('versionBind', {
+        version: versionId,
+        nativeVersion: pkg.name,
+        id: pkg.id,
+      })}`,
+    );
+  }
+  console.log(t('operationComplete', { count: pkgs.length }));
+};
+
 export const commands = {
   publish: async function ({
     args,
@@ -128,21 +160,18 @@ export const commands = {
       throw new Error(t('publishUsage'));
     }
 
-    const platform = checkPlatform(
-      options.platform ||
-        ((await question('平台(ios/android/harmony):')) as Platform),
-    );
+    const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
 
     const { hash } = await uploadFile(fn);
 
     const versionName =
-      name || (await question('输入版本名称: ')) || '(未命名)';
+      name || (await question(t('versionNameQuestion'))) || t('unnamed');
     const { id } = await post(`/app/${appId}/version/create`, {
       name: versionName,
       hash,
-      description: description || (await question('输入版本描述:')),
-      metaInfo: metaInfo || (await question('输入自定义的 meta info:')),
+      description: description || (await question(t('versionDescriptionQuestion'))),
+      metaInfo: metaInfo || (await question(t('versionMetaInfoQuestion'))),
       deps: depVersions,
       commit: await getCommitInfo(),
     });
@@ -150,17 +179,14 @@ export const commands = {
     saveToLocal(fn, `${appId}/ppk/${id}.ppk`);
     console.log(t('packageUploadSuccess', { id }));
 
-    const v = await question('是否现在将此热更应用到原生包上？(Y/N)');
+    const v = await question(t('updateNativePackageQuestion'));
     if (v.toLowerCase() === 'y') {
       await this.update({ args: [], options: { versionId: id, platform } });
     }
     return versionName;
   },
   versions: async ({ options }: { options: CommandOptions }) => {
-    const platform = checkPlatform(
-      options.platform ||
-        ((await question('平台(ios/android/harmony):')) as Platform),
-    );
+    const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
     await listVersions(appId);
   },
@@ -171,20 +197,18 @@ export const commands = {
     args: string[];
     options: CommandOptions;
   }) => {
-    const platform = checkPlatform(
-      options.platform ||
-        ((await question('平台(ios/android/harmony):')) as Platform),
-    );
+    const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
     let versionId = options.versionId || (await chooseVersion(appId)).id;
     if (versionId === 'null') {
       versionId = undefined;
     }
 
-    let pkgId: string | undefined;
+    let pkgId = options.packageId;
     let pkgVersion = options.packageVersion;
     let minPkgVersion = options.minPackageVersion;
     let maxPkgVersion = options.maxPackageVersion;
+    let semverRange = options.semverRange;
     let rollout: number | undefined = undefined;
 
     if (options.rollout !== undefined) {
@@ -198,146 +222,78 @@ export const commands = {
       }
     }
 
+    const allPkgs = await getAllPackages(appId);
+
+    if (!allPkgs) {
+      throw new Error(t('noPackagesFound', { appId }));
+    }
+
+    let pkgsToBind: Package[] = [];
+
     if (minPkgVersion) {
       minPkgVersion = String(minPkgVersion).trim();
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-      const pkgs = data.filter((pkg: Package) =>
-        compare(pkg.name, minPkgVersion!, '>='),
+      pkgsToBind = allPkgs.filter((pkg: Package) =>
+        semverSatisfies(pkg.name, `>=${minPkgVersion}`),
       );
-      if (pkgs.length === 0) {
-        throw new Error(t('nativeVersionNotFound', { version: minPkgVersion }));
-      }
-      if (rollout !== undefined) {
-        const rolloutConfig: Record<string, number> = {};
-        for (const pkg of pkgs) {
-          rolloutConfig[pkg.name] = rollout;
-        }
-        await put(`/app/${appId}/version/${versionId}`, {
-          config: {
-            rollout: rolloutConfig,
-          },
-        });
-        console.log(
-          `${t('rolloutConfigSet', {
-            versions: pkgs.map((pkg: Package) => pkg.name).join(', '),
-            rollout: rollout,
-          })}`,
-        );
-      }
-      for (const pkg of pkgs) {
-        await put(`/app/${appId}/package/${pkg.id}`, {
-          versionId,
-        });
-        console.log(
-          `${t('versionBind', {
-            version: versionId,
-            nativeVersion: pkg.name,
-            id: pkg.id,
-          })}`,
+      if (pkgsToBind.length === 0) {
+        throw new Error(
+          t('nativeVersionNotFoundGte', { version: minPkgVersion }),
         );
       }
-      console.log(t('operationComplete', { count: pkgs.length }));
-      return;
-    }
-    if (maxPkgVersion) {
+    } else if (maxPkgVersion) {
       maxPkgVersion = String(maxPkgVersion).trim();
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-      const pkgs = data.filter((pkg: Package) =>
-        compare(pkg.name, maxPkgVersion!, '<='),
+      pkgsToBind = allPkgs.filter((pkg: Package) =>
+        semverSatisfies(pkg.name, `<=${maxPkgVersion}`),
       );
-      if (pkgs.length === 0) {
+      if (pkgsToBind.length === 0) {
         throw new Error(
-          t('nativeVersionNotFoundLess', { version: maxPkgVersion }),
+          t('nativeVersionNotFoundLte', { version: maxPkgVersion }),
         );
       }
-      if (rollout !== undefined) {
-        const rolloutConfig: Record<string, number> = {};
-        for (const pkg of pkgs) {
-          rolloutConfig[pkg.name] = rollout;
-        }
-        await put(`/app/${appId}/version/${versionId}`, {
-          config: {
-            rollout: rolloutConfig,
-          },
-        });
-        console.log(
-          `${t('rolloutConfigSet', {
-            versions: pkgs.map((pkg: Package) => pkg.name).join(', '),
-            rollout: rollout,
-          })}`,
-        );
-      }
-      for (const pkg of pkgs) {
-        await put(`/app/${appId}/package/${pkg.id}`, {
-          versionId,
-        });
-        console.log(
-          `${t('versionBind', {
-            version: versionId,
-            nativeVersion: pkg.name,
-            id: pkg.id,
-          })}`,
-        );
-      }
-      console.log(t('operationComplete', { count: pkgs.length }));
-      return;
-    }
-
-    const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-    if (pkgVersion) {
+    } else if (pkgVersion) {
       pkgVersion = pkgVersion.trim();
-      const pkg = data.find((pkg: Package) => pkg.name === pkgVersion);
+      const pkg = allPkgs.find((pkg: Package) => pkg.name === pkgVersion);
       if (pkg) {
-        pkgId = pkg.id;
+        pkgsToBind = [pkg];
       } else {
         throw new Error(
           t('nativeVersionNotFoundMatch', { version: pkgVersion }),
         );
       }
-    }
-    if (!pkgId) {
-      pkgId = options.packageId || (await choosePackage(appId)).id;
-    }
-
-    if (!pkgId) {
-      throw new Error(t('packageIdRequired'));
-    }
-
-    if (!pkgVersion) {
-      const pkg = data.find((pkg: Package) => String(pkg.id) === String(pkgId));
-      if (pkg) {
-        pkgVersion = pkg.name;
+    } else if (semverRange) {
+      semverRange = semverRange.trim();
+      pkgsToBind = allPkgs.filter((pkg: Package) =>
+        semverSatisfies(pkg.name, semverRange!),
+      );
+      if (pkgsToBind.length === 0) {
+        throw new Error(
+          t('nativeVersionNotFoundMatch', { version: semverRange }),
+        );
+      }
+    } else {
+      if (!pkgId) {
+        pkgId = (await choosePackage(appId)).id;
       }
-    }
 
-    if (rollout !== undefined && pkgVersion) {
-      await put(`/app/${appId}/version/${versionId}`, {
-        config: {
-          rollout: {
-            [pkgVersion]: rollout,
-          },
-        },
-      });
-      console.log(
-        `${t('rolloutConfigSet', {
-          versions: pkgVersion,
-          rollout: rollout,
-        })}`,
+      if (!pkgId) {
+        throw new Error(t('packageIdRequired'));
+      }
+      const pkg = allPkgs.find(
+        (pkg: Package) => String(pkg.id) === String(pkgId),
       );
+      if (pkg) {
+        pkgsToBind = [pkg];
+      } else {
+        throw new Error(t('nativePackageIdNotFound', { id: pkgId }));
+      }
     }
 
-    if (versionId !== undefined) {
-      await put(`/app/${appId}/package/${pkgId}`, {
-        versionId,
-      });
-      console.log(
-        `${t('versionBind', {
-          version: versionId,
-          nativeVersion: pkgVersion,
-          id: pkgId,
-        })}`,
-      );
-    }
+    await bindVersionToPackages({
+      appId,
+      versionId,
+      pkgs: pkgsToBind,
+      rollout,
+    });
     console.log(t('operationSuccess'));
   },
   updateVersionInfo: async ({
@@ -347,10 +303,7 @@ export const commands = {
     args: string[];
     options: CommandOptions;
   }) => {
-    const platform = checkPlatform(
-      options.platform ||
-        ((await question('平台(ios/android/harmony):')) as Platform),
-    );
+    const platform = await getPlatform(options.platform);
     const { appId } = await getSelectedApp(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;