react-native-update-cli 1.30.3 → 1.31.0

package/lib/versions.js

@@ -1,193 +1,241 @@
-'use strict';
-
+"use strict";
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.commands = undefined;
-
-var _api = require('./api');
-
-var _utils = require('./utils');
-
-var _app = require('./app');
-
-var _package = require('./package');
-
-var _compareVersions = require('compare-versions');
-
-async function showVersion(appId, offset) {
-  const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
-  console.log(`Offset ${offset}`);
-  for (const version of data) {
-    let packageInfo = version.packages.slice(0, 3).map(v => v.name).join(', ');
-    const count = version.packages.length;
-    if (count > 3) {
-      packageInfo += `...and ${count - 3} more`;
+Object.defineProperty(exports, "commands", {
+    enumerable: true,
+    get: function() {
+        return commands;
     }
-    if (count === 0) {
-      packageInfo = `(no package)`;
-    } else {
-      packageInfo = `[${packageInfo}]`;
+});
+const _api = require("./api");
+const _utils = require("./utils");
+const _app = require("./app");
+const _package = require("./package");
+const _compareversions = require("compare-versions");
+async function showVersion(appId, offset) {
+    const { data, count } = await (0, _api.get)(`/app/${appId}/version/list`);
+    console.log(`Offset ${offset}`);
+    for (const version of data){
+        let packageInfo = version.packages.slice(0, 3).map((v)=>v.name).join(', ');
+        const count = version.packages.length;
+        if (count > 3) {
+            packageInfo += `...and ${count - 3} more`;
+        }
+        if (count === 0) {
+            packageInfo = `(no package)`;
+        } else {
+            packageInfo = `[${packageInfo}]`;
+        }
+        console.log(`${version.id}) ${version.hash.slice(0, 8)} ${version.name} ${packageInfo}`);
     }
-    console.log(`${version.id}) ${version.hash.slice(0, 8)} ${version.name} ${packageInfo}`);
-  }
-  return data;
+    return data;
 }
-
 async function listVersions(appId) {
-  let offset = 0;
-  while (true) {
-    await showVersion(appId, offset);
-    const cmd = await (0, _utils.question)('page Up/page Down/Begin/Quit(U/D/B/Q)');
-    switch (cmd.toLowerCase()) {
-      case 'u':
-        offset = Math.max(0, offset - 10);
-        break;
-      case 'd':
-        offset += 10;
-        break;
-      case 'b':
-        offset = 0;
-        break;
-      case 'q':
-        return;
+    let offset = 0;
+    while(true){
+        await showVersion(appId, offset);
+        const cmd = await (0, _utils.question)('page Up/page Down/Begin/Quit(U/D/B/Q)');
+        switch(cmd.toLowerCase()){
+            case 'u':
+                offset = Math.max(0, offset - 10);
+                break;
+            case 'd':
+                offset += 10;
+                break;
+            case 'b':
+                offset = 0;
+                break;
+            case 'q':
+                return;
+        }
     }
-  }
 }
-
 async function chooseVersion(appId) {
-  let offset = 0;
-  while (true) {
-    const data = await showVersion(appId, offset);
-    const cmd = await (0, _utils.question)('Enter versionId or page Up/page Down/Begin(U/D/B)');
-    switch (cmd.toLowerCase()) {
-      case 'U':
-        offset = Math.max(0, offset - 10);
-        break;
-      case 'D':
-        offset += 10;
-        break;
-      case 'B':
-        offset = 0;
-        break;
-      default:
-        {
-          const v = data.find(v => v.id === (cmd | 0));
-          if (v) {
-            return v;
-          }
+    let offset = 0;
+    while(true){
+        const data = await showVersion(appId, offset);
+        const cmd = await (0, _utils.question)('Enter versionId or page Up/page Down/Begin(U/D/B)');
+        switch(cmd.toLowerCase()){
+            case 'U':
+                offset = Math.max(0, offset - 10);
+                break;
+            case 'D':
+                offset += 10;
+                break;
+            case 'B':
+                offset = 0;
+                break;
+            default:
+                {
+                    const v = data.find((v)=>v.id === (cmd | 0));
+                    if (v) {
+                        return v;
+                    }
+                }
         }
     }
-  }
 }
-
-const commands = exports.commands = {
-  publish: async function ({ args, options }) {
-    const fn = args[0];
-    const { name, description, metaInfo } = options;
-
-    if (!fn || !fn.endsWith('.ppk')) {
-      throw new Error('使用方法: pushy publish ppk后缀文件 --platform ios|android');
-    }
-
-    const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const { appId } = await (0, _app.getSelectedApp)(platform);
-
-    const { hash } = await (0, _api.uploadFile)(fn);
-
-    const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
-      name: name || (await (0, _utils.question)('输入版本名称: ')) || '(未命名)',
-      hash,
-      description: description || (await (0, _utils.question)('输入版本描述:')),
-      metaInfo: metaInfo || (await (0, _utils.question)('输入自定义的 meta info:'))
-    });
-    // TODO local diff
-    (0, _utils.saveToLocal)(fn, `${appId}/ppk/${id}.ppk`);
-    console.log(`已成功上传新热更包（id: ${id}）`);
-
-    const v = await (0, _utils.question)('是否现在将此热更应用到原生包上？(Y/N)');
-    if (v.toLowerCase() === 'y') {
-      await this.update({ args: [], options: { versionId: id, platform } });
-    }
-  },
-  versions: async function ({ options }) {
-    const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const { appId } = await (0, _app.getSelectedApp)(platform);
-    await listVersions(appId);
-  },
-  update: async function ({ args, options }) {
-    const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const { appId } = await (0, _app.getSelectedApp)(platform);
-    const versionId = options.versionId || (await chooseVersion(appId)).id;
-
-    let pkgId;
-    let pkgVersion = options.packageVersion;
-    let minPkgVersion = options.minPackageVersion;
-    let maxPkgVersion = options.maxPackageVersion;
-    if (pkgVersion) {
-      pkgVersion = pkgVersion.trim();
-      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-      const pkg = data.find(d => d.name === pkgVersion);
-      if (pkg) {
-        pkgId = pkg.id;
-      } else {
-        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
-      }
-    }
-    if (minPkgVersion) {
-      minPkgVersion = String(minPkgVersion).trim();
-      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-      const pkgs = data.filter(d => (0, _compareVersions.compare)(d.name, minPkgVersion, '>='));
-      if (pkgs.length === 0) {
-        throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`);
-      }
-      for (const pkg of pkgs) {
-        await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
-          versionId
+const commands = {
+    publish: async function({ args, options }) {
+        const fn = args[0];
+        const { name, description, metaInfo } = options;
+        if (!fn || !fn.endsWith('.ppk')) {
+            throw new Error('使用方法: pushy publish ppk后缀文件 --platform ios|android');
+        }
+        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android):'));
+        const { appId } = await (0, _app.getSelectedApp)(platform);
+        const { hash } = await (0, _api.uploadFile)(fn);
+        const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
+            name: name || await (0, _utils.question)('输入版本名称: ') || '(未命名)',
+            hash,
+            description: description || await (0, _utils.question)('输入版本描述:'),
+            metaInfo: metaInfo || await (0, _utils.question)('输入自定义的 meta info:')
         });
-        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
-      }
-      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
-      return;
-    }
-    if (maxPkgVersion) {
-      maxPkgVersion = String(maxPkgVersion).trim();
-      const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
-      const pkgs = data.filter(d => (0, _compareVersions.compare)(d.name, maxPkgVersion, '<='));
-      if (pkgs.length === 0) {
-        throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`);
-      }
-      for (const pkg of pkgs) {
-        await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
-          versionId
+        // TODO local diff
+        (0, _utils.saveToLocal)(fn, `${appId}/ppk/${id}.ppk`);
+        console.log(`已成功上传新热更包（id: ${id}）`);
+        const v = await (0, _utils.question)('是否现在将此热更应用到原生包上？(Y/N)');
+        if (v.toLowerCase() === 'y') {
+            await this.update({
+                args: [],
+                options: {
+                    versionId: id,
+                    platform
+                }
+            });
+        }
+    },
+    versions: async function({ options }) {
+        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android):'));
+        const { appId } = await (0, _app.getSelectedApp)(platform);
+        await listVersions(appId);
+    },
+    update: async function({ args, options }) {
+        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android):'));
+        const { appId } = await (0, _app.getSelectedApp)(platform);
+        let versionId = options.versionId || (await chooseVersion(appId)).id;
+        if (versionId === 'null') {
+            versionId = null;
+        }
+        let pkgId;
+        let pkgVersion = options.packageVersion;
+        let minPkgVersion = options.minPackageVersion;
+        let maxPkgVersion = options.maxPackageVersion;
+        let rollout = options.rollout;
+        if (rollout !== undefined) {
+            try {
+                rollout = parseInt(rollout);
+            } catch (e) {
+                throw new Error('rollout 必须是 1-100 的整数');
+            }
+            if (rollout < 1 || rollout > 100) {
+                throw new Error('rollout 必须是 1-100 的整数');
+            }
+        }
+        if (minPkgVersion) {
+            minPkgVersion = String(minPkgVersion).trim();
+            const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+            const pkgs = data.filter((d)=>(0, _compareversions.compare)(d.name, minPkgVersion, '>='));
+            if (pkgs.length === 0) {
+                throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`);
+            }
+            if (rollout) {
+                const rolloutConfig = {};
+                for (const pkg of pkgs){
+                    rolloutConfig[pkg.name] = rollout;
+                }
+                await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
+                    config: {
+                        rollout: rolloutConfig
+                    }
+                });
+                console.log(`已在原生版本 ${pkgs.map((p)=>p.name).join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`);
+            }
+            for (const pkg of pkgs){
+                await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
+                    versionId
+                });
+                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+            }
+            console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+            return;
+        }
+        if (maxPkgVersion) {
+            maxPkgVersion = String(maxPkgVersion).trim();
+            const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+            const pkgs = data.filter((d)=>(0, _compareversions.compare)(d.name, maxPkgVersion, '<='));
+            if (pkgs.length === 0) {
+                throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`);
+            }
+            if (rollout) {
+                const rolloutConfig = {};
+                for (const pkg of pkgs){
+                    rolloutConfig[pkg.name] = rollout;
+                }
+                await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
+                    config: {
+                        rollout: rolloutConfig
+                    }
+                });
+                console.log(`已在原生版本 ${pkgs.map((p)=>p.name).join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`);
+            }
+            for (const pkg of pkgs){
+                await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
+                    versionId
+                });
+                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+            }
+            console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
+            return;
+        }
+        if (pkgVersion) {
+            pkgVersion = pkgVersion.trim();
+            const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+            const pkg = data.find((d)=>d.name === pkgVersion);
+            if (pkg) {
+                pkgId = pkg.id;
+            } else {
+                throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+            }
+        }
+        if (!pkgId) {
+            pkgId = options.packageId || (await (0, _package.choosePackage)(appId)).id;
+        }
+        if (!pkgId) {
+            throw new Error('请提供 packageId 或 packageVersion 参数');
+        }
+        if (rollout) {
+            if (!pkgVersion) {
+                const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
+                const pkg = data.find((d)=>d.id === pkgId);
+                if (pkg) {
+                    pkgVersion = pkg.name;
+                }
+            }
+            await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
+                config: {
+                    rollout: {
+                        [pkgVersion]: rollout
+                    }
+                }
+            });
+            console.log(`已将在原生版本 ${pkgVersion} 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `);
+        }
+        await (0, _api.put)(`/app/${appId}/package/${pkgId}`, {
+            versionId
         });
