remove request

.swcrc

@@ -0,0 +1,15 @@
+{
+  "jsc": {
+    "loose": true,
+    "target": "es2018",
+    "parser": {
+      "syntax": "typescript",
+      "tsx": false,
+      "decorators": false,
+      "dynamicImport": false
+    }
+  },
+  "module": {
+    "type": "commonjs"
+  }
+}

cli.json

@@ -81,7 +81,6 @@
         "packageId": {
           "hasValue": true
         },
-
         "packageVersion": {
           "hasValue": true
         },
@@ -90,6 +89,9 @@
         },
         "maxPackageVersion": {
           "hasValue": true
+        },
+        "rollout": {
+          "hasValue": true
         }
       }
     },

index.js

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.30.3",
+  "version": "1.32.2",
   "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",
+    "prepare": "npm run build && chmod +x lib/index.js"
   },
   "repository": {
     "type": "git",
@@ -31,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",
+    "read": "^4.0.0",
-    "request": "^2.88.2",
+    "semver": "^7.6.3",
     "tcp-ping": "^0.1.1",
     "tty-table": "4.2",
     "update-notifier": "^5.1.0",
-    "yauzl": "^2.10.0",
+    "yauzl": "^3.2.0",
-    "yazl": "2.5.1"
+    "yazl": "3.3.0"
-  },
-  "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.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"
 }

src/api.ts

@@ -1,20 +1,22 @@
 import fetch from 'node-fetch';
-const defaultEndpoint = 'https://update.reactnative.cn/api';
+import fs from 'node:fs';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
+import util from 'node:util';
-import fs from 'fs';
+import path from 'node:path';
-import request from 'request';
 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 session: Session | undefined;
-let savedSession = 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,26 +61,28 @@ 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;
   try {
     json = JSON.parse(text);
   } catch (e) {
-    throw new Error(`Server error: ${text}`);
+    if (resp.statusText.includes('Unauthorized')) {
+      throw new Error('登录信息已过期，请使用 pushy login 命令重新登录');
+    } else {
+      throw new Error(`Server error: ${resp.statusText}`);
+    }
   }
 
   if (resp.status !== 200) {
-    throw Object.assign(new Error(json.message || json.error), {
+    throw new Error(`${resp.status}: ${resp.statusText}`);
-      status: resp.status,
-    });
   }
   return json;
 }
 
