v1.17.0

cli.json

@@ -88,6 +88,29 @@
       }
     },
 
+    "updateVersionInfo": {
+      "options": {
+        "platform": {
+          "hasValue": true
+        },
+        "versionId": {
+          "hasValue": true
+        },
+        "name": {
+          "default": false,
+          "hasValue": true
+        },
+        "description": {
+          "default": false,
+          "hasValue": true
+        },
+        "metaInfo": {
+          "default": false,
+          "hasValue": true
+        }
+      }
+    },
+
     "build": {
       "description": "Bundle javascript and copy assets."
     },
@@ -117,7 +140,9 @@
           "default": ".pushy/output/${platform}.${time}.ppk",
           "hasValue": true
         },
-        "verbose": {}
+        "sourcemap": {
+          "default": false
+        }
       }
     },
     "release": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.7.0",
+  "version": "1.17.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -36,9 +36,10 @@
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
-    "gradle-to-js": "^2.0.0",
+    "gradle-to-js": "^2.0.1",
     "node-fetch": "^2.6.1",
     "progress": "^2.0.3",
+    "properties": "^1.2.1",
     "read": "^1.0.7",
     "request": "^2.88.2",
     "tcp-ping": "^0.1.1",

src/api.js

@@ -1,5 +1,5 @@
 const fetch = require('node-fetch');
-const defaultEndpoint = 'http://u.reactnative.cn/api';
+const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const fs = require('fs');
 import request from 'request';
