v1.4.0

cli.json

@@ -123,7 +123,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": "build/output/diff",
+          "default": ".pushy/output/diff",
           "hasValue": true
         }
       }
@@ -132,7 +132,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 +141,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.3.2",
+  "version": "1.4.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

src/bundle.js

@@ -13,20 +13,14 @@ 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;
+} catch (e) {}
+
+try {
+  hdiff = require('node-hdiffpatch').diff;
+} catch (e) {}
 
 async function runReactNativeBundleCommand(
   bundleName,
@@ -38,12 +32,12 @@ async function runReactNativeBundleCommand(
   config,
 ) {
   let gradleConfig = {};
-  // if (platform === 'android') {
-  //   gradleConfig = await checkGradleConfig();
+  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 +133,7 @@ async function checkGradleConfig() {
   return {
     enableHermes,
     crunchPngs,
-  }
+  };
 }
 
 async function compileHermesByteCode(bundleName, outputFolder) {
@@ -482,6 +476,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 +565,41 @@ 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 +611,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);