Merge pull request #168 from Microsoft/android-asset-updates

Android Asset Updates 🎉

Author: geof90

CodePush.m

@@ -366,32 +366,34 @@ - (void)savePendingUpdate:(NSString *)packageHash
                         resolver:(RCTPromiseResolveBlock)resolve
                         rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [CodePushPackage downloadPackage:updatePackage
-        // The download is progressing forward
-        progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
-            // Notify the script-side about the progress
-            [self.bridge.eventDispatcher
-                sendDeviceEventWithName:@"CodePushDownloadProgress"
-                body:@{
-                        @"totalBytes":[NSNumber numberWithLongLong:expectedContentLength],
-                        @"receivedBytes":[NSNumber numberWithLongLong:receivedContentLength]
-                      }];
-        }
-        // The download completed
-        doneCallback:^{
-            NSError *err;
-            NSDictionary *newPackage = [CodePushPackage getPackage:updatePackage[PackageHashKey] error:&err];
-            
-            if (err) {
-                return reject(err);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [CodePushPackage downloadPackage:updatePackage
+            // The download is progressing forward
+            progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
+                // Notify the script-side about the progress
+                [self.bridge.eventDispatcher
+                    sendDeviceEventWithName:@"CodePushDownloadProgress"
+                    body:@{
+                            @"totalBytes":[NSNumber numberWithLongLong:expectedContentLength],
+                            @"receivedBytes":[NSNumber numberWithLongLong:receivedContentLength]
+                          }];
             }
-            
-            resolve(newPackage);
-        }
-        // The download failed
-        failCallback:^(NSError *err) {
-            reject(err);
-        }];
+            // The download completed
+            doneCallback:^{
+                NSError *err;
+                NSDictionary *newPackage = [CodePushPackage getPackage:updatePackage[PackageHashKey] error:&err];
+                    
+                if (err) {
+                    return reject(err);
+                }
+                    
+                resolve(newPackage);
+            }
+            // The download failed
+            failCallback:^(NSError *err) {
+                reject(err);
+            }];
+    });
 }
 
 /*

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -425,41 +425,50 @@ protected Void doInBackground(Object... params) {
         }
 
         @ReactMethod
-        public void getNewStatusReport(Promise promise) {
-            if (needToReportRollback) {
-                needToReportRollback = false;
-                JSONArray failedUpdates = getFailedUpdates();
-                if (failedUpdates != null && failedUpdates.length() > 0) {
-                    try {
-                        JSONObject lastFailedPackageJSON = failedUpdates.getJSONObject(failedUpdates.length() - 1);
-                        WritableMap lastFailedPackage = CodePushUtils.convertJsonObjectToWriteable(lastFailedPackageJSON);
-                        WritableMap failedStatusReport = codePushTelemetryManager.getRollbackReport(lastFailedPackage);
-                        if (failedStatusReport != null) {
-                            promise.resolve(failedStatusReport);
-                            return;
+        public void getNewStatusReport(final Promise promise) {
+
+            AsyncTask asyncTask = new AsyncTask() {
+                @Override
+                protected Void doInBackground(Object... params) {
+                    if (needToReportRollback) {
+                        needToReportRollback = false;
+                        JSONArray failedUpdates = getFailedUpdates();
+                        if (failedUpdates != null && failedUpdates.length() > 0) {
+                            try {
+                                JSONObject lastFailedPackageJSON = failedUpdates.getJSONObject(failedUpdates.length() - 1);
+                                WritableMap lastFailedPackage = CodePushUtils.convertJsonObjectToWriteable(lastFailedPackageJSON);
+                                WritableMap failedStatusReport = codePushTelemetryManager.getRollbackReport(lastFailedPackage);
+                                if (failedStatusReport != null) {
+                                    promise.resolve(failedStatusReport);
+                                    return null;
+                                }
+                            } catch (JSONException e) {
+                                throw new CodePushUnknownException("Unable to read failed updates information stored in SharedPreferences.", e);
+                            }
+                        }
+                    } else if (didUpdate) {
+                        WritableMap currentPackage = codePushPackage.getCurrentPackage();
+                        if (currentPackage != null) {
+                            WritableMap newPackageStatusReport = codePushTelemetryManager.getUpdateReport(currentPackage);
+                            if (newPackageStatusReport != null) {
+                                promise.resolve(newPackageStatusReport);
+                                return null;
+                            }
+                        }
+                    } else if (isRunningBinaryVersion) {
+                        WritableMap newAppVersionStatusReport = codePushTelemetryManager.getBinaryUpdateReport(appVersion);
+                        if (newAppVersionStatusReport != null) {
+                            promise.resolve(newAppVersionStatusReport);
+                            return null;
                         }
-                    } catch (JSONException e) {
-                        throw new CodePushUnknownException("Unable to read failed updates information stored in SharedPreferences.", e);
-                    }
-                }
-            } else if (didUpdate) {
-                WritableMap currentPackage = codePushPackage.getCurrentPackage();
-                if (currentPackage != null) {
-                    WritableMap newPackageStatusReport = codePushTelemetryManager.getUpdateReport(currentPackage);
-                    if (newPackageStatusReport != null) {
-                        promise.resolve(newPackageStatusReport);
-                        return;
                     }
+
+                    promise.resolve("");
+                    return null;
                 }
-            } else if (isRunningBinaryVersion) {
-                WritableMap newAppVersionStatusReport = codePushTelemetryManager.getBinaryUpdateReport(appVersion);
-                if (newAppVersionStatusReport != null) {
-                    promise.resolve(newAppVersionStatusReport);
-                    return;
-                }
-            }
+            };
 
-            promise.resolve("");
+            asyncTask.execute();
         }
 
         @ReactMethod

android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java

@@ -0,0 +1,7 @@
+package com.microsoft.codepush.react;
+
+public class CodePushInvalidUpdateException extends RuntimeException {
+    public CodePushInvalidUpdateException() {
+        super("Update is invalid - no files with extension .bundle, .js or .jsbundle were found in the update package.");
+    }
+}

android/app/src/main/java/com/microsoft/codepush/react/CodePushPackage.java

@@ -2,10 +2,14 @@
 
 import android.content.Context;
 
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -14,25 +18,38 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.ByteBuffer;
 
 public class CodePushPackage {
 
     public final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
-    public final String STATUS_FILE = "codepush.json";
-    public final String UPDATE_BUNDLE_FILE_NAME = "app.jsbundle";
     public final String CURRENT_PACKAGE_KEY = "currentPackage";
-    public final String PREVIOUS_PACKAGE_KEY = "previousPackage";
+    public final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
+    public final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
+    public final String DOWNLOAD_FILE_NAME = "download.zip";
+    public final String DOWNLOAD_URL_KEY = "downloadUrl";
     public final String PACKAGE_FILE_NAME = "app.json";
     public final String PACKAGE_HASH_KEY = "packageHash";
-    public final String DOWNLOAD_URL_KEY = "downloadUrl";
-    public final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
+    public final String PREVIOUS_PACKAGE_KEY = "previousPackage";
+    public final String RELATIVE_BUNDLE_PATH_KEY = "bundlePath";
+    public final String STATUS_FILE = "codepush.json";
+    public final String UNZIPPED_FOLDER_NAME = "unzipped";
+    public final String UPDATE_BUNDLE_FILE_NAME = "app.jsbundle";
 
     private String documentsDirectory;
 
     public CodePushPackage(String documentsDirectory) {
         this.documentsDirectory = documentsDirectory;
     }
 
+    public String getDownloadFilePath() {
+        return CodePushUtils.appendPathComponent(getCodePushPath(), DOWNLOAD_FILE_NAME);
+    }
+
+    public String getUnzippedFolderPath() {
+        return CodePushUtils.appendPathComponent(getCodePushPath(), UNZIPPED_FOLDER_NAME);
+    }
+
     public String getDocumentsDirectory() {
         return documentsDirectory;
     }
@@ -52,7 +69,7 @@ public String getStatusFilePath() {
 
     public WritableMap getCurrentPackageInfo() {
         String statusFilePath = getStatusFilePath();
-        if (!CodePushUtils.fileAtPathExists(statusFilePath)) {
+        if (!FileUtils.fileAtPathExists(statusFilePath)) {
             return new WritableNativeMap();
         }
 
@@ -87,7 +104,13 @@ public String getCurrentPackageBundlePath() {
             return null;
         }
 
-        return CodePushUtils.appendPathComponent(packageFolder, UPDATE_BUNDLE_FILE_NAME);
+        WritableMap currentPackage = getCurrentPackage();
+        String relativeBundlePath = CodePushUtils.tryGetString(currentPackage, RELATIVE_BUNDLE_PATH_KEY);
+        if (relativeBundlePath == null) {
+            return CodePushUtils.appendPathComponent(packageFolder, UPDATE_BUNDLE_FILE_NAME);
+        } else {
+            return CodePushUtils.appendPathComponent(packageFolder, relativeBundlePath);
+        }
     }
 
     public String getPackageFolderPath(String packageHash) {
@@ -132,15 +155,18 @@ public WritableMap getPackage(String packageHash) {
     public void downloadPackage(Context applicationContext, ReadableMap updatePackage,
                                 DownloadProgressCallback progressCallback) throws IOException {
 
-        String packageFolderPath = getPackageFolderPath(CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY));
+        String newPackageFolderPath = getPackageFolderPath(CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY));
         String downloadUrlString = CodePushUtils.tryGetString(updatePackage, DOWNLOAD_URL_KEY);
 
         URL downloadUrl = null;
         HttpURLConnection connection = null;
         BufferedInputStream bin = null;
         FileOutputStream fos = null;
         BufferedOutputStream bout = null;
+        File downloadFile = null;
+        boolean isZip = false;
 
+        // Download the file while checking if it is a zip and notifying client of progress.
         try {
             downloadUrl = new URL(downloadUrlString);
             connection = (HttpURLConnection) (downloadUrl.openConnection());
@@ -149,23 +175,34 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
             long receivedBytes = 0;
 
             bin = new BufferedInputStream(connection.getInputStream());
-            File downloadFolder = new File(packageFolderPath);
+            File downloadFolder = new File(getCodePushPath());
             downloadFolder.mkdirs();
-            File downloadFile = new File(downloadFolder, UPDATE_BUNDLE_FILE_NAME);
+            downloadFile = new File(downloadFolder, DOWNLOAD_FILE_NAME);
             fos = new FileOutputStream(downloadFile);
             bout = new BufferedOutputStream(fos, DOWNLOAD_BUFFER_SIZE);
             byte[] data = new byte[DOWNLOAD_BUFFER_SIZE];
+            byte[] header = new byte[4];
+
             int numBytesRead = 0;
             while ((numBytesRead = bin.read(data, 0, DOWNLOAD_BUFFER_SIZE)) >= 0) {
+                if (receivedBytes < 4) {
+                    for (int i = 0; i < numBytesRead; i++) {
+                        int headerOffset = (int)(receivedBytes) + i;
+                        if (headerOffset >= 4) {
+                            break;
+                        }
+
+                        header[headerOffset] = data[i];
+                    }
+                }
+
                 receivedBytes += numBytesRead;
                 bout.write(data, 0, numBytesRead);
                 progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
             }
 
             assert totalBytes == receivedBytes;
-
-            String bundlePath = CodePushUtils.appendPathComponent(packageFolderPath, PACKAGE_FILE_NAME);
-            CodePushUtils.writeReadableMapToFile(updatePackage, bundlePath);
+            isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(downloadUrlString, e);
         } finally {
@@ -178,14 +215,59 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
                 throw new CodePushUnknownException("Error closing IO resources.", e);
             }
         }
+
+        if (isZip) {
+            // Unzip the downloaded file and then delete the zip
+            String unzippedFolderPath = getUnzippedFolderPath();
+            FileUtils.unzipFile(downloadFile, unzippedFolderPath);
+            FileUtils.deleteFileSilently(downloadFile);
+
+            // Merge contents with current update based on the manifest
+            String diffManifestFilePath = CodePushUtils.appendPathComponent(unzippedFolderPath,
+                    DIFF_MANIFEST_FILE_NAME);
+            if (FileUtils.fileAtPathExists(diffManifestFilePath)) {
+                String currentPackageFolderPath = getCurrentPackageFolderPath();
+                CodePushUpdateUtils.copyNecessaryFilesFromCurrentPackage(diffManifestFilePath, currentPackageFolderPath, newPackageFolderPath);
+            }
+
+            FileUtils.copyDirectoryContents(unzippedFolderPath, newPackageFolderPath);
+            FileUtils.deleteFileAtPathSilently(unzippedFolderPath);
+
+            // For zip updates, we need to find the relative path to the jsBundle and save it in the
+            // metadata so that we can find and run it easily the next time.
+            String relativeBundlePath = CodePushUpdateUtils.findJSBundleInUpdateContents(newPackageFolderPath);
+
+            if (relativeBundlePath == null) {
+                throw new CodePushInvalidUpdateException();
+            } else {
+                JSONObject updatePackageJSON = CodePushUtils.convertReadableToJsonObject(updatePackage);
+                try {
+                    updatePackageJSON.put(RELATIVE_BUNDLE_PATH_KEY, relativeBundlePath);
+                } catch (JSONException e) {
+                    throw new CodePushUnknownException("Unable to set key " +
+                            RELATIVE_BUNDLE_PATH_KEY + " to value " + relativeBundlePath +
+                            " in update package.", e);
+                }
+                
+                updatePackage = CodePushUtils.convertJsonObjectToWriteable(updatePackageJSON);
+            }
+        } else {
+            // File is a jsBundle, move it to a folder with the packageHash as its name
+            File updateBundleFile = new File(newPackageFolderPath, UPDATE_BUNDLE_FILE_NAME);
+            downloadFile.renameTo(updateBundleFile);
+        }
+
+        // Save metadata to the folder.
+        String bundlePath = CodePushUtils.appendPathComponent(newPackageFolderPath, PACKAGE_FILE_NAME);
+        CodePushUtils.writeReadableMapToFile(updatePackage, bundlePath);
     }
 
     public void installPackage(ReadableMap updatePackage) throws IOException {
         String packageHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
         WritableMap info = getCurrentPackageInfo();
         String previousPackageHash = getPreviousPackageHash();
         if (previousPackageHash != null && !previousPackageHash.equals(packageHash)) {
-            CodePushUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
+            FileUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
         }
 
         info.putString(PREVIOUS_PACKAGE_KEY, CodePushUtils.tryGetString(info, CURRENT_PACKAGE_KEY));
@@ -196,7 +278,7 @@ public void installPackage(ReadableMap updatePackage) throws IOException {
     public void rollbackPackage() {
         WritableMap info = getCurrentPackageInfo();
         String currentPackageFolderPath = getCurrentPackageFolderPath();
-        CodePushUtils.deleteDirectoryAtPath(currentPackageFolderPath);
+        FileUtils.deleteDirectoryAtPath(currentPackageFolderPath);
         info.putString(CURRENT_PACKAGE_KEY, CodePushUtils.tryGetString(info, PREVIOUS_PACKAGE_KEY));
         info.putNull(PREVIOUS_PACKAGE_KEY);
         updateCurrentPackageInfo(info);
@@ -238,6 +320,6 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl) throws IOExc
     public void clearUpdates() {
         File statusFile = new File(getStatusFilePath());
         statusFile.delete();
-        CodePushUtils.deleteDirectoryAtPath(getCodePushPath());
+        FileUtils.deleteDirectoryAtPath(getCodePushPath());
     }
 }