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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.41.0-beta.1",
+  "version": "1.41.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -76,7 +76,8 @@
     "@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/utils/index.ts

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