v1.20.1

cli.json

@@ -140,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.10.0",
+  "version": "1.20.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,6 @@
     "cli.json"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "prepublish": "babel src --out-dir lib"
   },
   "repository": {
@@ -32,18 +31,19 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "app-info-parser": "^1.0.0",
+    "app-info-parser": "github:sunnylqm/app-info-parser#fix/support-ascii-versionname",
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
     "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",
-    "tty-table": "4.1",
-    "update-notifier": "^4.1.1",
+    "tty-table": "4.2",
+    "update-notifier": "^5.1.0",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },
@@ -55,6 +55,6 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0"
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 10"
   }
 }

patches/app-info-parser@1.1.6.patch

@@ -0,0 +1,17 @@
+diff --git a/src/xml-parser/binary.js b/src/xml-parser/binary.js
+index e20cc96e8131078ea81afeb31af46142a52da58e..f0f788cc555046f0dab47f8854f26344e0d5d714 100644
+--- a/src/xml-parser/binary.js
++++ b/src/xml-parser/binary.js
+@@ -547,8 +547,10 @@ var BinaryXmlParser = /*#__PURE__*/function () {
+       attr.nodeName = attr.name = this.strings[nameRef];
+       if (valueRef > 0) {
+         // some apk have versionName with special characters
+-        if (attr.name === 'versionName') {
+-          this.strings[valueRef] = this.strings[valueRef].replace(/[^\d\w-.]/g, '');
++        if (attr.name === 'versionName') {        
++          // only keep printable characters
++          // https://www.ascii-code.com/characters/printable-characters
++          this.strings[valueRef] = this.strings[valueRef].replace(/[^\x21-\x7E]/g, '')
+         }
+         attr.value = this.strings[valueRef];
+       }

src/api.js

@@ -1,13 +1,13 @@
-const fetch = require('node-fetch');
-const defaultEndpoint = 'http://u.reactnative.cn/api';
+import fetch from 'node-fetch';
+const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-const fs = require('fs');
+import fs from 'fs';
 import request from 'request';
 import ProgressBar from 'progress';
-const packageJson = require('../package.json');
-const tcpp = require('tcp-ping');
-const util = require('util');
-const path = require('path');
+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';
 
@@ -18,10 +18,18 @@ let savedSession = undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
-exports.loadSession = async function () {
+export const getSession = function () {
+  return session;
+};
+
+export const replaceSession = function (newSession) {
+  session = newSession;
+};
+
+export const loadSession = async function () {
   if (fs.existsSync('.update')) {
     try {
-      exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
+      replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
       savedSession = session;
     } catch (e) {
       console.error(
@@ -32,15 +40,7 @@ exports.loadSession = async function () {
   }
 };
 
-exports.getSession = function () {
-  return session;
-};
-
-exports.replaceSession = function (newSession) {
-  session = newSession;
-};
-
-exports.saveSession = function () {
+export const saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -50,7 +50,7 @@ exports.saveSession = function () {
   }
 };
 
-exports.closeSession = function () {
+export const closeSession = function () {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
@@ -103,13 +103,13 @@ function queryWithBody(method) {
   };
 }
 
-exports.get = queryWithoutBody('GET');
-exports.post = queryWithBody('POST');
-exports.put = queryWithBody('PUT');
-exports.doDelete = queryWithBody('DELETE');
+export const get = queryWithoutBody('GET');
+export const post = queryWithBody('POST');
+export const put = queryWithBody('PUT');
+export const doDelete = queryWithBody('DELETE');
 
-async function uploadFile(fn, key) {
-  const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
+export async function uploadFile(fn, key) {
+  const { url, backupUrl, formData, maxSize } = await post('/upload', {
     ext: path.extname(fn),
   });
   let realUrl = url;
@@ -175,5 +175,3 @@ async function uploadFile(fn, key) {
   });
   return info;
 }
-
-exports.uploadFile = uploadFile;

src/app.js

@@ -1,8 +1,8 @@
 import { question } from './utils';
 import fs from 'fs';
-const Table = require('tty-table');
+import Table from 'tty-table';
 
-const { post, get, doDelete } = require('./api');
+import { post, get, doDelete } from './api';
 
 const validPlatforms = {
   ios: 1,

src/bundle.js

@@ -1,15 +1,16 @@
-const path = require('path');
+import path from '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';
-const { spawn, spawnSync } = require('child_process');
+import { spawn, spawnSync } from 'child_process';
 const g2js = require('gradle-to-js/lib/parser');
-const os = require('os');
+import os from 'os';
+const properties = require('properties');
 
-var bsdiff, hdiff, diff;
+let bsdiff, hdiff, diff;
 try {
   bsdiff = require('node-bsdiff').diff;
 } catch (e) {}
@@ -30,9 +31,11 @@ async function runReactNativeBundleCommand(
   let gradleConfig = {};
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
-    // if (gradleConfig.crunchPngs !== false) {
-    //   throw new Error('请先禁用android的crunchPngs优化，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8android%E7%9A%84crunch%E4%BC%98%E5%8C%96')
-    // }
+    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',
+      );
+    }
   }
 
   let reactNativeBundleArgs = [];
@@ -48,10 +51,27 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  // TODO sourcemap
+  let cliPath = require.resolve('react-native/local-cli/cli.js', {
+    paths: [process.cwd()],
+  });
+  try {
+    require.resolve('expo-router', {
+      paths: [process.cwd()],
+    });
+
+    console.log(`expo-router detected, will use @expo/cli to bundle.\n`);
+    // if using expo-router, use expo-cli
+    cliPath = require.resolve('@expo/cli', {
+      paths: [process.cwd()],
+    });
+  } catch (e) {}
+  const bundleCommand = cliPath.includes('@expo/cli')
+    ? 'export:embed'
+    : 'bundle';
+
   Array.prototype.push.apply(reactNativeBundleArgs, [
-    path.join('node_modules', 'react-native', 'local-cli', 'cli.js'),
-    'bundle',
+    cliPath,
+    bundleCommand,
     '--assets-dest',
     outputFolder,
     '--bundle-output',
@@ -95,11 +115,39 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        if (
-          (platform === 'android' && gradleConfig.enableHermes) ||
-          (platform === 'ios' && fs.existsSync('ios/Pods/hermes-engine'))
+        let hermesEnabled = false;
+
+        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')
         ) {
-          await compileHermesByteCode(bundleName, outputFolder);
+          hermesEnabled = true;
+        }
+        if (hermesEnabled) {
+          await compileHermesByteCode(
+            bundleName,
+            outputFolder,
+            sourcemapOutput,
+          );
         }
         resolve(null);
       }
@@ -136,41 +184,50 @@ async function checkGradleConfig() {
   };
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function compileHermesByteCode(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
   // >= rn 0.69
-  let hermesCommand = `node_modules/react-native/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()}`;
+  const rnDir = path.dirname(
+    require.resolve('react-native', {
+      paths: [process.cwd()],
+    }),
+  );
+  let hermesPath = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
 
-    hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
-      ? `${hermesPath}/hermesc` // 0.5+
-      : `${hermesPath}/hermes`; // < 0.5
+  // < rn 0.69
+  if (!fs.existsSync(hermesPath)) {
+    hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
   }
 
-  // TODO sourcemap
-  spawnSync(
-    path.join.apply(null, hermesCommand.split('/')),
-    [
-      '-emit-binary',
-      '-out',
-      path.join(outputFolder, bundleName),
-      path.join(outputFolder, bundleName),
-      '-O',
-    ],
-    { stdio: 'ignore' },
+  const hermesCommand = `${hermesPath}/hermesc`;
+  
+  const args = [
+    '-emit-binary',
+    '-out',
+    path.join(outputFolder, bundleName),
+    path.join(outputFolder, bundleName),
+    '-O',
+  ];
+  if (sourcemapOutput) {
+    args.push('-output-source-map');
+  }
+  console.log(
+    'Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n',
   );
+  spawnSync(hermesCommand, args, {
+    stdio: 'ignore',
+  });
 }
 
 async function pack(dir, output) {
   console.log('Packing');
   fs.ensureDirSync(path.dirname(output));
   await new Promise((resolve, reject) => {
-    var zipfile = new ZipFile();
+    const zipfile = new ZipFile();
 
     function addDirectory(root, rel) {
       if (rel) {
@@ -260,7 +317,7 @@ async function diffFromPPK(origin, next, output) {
 
   const copies = {};
 
-  var zipfile = new ZipFile();
+  const zipfile = new ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {
@@ -345,7 +402,7 @@ async function diffFromPPK(origin, next, output) {
 
   const deletes = {};
 
-  for (var k in originEntries) {
+  for (let k in originEntries) {
     if (!newEntries[k]) {
       console.log('Delete ' + k);
       deletes[k] = 1;
@@ -402,7 +459,7 @@ async function diffFromPackage(
 
   const copies = {};
 
-  var zipfile = new ZipFile();
+  const zipfile = new ZipFile();
 
   const writePromise = new Promise((resolve, reject) => {
     zipfile.outputStream.on('error', (err) => {
@@ -524,13 +581,13 @@ export const commands = {
       options.platform || (await question('平台(ios/android):')),
     );
 
-    let { bundleName, entryFile, intermediaDir, output, dev, verbose } =
+    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
       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());
 
@@ -549,6 +606,7 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);

src/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { loadSession } = require('./api');
-const updateNotifier = require('update-notifier');
+import { loadSession } from './api';
+import updateNotifier from 'update-notifier';
 import { printVersionCommand } from './utils/index.js';
-const pkg = require('../package.json');
+import pkg from '../package.json';
 
 updateNotifier({ pkg }).notify({ isGlobal: true });
 

src/package.js

@@ -1,14 +1,10 @@
-/**
- * Created by tdzl2003 on 4/2/16.
- */
-
-const { get, post, uploadFile } = require('./api');
+import { get, post, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';
 
 import { getApkInfo, getIpaInfo } from './utils';
-const Table = require('tty-table');
+import Table from 'tty-table';
 
 export async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
@@ -65,7 +61,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}`,
       );
@@ -85,7 +81,9 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
-    console.log(`已成功上传ipa原生包（id: ${id}）`);
+    console.log(
+      `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   uploadApk: async function ({ args }) {
     const fn = args[0];
@@ -100,7 +98,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}`,
       );
@@ -120,7 +118,9 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
-    console.log(`已成功上传apk原生包（id: ${id}）`);
+    console.log(
+      `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   parseIpa: async function ({ args }) {
     const fn = args[0];

src/user.js

@@ -1,38 +1,28 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import {question} from './utils';
-const {
-  post,
-  get,
-  replaceSession,
-  saveSession,
-  closeSession,
-} = require('./api');
-const crypto = require('crypto');
+import { question } from './utils';
+import { post, get, replaceSession, saveSession, closeSession } from './api';
+import crypto from 'crypto';
 
 function md5(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
-exports.commands = {
-  login: async function ({args}){
-    const email = args[0] || await question('email:');
-    const pwd = args[1] || await question('password:', true);
-    const {token, info} = await post('/user/login', {
+export const commands = {
+  login: async function ({ args }) {
+    const email = args[0] || (await question('email:'));
+    const pwd = args[1] || (await question('password:', true));
+    const { token, info } = await post('/user/login', {
       email,
       pwd: md5(pwd),
     });
-    replaceSession({token});
+    replaceSession({ token });
     await saveSession();
     console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
-  logout: async function (){
+  logout: async function () {
     await closeSession();
     console.log('已退出登录');
   },
-  me: async function (){
+  me: async function () {
     const me = await get('/user/me');
     for (const k in me) {
       if (k !== 'ok') {
@@ -40,4 +30,4 @@ exports.commands = {
       }
     }
   },
-}
+};

src/utils/index.js

@@ -1,14 +1,10 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
-const pkg = require('../../package.json');
-const AppInfoParser = require('app-info-parser');
+import pkg from '../../package.json';
+import AppInfoParser from 'app-info-parser';
 
-var read = require('read');
+import read from 'read';
 
 export function question(query, password) {
   if (NO_INTERACTIVE) {
@@ -43,7 +39,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 +106,8 @@ export async function getIpaInfo(fn) {
   if (updateJsonFile) {
     appCredential = JSON.parse(updateJsonFile.toString()).ios;
   }
-  const {
-    CFBundleShortVersionString: versionName,
-  } = await appInfoParser.parse();
+  const { CFBundleShortVersionString: versionName } =
+    await appInfoParser.parse();
   let buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
     /payload\/.+?\.app\/pushy_build_time.txt/,
   );
@@ -139,11 +138,11 @@ export function saveToLocal(originPath, destName) {
 export function printVersionCommand() {
   console.log('react-native-update-cli: ' + pkg.version);
   try {
-    const PACKAGE_JSON_PATH = path.resolve(
-      process.cwd(),
-      'node_modules',
-      'react-native-update',
-      'package.json',
+    const PACKAGE_JSON_PATH = require.resolve(
+      'react-native-update/package.json',
+      {
+        paths: [process.cwd()],
+      },
     );
     console.log('react-native-update: ' + require(PACKAGE_JSON_PATH).version);
   } catch (e) {

src/versions.js

@@ -1,4 +1,4 @@
-const { get, post, put, uploadFile } = require('./api');
+import { get, post, put, uploadFile } from './api';
 import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';