v1.24.0

LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2020, reactnativecn
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cli.json

@@ -80,6 +80,33 @@
         },
         "packageId": {
           "hasValue": true
+        },
+
+        "packageVersion": {
+          "hasValue": true
+        }
+      }
+    },
+
+    "updateVersionInfo": {
+      "options": {
+        "platform": {
+          "hasValue": true
+        },
+        "versionId": {
+          "hasValue": true
+        },
+        "name": {
+          "default": false,
+          "hasValue": true
+        },
+        "description": {
+          "default": false,
+          "hasValue": true
+        },
+        "metaInfo": {
+          "default": false,
+          "hasValue": true
         }
       }
     },
@@ -113,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.4.0-beta1",
+  "version": "1.24.0",
   "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,24 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "app-info-parser": "^1.0.0",
+    "bplist-parser": "^0.2.0",
+    "bytebuffer": "^5.0.1",
+    "cgbi-to-png": "^1.0.7",
     "cli-arguments": "^0.2.1",
+    "commander": "^7.2.0",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
-    "gradle-to-js": "^2.0.0",
+    "gradle-to-js": "^2.0.1",
+    "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
+    "plist": "^3.0.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",
+    "tty-table": "4.2",
-    "update-notifier": "^4.1.1",
+    "update-notifier": "^5.1.0",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },
@@ -55,6 +60,6 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0"
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 10"
   }
 }

src/api.js

@@ -1,17 +1,13 @@
-/**
+import fetch from 'node-fetch';
- * Created by tdzl2003 on 2/13/16.
+const defaultEndpoint = 'https://update.reactnative.cn/api';
- */
-
-const fetch = require('node-fetch');
-const defaultEndpoint = 'http://u.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');
+import packageJson from '../package.json';
-const tcpp = require('tcp-ping');
+import tcpp from 'tcp-ping';
-const util = require('util');
+import util from 'util';
-const path = require('path');
+import path from 'path';
 import filesizeParser from 'filesize-parser';
 import { pricingPageUrl } from './utils';
 
@@ -22,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(
@@ -36,15 +40,7 @@ exports.loadSession = async function () {
   }
 };
 
-exports.getSession = function () {
+export const saveSession = function () {
-  return session;
-};
-
-exports.replaceSession = function (newSession) {
-  session = newSession;
-};
-
-exports.saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -54,7 +50,7 @@ exports.saveSession = function () {
   }
 };
 