-function queryWithoutBody(method) {
+function queryWithoutBody(method: string) {
-  return function (api) {
+  return function (api: string) {
     return query(host + api, {
       method,
       headers: {
@@ -89,8 +93,8 @@ function queryWithoutBody(method) {
   };
 }
 
-function queryWithBody(method) {
+function queryWithBody(method: string) {
-  return function (api, body) {
+  return function (api: string, body: Record<string, any>) {
     return query(host + api, {
       method,
       headers: {
@@ -108,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;
@@ -134,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}`,
     );
   }
 
@@ -146,34 +149,30 @@ export async function uploadFile(fn, key) {
     total: fileSize,
   });
 
-  const info = await new Promise((resolve, reject) => {
+  const form = new FormData();
-    if (key) {
-      formData.key = key;
-    }
-    formData.file = fs.createReadStream(fn);
 
-    formData.file.on('data', function (data) {
+  Object.entries(formData).forEach(([k, v]) => {
-      bar.tick(data.length);
+    form.append(k, v);
-    });
-    request.post(
-      realUrl,
-      {
-        formData,
-      },
-      (err, resp, body) => {
-        if (err) {
-          return reject(err);
-        }
-        if (resp.statusCode > 299) {
-          return reject(
-            Object.assign(new Error(JSON.stringify(body)), {
-              status: resp.statusCode,
-            }),
-          );
-        }
-        resolve({ hash: formData.key });
-      },
-    );
   });
-  return info;
+  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,
+  });
+
+  if (res.status > 299) {
+    throw new Error(`${res.status}: ${res.statusText}`);
+  }
+
+  // const body = await response.json();
+  return { hash: key || formData.key };
 }

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');
@@ -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 (projectConfig) {
-      if (
+      for (const packagerConfig of projectConfig) {
-        packagerConfig.includes('enableHermes') &&
+        if (
-        packagerConfig.includes('true')
+          packagerConfig.includes('enableHermes') &&
-      ) {
+          packagerConfig.includes('true')
-        enableHermes = true;
+        ) {
-        break;
+          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,

src/types.ts

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

src/utils/index.js

@@ -1,26 +1,21 @@
 import fs from 'fs-extra';
-import os from 'os';
+import os from 'node:os';
-import path from 'path';
+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) =>
+  return read({
-    read(
+    prompt: query,
-      {
+    silent: password,
-        prompt: query,
+    replace: password ? '*' : undefined,
-        silent: password,
+  });
-        replace: password ? '*' : undefined,
-      },
-      (err, result) => (err ? reject(err) : resolve(result)),
-    ),
-  );
 }
 
 export function translateOptions(options) {
@@ -154,11 +149,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`,
       );
     }
   }

src/versions.js

@@ -124,20 +124,26 @@ export const commands = {
       options.platform || (await question('平台(ios/android):')),
     );
     const { appId } = await getSelectedApp(platform);
-    const versionId = options.versionId || (await chooseVersion(appId)).id;
+    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;
-    if (pkgVersion) {
+    let rollout = options.rollout;
-      pkgVersion = pkgVersion.trim();
+    if (rollout === undefined) {
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      rollout = null;
-      const pkg = data.find((d) => d.name === pkgVersion);
+    } else {
-      if (pkg) {
+      try {
-        pkgId = pkg.id;
+        rollout = parseInt(rollout);
-      } else {
+      } catch (e) {
-        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+        throw new Error('rollout 必须是 1-100 的整数');
+      }
+      if (rollout < 1 || rollout > 100) {
+        throw new Error('rollout 必须是 1-100 的整数');
       }
     }
     if (minPkgVersion) {
@@ -145,15 +151,29 @@ export const commands = {
       const { data } = await get(`/app/${appId}/package/list?limit=1000`);
       const pkgs = data.filter((d) => compare(d.name, minPkgVersion, '>='));
       if (pkgs.length === 0) {
-        throw new Error(
+        throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`);
-          `未查询到 >= ${minPkgVersion} 的原生版本`,
+      }
+      if (rollout) {
+        const rolloutConfig = {};
+        for (const pkg of pkgs) {
+          rolloutConfig[pkg.name] = rollout;
+        }
+        await put(`/app/${appId}/version/${versionId}`, {
+          config: {
+            rollout: rolloutConfig,
+          },
+        });
+        console.log(
+          `已在原生版本 ${pkgs
+            .map((p) => p.name)
+            .join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`,
         );
       }
       for (const pkg of pkgs) {
         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;
@@ -163,19 +183,44 @@ export const commands = {
       const { data } = await get(`/app/${appId}/package/list?limit=1000`);
       const pkgs = data.filter((d) => compare(d.name, maxPkgVersion, '<='));
       if (pkgs.length === 0) {
-        throw new Error(
+        throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`);
-          `未查询到 <= ${maxPkgVersion} 的原生版本`,
+      }
+      if (rollout) {
+        const rolloutConfig = {};
+        for (const pkg of pkgs) {
+          rolloutConfig[pkg.name] = rollout;
+        }
+        await put(`/app/${appId}/version/${versionId}`, {
+          config: {
+            rollout: rolloutConfig,
+          },
+        });
+        console.log(
+          `已在原生版本 ${pkgs
+            .map((p) => p.name)
+            .join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`,
         );
       }
       for (const pkg of pkgs) {
         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 pkg = data.find((d) => d.name === pkgVersion);
+      if (pkg) {
+        pkgId = pkg.id;
+      } else {
+        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+      }
+    }
     if (!pkgId) {
       pkgId = options.packageId || (await choosePackage(appId)).id;
     }
@@ -183,10 +228,30 @@ export const commands = {
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');
     }
+    
+    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: {
+            [pkgVersion]: rollout,
+          },
+        },
+      });
+      console.log(
+        `已将在原生版本 ${pkgVersion} (id: ${pkgId}) 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `,
+      );
+    }
     await put(`/app/${appId}/package/${pkgId}`, {
       versionId,
     });
-    console.log('操作成功');
+    console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`);
   },
   updateVersionInfo: async function ({ args, options }) {
     const platform = checkPlatform(

tsconfig.json

@@ -0,0 +1,75 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    "lib": [
+      "ESNext"
+    ] /* Specify library files to be included in the compilation. */,
+    "allowJs": true /* Allow javascript files to be compiled. */,
+    // "checkJs": true /* Report errors in .js files. */,
+    "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "lib" /* Redirect output structure to the directory. */,
+    // "rootDir": "src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    // "composite": true,                     /* Enable project compilation */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    "noEmit": true /* Do not emit outputs. */,
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    "isolatedModules": true /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */,
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+    "strictNullChecks": true /* Enable strict null checks. */,
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true /* Report errors on unused locals. */,
+    // "noUnusedParameters": true /* Report errors on unused parameters. */,
+    "noImplicitReturns": false /* Report error when not all code paths in function return a value. */,
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */,
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [
+    //   "src",
+    //   "db",
+    //   "config",
+    //   "models"
+    // ] /* List of root folders whose combined content represents the structure of the project at runtime. */,
+    "typeRoots": [
+      "src/types"
+    ] /* List of folders to include type definitions from. */,
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
+    // "paths": {
+    //   "@/*": ["src/*"]
+    // },
+    "resolveJsonModule": true,
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "skipLibCheck": true,
+    "incremental": true
+  },
+  "exclude": ["node_modules", "lib"]
+}