semver range

Author: sunnylqm

bun.lock

@@ -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.json

@@ -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;
+};

src/api.ts

@@ -8,15 +8,21 @@ 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 }));
   }
   return 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;

src/app.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,

src/bundle.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)',
 };

src/locales/en.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: '(未命名)',
 };

src/locales/zh.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);
   },

src/package.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[];
+}