react-native-update-cli 1.41.0-beta.0 → 1.41.0

package/lib/api.js

@@ -50,7 +50,6 @@ const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
 const _filesizeparser = /*#__PURE__*/ _interop_require_default(require("filesize-parser"));
 const _constants = require("./utils/constants");
 const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
-const _constants1 = require("utils/constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -59,20 +58,20 @@ function _interop_require_default(obj) {
 const tcpPing = _nodeutil.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
-const defaultEndpoint = global.IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
+const defaultEndpoint = _constants.IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
+const host = process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
 const replaceSession = (newSession)=>{
     session = newSession;
 };
 const loadSession = async ()=>{
-    if (_nodefs.default.existsSync(_constants1.credentialFile)) {
+    if (_nodefs.default.existsSync(_constants.credentialFile)) {
         try {
-            replaceSession(JSON.parse(_nodefs.default.readFileSync(_constants1.credentialFile, 'utf8')));
+            replaceSession(JSON.parse(_nodefs.default.readFileSync(_constants.credentialFile, 'utf8')));
             savedSession = session;
         } catch (e) {
-            console.error(`Failed to parse file ${_constants1.credentialFile}. Try to remove it manually.`);
+            console.error(`Failed to parse file ${_constants.credentialFile}. Try to remove it manually.`);
             throw e;
         }
     }
@@ -82,17 +81,16 @@ const saveSession = ()=>{
     if (session !== savedSession) {
         const current = session;
         const data = JSON.stringify(current, null, 4);
-        _nodefs.default.writeFileSync(_constants1.credentialFile, data, 'utf8');
+        _nodefs.default.writeFileSync(_constants.credentialFile, data, 'utf8');
         savedSession = current;
     }
 };
 const closeSession = ()=>{
-    if (_nodefs.default.existsSync(_constants1.credentialFile)) {
-        _nodefs.default.unlinkSync(_constants1.credentialFile);
+    if (_nodefs.default.existsSync(_constants.credentialFile)) {
+        _nodefs.default.unlinkSync(_constants.credentialFile);
         savedSession = undefined;
     }
     session = undefined;
-    host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 async function query(url, options) {
     const resp = await (0, _nodefetch.default)(url, options);

package/lib/index.js

@@ -7,19 +7,17 @@ const _api = require("./api");
 const _updatenotifier = /*#__PURE__*/ _interop_require_default(require("update-notifier"));
 const _utils = require("./utils");
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
-const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _i18next = /*#__PURE__*/ _interop_require_default(require("i18next"));
 const _en = /*#__PURE__*/ _interop_require_default(require("./locales/en"));
 const _zh = /*#__PURE__*/ _interop_require_default(require("./locales/zh"));
+const _constants = require("./utils/constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-const scriptName = _nodepath.default.basename(process.argv[1]);
-global.IS_CRESC = scriptName === 'cresc';
 _i18next.default.init({
-    lng: global.IS_CRESC ? 'en' : 'zh',
+    lng: _constants.IS_CRESC ? 'en' : 'zh',
     // debug: process.env.NODE_ENV !== 'production',
     resources: {
         en: _en.default,
@@ -54,7 +52,7 @@ async function run() {
     }
     const argv = require('cli-arguments').parse(require('../cli.json'));
     global.NO_INTERACTIVE = argv.options['no-interactive'];
-    global.USE_ACC_OSS = argv.options['acc'];
+    global.USE_ACC_OSS = argv.options.acc;
     (0, _api.loadSession)().then(()=>commands[argv.command](argv)).catch((err)=>{
         if (err.status === 401) {
             console.log('尚未登录。\n请在项目目录中运行`pushy login`命令来登录');

package/lib/utils/constants.js

@@ -9,6 +9,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    IS_CRESC: function() {
+        return IS_CRESC;
+    },
     credentialFile: function() {
         return credentialFile;
     },
@@ -22,7 +25,15 @@ _export(exports, {
         return updateJson;
     }
 });
-const credentialFile = global.IS_CRESC ? '.cresc.token' : '.update';
-const updateJson = global.IS_CRESC ? 'cresc.config.json' : 'update.json';
-const tempDir = global.IS_CRESC ? '.cresc.temp' : '.pushy';
-const pricingPageUrl = global.IS_CRESC ? 'https://cresc.dev/pricing' : 'https://pushy.reactnative.cn/pricing.html';
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const scriptName = _nodepath.default.basename(process.argv[1]);
+const IS_CRESC = scriptName === 'cresc';
+const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
+const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
+const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';
+const pricingPageUrl = IS_CRESC ? 'https://cresc.dev/pricing' : 'https://pushy.reactnative.cn/pricing.html';

package/lib/utils/index.js

@@ -80,13 +80,12 @@ function getRNVersion() {
         paths: [
             process.cwd()
         ]
-    }))).version;
-    // We only care about major and minor version.
-    const match = /^(\d+)\.(\d+)\./.exec(version);
+    })).toString()).version;
+    const [, major, minor] = /^(\d+)\.(\d+)\./.exec(version) || [];
     return {
         version,
-        major: match[1] | 0,
-        minor: match[2] | 0
+        major: Number(major),
+        minor: Number(minor)
     };
 }
 async function getApkInfo(fn) {
@@ -183,14 +182,19 @@ function saveToLocal(originPath, destName) {
 // fs.ensureDirSync(path.dirname(destPath));
 // fs.copyFileSync(originPath, destPath);
 }
-async function getLatestVersion(pkgName) {
-    return Promise.race([
-        (0, _latestversion.default)(pkgName).then((p)=>p.latest).catch(()=>''),
-        new Promise((resolve)=>setTimeout(()=>resolve(''), 2000))
-    ]);
+async function getLatestVersion(pkgNames) {
+    return (0, _latestversion.default)(pkgNames, {
+        useCache: true,
+        requestOptions: {
+            timeout: 2000
+        }
+    }).then((pkgs)=>pkgs.map((pkg)=>pkg.latest)).catch(()=>[]);
 }
 async function printVersionCommand() {
-    let latestPushyCliVersion = await getLatestVersion('react-native-update-cli');
+    let [latestPushyCliVersion, latestPushyVersion] = await getLatestVersion([
+        'react-native-update-cli',
+        'react-native-update'
+    ]);
     latestPushyCliVersion = latestPushyCliVersion ? ` （最新：${_chalk.default.green(latestPushyCliVersion)}）` : '';
     console.log(`react-native-update-cli: ${_packagejson.default.version}${latestPushyCliVersion}`);
     let pushyVersion = '';
@@ -201,7 +205,6 @@ async function printVersionCommand() {
             ]
         });
         pushyVersion = require(PACKAGE_JSON_PATH).version;
-        let latestPushyVersion = await getLatestVersion('react-native-update');
         latestPushyVersion = latestPushyVersion ? ` （最新：${_chalk.default.green(latestPushyVersion)}）` : '';
         console.log(`react-native-update: ${pushyVersion}${latestPushyVersion}`);
     } catch (e) {

package/lib/versions.js

@@ -23,7 +23,7 @@ async function showVersion(appId, offset) {
             packageInfo += `...and ${count - 3} more`;
         }
         if (count === 0) {
-            packageInfo = `(no package)`;
+            packageInfo = 'no package';
         } else {
             packageInfo = `[${packageInfo}]`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.41.0-beta.0",
+  "version": "1.41.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -68,8 +68,16 @@
     "@biomejs/biome": "^1.9.4",
     "@swc/cli": "^0.5.1",
     "@swc/core": "^1.9.3",
+    "@types/filesize-parser": "^1.5.3",
+    "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.9.3",
+    "@types/node-fetch": "^2.6.12",
+    "@types/progress": "^2.0.7",
+    "@types/semver": "^7.5.8",
+    "@types/tcp-ping": "^0.1.6",
+    "@types/update-notifier": "^6.0.8",
+    "@types/yauzl": "^2.10.3",
+    "@types/yazl": "^2.4.6",
     "typescript": "^5.7.2"
-  },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }

package/src/api.ts

@@ -6,20 +6,21 @@ import ProgressBar from 'progress';
 import packageJson from '../package.json';
 import tcpp from 'tcp-ping';
 import filesizeParser from 'filesize-parser';
-import { pricingPageUrl } from './utils/constants';
+import { pricingPageUrl, credentialFile, IS_CRESC } from './utils/constants';
 import type { Session } from 'types';
 import FormData from 'form-data';
-import { credentialFile } from 'utils/constants';
 
 const tcpPing = util.promisify(tcpp.ping);
 
 let session: Session | undefined;
 let savedSession: Session | undefined;
 
-const defaultEndpoint = global.IS_CRESC
+const defaultEndpoint = IS_CRESC
   ? 'https://api.cresc.dev'
   : 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
+
+const host =
+  process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
@@ -29,8 +30,6 @@ export const replaceSession = (newSession: { token: string }) => {
   session = newSession;
 };
 
-
-
 export const loadSession = async () => {
   if (fs.existsSync(credentialFile)) {
     try {
@@ -61,7 +60,6 @@ export const closeSession = () => {
     savedSession = undefined;
   }
   session = undefined;
-  host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 
 async function query(url: string, options: fetch.RequestInit) {

package/src/index.ts

@@ -4,18 +4,13 @@ import { loadSession } from './api';
 import updateNotifier from 'update-notifier';
 import { printVersionCommand } from './utils';
 import pkg from '../package.json';
-import path from 'node:path';
 import i18next from 'i18next';
 import en from './locales/en';
 import zh from './locales/zh';
-
-const scriptName: 'cresc' | 'pushy' = path.basename(process.argv[1]) as
-  | 'cresc'
-  | 'pushy';
-global.IS_CRESC = scriptName === 'cresc';
+import { IS_CRESC } from './utils/constants';
 
 i18next.init({
-  lng: global.IS_CRESC ? 'en' : 'zh',
+  lng: IS_CRESC ? 'en' : 'zh',
   // debug: process.env.NODE_ENV !== 'production',
   resources: {
     en,
@@ -57,7 +52,7 @@ async function run() {
 
   const argv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
-  global.USE_ACC_OSS = argv.options['acc'];
+  global.USE_ACC_OSS = argv.options.acc;
 
   loadSession()
     .then(() => commands[argv.command](argv))

package/src/types.ts

@@ -1,7 +1,6 @@
 declare global {
   var NO_INTERACTIVE: boolean;
   var USE_ACC_OSS: boolean;
-  var IS_CRESC: boolean;
 }
 
 export interface Session {

package/src/utils/constants.ts

@@ -1,6 +1,13 @@
-export const credentialFile = global.IS_CRESC ? '.cresc.token' : '.update';
-export const updateJson = global.IS_CRESC ? 'cresc.config.json' : 'update.json';
-export const tempDir = global.IS_CRESC ? '.cresc.temp' : '.pushy';
-export const pricingPageUrl = global.IS_CRESC
+import path from 'node:path';
+
+const scriptName: 'cresc' | 'pushy' = path.basename(process.argv[1]) as
+  | 'cresc'
+  | 'pushy';
+export const IS_CRESC = scriptName === 'cresc';
+
+export const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
+export const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
+export const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';
+export const pricingPageUrl = IS_CRESC
   ? 'https://cresc.dev/pricing'
   : 'https://pushy.reactnative.cn/pricing.html';

package/src/utils/index.ts

@@ -11,7 +11,7 @@ import { checkPlugins } from './check-plugin';
 import { read } from 'read';
 import { tempDir } from './constants';
 
-export async function question(query: string, password: boolean) {
+export async function question(query: string, password?: boolean) {
   if (NO_INTERACTIVE) {
     return '';
   }
@@ -23,7 +23,7 @@ export async function question(query: string, password: boolean) {
 }
 
 export function translateOptions(options: Record<string, string>) {
-  const ret = {};
+  const ret: Record<string, string> = {};
   for (const key in options) {
     const v = options[key];
     if (typeof v === 'string') {
@@ -40,19 +40,21 @@ export function translateOptions(options: Record<string, string>) {
 
 export function getRNVersion() {
   const version = JSON.parse(
-    fs.readFileSync(
-      require.resolve('react-native/package.json', {
-        paths: [process.cwd()],
-      }),
-    ),
+    fs
+      .readFileSync(
+        require.resolve('react-native/package.json', {
+          paths: [process.cwd()],
+        }),
+      )
+      .toString(),
   ).version;
 
-  // We only care about major and minor version.
-  const match = /^(\d+)\.(\d+)\./.exec(version);
+  const [, major, minor] = /^(\d+)\.(\d+)\./.exec(version) || [];
+
   return {
     version,
-    major: match[1] | 0,
-    minor: match[2] | 0,
+    major: Number(major),
+    minor: Number(minor),
   };
 }
 
@@ -173,17 +175,22 @@ export function saveToLocal(originPath: string, destName: string) {
   // fs.copyFileSync(originPath, destPath);
 }
 
-async function getLatestVersion(pkgName: string) {
-  return Promise.race([
-    latestVersion(pkgName)
-      .then((p) => p.latest)
-      .catch(() => ''),
-    new Promise((resolve) => setTimeout(() => resolve(''), 2000)),
-  ]);
+async function getLatestVersion(pkgNames: string[]) {
+  return latestVersion(pkgNames, {
+    useCache: true,
+    requestOptions: {
+      timeout: 2000,
+    },
+  })
+    .then((pkgs) => pkgs.map((pkg) => pkg.latest))
+    .catch(() => []);
 }
 
 export async function printVersionCommand() {
-  let latestPushyCliVersion = await getLatestVersion('react-native-update-cli');
+  let [latestPushyCliVersion, latestPushyVersion] = await getLatestVersion([
+    'react-native-update-cli',
+    'react-native-update',
+  ]);
   latestPushyCliVersion = latestPushyCliVersion
     ? ` （最新：${chalk.green(latestPushyCliVersion)}）`
     : '';
@@ -199,7 +206,6 @@ export async function printVersionCommand() {
       },
     );
     pushyVersion = require(PACKAGE_JSON_PATH).version;
-    let latestPushyVersion = await getLatestVersion('react-native-update');
     latestPushyVersion = latestPushyVersion
       ? ` （最新：${chalk.green(latestPushyVersion)}）`
       : '';
@@ -226,6 +232,4 @@ export async function printVersionCommand() {
   }
 }
 
-
-
 export { checkPlugins };

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

@@ -5,7 +5,7 @@ import { checkPlatform, getSelectedApp } from './app';
 import { choosePackage } from './package';
 import { compare } from 'compare-versions';
 
-async function showVersion(appId, offset) {
+async function showVersion(appId: string, offset: number) {
   const { data, count } = await get(`/app/${appId}/version/list`);
   console.log(`Offset ${offset}`);
   for (const version of data) {
@@ -18,7 +18,7 @@ async function showVersion(appId, offset) {
       packageInfo += `...and ${count - 3} more`;
     }
     if (count === 0) {
-      packageInfo = `(no package)`;
+      packageInfo = 'no package';
     } else {
       packageInfo = `[${packageInfo}]`;
     }