v1.4.0-beta0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.3.0",
+  "version": "1.4.0-beta0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

src/api.js

@@ -3,7 +3,7 @@
  */
 
 const fetch = require('node-fetch');
-const defaultEndpoint = 'http://u.reactnative.cn/api'
+const defaultEndpoint = 'http://u.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const fs = require('fs');
 import request from 'request';
@@ -22,7 +22,7 @@ let savedSession = undefined;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
-exports.loadSession = async function() {
+exports.loadSession = async function () {
   if (fs.existsSync('.update')) {
     try {
       exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
@@ -36,15 +36,15 @@ exports.loadSession = async function() {
   }
 };
 
-exports.getSession = function() {
+exports.getSession = function () {
   return session;
 };
 
-exports.replaceSession = function(newSession) {
+exports.replaceSession = function (newSession) {
   session = newSession;
 };
 
-exports.saveSession = function() {
+exports.saveSession = function () {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -54,7 +54,7 @@ exports.saveSession = function() {
   }
 };
 
-exports.closeSession = function() {
+exports.closeSession = function () {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
@@ -75,7 +75,7 @@ async function query(url, options) {
 }
 
 function queryWithoutBody(method) {
-  return function(api) {
+  return function (api) {
     return query(host + api, {
       method,
       headers: {
@@ -87,7 +87,7 @@ function queryWithoutBody(method) {
 }
 
 function queryWithBody(method) {
-  return function(api, body) {
+  return function (api, body) {
     return query(host + api, {
       method,
       headers: {
@@ -107,7 +107,7 @@ 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;
 
@@ -126,7 +126,11 @@ async function uploadFile(fn, key) {
 
   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', {
@@ -141,7 +145,7 @@ async function uploadFile(fn, key) {
     }
     formData.file = fs.createReadStream(fn);
 
-    formData.file.on('data', function(data) {
+    formData.file.on('data', function (data) {
       bar.tick(data.length);
     });
     request.post(

src/bundle.js

@@ -13,20 +13,11 @@ const { spawn, spawnSync } = require('child_process');
 const g2js = require('gradle-to-js/lib/parser');
 const os = require('os');
 
-var diff;
+var bsdiff, hdiff, diff;
 try {
-  var bsdiff = require('node-bsdiff');
-  diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff;
-} catch (e) {
-  diff = function () {
-    console.warn(
-      'This function needs "node-bsdiff". Please run "npm i node-bsdiff" from your project directory first!',
-    );
-    throw new Error(
-      'This function needs module "node-bsdiff". Please install it first.',
-    );
-  };
-}
+  bsdiff = require('node-bsdiff').diff;
+  hdiff = require('node-hdiffpatch').diff;
+} catch (e) {}
 
 async function runReactNativeBundleCommand(
   bundleName,
@@ -38,12 +29,12 @@ async function runReactNativeBundleCommand(
   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')
-    }
-  }
+  // 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 = [];
 
@@ -139,7 +130,7 @@ async function checkGradleConfig() {
   return {
     enableHermes,
     crunchPngs,
-  }
+  };
 }
 
 async function compileHermesByteCode(bundleName, outputFolder) {
@@ -482,6 +473,42 @@ 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(
@@ -535,30 +562,45 @@ export const commands = {
   },
 
   async diff({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck({ args, options, diff });
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
+    console.log(`${realOutput} generated.`);
+  },
 
-    if (!origin || !next) {
-      console.error('pushy diff <origin> <next>');
-      process.exit(1);
-    }
+  async hdiff({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck({
+      args,
+      options,
+      hdiff,
+    });
 
     await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
     console.log(`${realOutput} generated.`);
   },
 
   async diffFromApk({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck({
+      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) {
-      console.error('pushy diffFromApk <origin> <next>');
-      process.exit(1);
-    }
+  async hdiffFromApk({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck({
+      args,
+      options,
+      hdiffFromApk,
+    });
 
     await diffFromPackage(
       origin,
@@ -570,15 +612,26 @@ export const commands = {
   },
 
   async diffFromIpa({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
+    const { origin, next, realOutput } = diffArgsCheck({
+      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.error('pushy diffFromIpa <origin> <next>');
-      process.exit(1);
-    }
+    console.log(`${realOutput} generated.`);
+  },
+
+  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);