-        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
-      }
-      console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
-      return;
-    }
-    if (!pkgId) {
-      pkgId = options.packageId || (await (0, _package.choosePackage)(appId)).id;
-    }
-
-    if (!pkgId) {
-      throw new Error('请提供 packageId 或 packageVersion 参数');
+        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion}`);
+    },
+    updateVersionInfo: async function({ args, options }) {
+        const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android):'));
+        const { appId } = await (0, _app.getSelectedApp)(platform);
+        const versionId = options.versionId || (await chooseVersion(appId)).id;
+        const updateParams = {};
+        options.name && (updateParams.name = options.name);
+        options.description && (updateParams.description = options.description);
+        options.metaInfo && (updateParams.metaInfo = options.metaInfo);
+        await (0, _api.put)(`/app/${appId}/version/${versionId}`, updateParams);
+        console.log('操作成功');
     }
-    await (0, _api.put)(`/app/${appId}/package/${pkgId}`, {
-      versionId
-    });
-    console.log('操作成功');
-  },
-  updateVersionInfo: async function ({ args, options }) {
-    const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const { appId } = await (0, _app.getSelectedApp)(platform);
-    const versionId = options.versionId || (await chooseVersion(appId)).id;
-
-    const updateParams = {};
-    options.name && (updateParams.name = options.name);
-    options.description && (updateParams.description = options.description);
-    options.metaInfo && (updateParams.metaInfo = options.metaInfo);
-    await (0, _api.put)(`/app/${appId}/version/${versionId}`, updateParams);
-    console.log('操作成功');
-  }
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.30.3",
+  "version": "1.31.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,8 @@
     "cli.json"
   ],
   "scripts": {
-    "prepublish": "babel src --out-dir lib && chmod +x lib/index.js"
+    "build": "swc src -d lib --strip-leading-paths",
+    "prepublish": "npm run build && chmod +x lib/index.js"
   },
   "repository": {
     "type": "git",
@@ -53,14 +54,14 @@
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },
-  "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-plugin-syntax-object-rest-spread": "^6.13.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "babel-plugin-transform-es2015-spread": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0"
-  },
   "engines": {
     "node": ">= 10"
+  },
+  "devDependencies": {
+    "@swc/cli": "^0.4.1-nightly.20240914",
+    "@swc/core": "^1.7.36",
+    "@types/node": "^22.7.5",
+    "oxlint": "^0.9.10",
+    "typescript": "^5.6.3"
   }
 }

package/src/api.js

@@ -74,9 +74,12 @@ async function query(url, options) {
   }
 
   if (resp.status !== 200) {
-    throw Object.assign(new Error(json.message || json.error), {
-      status: resp.status,
-    });
+    throw Object.assign(
+      new Error(json.message || json.error || resp.statusText),
+      {
+        status: resp.status,
+      },
+    );
   }
   return json;
 }

package/src/bundle.js

@@ -33,7 +33,7 @@ async function runReactNativeBundleCommand(
     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',
+        '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',
       );
     }
   }
@@ -177,17 +177,19 @@ async function checkGradleConfig() {
   let crunchPngs;
   try {
     const gradleConfig = await g2js.parseFile('android/app/build.gradle');
+    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
     const projectConfig = gradleConfig['project.ext.react'];
-    for (const packagerConfig of projectConfig) {
-      if (
-        packagerConfig.includes('enableHermes') &&
-        packagerConfig.includes('true')
-      ) {
-        enableHermes = true;
-        break;
+    if (projectConfig) {
+      for (const packagerConfig of projectConfig) {
+        if (
+          packagerConfig.includes('enableHermes') &&
+          packagerConfig.includes('true')
+        ) {
+          enableHermes = true;
+          break;
+        }
       }
     }
-    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
   } catch (e) {}
   return {
     enableHermes,
@@ -609,7 +611,6 @@ export const commands = {
     const { version, major, minor } = getRNVersion();
 
     console.log('Bundling with react-native: ', version);
-    printVersionCommand();
 
     await runReactNativeBundleCommand(
       bundleName,

package/src/utils/index.js

@@ -154,11 +154,13 @@ export function printVersionCommand() {
   if (pushyVersion) {
     if (semverSatisfies(pushyVersion, '<8.5.1')) {
       console.warn(
-        '当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8',
+        `当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8 .
+        如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
       );
     } else if (semverSatisfies(pushyVersion, '9.0.0 - 9.2.0')) {
       console.warn(
-        '当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9',
+        `当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9 .
+        如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
       );
     }
   }