@@ -159,10 +159,6 @@ async function uploadFile(fn, key) {
       realUrl,
       {
         formData,
-        headers: {
-          'User-Agent': userAgent,
-          'X-AccessToken': session ? session.token : '',
-        },
       },
       (err, resp, body) => {
         if (err) {

src/app.js

@@ -100,7 +100,7 @@ export const commands = {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android):')),
     );
-    const id = args[0] || (await chooseApp(platform)).id;
+    const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
 
     let updateInfo = {};
     if (fs.existsSync('update.json')) {

src/bundle.js

@@ -8,6 +8,7 @@ import { checkPlatform } from './app';
 const { spawn, spawnSync } = require('child_process');
 const g2js = require('gradle-to-js/lib/parser');
 const os = require('os');
+const properties = require('properties');
 
 var bsdiff, hdiff, diff;
 try {
@@ -49,7 +50,9 @@ async function runReactNativeBundleCommand(
   fs.emptyDirSync(outputFolder);
 
   Array.prototype.push.apply(reactNativeBundleArgs, [
-    path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
+    require.resolve('react-native/local-cli/cli.js', {
+      paths: [process.cwd()],
+    }), // 'react-native' package may be symlinked
     'bundle',
     '--assets-dest',
     outputFolder,
@@ -94,8 +97,39 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (gradleConfig.enableHermes) {
+        let hermesEnabled = false;
-          await compileHermesByteCode(bundleName, outputFolder);
+
+        if (platform === 'android') {
+          const gradlePropeties = await new Promise((resolve) => {
+            properties.parse(
+              './android/gradle.properties',
+              { path: true },
+              function (error, props) {
+                if (error) {
+                  console.error(error);
+                  resolve(null);
+                }
+
+                resolve(props);
+              },
+            );
+          });
+          hermesEnabled = gradlePropeties.hermesEnabled;
+
+          if (typeof hermesEnabled !== 'boolean')
+            hermesEnabled = gradleConfig.enableHermes;
+        } else if (
+          platform === 'ios' &&
+          fs.existsSync('ios/Pods/hermes-engine')
+        ) {
+          hermesEnabled = true;
+        }
+        if (hermesEnabled) {
+          await compileHermesByteCode(
+            bundleName,
+            outputFolder,
+            sourcemapOutput,
+          );
         }
         resolve(null);
       }
@@ -132,28 +166,47 @@ async function checkGradleConfig() {
   };
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function compileHermesByteCode(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-  const hermesPackage = fs.existsSync('node_modules/hermes-engine')
+  // >= rn 0.69
-    ? 'node_modules/hermes-engine' // 0.2+
+  const rnDir = path.dirname(
-    : 'node_modules/hermesvm'; // < 0.2
+    require.resolve('react-native', {
-  const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
+      paths: [process.cwd()],
-
+    }),
-  const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
-    ? `${hermesPath}/hermesc` // 0.5+
-    : `${hermesPath}/hermes`; // < 0.5
-
-  spawnSync(
-    path.join.apply(null, hermesCommand.split('/')),
-    [
-      '-emit-binary',
-      '-out',
-      path.join(outputFolder, bundleName),
-      path.join(outputFolder, bundleName),
-      '-O',
-    ],
-    { stdio: 'ignore' },
   );
+  const hermesCommand = path.join(
+    rnDir,
+    `/sdks/hermesc/${getHermesOSBin()}/hermesc`,
+  );
+
+  // < rn 0.69
+  if (!fs.existsSync(hermesCommand)) {
+    const hermesPackage = fs.existsSync('node_modules/hermes-engine')
+      ? 'node_modules/hermes-engine' // 0.2+
+      : 'node_modules/hermesvm'; // < 0.2
+    const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
+
+    hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
+      ? `${hermesPath}/hermesc` // 0.5+
+      : `${hermesPath}/hermes`; // < 0.5
+  }
+  const args = [
+    '-emit-binary',
+    '-out',
+    path.join(outputFolder, bundleName),
+    path.join(outputFolder, bundleName),
+    '-O',
+  ];
+  if (sourcemapOutput) {
+    args.push('-output-source-map');
+  }
+  spawnSync(path.join.apply(null, hermesCommand.split('/')), args, {
+    stdio: 'ignore',
+  });
 }
 
 async function pack(dir, output) {
@@ -514,19 +567,13 @@ export const commands = {
       options.platform || (await question('平台(ios/android):')),
     );
 
-    let {
+    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
-      bundleName,
+      translateOptions({
-      entryFile,
+        ...options,
-      intermediaDir,
+        platform,
-      output,
+      });
-      dev,
-      verbose,
-    } = translateOptions({
-      ...options,
-      platform,
-    });
 
-    // const sourcemapOutput = path.join(intermediaDir, bundleName + ".map");
+    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
 
     const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
 
@@ -545,6 +592,7 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);

src/package.js

@@ -13,20 +13,25 @@ const Table = require('tty-table');
 export async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
 
-  const header = [{ value: 'Package Id' }, { value: 'Version' }];
+  const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
   const rows = [];
   for (const pkg of data) {
     const { version } = pkg;
     let versionInfo = '';
     if (version) {
-      versionInfo = ` - ${version.id} ${version.hash.slice(0, 8)} ${
+      versionInfo = `, 已绑定：${version.name} (${version.id})`;
-        version.name
-      }`;
     } else {
-      versionInfo = ' (newest)';
+      // versionInfo = ' (newest)';
     }
-
+    let output = pkg.name;
-    rows.push([pkg.id, `${pkg.name}(${pkg.status})${versionInfo}`]);
+    if (pkg.status === 'paused') {
+      output += '(已暂停)';
+    }
+    if (pkg.status === 'expired') {
+      output += '(已过期)';
+    }
+    output += versionInfo;
+    rows.push([pkg.id, output]);
   }
 
   console.log(Table(header, rows).render());
@@ -60,7 +65,7 @@ export const commands = {
     } = await getIpaInfo(fn);
     const { appId, appKey } = await getSelectedApp('ios');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(
         `appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`,
       );
@@ -95,7 +100,7 @@ export const commands = {
     } = await getApkInfo(fn);
     const { appId, appKey } = await getSelectedApp('android');
 
-    if (appIdInPkg && appIdInPkg !== appId) {
+    if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(
         `appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`,
       );

src/utils/index.js

@@ -43,7 +43,11 @@ export function translateOptions(options) {
 
 export function getRNVersion() {
   const version = JSON.parse(
-    fs.readFileSync(path.resolve('node_modules/react-native/package.json')),
+    fs.readFileSync(
+      require.resolve('react-native/package.json', {
+        paths: [process.cwd()],
+      }),
+    ),
   ).version;
 
   // We only care about major and minor version.
@@ -106,9 +110,8 @@ export async function getIpaInfo(fn) {
   if (updateJsonFile) {
     appCredential = JSON.parse(updateJsonFile.toString()).ios;
   }
-  const {
+  const { CFBundleShortVersionString: versionName } =
-    CFBundleShortVersionString: versionName,
+    await appInfoParser.parse();
-  } = await appInfoParser.parse();
   let buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
     /payload\/.+?\.app\/pushy_build_time.txt/,
   );
@@ -139,11 +142,11 @@ export function saveToLocal(originPath, destName) {
 export function printVersionCommand() {
   console.log('react-native-update-cli: ' + pkg.version);
   try {
-    const PACKAGE_JSON_PATH = path.resolve(
+    const PACKAGE_JSON_PATH = require.resolve(
-      process.cwd(),
+      'react-native-update/package.json',
-      'node_modules',
+      {
-      'react-native-update',
+        paths: [process.cwd()],
-      'package.json',
+      },
     );
     console.log('react-native-update: ' + require(PACKAGE_JSON_PATH).version);
   } catch (e) {

src/versions.js

@@ -124,20 +124,22 @@ export const commands = {
     );
     const { appId } = await getSelectedApp(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;
-    let pkgId = options.packageId;
+
-    if (!pkgId) {
+    let pkgId;
-      let pkgVersion = options.packageVersion;
+    let pkgVersion = options.packageVersion;
-      if (pkgVersion) {
+    if (pkgVersion) {
-        pkgVersion = pkgVersion.trim();
+      pkgVersion = pkgVersion.trim();
-        const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-        const pkg = data.find((d) => d.name === pkgVersion);
+      const pkg = data.find((d) => d.name === pkgVersion);
-        if (pkg) {
+      if (pkg) {
-          pkgId = pkg.id;
+        pkgId = pkg.id;
-        } else {
+      } else {
-          throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
-        }
       }
     }
+    if (!pkgId) {
+      pkgId = options.packageId || (await choosePackage(appId)).id;
+    }
 
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');
@@ -147,4 +149,18 @@ export const commands = {
     });
     console.log('操作成功');
   },
+  updateVersionInfo: async function ({ args, options }) {
+    const platform = checkPlatform(
+      options.platform || (await question('平台(ios/android):')),
+    );
+    const { appId } = await 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 put(`/app/${appId}/version/${versionId}`, updateParams);
+    console.log('操作成功');
+  },
 };