v1.18.0

# Conflicts:
#	package.json

.gitignore

@@ -104,3 +104,4 @@ dist
 .tern-port
 
 lib/
+.DS_Store

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
         }
       }
     },
@@ -106,14 +133,16 @@
           "hasValue": true
         },
         "intermediaDir": {
-          "default": "build/intermedia/${platform}",
+          "default": ".pushy/intermedia/${platform}",
           "hasValue": true
         },
         "output": {
-          "default": "build/output/${platform}.${time}.ppk",
+          "default": ".pushy/output/${platform}.${time}.ppk",
           "hasValue": true
         },
-        "verbose": {}
+        "sourcemap": {
+          "default": false
+        }
       }
     },
     "release": {
@@ -123,7 +152,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": "build/output/diff",
+          "default": ".pushy/output/diff",
           "hasValue": true
         }
       }
@@ -132,7 +161,7 @@
       "description": "Create diff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": "build/output/diff-${time}.apk-patch",
+          "default": ".pushy/output/diff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -141,7 +170,34 @@
       "description": "Create diff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "default": "build/output/diff-${time}.ipa-patch",
+          "default": ".pushy/output/diff-${time}.ipa-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiff": {
+      "description": "Create hdiff patch",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromApk": {
+      "description": "Create hdiff patch from a Android package(.apk)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.apk-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromIpa": {
+      "description": "Create hdiff patch from a iOS package(.ipa)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.ipa-patch",
           "hasValue": true
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.1.18",
+  "version": "1.18.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -32,18 +32,19 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "app-info-parser": "^0.3.9",
+    "app-info-parser": "^1.0.0",
     "cli-arguments": "^0.2.1",
     "filesize-parser": "^1.5.0",
     "fs-extra": "8",
-    "gradle-to-js": "^2.0.0",
+    "gradle-to-js": "^2.0.1",
-    "node-fetch": "^2.6.0",
+    "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.0",
+    "update-notifier": "^4.1.1",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
   },

src/api.js

@@ -1,9 +1,6 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
 const fetch = require('node-fetch');
-let host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn/api';
+const defaultEndpoint = 'https://update.reactnative.cn/api';
+let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const fs = require('fs');
 import request from 'request';
 import ProgressBar from 'progress';
@@ -59,12 +56,19 @@ exports.closeSession = function() {
     savedSession = undefined;
   }
   session = undefined;
-  host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn/api';
+  host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 
 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,
@@ -106,11 +110,14 @@ exports.doDelete = queryWithBody('DELETE');
 
 async function uploadFile(fn, key) {
   const { url, backupUrl, formData, maxSize } = await exports.post('/upload', {
-    ext: path.extname(fn)
+    ext: path.extname(fn),
   });
   let realUrl = url;
 
   if (backupUrl) {
+    if (global.USE_ACC_OSS) {
+      realUrl = backupUrl;
+    } else {
       const pingResult = await tcpPing({
         address: url.replace('https://', ''),
         attempts: 4,
@@ -120,15 +127,20 @@ async function uploadFile(fn, key) {
       if (isNaN(pingResult.avg) || pingResult.avg > 150) {
         realUrl = backupUrl;
       }
+    }
     // console.log({realUrl});
   }
 
   const fileSize = fs.statSync(fn).size;
   if (maxSize && fileSize > filesizeParser(maxSize)) {
-    throw new Error(`此文件大小超出上限${maxSize}。您可以考虑升级付费业务以提升此限制。详情请访问：${pricingPageUrl}`)
+    throw new Error(
+      `此文件大小${(fileSize / 1048576).toFixed(
+        1,
+      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
+    );
   }
 
-  const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
+  const bar = new ProgressBar('  上传中 [:bar] :percent :etas', {
     complete: '=',
     incomplete: ' ',
     total: fileSize,
@@ -147,10 +159,6 @@ async function uploadFile(fn, key) {
       realUrl,
       {
         formData,
-        headers: {
-          'User-Agent': userAgent,
-          'X-AccessToken': session ? session.token : '',
-        },
       },
       (err, resp, body) => {
         if (err) {
@@ -161,13 +169,7 @@ 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 },
-        );
       },
     );
   });

src/app.js

@@ -1,15 +1,8 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
 import { question } from './utils';
 import fs from 'fs';
+const Table = require('tty-table');
 
-const {
+const { post, get, doDelete } = require('./api');
-  post,
-  get,
-  doDelete,
-} = require('./api');
 
 const validPlatforms = {
   ios: 1,
@@ -18,34 +11,48 @@ const validPlatforms = {
 
 export function checkPlatform(platform) {
   if (!validPlatforms[platform]) {
-    throw new Error(`Invalid platform '${platform}'`);
+    throw new Error(`无法识别的平台 '${platform}'`);
   }
-  return platform
+  return platform;
 }
 
 export function getSelectedApp(platform) {
   checkPlatform(platform);
 
   if (!fs.existsSync('update.json')) {
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+    throw new Error(
+      `App not selected. run 'pushy selectApp --platform ${platform}' first!`,
+    );
   }
   const updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
   if (!updateInfo[platform]) {
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
+    throw new Error(
+      `App not selected. run 'pushy selectApp --platform ${platform}' first!`,
+    );
   }
   return updateInfo[platform];
 }
 
 export async function listApp(platform) {
   const { data } = await get('/app/list');
-  const list = platform?data.filter(v=>v.platform===platform):data;
+  const list = platform ? data.filter((v) => v.platform === platform) : data;
+
+  const header = [
+    { value: '应用 id' },
+    { value: '应用名称' },
+    { value: '平台' },
+  ];
+  const rows = [];
   for (const app of list) {
-    console.log(`${app.id}) ${app.name}(${app.platform})`);
+    rows.push([app.id, app.name, app.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;
 }
@@ -54,8 +61,8 @@ 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));
+    const app = list.find((v) => v.id === (id | 0));
     if (app) {
       return app;
     }
@@ -64,11 +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):'));
+    const platform = checkPlatform(
+      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 },
@@ -78,25 +87,29 @@ 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;
     listApp(platform);
   },
   selectApp: async function ({ args, options }) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
+    const platform = checkPlatform(
-    const id = args[0] || (await chooseApp(platform)).id;
+      options.platform || (await question('平台(ios/android):')),
+    );
+    const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
 
     let updateInfo = {};
     if (fs.existsSync('update.json')) {
       try {
         updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
       } catch (e) {
-        console.error('Failed to parse file `update.json`. Try to remove it manually.');
+        console.error(
+          'Failed to parse file `update.json`. Try to remove it manually.',
+        );
         throw e;
       }
     }
@@ -105,6 +118,10 @@ export const commands = {
       appId: id,
       appKey,
     };
-    fs.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
+    fs.writeFileSync(
+      'update.json',
+      JSON.stringify(updateInfo, null, 4),
+      'utf8',
+    );
   },
-}
+};

src/bundle.js

@@ -1,7 +1,3 @@
-/**
- * Created by tdzl2003 on 2/22/16.
- */
-
 const path = require('path');
 import { getRNVersion, translateOptions } from './utils';
 import * as fs from 'fs-extra';
@@ -12,21 +8,16 @@ import { checkPlatform } from './app';
 const { spawn, spawnSync } = require('child_process');
 const g2js = require('gradle-to-js/lib/parser');
 const os = require('os');
+const properties = require('properties');
 
-var diff;
+var bsdiff, hdiff, diff;
 try {
-  var bsdiff = require('node-bsdiff');
+  bsdiff = require('node-bsdiff').diff;
-  diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff;
+} catch (e) {}
-} catch (e) {
+
-  diff = function () {
+try {
-    console.warn(
+  hdiff = require('node-hdiffpatch').diff;
-      'This function needs "node-bsdiff". Please run "npm i node-bsdiff" from your project directory first!',
+} catch (e) {}
-    );
-    throw new Error(
-      'This function needs module "node-bsdiff". Please install it first.',
-    );
-  };
-}
 
 async function runReactNativeBundleCommand(
   bundleName,
@@ -37,6 +28,14 @@ async function runReactNativeBundleCommand(
   sourcemapOutput,
   config,
 ) {
+  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')
+    // }
+  }
+
   let reactNativeBundleArgs = [];
 
   let envArgs = process.env.PUSHY_ENV_ARGS;
@@ -50,9 +49,21 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
+  let cliPath = require.resolve('react-native/local-cli/cli.js', {
+    paths: [process.cwd()],
+  });
+  try {
+    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',
@@ -96,8 +107,39 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
+        let hermesEnabled = false;
+
         if (platform === 'android') {
-          await compileHermesByteCode(bundleName, outputFolder);
+          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);
       }
@@ -111,8 +153,9 @@ function getHermesOSBin() {
   if (os.platform() === 'linux') return 'linux64-bin';
 }
 
-async function compileHermesByteCode(bundleName, outputFolder) {
+async function checkGradleConfig() {
   let enableHermes = false;
+  let crunchPngs;
   try {
     const gradleConfig = await g2js.parseFile('android/app/build.gradle');
     const projectConfig = gradleConfig['project.ext.react'];
@@ -125,30 +168,58 @@ async function compileHermesByteCode(bundleName, outputFolder) {
         break;
       }
     }
+    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
   } catch (e) {}
-  if (enableHermes) {
+  return {
+    enableHermes,
+    crunchPngs,
+  };
+}
+
+async function compileHermesByteCode(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+) {
   console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
+  // >= rn 0.69
+  const rnDir = path.dirname(
+    require.resolve('react-native', {
+      paths: [process.cwd()],
+    }),
+  );
+  const hermesCommand = path.join(
+    rnDir,
+    `/sdks/hermesc/${getHermesOSBin()}/hermesc`,
+  );
+
+  // < rn 0.69
+  if (!fs.existsSync(hermesCommand)) {
     const hermesPackage = fs.existsSync('node_modules/hermes-engine')
       ? 'node_modules/hermes-engine' // 0.2+
       : 'node_modules/hermesvm'; // < 0.2
     const hermesPath = `${hermesPackage}/${getHermesOSBin()}`;
 
-    const hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
+    hermesCommand = fs.existsSync(`${hermesPath}/hermesc`)
       ? `${hermesPath}/hermesc` // 0.5+
       : `${hermesPath}/hermes`; // < 0.5
-
+  }
-    spawnSync(
+  const args = [
-      path.join.apply(null, hermesCommand.split('/')),
-      [
     '-emit-binary',
     '-out',
     path.join(outputFolder, bundleName),
     path.join(outputFolder, bundleName),
     '-O',
-      ],
+  ];
-      { stdio: 'ignore' },
+  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) {
@@ -188,7 +259,7 @@ async function pack(dir, output) {
       });
     zipfile.end();
   });
-  console.log('Bundled saved to: ' + output);
+  console.log('ppk热更包已生成并保存到: ' + output);
 }
 
 function readEntire(entry, zipFile) {
@@ -467,25 +538,55 @@ function enumZipEntries(zipFn, callback) {
   });
 }
 
+function diffArgsCheck(args, options, diffFn) {
+  const [origin, next] = args;
+
+  if (!origin || !next) {
+    console.error(`Usage: pushy ${diffFn} <origin> <next>`);
+    process.exit(1);
+  }
+
+  if (diffFn.startsWith('hdiff')) {
+    if (!hdiff) {
+      console.error(
+        `This function needs "node-hdiffpatch". 
+        Please run "npm i node-hdiffpatch" to install`,
+      );
+      process.exit(1);
+    }
+    diff = hdiff;
+  } else {
+    if (!bsdiff) {
+      console.error(
+        `This function needs "node-bsdiff". 
+        Please run "npm i node-bsdiff" to install`,
+      );
+      process.exit(1);
+    }
+    diff = bsdiff;
+  }
+  const { output } = options;
+
+  return {
+    origin,
+    next,
+    realOutput: output.replace(/\$\{time\}/g, '' + Date.now()),
+  };
+}
+
 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,
-      intermediaDir,
-      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());
 
@@ -504,11 +605,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],
@@ -520,30 +622,41 @@ export const commands = {
   },
 
   async diff({ args, options }) {
-    const [origin, next] = args;
+    const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
-    const { output } = options;
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
+    console.log(`${realOutput} generated.`);
+  },
 
-    if (!origin || !next) {
+  async hdiff({ args, options }) {
-      console.error('pushy diff <origin> <next>');
+    const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
-      process.exit(1);
-    }
 
     await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
     console.log(`${realOutput} generated.`);
   },
 
   async diffFromApk({ args, options }) {
-    const [origin, next] = args;
+    const { origin, next, realOutput } = diffArgsCheck(
-    const { output } = options;
+      args,
+      options,
+      'diffFromApk',
+    );
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPackage(
+      origin,
+      next,
+      realOutput,
+      'assets/index.android.bundle',
+    );
+    console.log(`${realOutput} generated.`);
+  },
 
-    if (!origin || !next) {
+  async hdiffFromApk({ args, options }) {
-      console.error('pushy diffFromApk <origin> <next>');
+    const { origin, next, realOutput } = diffArgsCheck(
-      process.exit(1);
+      args,
-    }
+      options,
+      'hdiffFromApk',
+    );
 
     await diffFromPackage(
       origin,
@@ -555,15 +668,26 @@ export const commands = {
   },
 
   async diffFromIpa({ args, options }) {
-    const [origin, next] = args;
+    const { origin, next, realOutput } = diffArgsCheck(
-    const { output } = options;
+      args,
+      options,
+      'diffFromIpa',
+    );
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
+      const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
+      return m && m[1];
+    });
 
-    if (!origin || !next) {
+    console.log(`${realOutput} generated.`);
-      console.error('pushy diffFromIpa <origin> <next>');
+  },
-      process.exit(1);
+
-    }
+  async hdiffFromIpa({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'hdiffFromIpa',
+    );
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);

src/index.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
-/**
- * Created by tdzl2003 on 2/13/16.
- */
 
 const { loadSession } = require('./api');
 const updateNotifier = require('update-notifier');
@@ -14,8 +11,10 @@ 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);
 }
 
@@ -36,17 +35,18 @@ function run() {
 
   const argv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
+  global.USE_ACC_OSS = argv.options['acc'];
 
   loadSession()
     .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();

src/package.js

@@ -13,24 +13,29 @@ const Table = require('tty-table');
 export async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
 
-  const header = [{ value: 'Package Id' }, { value: 'Version' }];
+  const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
   const rows = [];
   for (const pkg of data) {
     const { version } = pkg;
     let versionInfo = '';
     if (version) {
-      versionInfo = ` - ${version.id} ${version.hash.slice(0, 8)} ${
+      versionInfo = `, 已绑定：${version.name} (${version.id})`;
-        version.name
-      }`;
     } else {
-      versionInfo = ' (newest)';
+      // versionInfo = ' (newest)';
     }
-
+    let output = pkg.name;
-    rows.push([pkg.id, `${pkg.name}(${pkg.status})${versionInfo}`]);
+    if (pkg.status === 'paused') {
+      output += '(已暂停)';
+    }
+    if (pkg.status === 'expired') {
+      output += '(已过期)';
+    }
+    output += versionInfo;
+    rows.push([pkg.id, output]);
   }
 
   console.log(Table(header, rows).render());
-  console.log(`\nTotal ${data.length} package(s).`);
+  console.log(`\n共 ${data.length} 个包`);
   return data;
 }
 
@@ -38,7 +43,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,10 +55,27 @@ 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,
+      buildTime,
+      appId: appIdInPkg,
+      appKey: appKeyInPkg,
+    } = await getIpaInfo(fn);
+    const { appId, appKey } = await getSelectedApp('ios');
+
+    if (appIdInPkg && appIdInPkg != appId) {
+      throw new Error(
+        `appId不匹配！当前ipa: ${appIdInPkg}, 当前update.json: ${appId}`,
+      );
+    }
+
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+      throw new Error(
+        `appKey不匹配！当前ipa: ${appKeyInPkg}, 当前update.json: ${appKey}`,
+      );
     }
-    const { versionName, buildTime } = await getIpaInfo(fn);
-    const { appId } = await getSelectedApp('ios');
 
     const { hash } = await uploadFile(fn);
 
@@ -63,15 +85,32 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
-    console.log(`Ipa uploaded: ${id}`);
+    console.log(`已成功上传ipa原生包（id: ${id}）`);
   },
   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,
+      buildTime,
+      appId: appIdInPkg,
+      appKey: appKeyInPkg,
+    } = await getApkInfo(fn);
+    const { appId, appKey } = await getSelectedApp('android');
+
+    if (appIdInPkg && appIdInPkg != appId) {
+      throw new Error(
+        `appId不匹配！当前apk: ${appIdInPkg}, 当前update.json: ${appId}`,
+      );
+    }
+
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+      throw new Error(
+        `appKey不匹配！当前apk: ${appKeyInPkg}, 当前update.json: ${appKey}`,
+      );
     }
-    const { versionName, buildTime } = await getApkInfo(fn);
-    const { appId } = await getSelectedApp('android');
 
     const { hash } = await uploadFile(fn);
 
@@ -81,25 +120,25 @@ export const commands = {
       buildTime,
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
-    console.log(`Apk uploaded: ${id}`);
+    console.log(`已成功上传apk原生包（id: ${id}）`);
   },
   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

@@ -26,11 +26,11 @@ exports.commands = {
     });
     replaceSession({token});
     await saveSession();
-    console.log(`Welcome, ${info.name}.`);
+    console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
   logout: async function (){
     await closeSession();
-    console.log('Logged out.');
+    console.log('已退出登录');
   },
   me: async function (){
     const me = await get('/user/me');

src/utils/index.js

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

src/versions.js

@@ -1,13 +1,4 @@
-/**
+const { get, post, put, uploadFile } = require('./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,7 +8,10 @@ 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`;
@@ -27,7 +21,11 @@ async function showVersion(appId, offset) {
     } 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;
         }
@@ -72,42 +84,83 @@ export const commands = {
     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 } });
     }
   },
   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 }) {
-    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('操作成功');
+  },
 };