react-native-update-cli 1.31.0 → 1.32.2

package/index.js

@@ -1,4 +1 @@
-/**
- * Created by tdzl2003 on 2/22/16.
- */
-module.exports = require('./lib');
+module.exports = require('./lib');

package/lib/api.js

@@ -41,25 +41,25 @@ _export(exports, {
     }
 });
 const _nodefetch = /*#__PURE__*/ _interop_require_default(require("node-fetch"));
-const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
-const _request = /*#__PURE__*/ _interop_require_default(require("request"));
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
+const _nodeutil = /*#__PURE__*/ _interop_require_default(require("node:util"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _progress = /*#__PURE__*/ _interop_require_default(require("progress"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
 const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
-const _util = /*#__PURE__*/ _interop_require_default(require("util"));
-const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _filesizeparser = /*#__PURE__*/ _interop_require_default(require("filesize-parser"));
 const _utils = require("./utils");
+const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+const tcpPing = _nodeutil.default.promisify(_tcpping.default.ping);
+let session;
+let savedSession;
 const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-const tcpPing = _util.default.promisify(_tcpping.default.ping);
-let session = undefined;
-let savedSession = undefined;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = function() {
     return session;
@@ -68,9 +68,9 @@ const replaceSession = function(newSession) {
     session = newSession;
 };
 const loadSession = async function() {
-    if (_fs.default.existsSync('.update')) {
+    if (_nodefs.default.existsSync('.update')) {
         try {
-            replaceSession(JSON.parse(_fs.default.readFileSync('.update', 'utf8')));
+            replaceSession(JSON.parse(_nodefs.default.readFileSync('.update', 'utf8')));
             savedSession = session;
         } catch (e) {
             console.error('Failed to parse file `.update`. Try to remove it manually.');
@@ -83,13 +83,13 @@ const saveSession = function() {
     if (session !== savedSession) {
         const current = session;
         const data = JSON.stringify(current, null, 4);
-        _fs.default.writeFileSync('.update', data, 'utf8');
+        _nodefs.default.writeFileSync('.update', data, 'utf8');
         savedSession = current;
     }
 };
 const closeSession = function() {
-    if (_fs.default.existsSync('.update')) {
-        _fs.default.unlinkSync('.update');
+    if (_nodefs.default.existsSync('.update')) {
+        _nodefs.default.unlinkSync('.update');
         savedSession = undefined;
     }
     session = undefined;
@@ -109,9 +109,7 @@ async function query(url, options) {
         }
     }
     if (resp.status !== 200) {
-        throw Object.assign(new Error(json.message || json.error || resp.statusText), {
-            status: resp.status
-        });
+        throw new Error(`${resp.status}: ${resp.statusText}`);
     }
     return json;
 }
@@ -145,7 +143,7 @@ const put = queryWithBody('PUT');
 const doDelete = queryWithBody('DELETE');
 async function uploadFile(fn, key) {
     const { url, backupUrl, formData, maxSize } = await post('/upload', {
-        ext: _path.default.extname(fn)
+        ext: _nodepath.default.extname(fn)
     });
     let realUrl = url;
     if (backupUrl) {
@@ -164,38 +162,36 @@ async function uploadFile(fn, key) {
         }
     // console.log({realUrl});
     }
-    const fileSize = _fs.default.statSync(fn).size;
+    const fileSize = _nodefs.default.statSync(fn).size;
     if (maxSize && fileSize > (0, _filesizeparser.default)(maxSize)) {
-        throw new Error(`此文件大小${(fileSize / 1048576).toFixed(1)}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${_utils.pricingPageUrl}`);
+        throw new Error(`此文件大小 ${(fileSize / 1048576).toFixed(1)}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${_utils.pricingPageUrl}`);
     }
     const bar = new _progress.default('  上传中 [:bar] :percent :etas', {
         complete: '=',
         incomplete: ' ',
         total: fileSize
     });
-    const info = await new Promise((resolve, reject)=>{
-        if (key) {
-            formData.key = key;
-        }
-        formData.file = _fs.default.createReadStream(fn);
-        formData.file.on('data', function(data) {
-            bar.tick(data.length);
-        });
-        _request.default.post(realUrl, {
-            formData
-        }, (err, resp, body)=>{
-            if (err) {
-                return reject(err);
-            }
-            if (resp.statusCode > 299) {
-                return reject(Object.assign(new Error(body), {
-                    status: resp.statusCode
-                }));
-            }
-            resolve({
-                hash: formData.key
-            });
-        });
+    const form = new _formdata.default();
+    Object.entries(formData).forEach(([k, v])=>{
+        form.append(k, v);
+    });
+    const fileStream = _nodefs.default.createReadStream(fn);
+    fileStream.on('data', function(data) {
+        bar.tick(data.length);
+    });
+    if (key) {
+        form.append('key', key);
+    }
+    form.append('file', fileStream);
+    const res = await (0, _nodefetch.default)(realUrl, {
+        method: 'POST',
+        body: form
     });
-    return info;
+    if (res.status > 299) {
+        throw new Error(`${res.status}: ${res.statusText}`);
+    }
+    // const body = await response.json();
+    return {
+        hash: key || formData.key
+    };
 }

package/lib/bundle.js

@@ -8,13 +8,13 @@ Object.defineProperty(exports, "commands", {
         return commands;
     }
 });
-const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _utils = require("./utils");
 const _fsextra = /*#__PURE__*/ _interop_require_wildcard(require("fs-extra"));
 const _yazl = require("yazl");
 const _yauzl = require("yauzl");
 const _app = require("./app");
-const _child_process = require("child_process");
+const _nodechild_process = require("node:child_process");
 const _os = /*#__PURE__*/ _interop_require_default(require("os"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -76,7 +76,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     if (platform === 'android') {
         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');
+            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');
         }
     }
     let reactNativeBundleArgs = [];
@@ -124,7 +124,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
         '--assets-dest',
         outputFolder,
         '--bundle-output',
-        _path.default.join(outputFolder, bundleName),
+        _nodepath.default.join(outputFolder, bundleName),
         '--dev',
         development,
         '--entry-file',
@@ -139,7 +139,7 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
     if (config) {
         reactNativeBundleArgs.push('--config', config);
     }
-    const reactNativeBundleProcess = (0, _child_process.spawn)('node', reactNativeBundleArgs);
+    const reactNativeBundleProcess = (0, _nodechild_process.spawn)('node', reactNativeBundleArgs);
     console.log(`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`);
     return new Promise((resolve, reject)=>{
         reactNativeBundleProcess.stdout.on('data', (data)=>{
@@ -207,12 +207,12 @@ async function checkGradleConfig() {
 async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput) {
     console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
     // >= rn 0.69
-    const rnDir = _path.default.dirname(require.resolve('react-native', {
+    const rnDir = _nodepath.default.dirname(require.resolve('react-native', {
         paths: [
             process.cwd()
         ]
     }));
-    let hermesPath = _path.default.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
+    let hermesPath = _nodepath.default.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
     // < rn 0.69
     if (!_fsextra.existsSync(hermesPath)) {
         hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
@@ -221,21 +221,21 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
     const args = [
         '-emit-binary',
         '-out',
-        _path.default.join(outputFolder, bundleName),
-        _path.default.join(outputFolder, bundleName),
+        _nodepath.default.join(outputFolder, bundleName),
+        _nodepath.default.join(outputFolder, bundleName),
         '-O'
     ];
     if (sourcemapOutput) {
         args.push('-output-source-map');
     }
     console.log('Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n');
-    (0, _child_process.spawnSync)(hermesCommand, args, {
+    (0, _nodechild_process.spawnSync)(hermesCommand, args, {
         stdio: 'ignore'
     });
 }
 async function pack(dir, output) {
     console.log('Packing');
-    _fsextra.ensureDirSync(_path.default.dirname(output));
+    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
     await new Promise((resolve, reject)=>{
         const zipfile = new _yazl.ZipFile();
         function addDirectory(root, rel) {
@@ -247,7 +247,7 @@ async function pack(dir, output) {
                 if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
                     continue;
                 }
-                const fullPath = _path.default.join(root, name);
+                const fullPath = _nodepath.default.join(root, name);
                 const stat = _fsextra.statSync(fullPath);
                 if (stat.isFile()) {
                     //console.log('adding: ' + rel+name);
@@ -291,7 +291,7 @@ function basename(fn) {
     return m && m[1];
 }
 async function diffFromPPK(origin, next, output) {
-    _fsextra.ensureDirSync(_path.default.dirname(output));
+    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
     const originEntries = {};
     const originMap = {};
     let originSource;
@@ -394,7 +394,7 @@ async function diffFromPPK(origin, next, output) {
     await writePromise;
 }
 async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = (v)=>v) {
-    _fsextra.ensureDirSync(_path.default.dirname(output));
+    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
     const originEntries = {};
     const originMap = {};
     let originSource;
@@ -526,7 +526,7 @@ const commands = {
             ...options,
             platform
         });
-        const sourcemapOutput = _path.default.join(intermediaDir, bundleName + '.map');
+        const sourcemapOutput = _nodepath.default.join(intermediaDir, bundleName + '.map');
         const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
         if (!platform) {
             throw new Error('Platform must be specified.');
@@ -534,7 +534,7 @@ const commands = {
         const { version, major, minor } = (0, _utils.getRNVersion)();
         console.log('Bundling with react-native: ', version);
         await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap ? sourcemapOutput : '');
-        await pack(_path.default.resolve(intermediaDir), realOutput);
+        await pack(_nodepath.default.resolve(intermediaDir), realOutput);
         const v = await (0, _utils.question)('是否现在上传此热更包?(Y/N)');
         if (v.toLowerCase() === 'y') {
             await this.publish({

package/lib/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/lib/utils/index.js

@@ -35,26 +35,26 @@ _export(exports, {
     }
 });
 const _fsextra = /*#__PURE__*/ _interop_require_default(require("fs-extra"));
-const _os = /*#__PURE__*/ _interop_require_default(require("os"));
-const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _nodeos = /*#__PURE__*/ _interop_require_default(require("node:os"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../package.json"));
 const _appinfoparser = /*#__PURE__*/ _interop_require_default(require("./app-info-parser"));
 const _satisfies = /*#__PURE__*/ _interop_require_default(require("semver/functions/satisfies"));
-const _read = /*#__PURE__*/ _interop_require_default(require("read"));
+const _read = require("read");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function question(query, password) {
+async function question(query, password) {
     if (NO_INTERACTIVE) {
-        return Promise.resolve('');
+        return '';
     }
-    return new Promise((resolve, reject)=>(0, _read.default)({
-            prompt: query,
-            silent: password,
-            replace: password ? '*' : undefined
-        }, (err, result)=>err ? reject(err) : resolve(result)));
+    return (0, _read.read)({
+        prompt: query,
+        silent: password,
+        replace: password ? '*' : undefined
+    });
 }
 function translateOptions(options) {
     const ret = {};
@@ -140,7 +140,7 @@ async function getIpaInfo(fn) {
         ...appCredential
     };
 }
-const localDir = _path.default.resolve(_os.default.homedir(), '.pushy');
+const localDir = _nodepath.default.resolve(_nodeos.default.homedir(), '.pushy');
 _fsextra.default.ensureDirSync(localDir);
 function saveToLocal(originPath, destName) {
 // TODO

package/lib/versions.js

@@ -123,7 +123,9 @@ const commands = {
         let minPkgVersion = options.minPackageVersion;
         let maxPkgVersion = options.maxPackageVersion;
         let rollout = options.rollout;
-        if (rollout !== undefined) {
+        if (rollout === undefined) {
+            rollout = null;
+        } else {
             try {
                 rollout = parseInt(rollout);
             } catch (e) {
@@ -156,7 +158,7 @@ const commands = {
                 await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
                     versionId
                 });
-                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
             }
             console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
             return;
@@ -184,14 +186,14 @@ const commands = {
                 await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
                     versionId
                 });
-                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+                console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
             }
             console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
             return;
         }
+        const { data } = await (0, _api.get)(`/app/${appId}/package/list?limit=1000`);
         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;
@@ -205,14 +207,13 @@ const commands = {
         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;
-                }
+        if (!pkgVersion) {
+            const pkg = data.find((d)=>d.id === pkgId);
+            if (pkg) {
+                pkgVersion = pkg.name;
             }
+        }
+        if (rollout) {
             await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
                 config: {
                     rollout: {
@@ -220,12 +221,12 @@ const commands = {
                     }
                 }
             });
-            console.log(`已将在原生版本 ${pkgVersion} 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `);
+            console.log(`已将在原生版本 ${pkgVersion} (id: ${pkgId}) 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `);
         }
         await (0, _api.put)(`/app/${appId}/package/${pkgId}`, {
             versionId
         });
-        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion}`);
+        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`);
     },
     updateVersionInfo: async function({ args, options }) {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android):'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.31.0",
+  "version": "1.32.2",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "build": "swc src -d lib --strip-leading-paths",
-    "prepublish": "npm run build && chmod +x lib/index.js"
+    "prepare": "npm run build && chmod +x lib/index.js"
   },
   "repository": {
     "type": "git",
@@ -32,36 +32,38 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "bplist-parser": "^0.2.0",
+    "bplist-parser": "^0.3.2",
     "bytebuffer": "^5.0.1",
     "cgbi-to-png": "^1.0.7",
     "cli-arguments": "^0.2.1",
-    "commander": "^7.2.0",
+    "commander": "^12.1.0",
     "compare-versions": "^6.1.1",
-    "filesize-parser": "^1.5.0",
+    "filesize-parser": "^1.5.1",
+    "form-data": "^4.0.1",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.1",
     "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
-    "plist": "^3.0.1",
+    "plist": "^3.1.0",
     "progress": "^2.0.3",
     "properties": "^1.2.1",
-    "read": "^1.0.7",
-    "request": "^2.88.2",
+    "read": "^4.0.0",
+    "semver": "^7.6.3",
     "tcp-ping": "^0.1.1",
     "tty-table": "4.2",
     "update-notifier": "^5.1.0",
-    "yauzl": "^2.10.0",
-    "yazl": "2.5.1"
+    "yauzl": "^3.2.0",
+    "yazl": "3.3.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",
+    "@swc/cli": "^0.5.0",
+    "@swc/core": "^1.9.2",
+    "@types/node": "^22.9.0",
+    "oxlint": "^0.11.1",
     "typescript": "^5.6.3"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package/src/{api.js → api.ts}

@@ -1,20 +1,22 @@
 import fetch from 'node-fetch';
-const defaultEndpoint = 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-import fs from 'fs';
-import request from 'request';
+import fs from 'node:fs';
+import util from 'node:util';
+import path from 'node:path';
 import ProgressBar from 'progress';
 import packageJson from '../package.json';
 import tcpp from 'tcp-ping';
-import util from 'util';
-import path from 'path';
 import filesizeParser from 'filesize-parser';
 import { pricingPageUrl } from './utils';
+import { Session } from 'types';
+import FormData from 'form-data';
 
 const tcpPing = util.promisify(tcpp.ping);
 
-let session = undefined;
-let savedSession = undefined;
+let session: Session | undefined;
+let savedSession: Session | undefined;
+
+const defaultEndpoint = 'https://update.reactnative.cn/api';
+let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
@@ -22,7 +24,7 @@ export const getSession = function () {
   return session;
 };
 
-export const replaceSession = function (newSession) {
+export const replaceSession = function (newSession: { token: string }) {
   session = newSession;
 };
 
@@ -59,7 +61,7 @@ export const closeSession = function () {
   host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 
-async function query(url, options) {
+async function query(url: string, options: fetch.RequestInit) {
   const resp = await fetch(url, options);
   const text = await resp.text();
   let json;
@@ -74,18 +76,13 @@ async function query(url, options) {
   }
 
   if (resp.status !== 200) {
-    throw Object.assign(
-      new Error(json.message || json.error || resp.statusText),
-      {
-        status: resp.status,
-      },
-    );
+    throw new Error(`${resp.status}: ${resp.statusText}`);
   }
   return json;
 }
 
-function queryWithoutBody(method) {
-  return function (api) {
+function queryWithoutBody(method: string) {
+  return function (api: string) {
     return query(host + api, {
       method,
       headers: {
@@ -96,8 +93,8 @@ function queryWithoutBody(method) {
   };
 }
 
-function queryWithBody(method) {
-  return function (api, body) {
+function queryWithBody(method: string) {
+  return function (api: string, body: Record<string, any>) {
     return query(host + api, {
       method,
       headers: {
@@ -115,12 +112,11 @@ export const post = queryWithBody('POST');
 export const put = queryWithBody('PUT');
 export const doDelete = queryWithBody('DELETE');
 
-export async function uploadFile(fn, key) {
+export async function uploadFile(fn: string, key?: string) {
   const { url, backupUrl, formData, maxSize } = await post('/upload', {
     ext: path.extname(fn),
   });
   let realUrl = url;
-
   if (backupUrl) {
     if (global.USE_ACC_OSS) {
       realUrl = backupUrl;
@@ -141,9 +137,9 @@ export async function uploadFile(fn, key) {
   const fileSize = fs.statSync(fn).size;
   if (maxSize && fileSize > filesizeParser(maxSize)) {
     throw new Error(
-      `此文件大小${(fileSize / 1048576).toFixed(
+      `此文件大小 ${(fileSize / 1048576).toFixed(
         1,
-      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
+      )}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
     );
   }
 
@@ -153,34 +149,30 @@ export async function uploadFile(fn, key) {
     total: fileSize,
   });
 
-  const info = await new Promise((resolve, reject) => {
-    if (key) {
-      formData.key = key;
-    }
-    formData.file = fs.createReadStream(fn);
+  const form = new FormData();
 
-    formData.file.on('data', function (data) {
-      bar.tick(data.length);
-    });
-    request.post(
-      realUrl,
-      {
-        formData,
-      },
-      (err, resp, body) => {
-        if (err) {
-          return reject(err);
-        }
-        if (resp.statusCode > 299) {
-          return reject(
-            Object.assign(new Error(body), {
-              status: resp.statusCode,
-            }),
-          );
-        }
-        resolve({ hash: formData.key });
-      },
-    );
+  Object.entries(formData).forEach(([k, v]) => {
+    form.append(k, v);
+  });
+  const fileStream = fs.createReadStream(fn);
+  fileStream.on('data', function (data) {
+    bar.tick(data.length);
+  });
+
+  if (key) {
+    form.append('key', key);
+  }
+  form.append('file', fileStream);
+
+  const res = await fetch(realUrl, {
+    method: 'POST',
+    body: form,
   });
-  return info;
+
+  if (res.status > 299) {
+    throw new Error(`${res.status}: ${res.statusText}`);
+  }
+
+  // const body = await response.json();
+  return { hash: key || formData.key };
 }

package/src/bundle.js

@@ -1,11 +1,11 @@
-import path from 'path';
+import path from 'node:path';
 import { getRNVersion, translateOptions } from './utils';
 import * as fs from 'fs-extra';
 import { ZipFile } from 'yazl';
 import { open as openZipFile } from 'yauzl';
 import { question, printVersionCommand } from './utils';
 import { checkPlatform } from './app';
-import { spawn, spawnSync } from 'child_process';
+import { spawn, spawnSync } from 'node:child_process';
 const g2js = require('gradle-to-js/lib/parser');
 import os from 'os';
 const properties = require('properties');

package/src/types.ts

@@ -0,0 +1,8 @@
+declare global {
+  var NO_INTERACTIVE: boolean;
+  var USE_ACC_OSS: boolean;
+}
+
+export interface Session {
+  token: string;
+}

package/src/utils/index.js

@@ -1,26 +1,21 @@
 import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
+import os from 'node:os';
+import path from 'node:path';
 import pkg from '../../package.json';
 import AppInfoParser from './app-info-parser';
 import semverSatisfies from 'semver/functions/satisfies';
 
-import read from 'read';
+import { read } from 'read';
 
-export function question(query, password) {
+export async function question(query, password) {
   if (NO_INTERACTIVE) {
-    return Promise.resolve('');
+    return '';
   }
-  return new Promise((resolve, reject) =>
-    read(
-      {
-        prompt: query,
-        silent: password,
-        replace: password ? '*' : undefined,
-      },
-      (err, result) => (err ? reject(err) : resolve(result)),
-    ),
-  );
+  return read({
+    prompt: query,
+    silent: password,
+    replace: password ? '*' : undefined,
+  });
 }
 
 export function translateOptions(options) {

package/src/versions.js

@@ -173,7 +173,7 @@ export const commands = {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
@@ -205,15 +205,15 @@ export const commands = {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
     }
 
+    const { data } = await get(`/app/${appId}/package/list?limit=1000`);
     if (pkgVersion) {
       pkgVersion = pkgVersion.trim();
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
       const pkg = data.find((d) => d.name === pkgVersion);
       if (pkg) {
         pkgId = pkg.id;
@@ -228,14 +228,15 @@ export const commands = {
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');
     }
-    if (rollout) {
-      if (!pkgVersion) {
-        const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-        const pkg = data.find((d) => d.id === pkgId);
-        if (pkg) {
-          pkgVersion = pkg.name;
-        }
+    
+    if (!pkgVersion) {
+      const pkg = data.find((d) => d.id === pkgId);
+      if (pkg) {
+        pkgVersion = pkg.name;
       }
+    }
+    
+    if (rollout) {
       await put(`/app/${appId}/version/${versionId}`, {
         config: {
           rollout: {
@@ -244,13 +245,13 @@ export const commands = {
         },
       });
       console.log(
-        `已将在原生版本 ${pkgVersion} 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `,
+        `已将在原生版本 ${pkgVersion} (id: ${pkgId}) 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `,
       );
     }
     await put(`/app/${appId}/package/${pkgId}`, {
       versionId,
     });
-    console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion}`);
+    console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`);
   },
   updateVersionInfo: async function ({ args, options }) {
     const platform = checkPlatform(