-exports.closeSession = function () {
+export const closeSession = function () {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
@@ -65,7 +61,14 @@ exports.closeSession = function () {
 
 async function query(url, options) {
   const resp = await fetch(url, options);
-  const json = await resp.json();
+  const text = await resp.text();
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch (e) {
+    throw new Error(`Server error: ${text}`);
+  }
+
   if (resp.status !== 200) {
     throw Object.assign(new Error(json.message || json.error), {
       status: resp.status,
@@ -100,26 +103,30 @@ function queryWithBody(method) {
   };
 }
 
-exports.get = queryWithoutBody('GET');
+export const get = queryWithoutBody('GET');
-exports.post = queryWithBody('POST');
+export const post = queryWithBody('POST');
-exports.put = queryWithBody('PUT');
+export const put = queryWithBody('PUT');
-exports.doDelete = queryWithBody('DELETE');
+export const doDelete = queryWithBody('DELETE');
 
-async function uploadFile(fn, key) {
+export async function uploadFile(fn, key) {
-  const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
+  const { url, backupUrl, formData, maxSize } = await post('/upload', {
     ext: path.extname(fn),
   });
   let realUrl = url;
 
   if (backupUrl) {
-    const pingResult = await tcpPing({
+    if (global.USE_ACC_OSS) {
-      address: url.replace('https://', ''),
-      attempts: 4,
-      timeout: 1000,
-    });
-    // console.log({pingResult});
-    if (isNaN(pingResult.avg) || pingResult.avg > 150) {
       realUrl = backupUrl;
+    } else {
+      const pingResult = await tcpPing({
+        address: url.replace('https://', ''),
+        attempts: 4,
+        timeout: 1000,
+      });
+      // console.log({pingResult});
+      if (isNaN(pingResult.avg) || pingResult.avg > 150) {
+        realUrl = backupUrl;
+      }
     }
     // console.log({realUrl});
   }
@@ -129,11 +136,11 @@ async function uploadFile(fn, key) {
     throw new Error(
       `此文件大小${(fileSize / 1048576).toFixed(
         1,
-      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问：${pricingPageUrl}`,
+      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
     );
   }
 
-  const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
+  const bar = new ProgressBar('  上传中 [:bar] :percent :etas', {
     complete: '=',
     incomplete: ' ',
     total: fileSize,
@@ -152,10 +159,6 @@ async function uploadFile(fn, key) {
       realUrl,
       {
         formData,
-        headers: {
-          'User-Agent': userAgent,
-          'X-AccessToken': session ? session.token : '',
-        },
       },
       (err, resp, body) => {
         if (err) {
@@ -166,17 +169,9 @@ async function uploadFile(fn, key) {
             Object.assign(new Error(body), { status: resp.statusCode }),
           );
         }
-        resolve(
+        resolve({ hash: formData.key });
-          body
-            ? // qiniu
-              JSON.parse(body)
-            : // aliyun oss
-              { hash: formData.key },
-        );
       },
     );
   });
   return info;
 }
-
-exports.uploadFile = uploadFile;

src/app.js

@@ -1,12 +1,8 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
 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,
@@ -15,7 +11,7 @@ const validPlatforms = {
 
 export function checkPlatform(platform) {
   if (!validPlatforms[platform]) {
-    throw new Error(`Invalid platform '${platform}'`);
+    throw new Error(`无法识别的平台 '${platform}'`);
   }
   return platform;
 }
@@ -42,9 +38,9 @@ export async function listApp(platform) {
   const list = platform ? data.filter((v) => v.platform === platform) : data;
 
   const header = [
-    { value: 'App Id' },
+    { value: '应用 id' },
-    { value: 'App Name' },
+    { value: '应用名称' },
-    { value: 'Platform' },
+    { value: '平台' },
   ];
   const rows = [];
   for (const app of list) {
@@ -54,9 +50,9 @@ export async function listApp(platform) {
   console.log(Table(header, rows).render());
 
   if (platform) {
-    console.log(`\nTotal ${list.length} ${platform} apps`);
+    console.log(`\共 ${list.length} ${platform} 个应用`);
   } else {
-    console.log(`\nTotal ${list.length} apps`);
+    console.log(`\共 ${list.length} 个应用`);
   }
   return list;
 }
@@ -65,7 +61,7 @@ export async function chooseApp(platform) {
   const list = await listApp(platform);
 
   while (true) {
-    const id = await question('Enter appId:');
+    const id = await question('输入应用 id:');
     const app = list.find((v) => v.id === (id | 0));
     if (app) {
       return app;
@@ -75,13 +71,13 @@ export async function chooseApp(platform) {
 
 export const commands = {
   createApp: async function ({ options }) {
-    const name = options.name || (await question('App Name:'));
+    const name = options.name || (await question('应用名称:'));
     const { downloadUrl } = options;
     const platform = checkPlatform(
-      options.platform || (await question('Platform(ios/android):')),
+      options.platform || (await question('平台(ios/android):')),
     );
     const { id } = await post('/app/create', { name, platform });
-    console.log(`Created app ${id}`);
+    console.log(`已成功创建应用（id: ${id}）`);
     await this.selectApp({
       args: [id],
       options: { platform, downloadUrl },
@@ -91,10 +87,10 @@ export const commands = {
     const { platform } = options;
     const id = args[0] || chooseApp(platform);
     if (!id) {
-      console.log('Canceled');
+      console.log('已取消');
     }
     await doDelete(`/app/${id}`);
-    console.log('Ok.');
+    console.log('操作成功');
   },
   apps: async function ({ options }) {
     const { platform } = options;
@@ -102,9 +98,9 @@ export const commands = {
   },
   selectApp: async function ({ args, options }) {
     const platform = checkPlatform(
-      options.platform || (await question('Platform(ios/android):')),
+      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

@@ -1,19 +1,16 @@
-/**
+import path from 'path';
- * Created by tdzl2003 on 2/22/16.
- */
-
-const path = require('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) {}
@@ -32,12 +29,14 @@ async function runReactNativeBundleCommand(
   config,
 ) {
   let gradleConfig = {};
-  // if (platform === 'android') {
+  if (platform === 'android') {
-  //   gradleConfig = await checkGradleConfig();
+    gradleConfig = await checkGradleConfig();
-  //   if (gradleConfig.crunchPngs !== false) {
+    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')
+      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 = [];
 
@@ -52,9 +51,27 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
+  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'),
+    cliPath,
-    'bundle',
+    bundleCommand,
     '--assets-dest',
     outputFolder,
     '--bundle-output',
@@ -98,8 +115,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);
       }
@@ -119,7 +167,6 @@ async function checkGradleConfig() {
   try {
     const gradleConfig = await g2js.parseFile('android/app/build.gradle');
     const projectConfig = gradleConfig['project.ext.react'];
-    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
     for (const packagerConfig of projectConfig) {
       if (
         packagerConfig.includes('enableHermes') &&
@@ -129,6 +176,7 @@ async function checkGradleConfig() {
         break;
       }
     }
+    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
   } catch (e) {}
   return {
     enableHermes,
@@ -136,35 +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`);
-  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' },
   );
+  let hermesPath = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
+
+  // < rn 0.69
+  if (!fs.existsSync(hermesPath)) {
+    hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
+  }
+
+  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) {
@@ -172,7 +235,7 @@ async function pack(dir, output) {
       }
       const childs = fs.readdirSync(root);
       for (const name of childs) {
-        if (name === '.' || name === '..') {
+        if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
           continue;
         }
         const fullPath = path.join(root, name);
@@ -197,7 +260,7 @@ async function pack(dir, output) {
       });
     zipfile.end();
   });
-  console.log('Bundled saved to: ' + output);
+  console.log('ppk热更包已生成并保存到: ' + output);
 }
 
 function readEntire(entry, zipFile) {
@@ -254,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) => {
@@ -339,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;
@@ -396,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) => {
@@ -515,22 +578,16 @@ function diffArgsCheck(args, options, diffFn) {
 export const commands = {
   bundle: async function ({ options }) {
     const platform = checkPlatform(
-      options.platform || (await question('Platform(ios/android):')),
+      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());
 
@@ -549,11 +606,12 @@ export const commands = {
       entryFile,
       intermediaDir,
       platform,
+      sourcemap ? sourcemapOutput : '',
     );
 
     await pack(path.resolve(intermediaDir), realOutput);
 
-    const v = await question('Would you like to publish it?(Y/N)');
+    const v = await question('是否现在上传此热更包?(Y/N)');
     if (v.toLowerCase() === 'y') {
       await this.publish({
         args: [realOutput],

src/index.js

@@ -1,21 +1,20 @@
 #!/usr/bin/env node
-/**
- * Created by tdzl2003 on 2/13/16.
- */
 
-const {loadSession} = require('./api');
+import { loadSession } from './api';
-const updateNotifier = require('update-notifier');
+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});
+updateNotifier({ pkg }).notify({ isGlobal: true });
 
-function printUsage({args}) {
+function printUsage({ args }) {
   // const commandName = args[0];
   // TODO: print usage of commandName, or print global usage.
 
-  console.log('Usage is under development now.')
+  console.log('Usage is under development now.');
-  console.log('Visit `https://github.com/reactnativecn/react-native-pushy` for early document.');
+  console.log(
+    'Visit `https://github.com/reactnativecn/react-native-pushy` for early document.',
+  );
   process.exit(1);
 }
 
@@ -33,20 +32,21 @@ function run() {
     printVersionCommand();
     process.exit();
   }
-  
+
   const argv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
+  global.USE_ACC_OSS = argv.options['acc'];
 
   loadSession()
-    .then(()=>commands[argv.command](argv))
+    .then(() => commands[argv.command](argv))
-    .catch(err=>{
+    .catch((err) => {
       if (err.status === 401) {
-        console.log('Not loggined.\nRun `pushy login` at your project directory to login.');
+        console.log('尚未登录。\n请在项目目录中运行`pushy login`命令来登录');
         return;
       }
       console.error(err.stack);
       process.exit(-1);
     });
-};
+}
 
-run();
+run();

src/package.js

@@ -1,36 +1,37 @@
-/**
+import { get, post, uploadFile } from './api';
- * Created by tdzl2003 on 4/2/16.
- */
-
-const { get, post, uploadFile } = require('./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`);
 
-  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());
-  console.log(`\nTotal ${data.length} package(s).`);
+  console.log(`\n共 ${data.length} 个包`);
   return data;
 }
 
@@ -38,7 +39,7 @@ export async function choosePackage(appId) {
   const list = await listPackage(appId);
 
   while (true) {
-    const id = await question('Enter Package Id:');
+    const id = await question('输入原生包 id:');
     const app = list.find((v) => v.id === (id | 0));
     if (app) {
       return app;
@@ -50,7 +51,7 @@ export const commands = {
   uploadIpa: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
-      throw new Error('Usage: pushy uploadIpa <ipaFile>');
+      throw new Error('使用方法: pushy uploadIpa ipa后缀文件');
     }
     const {
       versionName,
@@ -60,15 +61,15 @@ 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}`,
+        `appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`,
       );
     }
 
     if (appKeyInPkg && appKeyInPkg !== appKey) {
       throw new Error(
-        `appKey不匹配！当前ipa：${appKeyInPkg}, 当前update.json：${appKey}`,
+        `appKey不匹配！当前ipa: ${appKeyInPkg}, 当前update.json: ${appKey}`,
       );
     }
 
@@ -80,12 +81,14 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
-    console.log(`Ipa uploaded: ${id}`);
+    console.log(
+      `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   uploadApk: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
-      throw new Error('Usage: pushy uploadApk <apkFile>');
+      throw new Error('使用方法: pushy uploadApk apk后缀文件');
     }
     const {
       versionName,
@@ -95,15 +98,15 @@ 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}`,
+        `appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`,
       );
     }
 
     if (appKeyInPkg && appKeyInPkg !== appKey) {
       throw new Error(
-        `appKey不匹配！当前apk：${appKeyInPkg}, 当前update.json：${appKey}`,
+        `appKey不匹配！当前apk: ${appKeyInPkg}, 当前update.json: ${appKey}`,
       );
     }
 
@@ -115,25 +118,27 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
-    console.log(`Apk uploaded: ${id}`);
+    console.log(
+      `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
   },
   parseIpa: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
-      throw new Error('Usage: pushy parseIpa <ipaFile>');
+      throw new Error('使用方法: pushy parseIpa ipa后缀文件');
     }
     console.log(await getIpaInfo(fn));
   },
   parseApk: async function ({ args }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
-      throw new Error('Usage: pushy parseApk <apkFile>');
+      throw new Error('使用方法: pushy parseApk apk后缀文件');
     }
     console.log(await getApkInfo(fn));
   },
   packages: async function ({ options }) {
     const platform = checkPlatform(
-      options.platform || (await question('Platform(ios/android):')),
+      options.platform || (await question('平台(ios/android):')),
     );
     const { appId } = await getSelectedApp(platform);
     await listPackage(appId);

src/user.js

@@ -1,38 +1,28 @@
-/**
+import { question } from './utils';
- * Created by tdzl2003 on 2/13/16.
+import { post, get, replaceSession, saveSession, closeSession } from './api';
- */
+import crypto from 'crypto';
-
-import {question} from './utils';
-const {
-  post,
-  get,
-  replaceSession,
-  saveSession,
-  closeSession,
-} = require('./api');
-const crypto = require('crypto');
 
 function md5(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
-exports.commands = {
+export const commands = {
-  login: async function ({args}){
+  login: async function ({ args }) {
-    const email = args[0] || await question('email:');
+    const email = args[0] || (await question('email:'));
-    const pwd = args[1] || await question('password:', true);
+    const pwd = args[1] || (await question('password:', true));
-    const {token, info} = await post('/user/login', {
+    const { token, info } = await post('/user/login', {
       email,
       pwd: md5(pwd),
     });
-    replaceSession({token});
+    replaceSession({ token });
     await saveSession();
-    console.log(`Welcome, ${info.name}.`);
+    console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
-  logout: async function (){
+  logout: async function () {
     await closeSession();
-    console.log('Logged out.');
+    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/app-info-parser/apk.js

@@ -0,0 +1,90 @@
+const Zip = require('./zip')
+const { mapInfoResource, findApkIconPath, getBase64FromBuffer } = require('./utils')
+const ManifestName = /^androidmanifest\.xml$/
+const ResourceName = /^resources\.arsc$/
+
+const ManifestXmlParser = require('./xml-parser/manifest')
+const ResourceFinder = require('./resource-finder')
+
+class ApkParser extends Zip {
+  /**
+   * parser for parsing .apk file
+   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   */
+  constructor (file) {
+    super(file)
+    if (!(this instanceof ApkParser)) {
+      return new ApkParser(file)
+    }
+  }
+  parse () {
+    return new Promise((resolve, reject) => {
+      this.getEntries([ManifestName, ResourceName]).then(buffers => {
+        if (!buffers[ManifestName]) {
+          throw new Error('AndroidManifest.xml can\'t be found.')
+        }
+        let apkInfo = this._parseManifest(buffers[ManifestName])
+        let resourceMap
+        if (!buffers[ResourceName]) {
+          resolve(apkInfo)
+        } else {
+          // parse resourceMap
+          resourceMap = this._parseResourceMap(buffers[ResourceName])
+          // update apkInfo with resourceMap
+          apkInfo = mapInfoResource(apkInfo, resourceMap)
+
+          // find icon path and parse icon
+          const iconPath = findApkIconPath(apkInfo)
+          if (iconPath) {
+            this.getEntry(iconPath).then(iconBuffer => {
+              apkInfo.icon = iconBuffer ? getBase64FromBuffer(iconBuffer) : null
+              resolve(apkInfo)
+            }).catch(e => {
+              apkInfo.icon = null
+              resolve(apkInfo)
+              console.warn('[Warning] failed to parse icon: ', e)
+            })
+          } else {
+            apkInfo.icon = null
+            resolve(apkInfo)
+          }
+        }
+      }).catch(e => {
+        reject(e)
+      })
+    })
+  }
+  /**
+   * Parse manifest
+   * @param {Buffer} buffer // manifest file's buffer
+   */
+  _parseManifest (buffer) {
+    try {
+      const parser = new ManifestXmlParser(buffer, {
+        ignore: [
+          'application.activity',
+          'application.service',
+          'application.receiver',
+          'application.provider',
+          'permission-group'
+        ]
+      })
+      return parser.parse()
+    } catch (e) {
+      throw new Error('Parse AndroidManifest.xml error: ', e)
+    }
+  }
+  /**
+   * Parse resourceMap
+   * @param {Buffer} buffer // resourceMap file's buffer
+   */
+  _parseResourceMap (buffer) {
+    try {
+      return new ResourceFinder().processResourceTable(buffer)
+    } catch (e) {
+      throw new Error('Parser resources.arsc error: ' + e)
+    }
+  }
+}
+
+module.exports = ApkParser

src/utils/app-info-parser/index.js

@@ -0,0 +1,35 @@
+const ApkParser = require('./apk')
+const IpaParser = require('./ipa')
+const supportFileTypes = ['ipa', 'apk']
+
+class AppInfoParser {
+  /**
+   * parser for parsing .ipa or .apk file
+   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   */
+  constructor (file) {
+    if (!file) {
+      throw new Error('Param miss: file(file\'s path in Node, instance of File or Blob in browser).')
+    }
+    const splits = (file.name || file).split('.')
+    const fileType = splits[splits.length - 1].toLowerCase()
+    if (!supportFileTypes.includes(fileType)) {
+      throw new Error('Unsupported file type, only support .ipa or .apk file.')
+    }
+    this.file = file
+
+    switch (fileType) {
+      case 'ipa':
+        this.parser = new IpaParser(this.file)
+        break
+      case 'apk':
+        this.parser = new ApkParser(this.file)
+        break
+    }
+  }
+  parse () {
+    return this.parser.parse()
+  }
+}
+
+module.exports = AppInfoParser

src/utils/app-info-parser/ipa.js

@@ -0,0 +1,92 @@
+const parsePlist = require('plist').parse
+const parseBplist = require('bplist-parser').parseBuffer
+const cgbiToPng = require('cgbi-to-png')
+
+const Zip = require('./zip')
+const { findIpaIconPath, getBase64FromBuffer, isBrowser } = require('./utils')
+
+const PlistName = new RegExp('payload/[^/]+?.app/info.plist$', 'i')
+const ProvisionName = /payload\/.+?\.app\/embedded.mobileprovision/
+
+class IpaParser extends Zip {
+  /**
+   * parser for parsing .ipa file
+   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   */
+  constructor (file) {
+    super(file)
+    if (!(this instanceof IpaParser)) {
+      return new IpaParser(file)
+    }
+  }
+  parse () {
+    return new Promise((resolve, reject) => {
+      this.getEntries([PlistName, ProvisionName]).then(buffers => {
+        if (!buffers[PlistName]) {
+          throw new Error('Info.plist can\'t be found.')
+        }
+        const plistInfo = this._parsePlist(buffers[PlistName])
+        // parse mobile provision
+        const provisionInfo = this._parseProvision(buffers[ProvisionName])
+        plistInfo.mobileProvision = provisionInfo
+
+        // find icon path and parse icon
+        const iconRegex = new RegExp(findIpaIconPath(plistInfo).toLowerCase())
+        this.getEntry(iconRegex).then(iconBuffer => {
+          try {
+            // In general, the ipa file's icon has been specially processed, should be converted
+            plistInfo.icon = iconBuffer ? getBase64FromBuffer(cgbiToPng.revert(iconBuffer)) : null
+          } catch (err) {
+            if (isBrowser()) {
+              // Normal conversion in other cases
+              plistInfo.icon = iconBuffer ? getBase64FromBuffer(window.btoa(String.fromCharCode(...iconBuffer))) : null
+            } else {
+              plistInfo.icon = null
+              console.warn('[Warning] failed to parse icon: ', err)
+            }
+          }
+          resolve(plistInfo)
+        }).catch(e => {
+          reject(e)
+        })
+      }).catch(e => {
+        reject(e)
+      })
+    })
+  }
+  /**
+   * Parse plist
+   * @param {Buffer} buffer // plist file's buffer
+   */
+  _parsePlist (buffer) {
+    let result
+    const bufferType = buffer[0]
+    if (bufferType === 60 || bufferType === '<' || bufferType === 239) {
+      result = parsePlist(buffer.toString())
+    } else if (bufferType === 98) {
+      result = parseBplist(buffer)[0]
+    } else {
+      throw new Error('Unknown plist buffer type.')
+    }
+    return result
+  }
+  /**
+   * parse provision
+   * @param {Buffer} buffer // provision file's buffer
+   */
+  _parseProvision (buffer) {
+    let info = {}
+    if (buffer) {
+      let content = buffer.toString('utf-8')
+      const firstIndex = content.indexOf('<?xml')
+      const endIndex = content.indexOf('</plist>')
+      content = content.slice(firstIndex, endIndex + 8)
+      if (content) {
+        info = parsePlist(content)
+      }
+    }
+    return info
+  }
+}
+
+module.exports = IpaParser

src/utils/app-info-parser/resource-finder.js

@@ -0,0 +1,499 @@
+/**
+ * Code translated from a C# project https://github.com/hylander0/Iteedee.ApkReader/blob/master/Iteedee.ApkReader/ApkResourceFinder.cs
+ *
+ * Decode binary file `resources.arsc` from a .apk file to a JavaScript Object.
+ */
+
+var ByteBuffer = require("bytebuffer");
+
+var DEBUG = false;
+
+var RES_STRING_POOL_TYPE = 0x0001;
+var RES_TABLE_TYPE = 0x0002;
+var RES_TABLE_PACKAGE_TYPE = 0x0200;
+var RES_TABLE_TYPE_TYPE = 0x0201;
+var RES_TABLE_TYPE_SPEC_TYPE = 0x0202;
+
+// The 'data' holds a ResTable_ref, a reference to another resource
+// table entry.
+var TYPE_REFERENCE = 0x01;
+// The 'data' holds an index into the containing resource table's
+// global value string pool.
+var TYPE_STRING = 0x03;
+
+function ResourceFinder() {
+  this.valueStringPool = null;
+  this.typeStringPool = null;
+  this.keyStringPool = null;
+
+  this.package_id = 0;
+
+  this.responseMap = {};
+  this.entryMap = {};
+}
+
+/**
+ * Same to C# BinaryReader.readBytes
+ *
+ * @param bb ByteBuffer
+ * @param len length
+ * @returns {Buffer}
+ */
+ResourceFinder.readBytes = function(bb, len) {
+  var uint8Array = new Uint8Array(len);
+  for (var i = 0; i < len; i++) {
+    uint8Array[i] = bb.readUint8();
+  }
+
+  return ByteBuffer.wrap(uint8Array, "binary", true);
+};
+
+//
+/**
+ *
+ * @param {ByteBuffer} bb
+ * @return {Map<String, Set<String>>}
+ */
+ResourceFinder.prototype.processResourceTable = function(resourceBuffer) {
+  const bb = ByteBuffer.wrap(resourceBuffer, "binary", true);
+
+  // Resource table structure
+  var type = bb.readShort(),
+    headerSize = bb.readShort(),
+    size = bb.readInt(),
+    packageCount = bb.readInt(),
+    buffer,
+    bb2;
+  if (type != RES_TABLE_TYPE) {
+    throw new Error("No RES_TABLE_TYPE found!");
+  }
+  if (size != bb.limit) {
+    throw new Error("The buffer size not matches to the resource table size.");
+  }
+  bb.offset = headerSize;
+
+  var realStringPoolCount = 0,
+    realPackageCount = 0;
+
+  while (true) {
+    var pos, t, hs, s;
+    try {
+      pos = bb.offset;
+      t = bb.readShort();
+      hs = bb.readShort();
+      s = bb.readInt();
+    } catch (e) {
+      break;
+    }
+    if (t == RES_STRING_POOL_TYPE) {
+      // Process the string pool
+      if (realStringPoolCount == 0) {
+        // Only the first string pool is processed.
+        if (DEBUG) {
+          console.log("Processing the string pool ...");
+        }
+
+        buffer = new ByteBuffer(s);
+        bb.offset = pos;
+        bb.prependTo(buffer);
+
+        bb2 = ByteBuffer.wrap(buffer, "binary", true);
+
+        bb2.LE();
+        this.valueStringPool = this.processStringPool(bb2);
+      }
+      realStringPoolCount++;
+    } else if (t == RES_TABLE_PACKAGE_TYPE) {
+      // Process the package
+      if (DEBUG) {
+        console.log("Processing the package " + realPackageCount + " ...");
+      }
+
+      buffer = new ByteBuffer(s);
+      bb.offset = pos;
+      bb.prependTo(buffer);
+
+      bb2 = ByteBuffer.wrap(buffer, "binary", true);
+      bb2.LE();
+      this.processPackage(bb2);
+
+      realPackageCount++;
+    } else {
+      throw new Error("Unsupported type");
+    }
+    bb.offset = pos + s;
+    if (!bb.remaining()) break;
+  }
+
+  if (realStringPoolCount != 1) {
+    throw new Error("More than 1 string pool found!");
+  }
+  if (realPackageCount != packageCount) {
+    throw new Error("Real package count not equals the declared count.");
+  }
+
+  return this.responseMap;
+};
+
+/**
+ *
+ * @param {ByteBuffer} bb
+ */
+ResourceFinder.prototype.processPackage = function(bb) {
+  // Package structure
+  var type = bb.readShort(),
+    headerSize = bb.readShort(),
+    size = bb.readInt(),
+    id = bb.readInt();
+
+  this.package_id = id;
+
+  for (var i = 0; i < 256; ++i) {
+    bb.readUint8();
+  }
+
+  var typeStrings = bb.readInt(),
+    lastPublicType = bb.readInt(),
+    keyStrings = bb.readInt(),
+    lastPublicKey = bb.readInt();
+
+  if (typeStrings != headerSize) {
+    throw new Error(
+      "TypeStrings must immediately following the package structure header."
+    );
+  }
+
+  if (DEBUG) {
+    console.log("Type strings:");
+  }
+
+  var lastPosition = bb.offset;
+  bb.offset = typeStrings;
+  var bbTypeStrings = ResourceFinder.readBytes(bb, bb.limit - bb.offset);
+  bb.offset = lastPosition;
+  this.typeStringPool = this.processStringPool(bbTypeStrings);
+
+  // Key strings
+  if (DEBUG) {
+    console.log("Key strings:");
+  }
+
+  bb.offset = keyStrings;
+  var key_type = bb.readShort(),
+    key_headerSize = bb.readShort(),
+    key_size = bb.readInt();
+
+  lastPosition = bb.offset;
+  bb.offset = keyStrings;
+  var bbKeyStrings = ResourceFinder.readBytes(bb, bb.limit - bb.offset);
+  bb.offset = lastPosition;
+  this.keyStringPool = this.processStringPool(bbKeyStrings);
+
+  // Iterate through all chunks
+  var typeSpecCount = 0;
+  var typeCount = 0;
+
+  bb.offset = keyStrings + key_size;
+
+  var bb2;
+
+  while (true) {
+    var pos = bb.offset;
+    try {
+      var t = bb.readShort();
+      var hs = bb.readShort();
+      var s = bb.readInt();
+    } catch (e) {
+      break;
+    }
+
+    if (t == RES_TABLE_TYPE_SPEC_TYPE) {
+      bb.offset = pos;
+      bb2 = ResourceFinder.readBytes(bb, s);
+      this.processTypeSpec(bb2);
+
+      typeSpecCount++;
+    } else if (t == RES_TABLE_TYPE_TYPE) {
+      bb.offset = pos;
+      bb2 = ResourceFinder.readBytes(bb, s);
+      this.processType(bb2);
+
+      typeCount++;
+    }
+
+    if (s == 0) {
+      break;
+    }
+
+    bb.offset = pos + s;
+
+    if (!bb.remaining()) {
+      break;
+    }
+  }
+};
+
+/**
+ *
+ * @param {ByteBuffer} bb
+ */
+ResourceFinder.prototype.processType = function(bb) {
+  var type = bb.readShort(),
+    headerSize = bb.readShort(),
+    size = bb.readInt(),
+    id = bb.readByte(),
+    res0 = bb.readByte(),
+    res1 = bb.readShort(),
+    entryCount = bb.readInt(),
+    entriesStart = bb.readInt();
+
+  var refKeys = {};
+
+  var config_size = bb.readInt();
+
+  // Skip the config data
+  bb.offset = headerSize;
+
+  if (headerSize + entryCount * 4 != entriesStart) {
+    throw new Error("HeaderSize, entryCount and entriesStart are not valid.");
+  }
+
+  // Start to get entry indices
+  var entryIndices = new Array(entryCount);
+  for (var i = 0; i < entryCount; ++i) {
+    entryIndices[i] = bb.readInt();
+  }
+
+  // Get entries
+  for (var i = 0; i < entryCount; ++i) {
+    if (entryIndices[i] == -1) continue;
+
+    var resource_id = (this.package_id << 24) | (id << 16) | i;
+
+    var pos = bb.offset,
+      entry_size,
+      entry_flag,
+      entry_key,
+      value_size,
+      value_res0,
+      value_dataType,
+      value_data;
+    try {
+      entry_size = bb.readShort()
+      entry_flag = bb.readShort()
+      entry_key = bb.readInt()
+    } catch (e) {
+      break
+    }
+
+    // Get the value (simple) or map (complex)
+
+    var FLAG_COMPLEX = 0x0001;
+    if ((entry_flag & FLAG_COMPLEX) == 0) {
+      // Simple case
+      value_size = bb.readShort();
+      value_res0 = bb.readByte();
+      value_dataType = bb.readByte();
+      value_data = bb.readInt();
+
+      var idStr = Number(resource_id).toString(16);
+      var keyStr = this.keyStringPool[entry_key];
+
+      var data = null;
+
+      if (DEBUG) {
+        console.log(
+          "Entry 0x" + idStr + ", key: " + keyStr + ", simple value type: "
+        );
+      }
+
+      var key = parseInt(idStr, 16);
+
+      var entryArr = this.entryMap[key];
+      if (entryArr == null) {
+        entryArr = [];
+      }
+      entryArr.push(keyStr);
+
+      this.entryMap[key] = entryArr;
+
+      if (value_dataType == TYPE_STRING) {
+        data = this.valueStringPool[value_data];
+
+        if (DEBUG) {
+          console.log(", data: " + this.valueStringPool[value_data] + "");
+        }
+      } else if (value_dataType == TYPE_REFERENCE) {
+        var hexIndex = Number(value_data).toString(16);
+
+        refKeys[idStr] = value_data;
+      } else {
+        data = "" + value_data;
+        if (DEBUG) {
+          console.log(", data: " + value_data + "");
+        }
+      }
+
+      this.putIntoMap("@" + idStr, data);
+    } else {
+      // Complex case
+      var entry_parent = bb.readInt();
+      var entry_count = bb.readInt();
+
+      for (var j = 0; j < entry_count; ++j) {
+        var ref_name = bb.readInt();
+        value_size = bb.readShort();
+        value_res0 = bb.readByte();
+        value_dataType = bb.readByte();
+        value_data = bb.readInt();
+      }
+
+      if (DEBUG) {
+        console.log(
+          "Entry 0x" +
+            Number(resource_id).toString(16) +
+            ", key: " +
+            this.keyStringPool[entry_key] +
+            ", complex value, not printed."
+        );
+      }
+    }
+  }
+
+  for (var refK in refKeys) {
+    var values = this.responseMap[
+      "@" +
+        Number(refKeys[refK])
+          .toString(16)
+          .toUpperCase()
+    ];
+    if (values != null && Object.keys(values).length < 1000) {
+      for (var value in values) {
+        this.putIntoMap("@" + refK, values[value]);
+      }
+    }
+  }
+};
+
+/**
+ *
+ * @param {ByteBuffer} bb
+ * @return {Array}
+ */
+ResourceFinder.prototype.processStringPool = function(bb) {
+  // String pool structure
+  //
+  var type = bb.readShort(),
+    headerSize = bb.readShort(),
+    size = bb.readInt(),
+    stringCount = bb.readInt(),
+    styleCount = bb.readInt(),
+    flags = bb.readInt(),
+    stringsStart = bb.readInt(),
+    stylesStart = bb.readInt(),
+    u16len,
+    buffer;
+
+  var isUTF_8 = (flags & 256) != 0;
+
+  var offsets = new Array(stringCount);
+  for (var i = 0; i < stringCount; ++i) {
+    offsets[i] = bb.readInt();
+  }
+
+  var strings = new Array(stringCount);
+
+  for (var i = 0; i < stringCount; ++i) {
+    var pos = stringsStart + offsets[i];
+    bb.offset = pos;
+
+    strings[i] = "";
+
+    if (isUTF_8) {
+      u16len = bb.readUint8();
+
+      if ((u16len & 0x80) != 0) {
+        u16len = ((u16len & 0x7f) << 8) + bb.readUint8();
+      }
+
+      var u8len = bb.readUint8();
+      if ((u8len & 0x80) != 0) {
+        u8len = ((u8len & 0x7f) << 8) + bb.readUint8();
+      }
+
+      if (u8len > 0) {
+        buffer = ResourceFinder.readBytes(bb, u8len);
+        try {
+          strings[i] = ByteBuffer.wrap(buffer, "utf8", true).toString("utf8");
+        } catch (e) {
+          if (DEBUG) {
+            console.error(e);
+            console.log("Error when turning buffer to utf-8 string.");
+          }
+        }
+      } else {
+        strings[i] = "";
+      }
+    } else {
+      u16len = bb.readUint16();
+      if ((u16len & 0x8000) != 0) {
+        // larger than 32768
+        u16len = ((u16len & 0x7fff) << 16) + bb.readUint16();
+      }
+
+      if (u16len > 0) {
+        var len = u16len * 2;
+        buffer = ResourceFinder.readBytes(bb, len);
+        try {
+          strings[i] = ByteBuffer.wrap(buffer, "utf8", true).toString("utf8");
+        } catch (e) {
+          if (DEBUG) {
+            console.error(e);
+            console.log("Error when turning buffer to utf-8 string.");
+          }
+        }
+      }
+    }
+
+    if (DEBUG) {
+      console.log("Parsed value: {0}", strings[i]);
+    }
+  }
+
+  return strings;
+};
+
+/**
+ *
+ * @param {ByteBuffer} bb
+ */
+ResourceFinder.prototype.processTypeSpec = function(bb) {
+  var type = bb.readShort(),
+    headerSize = bb.readShort(),
+    size = bb.readInt(),
+    id = bb.readByte(),
+    res0 = bb.readByte(),
+    res1 = bb.readShort(),
+    entryCount = bb.readInt();
+
+  if (DEBUG) {
+    console.log("Processing type spec " + this.typeStringPool[id - 1] + "...");
+  }
+
+  var flags = new Array(entryCount);
+
+  for (var i = 0; i < entryCount; ++i) {
+    flags[i] = bb.readInt();
+  }
+};
+
+ResourceFinder.prototype.putIntoMap = function(resId, value) {
+  if (this.responseMap[resId.toUpperCase()] == null) {
+    this.responseMap[resId.toUpperCase()] = []
+  }
+  if(value){
+    this.responseMap[resId.toUpperCase()].push(value)
+  }
+};
+
+module.exports = ResourceFinder;

src/utils/app-info-parser/utils.js

@@ -0,0 +1,167 @@
+function objectType (o) {
+  return Object.prototype.toString.call(o).slice(8, -1).toLowerCase()
+}
+
+function isArray (o) {
+  return objectType(o) === 'array'
+}
+
+function isObject (o) {
+  return objectType(o) === 'object'
+}
+
+function isPrimitive (o) {
+  return o === null || ['boolean', 'number', 'string', 'undefined'].includes(objectType(o))
+}
+
+function isBrowser () {
+  return (
+    typeof process === 'undefined' ||
+    Object.prototype.toString.call(process) !== '[object process]'
+  )
+}
+
+/**
+ * map file place with resourceMap
+ * @param {Object} apkInfo // json info parsed from .apk file
+ * @param {Object} resourceMap // resourceMap
+ */
+function mapInfoResource (apkInfo, resourceMap) {
+  iteratorObj(apkInfo)
+  return apkInfo
+  function iteratorObj (obj) {
+    for (var i in obj) {
+      if (isArray(obj[i])) {
+        iteratorArray(obj[i])
+      } else if (isObject(obj[i])) {
+        iteratorObj(obj[i])
+      } else if (isPrimitive(obj[i])) {
+        if (isResources(obj[i])) {
+          obj[i] = resourceMap[transKeyToMatchResourceMap(obj[i])]
+        }
+      }
+    }
+  }
+
+  function iteratorArray (array) {
+    const l = array.length
+    for (let i = 0; i < l; i++) {
+      if (isArray(array[i])) {
+        iteratorArray(array[i])
+      } else if (isObject(array[i])) {
+        iteratorObj(array[i])
+      } else if (isPrimitive(array[i])) {
+        if (isResources(array[i])) {
+          array[i] = resourceMap[transKeyToMatchResourceMap(array[i])]
+        }
+      }
+    }
+  }
+
+  function isResources (attrValue) {
+    if (!attrValue) return false
+    if (typeof attrValue !== 'string') {
+      attrValue = attrValue.toString()
+    }
+    return attrValue.indexOf('resourceId:') === 0
+  }
+
+  function transKeyToMatchResourceMap (resourceId) {
+    return '@' + resourceId.replace('resourceId:0x', '').toUpperCase()
+  }
+}
+
+/**
+ * find .apk file's icon path from json info
+ * @param info // json info parsed from .apk file
+ */
+function findApkIconPath (info) {
+  if (!info.application.icon || !info.application.icon.splice) {
+    return ''
+  }
+  const rulesMap = {
+    mdpi: 48,
+    hdpi: 72,
+    xhdpi: 96,
+    xxdpi: 144,
+    xxxhdpi: 192
+  }
+  const resultMap = {}
+  const maxDpiIcon = { dpi: 120, icon: '' }
+
+  for (const i in rulesMap) {
+    info.application.icon.some((icon) => {
+      if (icon && icon.indexOf(i) !== -1) {
+        resultMap['application-icon-' + rulesMap[i]] = icon
+        return true
+      }
+    })
+
+    // get the maximal size icon
+    if (
+      resultMap['application-icon-' + rulesMap[i]] &&
+      rulesMap[i] >= maxDpiIcon.dpi
+    ) {
+      maxDpiIcon.dpi = rulesMap[i]
+      maxDpiIcon.icon = resultMap['application-icon-' + rulesMap[i]]
+    }
+  }
+
+  if (Object.keys(resultMap).length === 0 || !maxDpiIcon.icon) {
+    maxDpiIcon.dpi = 120
+    maxDpiIcon.icon = info.application.icon[0] || ''
+    resultMap['applicataion-icon-120'] = maxDpiIcon.icon
+  }
+  return maxDpiIcon.icon
+}
+
+/**
+ * find .ipa file's icon path from json info
+ * @param info // json info parsed from .ipa file
+ */
+function findIpaIconPath (info) {
+  if (
+    info.CFBundleIcons &&
+    info.CFBundleIcons.CFBundlePrimaryIcon &&
+    info.CFBundleIcons.CFBundlePrimaryIcon.CFBundleIconFiles &&
+    info.CFBundleIcons.CFBundlePrimaryIcon.CFBundleIconFiles.length
+  ) {
+    return info.CFBundleIcons.CFBundlePrimaryIcon.CFBundleIconFiles[info.CFBundleIcons.CFBundlePrimaryIcon.CFBundleIconFiles.length - 1]
+  } else if (info.CFBundleIconFiles && info.CFBundleIconFiles.length) {
+    return info.CFBundleIconFiles[info.CFBundleIconFiles.length - 1]
+  } else {
+    return '.app/Icon.png'
+  }
+}
+
+/**
+ * transform buffer to base64
+ * @param {Buffer} buffer
+ */
+function getBase64FromBuffer (buffer) {
+  return 'data:image/png;base64,' + buffer.toString('base64')
+}
+
+/**
+ * 去除unicode空字符
+ * @param {String} str
+ */
+function decodeNullUnicode (str) {
+  if (typeof str === 'string') {
+    // eslint-disable-next-line
+    str = str.replace(/\u0000/g, '')
+  }
+  return str
+}
+
+module.exports = {
+  isArray,
+  isObject,
+  isPrimitive,
+  isBrowser,
+  mapInfoResource,
+  findApkIconPath,
+  findIpaIconPath,
+  getBase64FromBuffer,
+  decodeNullUnicode
+}

src/utils/app-info-parser/xml-parser/binary.js

@@ -0,0 +1,674 @@
+// From https://github.com/openstf/adbkit-apkreader
+const NodeType = {
+  ELEMENT_NODE: 1,
+  ATTRIBUTE_NODE: 2,
+  CDATA_SECTION_NODE: 4
+}
+
+const ChunkType = {
+  NULL: 0x0000,
+  STRING_POOL: 0x0001,
+  TABLE: 0x0002,
+  XML: 0x0003,
+  XML_FIRST_CHUNK: 0x0100,
+  XML_START_NAMESPACE: 0x0100,
+  XML_END_NAMESPACE: 0x0101,
+  XML_START_ELEMENT: 0x0102,
+  XML_END_ELEMENT: 0x0103,
+  XML_CDATA: 0x0104,
+  XML_LAST_CHUNK: 0x017f,
+  XML_RESOURCE_MAP: 0x0180,
+  TABLE_PACKAGE: 0x0200,
+  TABLE_TYPE: 0x0201,
+  TABLE_TYPE_SPEC: 0x0202
+}
+
+const StringFlags = {
+  SORTED: 1 << 0,
+  UTF8: 1 << 8
+}
+
+// Taken from android.util.TypedValue
+const TypedValue = {
+  COMPLEX_MANTISSA_MASK: 0x00ffffff,
+  COMPLEX_MANTISSA_SHIFT: 0x00000008,
+  COMPLEX_RADIX_0p23: 0x00000003,
+  COMPLEX_RADIX_16p7: 0x00000001,
+  COMPLEX_RADIX_23p0: 0x00000000,
+  COMPLEX_RADIX_8p15: 0x00000002,
+  COMPLEX_RADIX_MASK: 0x00000003,
+  COMPLEX_RADIX_SHIFT: 0x00000004,
+  COMPLEX_UNIT_DIP: 0x00000001,
+  COMPLEX_UNIT_FRACTION: 0x00000000,
+  COMPLEX_UNIT_FRACTION_PARENT: 0x00000001,
+  COMPLEX_UNIT_IN: 0x00000004,
+  COMPLEX_UNIT_MASK: 0x0000000f,
+  COMPLEX_UNIT_MM: 0x00000005,
+  COMPLEX_UNIT_PT: 0x00000003,
+  COMPLEX_UNIT_PX: 0x00000000,
+  COMPLEX_UNIT_SHIFT: 0x00000000,
+  COMPLEX_UNIT_SP: 0x00000002,
+  DENSITY_DEFAULT: 0x00000000,
+  DENSITY_NONE: 0x0000ffff,
+  TYPE_ATTRIBUTE: 0x00000002,
+  TYPE_DIMENSION: 0x00000005,
+  TYPE_FIRST_COLOR_INT: 0x0000001c,
+  TYPE_FIRST_INT: 0x00000010,
+  TYPE_FLOAT: 0x00000004,
+  TYPE_FRACTION: 0x00000006,
+  TYPE_INT_BOOLEAN: 0x00000012,
+  TYPE_INT_COLOR_ARGB4: 0x0000001e,
+  TYPE_INT_COLOR_ARGB8: 0x0000001c,
+  TYPE_INT_COLOR_RGB4: 0x0000001f,
+  TYPE_INT_COLOR_RGB8: 0x0000001d,
+  TYPE_INT_DEC: 0x00000010,
+  TYPE_INT_HEX: 0x00000011,
+  TYPE_LAST_COLOR_INT: 0x0000001f,
+  TYPE_LAST_INT: 0x0000001f,
+  TYPE_NULL: 0x00000000,
+  TYPE_REFERENCE: 0x00000001,
+  TYPE_STRING: 0x00000003
+}
+
+class BinaryXmlParser {
+  constructor (buffer, options = {}) {
+    this.buffer = buffer
+    this.cursor = 0
+    this.strings = []
+    this.resources = []
+    this.document = null
+    this.parent = null
+    this.stack = []
+    this.debug = options.debug || false
+  }
+
+  readU8 () {
+    this.debug && console.group('readU8')
+    this.debug && console.debug('cursor:', this.cursor)
+    const val = this.buffer[this.cursor]
+    this.debug && console.debug('value:', val)
+    this.cursor += 1
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readU16 () {
+    this.debug && console.group('readU16')
+    this.debug && console.debug('cursor:', this.cursor)
+    const val = this.buffer.readUInt16LE(this.cursor)
+    this.debug && console.debug('value:', val)
+    this.cursor += 2
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readS32 () {
+    this.debug && console.group('readS32')
+    this.debug && console.debug('cursor:', this.cursor)
+    const val = this.buffer.readInt32LE(this.cursor)
+    this.debug && console.debug('value:', val)
+    this.cursor += 4
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readU32 () {
+    this.debug && console.group('readU32')
+    this.debug && console.debug('cursor:', this.cursor)
+    const val = this.buffer.readUInt32LE(this.cursor)
+    this.debug && console.debug('value:', val)
+    this.cursor += 4
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readLength8 () {
+    this.debug && console.group('readLength8')
+    let len = this.readU8()
+    if (len & 0x80) {
+      len = (len & 0x7f) << 8
+      len += this.readU8()
+    }
+    this.debug && console.debug('length:', len)
+    this.debug && console.groupEnd()
+    return len
+  }
+
+  readLength16 () {
+    this.debug && console.group('readLength16')
+    let len = this.readU16()
+    if (len & 0x8000) {
+      len = (len & 0x7fff) << 16
+      len += this.readU16()
+    }
+    this.debug && console.debug('length:', len)
+    this.debug && console.groupEnd()
+    return len
+  }
+
+  readDimension () {
+    this.debug && console.group('readDimension')
+
+    const dimension = {
+      value: null,
+      unit: null,
+      rawUnit: null
+    }
+
+    const value = this.readU32()
+    const unit = dimension.value & 0xff
+
+    dimension.value = value >> 8
+    dimension.rawUnit = unit
+
+    switch (unit) {
+      case TypedValue.COMPLEX_UNIT_MM:
+        dimension.unit = 'mm'
+        break
+      case TypedValue.COMPLEX_UNIT_PX:
+        dimension.unit = 'px'
+        break
+      case TypedValue.COMPLEX_UNIT_DIP:
+        dimension.unit = 'dp'
+        break
+      case TypedValue.COMPLEX_UNIT_SP:
+        dimension.unit = 'sp'
+        break
+      case TypedValue.COMPLEX_UNIT_PT:
+        dimension.unit = 'pt'
+        break
+      case TypedValue.COMPLEX_UNIT_IN:
+        dimension.unit = 'in'
+        break
+    }
+
+    this.debug && console.groupEnd()
+
+    return dimension
+  }
+
+  readFraction () {
+    this.debug && console.group('readFraction')
+
+    const fraction = {
+      value: null,
+      type: null,
+      rawType: null
+    }
+
+    const value = this.readU32()
+    const type = value & 0xf
+
+    fraction.value = this.convertIntToFloat(value >> 4)
+    fraction.rawType = type
+
+    switch (type) {
+      case TypedValue.COMPLEX_UNIT_FRACTION:
+        fraction.type = '%'
+        break
+      case TypedValue.COMPLEX_UNIT_FRACTION_PARENT:
+        fraction.type = '%p'
+        break
+    }
+
+    this.debug && console.groupEnd()
+
+    return fraction
+  }
+
+  readHex24 () {
+    this.debug && console.group('readHex24')
+    var val = (this.readU32() & 0xffffff).toString(16)
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readHex32 () {
+    this.debug && console.group('readHex32')
+    var val = this.readU32().toString(16)
+    this.debug && console.groupEnd()
+    return val
+  }
+
+  readTypedValue () {
+    this.debug && console.group('readTypedValue')
+
+    const typedValue = {
+      value: null,
+      type: null,
+      rawType: null
+    }
+
+    const start = this.cursor
+
+    let size = this.readU16()
+    /* const zero = */ this.readU8()
+    const dataType = this.readU8()
+
+    // Yes, there has been a real world APK where the size is malformed.
+    if (size === 0) {
+      size = 8
+    }
+
+    typedValue.rawType = dataType
+
+    switch (dataType) {
+      case TypedValue.TYPE_INT_DEC:
+        typedValue.value = this.readS32()
+        typedValue.type = 'int_dec'
+        break
+      case TypedValue.TYPE_INT_HEX:
+        typedValue.value = this.readS32()
+        typedValue.type = 'int_hex'
+        break
+      case TypedValue.TYPE_STRING:
+        var ref = this.readS32()
+        typedValue.value = ref > 0 ? this.strings[ref] : ''
+        typedValue.type = 'string'
+        break
+      case TypedValue.TYPE_REFERENCE:
+        var id = this.readU32()
+        typedValue.value = `resourceId:0x${id.toString(16)}`
+        typedValue.type = 'reference'
+        break
+      case TypedValue.TYPE_INT_BOOLEAN:
+        typedValue.value = this.readS32() !== 0
+        typedValue.type = 'boolean'
+        break
+      case TypedValue.TYPE_NULL:
+        this.readU32()
+        typedValue.value = null
+        typedValue.type = 'null'
+        break
+      case TypedValue.TYPE_INT_COLOR_RGB8:
+        typedValue.value = this.readHex24()
+        typedValue.type = 'rgb8'
+        break
+      case TypedValue.TYPE_INT_COLOR_RGB4:
+        typedValue.value = this.readHex24()
+        typedValue.type = 'rgb4'
+        break
+      case TypedValue.TYPE_INT_COLOR_ARGB8:
+        typedValue.value = this.readHex32()
+        typedValue.type = 'argb8'
+        break
+      case TypedValue.TYPE_INT_COLOR_ARGB4:
+        typedValue.value = this.readHex32()
+        typedValue.type = 'argb4'
+        break
+      case TypedValue.TYPE_DIMENSION:
+        typedValue.value = this.readDimension()
+        typedValue.type = 'dimension'
+        break
+      case TypedValue.TYPE_FRACTION:
+        typedValue.value = this.readFraction()
+        typedValue.type = 'fraction'
+        break
+      default: {
+        const type = dataType.toString(16)
+        console.debug(`Not sure what to do with typed value of type 0x${type}, falling back to reading an uint32.`)
+        typedValue.value = this.readU32()
+        typedValue.type = 'unknown'
+      }
+    }
+
+    // Ensure we consume the whole value
+    const end = start + size
+    if (this.cursor !== end) {
+      const type = dataType.toString(16)
+      const diff = end - this.cursor
+      console.debug(`Cursor is off by ${diff} bytes at ${this.cursor} at supposed end \
+of typed value of type 0x${type}. The typed value started at offset ${start} \
+and is supposed to end at offset ${end}. Ignoring the rest of the value.`)
+      this.cursor = end
+    }
+
+    this.debug && console.groupEnd()
+
+    return typedValue
+  }
+
+  // https://twitter.com/kawasima/status/427730289201139712
+  convertIntToFloat (int) {
+    const buf = new ArrayBuffer(4)
+    ;(new Int32Array(buf))[0] = int
+    return (new Float32Array(buf))[0]
+  }
+
+  readString (encoding) {
+    this.debug && console.group('readString', encoding)
+    switch (encoding) {
+      case 'utf-8':
+        var stringLength = this.readLength8(encoding)
+        this.debug && console.debug('stringLength:', stringLength)
+        var byteLength = this.readLength8(encoding)
+        this.debug && console.debug('byteLength:', byteLength)
+        var value = this.buffer.toString(encoding, this.cursor, (this.cursor += byteLength))
+        this.debug && console.debug('value:', value)
+        this.debug && console.groupEnd()
+        return value
+      case 'ucs2':
+        stringLength = this.readLength16(encoding)
+        this.debug && console.debug('stringLength:', stringLength)
+        byteLength = stringLength * 2
+        this.debug && console.debug('byteLength:', byteLength)
+        value = this.buffer.toString(encoding, this.cursor, (this.cursor += byteLength))
+        this.debug && console.debug('value:', value)
+        this.debug && console.groupEnd()
+        return value
+      default:
+        throw new Error(`Unsupported encoding '${encoding}'`)
+    }
+  }
+
+  readChunkHeader () {
+    this.debug && console.group('readChunkHeader')
+    var header = {
+      startOffset: this.cursor,
+      chunkType: this.readU16(),
+      headerSize: this.readU16(),
+      chunkSize: this.readU32()
+    }
+    this.debug && console.debug('startOffset:', header.startOffset)
+    this.debug && console.debug('chunkType:', header.chunkType)
+    this.debug && console.debug('headerSize:', header.headerSize)
+    this.debug && console.debug('chunkSize:', header.chunkSize)
+    this.debug && console.groupEnd()
+    return header
+  }
+
+  readStringPool (header) {
+    this.debug && console.group('readStringPool')
+
+    header.stringCount = this.readU32()
+    this.debug && console.debug('stringCount:', header.stringCount)
+    header.styleCount = this.readU32()
+    this.debug && console.debug('styleCount:', header.styleCount)
+    header.flags = this.readU32()
+    this.debug && console.debug('flags:', header.flags)
+    header.stringsStart = this.readU32()
+    this.debug && console.debug('stringsStart:', header.stringsStart)
+    header.stylesStart = this.readU32()
+    this.debug && console.debug('stylesStart:', header.stylesStart)
+
+    if (header.chunkType !== ChunkType.STRING_POOL) {
+      throw new Error('Invalid string pool header')
+    }
+
+    const offsets = []
+    for (let i = 0, l = header.stringCount; i < l; ++i) {
+      this.debug && console.debug('offset:', i)
+      offsets.push(this.readU32())
+    }
+
+    const sorted = (header.flags & StringFlags.SORTED) === StringFlags.SORTED
+    this.debug && console.debug('sorted:', sorted)
+    const encoding = (header.flags & StringFlags.UTF8) === StringFlags.UTF8
+      ? 'utf-8'
+      : 'ucs2'
+    this.debug && console.debug('encoding:', encoding)
+
+    const stringsStart = header.startOffset + header.stringsStart
+    this.cursor = stringsStart
+    for (let i = 0, l = header.stringCount; i < l; ++i) {
+      this.debug && console.debug('string:', i)
+      this.debug && console.debug('offset:', offsets[i])
+      this.cursor = stringsStart + offsets[i]
+      this.strings.push(this.readString(encoding))
+    }
+
+    // Skip styles
+    this.cursor = header.startOffset + header.chunkSize
+
+    this.debug && console.groupEnd()
+
+    return null
+  }
+
+  readResourceMap (header) {
+    this.debug && console.group('readResourceMap')
+    const count = Math.floor((header.chunkSize - header.headerSize) / 4)
+    for (let i = 0; i < count; ++i) {
+      this.resources.push(this.readU32())
+    }
+    this.debug && console.groupEnd()
+    return null
+  }
+
+  readXmlNamespaceStart (/* header */) {
+    this.debug && console.group('readXmlNamespaceStart')
+
+    /* const line = */ this.readU32()
+    /* const commentRef = */ this.readU32()
+    /* const prefixRef = */ this.readS32()
+    /* const uriRef = */ this.readS32()
+
+    // We don't currently care about the values, but they could
+    // be accessed like so:
+    //
+    // namespaceURI.prefix = this.strings[prefixRef] // if prefixRef > 0
+    // namespaceURI.uri = this.strings[uriRef] // if uriRef > 0
+
+    this.debug && console.groupEnd()
+
+    return null
+  }
+
+  readXmlNamespaceEnd (/* header */) {
+    this.debug && console.group('readXmlNamespaceEnd')
+
+    /* const line = */ this.readU32()
+    /* const commentRef = */ this.readU32()
+    /* const prefixRef = */ this.readS32()
+    /* const uriRef = */ this.readS32()
+
+    // We don't currently care about the values, but they could
+    // be accessed like so:
+    //
+    // namespaceURI.prefix = this.strings[prefixRef] // if prefixRef > 0
+    // namespaceURI.uri = this.strings[uriRef] // if uriRef > 0
+
+    this.debug && console.groupEnd()
+
+    return null
+  }
+
+  readXmlElementStart (/* header */) {
+    this.debug && console.group('readXmlElementStart')
+
+    const node = {
+      namespaceURI: null,
+      nodeType: NodeType.ELEMENT_NODE,
+      nodeName: null,
+      attributes: [],
+      childNodes: []
+    }
+
+    /* const line = */ this.readU32()
+    /* const commentRef = */ this.readU32()
+    const nsRef = this.readS32()
+    const nameRef = this.readS32()
+
+    if (nsRef > 0) {
+      node.namespaceURI = this.strings[nsRef]
+    }
+
+    node.nodeName = this.strings[nameRef]
+
+    /* const attrStart = */ this.readU16()
+    /* const attrSize = */ this.readU16()
+    const attrCount = this.readU16()
+    /* const idIndex = */ this.readU16()
+    /* const classIndex = */ this.readU16()
+    /* const styleIndex = */ this.readU16()
+
+    for (let i = 0; i < attrCount; ++i) {
+      node.attributes.push(this.readXmlAttribute())
+    }
+
+    if (this.document) {
+      this.parent.childNodes.push(node)
+      this.parent = node
+    } else {
+      this.document = (this.parent = node)
+    }
+
+    this.stack.push(node)
+
+    this.debug && console.groupEnd()
+
+    return node
+  }
+
+  readXmlAttribute () {
+    this.debug && console.group('readXmlAttribute')
+
+    const attr = {
+      namespaceURI: null,
+      nodeType: NodeType.ATTRIBUTE_NODE,
+      nodeName: null,
+      name: null,
+      value: null,
+      typedValue: null
+    }
+
+    const nsRef = this.readS32()
+    const nameRef = this.readS32()
+    const valueRef = this.readS32()
+
+    if (nsRef > 0) {
+      attr.namespaceURI = this.strings[nsRef]
+    }
+
+    attr.nodeName = attr.name = this.strings[nameRef]
+
+    if (valueRef > 0) {
+      // some apk have versionName with special characters
+      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]
+    }
+
+    attr.typedValue = this.readTypedValue()
+
+    this.debug && console.groupEnd()
+
+    return attr
+  }
+
+  readXmlElementEnd (/* header */) {
+    this.debug && console.group('readXmlCData')
+
+    /* const line = */ this.readU32()
+    /* const commentRef = */ this.readU32()
+    /* const nsRef = */ this.readS32()
+    /* const nameRef = */ this.readS32()
+
+    this.stack.pop()
+    this.parent = this.stack[this.stack.length - 1]
+
+    this.debug && console.groupEnd()
+
+    return null
+  }
+
+  readXmlCData (/* header */) {
+    this.debug && console.group('readXmlCData')
+
+    const cdata = {
+      namespaceURI: null,
+      nodeType: NodeType.CDATA_SECTION_NODE,
+      nodeName: '#cdata',
+      data: null,
+      typedValue: null
+    }
+
+    /* const line = */ this.readU32()
+    /* const commentRef = */ this.readU32()
+    const dataRef = this.readS32()
+
+    if (dataRef > 0) {
+      cdata.data = this.strings[dataRef]
+    }
+
+    cdata.typedValue = this.readTypedValue()
+
+    this.parent.childNodes.push(cdata)
+
+    this.debug && console.groupEnd()
+
+    return cdata
+  }
+
+  readNull (header) {
+    this.debug && console.group('readNull')
+    this.cursor += header.chunkSize - header.headerSize
+    this.debug && console.groupEnd()
+    return null
+  }
+
+  parse () {
+    this.debug && console.group('BinaryXmlParser.parse')
+
+    const xmlHeader = this.readChunkHeader()
+    if (xmlHeader.chunkType !== ChunkType.XML) {
+      throw new Error('Invalid XML header')
+    }
+
+    while (this.cursor < this.buffer.length) {
+      this.debug && console.group('chunk')
+      const start = this.cursor
+      const header = this.readChunkHeader()
+      switch (header.chunkType) {
+        case ChunkType.STRING_POOL:
+          this.readStringPool(header)
+          break
+        case ChunkType.XML_RESOURCE_MAP:
+          this.readResourceMap(header)
+          break
+        case ChunkType.XML_START_NAMESPACE:
+          this.readXmlNamespaceStart(header)
+          break
+        case ChunkType.XML_END_NAMESPACE:
+          this.readXmlNamespaceEnd(header)
+          break
+        case ChunkType.XML_START_ELEMENT:
+          this.readXmlElementStart(header)
+          break
+        case ChunkType.XML_END_ELEMENT:
+          this.readXmlElementEnd(header)
+          break
+        case ChunkType.XML_CDATA:
+          this.readXmlCData(header)
+          break
+        case ChunkType.NULL:
+          this.readNull(header)
+          break
+        default:
+          throw new Error(`Unsupported chunk type '${header.chunkType}'`)
+      }
+
+      // Ensure we consume the whole chunk
+      const end = start + header.chunkSize
+      if (this.cursor !== end) {
+        const diff = end - this.cursor
+        const type = header.chunkType.toString(16)
+        console.debug(`Cursor is off by ${diff} bytes at ${this.cursor} at supposed \
+end of chunk of type 0x${type}. The chunk started at offset ${start} and is \
+supposed to end at offset ${end}. Ignoring the rest of the chunk.`)
+        this.cursor = end
+      }
+
+      this.debug && console.groupEnd()
+    }
+
+    this.debug && console.groupEnd()
+
+    return this.document
+  }
+}
+
+module.exports = BinaryXmlParser

src/utils/app-info-parser/xml-parser/manifest.js

@@ -0,0 +1,216 @@
+// From https://github.com/openstf/adbkit-apkreader
+const BinaryXmlParser = require('./binary')
+
+const INTENT_MAIN = 'android.intent.action.MAIN'
+const CATEGORY_LAUNCHER = 'android.intent.category.LAUNCHER'
+
+class ManifestParser {
+  constructor (buffer, options = {}) {
+    this.buffer = buffer
+    this.xmlParser = new BinaryXmlParser(this.buffer, options)
+  }
+
+  collapseAttributes (element) {
+    const collapsed = Object.create(null)
+    for (let attr of Array.from(element.attributes)) {
+      collapsed[attr.name] = attr.typedValue.value
+    }
+    return collapsed
+  }
+
+  parseIntents (element, target) {
+    target.intentFilters = []
+    target.metaData = []
+
+    return element.childNodes.forEach(element => {
+      switch (element.nodeName) {
+        case 'intent-filter': {
+          const intentFilter = this.collapseAttributes(element)
+
+          intentFilter.actions = []
+          intentFilter.categories = []
+          intentFilter.data = []
+
+          element.childNodes.forEach(element => {
+            switch (element.nodeName) {
+              case 'action':
+                intentFilter.actions.push(this.collapseAttributes(element))
+                break
+              case 'category':
+                intentFilter.categories.push(this.collapseAttributes(element))
+                break
+              case 'data':
+                intentFilter.data.push(this.collapseAttributes(element))
+                break
+            }
+          })
+
+          target.intentFilters.push(intentFilter)
+          break
+        }
+        case 'meta-data':
+          target.metaData.push(this.collapseAttributes(element))
+          break
+      }
+    })
+  }
+
+  parseApplication (element) {
+    const app = this.collapseAttributes(element)
+
+    app.activities = []
+    app.activityAliases = []
+    app.launcherActivities = []
+    app.services = []
+    app.receivers = []
+    app.providers = []
+    app.usesLibraries = []
+    app.metaData = []
+
+    element.childNodes.forEach(element => {
+      switch (element.nodeName) {
+        case 'activity': {
+          const activity = this.collapseAttributes(element)
+          this.parseIntents(element, activity)
+          app.activities.push(activity)
+          if (this.isLauncherActivity(activity)) {
+            app.launcherActivities.push(activity)
+          }
+          break
+        }
+        case 'activity-alias': {
+          const activityAlias = this.collapseAttributes(element)
+          this.parseIntents(element, activityAlias)
+          app.activityAliases.push(activityAlias)
+          if (this.isLauncherActivity(activityAlias)) {
+            app.launcherActivities.push(activityAlias)
+          }
+          break
+        }
+        case 'service': {
+          const service = this.collapseAttributes(element)
+          this.parseIntents(element, service)
+          app.services.push(service)
+          break
+        }
+        case 'receiver': {
+          const receiver = this.collapseAttributes(element)
+          this.parseIntents(element, receiver)
+          app.receivers.push(receiver)
+          break
+        }
+        case 'provider': {
+          const provider = this.collapseAttributes(element)
+
+          provider.grantUriPermissions = []
+          provider.metaData = []
+          provider.pathPermissions = []
+
+          element.childNodes.forEach(element => {
+            switch (element.nodeName) {
+              case 'grant-uri-permission':
+                provider.grantUriPermissions.push(this.collapseAttributes(element))
+                break
+              case 'meta-data':
+                provider.metaData.push(this.collapseAttributes(element))
+                break
+              case 'path-permission':
+                provider.pathPermissions.push(this.collapseAttributes(element))
+                break
+            }
+          })
+
+          app.providers.push(provider)
+          break
+        }
+        case 'uses-library':
+          app.usesLibraries.push(this.collapseAttributes(element))
+          break
+        case 'meta-data':
+          app.metaData.push(this.collapseAttributes(element))
+          break
+      }
+    })
+
+    return app
+  }
+
+  isLauncherActivity (activity) {
+    return activity.intentFilters.some(function (filter) {
+      const hasMain = filter.actions.some(action => action.name === INTENT_MAIN)
+      if (!hasMain) {
+        return false
+      }
+      return filter.categories.some(category => category.name === CATEGORY_LAUNCHER)
+    })
+  }
+
+  parse () {
+    const document = this.xmlParser.parse()
+    const manifest = this.collapseAttributes(document)
+
+    manifest.usesPermissions = []
+    manifest.usesPermissionsSDK23 = []
+    manifest.permissions = []
+    manifest.permissionTrees = []
+    manifest.permissionGroups = []
+    manifest.instrumentation = null
+    manifest.usesSdk = null
+    manifest.usesConfiguration = null
+    manifest.usesFeatures = []
+    manifest.supportsScreens = null
+    manifest.compatibleScreens = []
+    manifest.supportsGlTextures = []
+    manifest.application = Object.create(null)
+
+    document.childNodes.forEach(element => {
+      switch (element.nodeName) {
+        case 'uses-permission':
+          manifest.usesPermissions.push(this.collapseAttributes(element))
+          break
+        case 'uses-permission-sdk-23':
+          manifest.usesPermissionsSDK23.push(this.collapseAttributes(element))
+          break
+        case 'permission':
+          manifest.permissions.push(this.collapseAttributes(element))
+          break
+        case 'permission-tree':
+          manifest.permissionTrees.push(this.collapseAttributes(element))
+          break
+        case 'permission-group':
+          manifest.permissionGroups.push(this.collapseAttributes(element))
+          break
+        case 'instrumentation':
+          manifest.instrumentation = this.collapseAttributes(element)
+          break
+        case 'uses-sdk':
+          manifest.usesSdk = this.collapseAttributes(element)
+          break
+        case 'uses-configuration':
+          manifest.usesConfiguration = this.collapseAttributes(element)
+          break
+        case 'uses-feature':
+          manifest.usesFeatures.push(this.collapseAttributes(element))
+          break
+        case 'supports-screens':
+          manifest.supportsScreens = this.collapseAttributes(element)
+          break
+        case 'compatible-screens':
+          element.childNodes.forEach(screen => {
+            return manifest.compatibleScreens.push(this.collapseAttributes(screen))
+          })
+          break
+        case 'supports-gl-texture':
+          manifest.supportsGlTextures.push(this.collapseAttributes(element))
+          break
+        case 'application':
+          manifest.application = this.parseApplication(element)
+          break
+      }
+    })
+
+    return manifest
+  }
+}
+
+module.exports = ManifestParser

src/utils/app-info-parser/zip.js

@@ -0,0 +1,48 @@
+const Unzip = require('isomorphic-unzip')
+const { isBrowser, decodeNullUnicode } = require('./utils')
+
+class Zip {
+  constructor (file) {
+    if (isBrowser()) {
+      if (!(file instanceof window.Blob || typeof file.size !== 'undefined')) {
+        throw new Error('Param error: [file] must be an instance of Blob or File in browser.')
+      }
+      this.file = file
+    } else {
+      if (typeof file !== 'string') {
+        throw new Error('Param error: [file] must be file path in Node.')
+      }
+      this.file = require('path').resolve(file)
+    }
+    this.unzip = new Unzip(this.file)
+  }
+
+  /**
+   * get entries by regexps, the return format is: { <filename>: <Buffer|Blob> }
+   * @param {Array} regexps // regexps for matching files
+   * @param {String} type // return type, can be buffer or blob, default buffer
+   */
+  getEntries (regexps, type = 'buffer') {
+    regexps = regexps.map(regex => decodeNullUnicode(regex))
+    return new Promise((resolve, reject) => {
+      this.unzip.getBuffer(regexps, { type }, (err, buffers) => {
+        err ? reject(err) : resolve(buffers)
+      })
+    })
+  }
+  /**
+   * get entry by regex, return an instance of Buffer or Blob
+   * @param {Regex} regex // regex for matching file
+   * @param {String} type // return type, can be buffer or blob, default buffer
+   */
+  getEntry (regex, type = 'buffer') {
+    regex = decodeNullUnicode(regex)
+    return new Promise((resolve, reject) => {
+      this.unzip.getBuffer([regex], { type }, (err, buffers) => {
+        err ? reject(err) : resolve(buffers[regex])
+      })
+    })
+  }
+}
+
+module.exports = Zip

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');
+import pkg from '../../package.json';
-const AppInfoParser = require('app-info-parser');
+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 {
+  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 +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(
+    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

@@ -1,13 +1,4 @@
-/**
+import { get, post, put, uploadFile } from './api';
- * Created by tdzl2003 on 4/2/16.
- */
-
-const {
-  get,
-  post,
-  put,
-  uploadFile,
-} = require('./api');
 import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';
@@ -17,17 +8,24 @@ async function showVersion(appId, offset) {
   const { data, count } = await get(`/app/${appId}/version/list`);
   console.log(`Offset ${offset}`);
   for (const version of data) {
-    let packageInfo = version.packages.slice(0, 3).map(v=>v.name).join(', ');
+    let packageInfo = version.packages
+      .slice(0, 3)
+      .map((v) => v.name)
+      .join(', ');
     const count = version.packages.length;
     if (count > 3) {
-      packageInfo += `...and ${count-3} more`;
+      packageInfo += `...and ${count - 3} more`;
     }
     if (count === 0) {
       packageInfo = `(no package)`;
     } else {
       packageInfo = `[${packageInfo}]`;
     }
-    console.log(`${version.id}) ${version.hash.slice(0, 8)} ${version.name} ${packageInfo}`);
+    console.log(
+      `${version.id}) ${version.hash.slice(0, 8)} ${
+        version.name
+      } ${packageInfo}`,
+    );
   }
   return data;
 }
@@ -38,10 +36,17 @@ async function listVersions(appId) {
     await showVersion(appId, offset);
     const cmd = await question('page Up/page Down/Begin/Quit(U/D/B/Q)');
     switch (cmd.toLowerCase()) {
-      case 'u': offset = Math.max(0, offset - 10); break;
+      case 'u':
-      case 'd': offset += 10; break;
+        offset = Math.max(0, offset - 10);
-      case 'b': offset = 0; break;
+        break;
-      case 'q': return;
+      case 'd':
+        offset += 10;
+        break;
+      case 'b':
+        offset = 0;
+        break;
+      case 'q':
+        return;
     }
   }
 }
@@ -50,14 +55,21 @@ async function chooseVersion(appId) {
   let offset = 0;
   while (true) {
     const data = await showVersion(appId, offset);
-    const cmd = await question('Enter versionId or page Up/page Down/Begin(U/D/B)');
+    const cmd = await question(
+      'Enter versionId or page Up/page Down/Begin(U/D/B)',
+    );
     switch (cmd.toLowerCase()) {
-      case 'U': offset = Math.max(0, offset - 10); break;
+      case 'U':
-      case 'D': offset += 10; break;
+        offset = Math.max(0, offset - 10);
-      case 'B': offset = 0; break;
+        break;
-      default:
+      case 'D':
-      {
+        offset += 10;
-        const v = data.find(v=>v.id === (cmd | 0));
+        break;
+      case 'B':
+        offset = 0;
+        break;
+      default: {
+        const v = data.find((v) => v.id === (cmd | 0));
         if (v) {
           return v;
         }
@@ -67,47 +79,88 @@ async function chooseVersion(appId) {
 }
 
 export const commands = {
-  publish: async function({args, options}) {
+  publish: async function ({ args, options }) {
     const fn = args[0];
-    const {name, description, metaInfo } = options;
+    const { name, description, metaInfo } = options;
 
     if (!fn || !fn.endsWith('.ppk')) {
-      throw new Error('Usage: pushy publish <ppkFile> --platform ios|android');
+      throw new Error(
+        '使用方法: pushy publish ppk后缀文件 --platform ios|android',
+      );
     }
 
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
+    const platform = checkPlatform(
+      options.platform || (await question('平台(ios/android):')),
+    );
     const { appId } = await getSelectedApp(platform);
 
     const { hash } = await uploadFile(fn);
 
     const { id } = await post(`/app/${appId}/version/create`, {
-      name: name || await question('Enter version name:') || '(未命名)',
+      name: name || (await question('输入版本名称: ')) || '(未命名)',
       hash,
-      description: description || await question('Enter description:'),
+      description: description || (await question('输入版本描述:')),
-      metaInfo: metaInfo || await question('Enter meta info:'),
+      metaInfo: metaInfo || (await question('输入自定义的 meta info:')),
     });
     // TODO local diff
     saveToLocal(fn, `${appId}/ppk/${id}.ppk`);
-    console.log(`Version published: ${id}`);
+    console.log(`已成功上传新热更包（id: ${id}）`);
 
-    const v = await question('Would you like to bind packages to this version?(Y/N)');
+    const v = await question('是否现在将此热更应用到原生包上？(Y/N)');
     if (v.toLowerCase() === 'y') {
-      await this.update({args:[], options:{versionId: id, platform}});
+      await this.update({ args: [], options: { versionId: id, platform } });
     }
   },
-  versions: async function({options}) {
+  versions: async function ({ options }) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
+    const platform = checkPlatform(
+      options.platform || (await question('平台(ios/android):')),
+    );
     const { appId } = await getSelectedApp(platform);
     await listVersions(appId);
   },
-  update: async function({args, options}) {
+  update: async function ({ args, options }) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
+    const platform = checkPlatform(
+      options.platform || (await question('平台(ios/android):')),
+    );
     const { appId } = await getSelectedApp(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;
-    const pkgId = options.packageId || (await choosePackage(appId)).id;
+
+    let pkgId;
+    let pkgVersion = options.packageVersion;
+    if (pkgVersion) {
+      pkgVersion = pkgVersion.trim();
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      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;
+    }
+
+    if (!pkgId) {
+      throw new Error('请提供 packageId 或 packageVersion 参数');
+    }
     await put(`/app/${appId}/package/${pkgId}`, {
       versionId,
     });
-    console.log('Ok.');
+    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('操作成功');
+  },
 };