v1.4.0-beta0

cli.json

@@ -123,7 +123,7 @@
       "description": "Create diff patch",
       "options": {
         "output": {
-          "default": ".pushy/output/diff",
+          "default": "build/output/diff",
           "hasValue": true
         }
       }
@@ -132,7 +132,7 @@
       "description": "Create diff patch from a Android package(.apk)",
       "options": {
         "output": {
-          "default": ".pushy/output/diff-${time}.apk-patch",
+          "default": "build/output/diff-${time}.apk-patch",
           "hasValue": true
         }
       }
@@ -141,34 +141,7 @@
       "description": "Create diff patch from a iOS package(.ipa)",
       "options": {
         "output": {
-          "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",
+          "default": "build/output/diff-${time}.ipa-patch",
           "hasValue": true
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.5.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

@@ -65,14 +65,7 @@ exports.closeSession = function () {
 
 async function query(url, options) {
   const resp = await fetch(url, options);
-  const text = await resp.text();
-  let json;
-  try {
-    json = JSON.parse(text);
-  } catch (e) {
-    throw new Error(`Server error: ${text}`);
-  }
-
+  const json = await resp.json();
   if (resp.status !== 200) {
     throw Object.assign(new Error(json.message || json.error), {
       status: resp.status,
@@ -119,18 +112,14 @@ async function uploadFile(fn, key) {
   let realUrl = url;
 
   if (backupUrl) {
-    if (global.USE_ACC_OSS) {
+    const pingResult = await tcpPing({
+      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});
   }

src/bundle.js

@@ -16,9 +16,6 @@ const os = require('os');
 var bsdiff, hdiff, diff;
 try {
   bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
-
-try {
   hdiff = require('node-hdiffpatch').diff;
 } catch (e) {}
 
@@ -32,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 = [];
 
@@ -119,6 +116,7 @@ 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') &&
@@ -128,7 +126,6 @@ async function checkGradleConfig() {
         break;
       }
     }
-    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
   } catch (e) {}
   return {
     enableHermes,
@@ -476,7 +473,7 @@ function enumZipEntries(zipFn, callback) {
   });
 }
 
-function diffArgsCheck(args, options, diffFn) {
+function diffArgsCheck({ args, options, diffFn }) {
   const [origin, next] = args;
 
   if (!origin || !next) {
@@ -565,25 +562,29 @@ export const commands = {
   },
 
   async diff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
+    const { origin, next, realOutput } = diffArgsCheck({ args, options, diff });
 
     await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
     console.log(`${realOutput} generated.`);
   },
 
   async hdiff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
+    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, realOutput } = diffArgsCheck(
+    const { origin, next, realOutput } = diffArgsCheck({
       args,
       options,
-      'diffFromApk',
-    );
+      diffFromApk,
+    });
 
     await diffFromPackage(
       origin,
@@ -595,11 +596,11 @@ export const commands = {
   },
 
   async hdiffFromApk({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
+    const { origin, next, realOutput } = diffArgsCheck({
       args,
       options,
-      'hdiffFromApk',
-    );
+      hdiffFromApk,
+    });
 
     await diffFromPackage(
       origin,
@@ -611,11 +612,11 @@ export const commands = {
   },
 
   async diffFromIpa({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
+    const { origin, next, realOutput } = diffArgsCheck({
       args,
       options,
-      'diffFromIpa',
-    );
+      diffFromIpa,
+    });
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
@@ -626,11 +627,11 @@ export const commands = {
   },
 
   async hdiffFromIpa({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
+    const { origin, next, realOutput } = diffArgsCheck({
       args,
       options,
-      'hdiffFromIpa',
-    );
+      hdiffFromIpa,
+    });
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);

src/index.js

@@ -36,7 +36,6 @@ 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))