v5.3.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 ### 最近更新
 
+## 5.3.0 (2019-09-19)
+
+1. 替换 apk reader 以避免某些环境读取 apk 版本号报错的问题
+
 ## 5.2.9 (2019-09-18)
 
 1. 添加 proguard 混淆规则以解决开启混淆后闪退的问题

local-cli/src/utils/index.js

@@ -4,7 +4,7 @@
 
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import ApkReader from 'node-apk-parser';
+const ApkReader = require('adbkit-apkreader');
 import ipaReader from './ipaReader';
 
 var read = require('read');
@@ -18,10 +18,10 @@ export function question(query, password) {
       {
         prompt: query,
         silent: password,
-        replace: password ? '*' : undefined
+        replace: password ? '*' : undefined,
       },
-      (err, result) => (err ? reject(err) : resolve(result))
-    )
+      (err, result) => (err ? reject(err) : resolve(result)),
+    ),
   );
 }
 
@@ -48,14 +48,14 @@ export function getRNVersion() {
   return {
     version,
     major: match[1] | 0,
-    minor: match[2] | 0
+    minor: match[2] | 0,
   };
 }
 
-export function getApkVersion(fn) {
-  const reader = ApkReader.readFile(fn);
-  const manifest = reader.readManifestSync();
-  return Promise.resolve(manifest.versionName);
+export async function getApkVersion(fn) {
+  const reader = await ApkReader.open(fn);
+  const manifest = await reader.readManifest();
+  return manifest.versionName;
 }
 
 export function getIPAVersion(fn) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "5.2.9",
+  "version": "5.3.0",
   "description": "react-native hot update",
   "main": "lib/index.js",
   "scripts": {
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
+    "adbkit-apkreader": "^3.1.2",
     "cli-arguments": "^0.2.1",
     "decompress-zip": "^0.3.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.2",
     "gradle-to-js": "^2.0.0",
     "isomorphic-fetch": "^2.2.1",
-    "node-apk-parser": "^0.2.3",
     "progress": "^1.1.8",
     "read": "^1.0.7",
     "request": "^2.69.0",

yarn.lock

@@ -14,9 +14,14 @@ acorn@^3.1.0:
   version "3.3.0"
   resolved "http://registry.npm.taobao.org/acorn/download/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-adm-zip@~0.4.4:
-  version "0.4.7"
-  resolved "http://registry.npm.taobao.org/adm-zip/download/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
+adbkit-apkreader@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/adbkit-apkreader/-/adbkit-apkreader-3.1.2.tgz#86a0c676870aba2f16d0f0948d2c94af58417bd5"
+  integrity sha512-xFlRkjEuJ8+hEo6BfUWXyaxDm54RtLCBBC4TzYc1S0SQqrE7r31QWfYaUlJH+eJiPGTUzUCd+SUs1cJaCkATnQ==
+  dependencies:
+    bluebird "^3.4.7"
+    debug "~0.7.4"
+    yauzl "^2.7.0"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -562,6 +567,11 @@ bluebird@^2.9.33:
   version "2.11.0"
   resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
+bluebird@^3.4.7:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+
 boom@2.x.x:
   version "2.10.1"
   resolved "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -1002,6 +1012,13 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  dependencies:
+    pend "~1.2.0"
+
 filename-regex@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
@@ -1751,13 +1768,6 @@ nice-try@^1.0.4:
   resolved "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=
 
-node-apk-parser@^0.2.3:
-  version "0.2.3"
-  resolved "http://registry.npm.taobao.org/node-apk-parser/download/node-apk-parser-0.2.3.tgz#385a141a6da38de562e5d9f08961bf9724d35fc4"
-  dependencies:
-    adm-zip "~0.4.4"
-    debug "~0.7.4"
-
 node-fetch@^1.0.1:
   version "1.6.3"
   resolved "http://registry.npm.taobao.org/node-fetch/download/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -2625,6 +2635,14 @@ yauzl@2.4.1:
   dependencies:
     fd-slicer "~1.0.1"
 
+yauzl@^2.7.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
 yazl@2.3.0:
   version "2.3.0"
   resolved "http://registry.npm.taobao.org/yazl/download/yazl-2.3.0.tgz#63a6f327b00d09ecdca347af4f3d422fcbca3557"