bugfixes

LICENSE

@@ -0,0 +1,15 @@
+Update Plugin for React Native
+
+Powered by ReactNative.cn
+
+Copyright (c) Hangzhou Erica Network Technology Co., Ltd.
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

android/src/main/java/cn/reactnative/modules/update/DownloadTask.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import com.facebook.stetho.inspector.elements.ShadowDocument;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
@@ -46,7 +47,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
         System.loadLibrary("rnupdate");
     }
 
-    private void removeDirectory(File file) {
+    private void removeDirectory(File file) throws IOException {
         if (UpdateContext.DEBUG) {
             Log.d("RNUpdate", "Removing " + file);
         }
@@ -60,7 +61,9 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
                 removeDirectory(f);
             }
         }
-        file.delete();
+        if (!file.delete()) {
+            throw new IOException("Failed to delete directory");
+        }
     }
 
     private void downloadFile(String url, File writePath) throws IOException {
@@ -389,8 +392,24 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
             Log.d("RNUpdate", "Unzip finished");
         }
     }
-    private void doCleanUp(DownloadTaskParams param) {
-
+    private void doCleanUp(DownloadTaskParams param) throws IOException {
+        if (UpdateContext.DEBUG) {
+            Log.d("RNUpdate", "Start cleaning up");
+        }
+        File root = param.unzipDirectory;
+        for (File sub : root.listFiles()) {
+            if (sub.getName().charAt(0) == '.') {
+                continue;
+            }
+            if (sub.isFile()) {
+                sub.delete();
+            } else {
+                if (sub.getName().equals(param.hash) || sub.getName().equals(param.originHash)) {
+                    continue;
+                }
+                removeDirectory(sub);
+            }
+        }
     }
 
     @Override

android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -178,7 +178,8 @@ public class UpdateContext {
         DownloadTaskParams params = new DownloadTaskParams();
         params.type = DownloadTaskParams.TASK_TYPE_CLEARUP;
         params.hash = sp.getString("currentVersion", null);
-        params.originHash = sp.getString("lastVersion", null);;
+        params.originHash = sp.getString("lastVersion", null);
+        params.unzipDirectory = rootDir;
         params.listener = new DownloadFileListener() {
             @Override
             public void onDownloadCompleted() {

lib/index.js

@@ -60,19 +60,19 @@ export async function downloadUpdate(options) {
     return;
   }
 
-  if (options.diff) {
+  if (options.diffUrl) {
     await HotUpdate.downloadPatchFromPpk({
       updateUrl: options.diffUrl,
       hashName: options.hash,
       originHash: currentVersion,
     });
-  } else if (options.diff) {
+  } else if (options.pdiffUrl) {
     await HotUpdate.downloadPatchFromPackage({
       updateUrl: options.pdiffUrl,
       hashName: options.hash,
     });
   } else {
-    await HotUpdate.downloadPatchFromPackage({
+    await HotUpdate.downloadUpdate({
       updateUrl: options.updateUrl,
       hashName: options.hash,
     });

local-cli/src/index.js

@@ -32,9 +32,6 @@ exports.run = function () {
         console.log('Not loggined.\nRun `pushy login` at your project directory to login.');
         return;
       }
-      console.log(err.message);
-      setTimeout(()=>{
-        throw err;
-      });
+      console.error(err.message);
     });
 };

package.json

@@ -2,7 +2,7 @@
   "name": "react-native-update",
   "version": "1.0.1",
   "description": "react-native hot update",
-  "main": "index.js",
+  "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "prepublish": "node_modules/.bin/babel local-cli/src --out-dir local-cli/lib"