@revopush/react-native-code-push 1.5.0 → 2.5.0-rc.0

package/android/src/main/java/com/microsoft/codepush/react/CodePushUtils.java

@@ -15,11 +15,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.Iterator;
 
 public class CodePushUtils {
@@ -30,7 +27,7 @@ public class CodePushUtils {
 
     public static WritableArray convertJsonArrayToWritable(JSONArray jsonArr) {
         WritableArray arr = Arguments.createArray();
-        for (int i=0; i<jsonArr.length(); i++) {
+        for (int i = 0; i < jsonArr.length(); i++) {
             Object obj = null;
             try {
                 obj = jsonArr.get(i);
@@ -43,18 +40,12 @@ public class CodePushUtils {
                 arr.pushMap(convertJsonObjectToWritable((JSONObject) obj));
             else if (obj instanceof JSONArray)
                 arr.pushArray(convertJsonArrayToWritable((JSONArray) obj));
-            else if (obj instanceof String)
-                arr.pushString((String) obj);
-            else if (obj instanceof Double)
-                arr.pushDouble((Double) obj);
-            else if (obj instanceof Integer)
-                arr.pushInt((Integer) obj);
-            else if (obj instanceof Boolean)
-                arr.pushBoolean((Boolean) obj);
-            else if (obj == null)
-                arr.pushNull();
-            else
-                throw new CodePushUnknownException("Unrecognized object: " + obj);
+            else if (obj instanceof String) arr.pushString((String) obj);
+            else if (obj instanceof Double) arr.pushDouble((Double) obj);
+            else if (obj instanceof Integer) arr.pushInt((Integer) obj);
+            else if (obj instanceof Boolean) arr.pushBoolean((Boolean) obj);
+            else if (obj == null) arr.pushNull();
+            else throw new CodePushUnknownException("Unrecognized object: " + obj);
         }
 
         return arr;
@@ -63,7 +54,7 @@ public class CodePushUtils {
     public static WritableMap convertJsonObjectToWritable(JSONObject jsonObj) {
         WritableMap map = Arguments.createMap();
         Iterator<String> it = jsonObj.keys();
-        while(it.hasNext()){
+        while (it.hasNext()) {
             String key = it.next();
             Object obj = null;
             try {
@@ -79,20 +70,13 @@ public class CodePushUtils {
                 map.putMap(key, convertJsonObjectToWritable((JSONObject) obj));
             else if (obj instanceof JSONArray)
                 map.putArray(key, convertJsonArrayToWritable((JSONArray) obj));
-            else if (obj instanceof String)
-                map.putString(key, (String) obj);
-            else if (obj instanceof Double)
-                map.putDouble(key, (Double) obj);
-            else if (obj instanceof Long)
-                map.putDouble(key, ((Long) obj).doubleValue());
-            else if (obj instanceof Integer)
-                map.putInt(key, (Integer) obj);
-            else if (obj instanceof Boolean)
-                map.putBoolean(key, (Boolean) obj);
-            else if (obj == null)
-                map.putNull(key);
-            else
-                throw new CodePushUnknownException("Unrecognized object: " + obj);
+            else if (obj instanceof String) map.putString(key, (String) obj);
+            else if (obj instanceof Double) map.putDouble(key, (Double) obj);
+            else if (obj instanceof Long) map.putDouble(key, ((Long) obj).doubleValue());
+            else if (obj instanceof Integer) map.putInt(key, (Integer) obj);
+            else if (obj instanceof Boolean) map.putBoolean(key, (Boolean) obj);
+            else if (obj == null) map.putNull(key);
+            else throw new CodePushUnknownException("Unrecognized object: " + obj);
         }
 
         return map;
@@ -100,7 +84,7 @@ public class CodePushUtils {
 
     public static JSONArray convertReadableToJsonArray(ReadableArray arr) {
         JSONArray jsonArr = new JSONArray();
-        for (int i=0; i<arr.size(); i++) {
+        for (int i = 0; i < arr.size(); i++) {
             ReadableType type = arr.getType(i);
             switch (type) {
                 case Map:
@@ -174,25 +158,6 @@ public class CodePushUtils {
         return jsonObj;
     }
 
-    public static String getStringFromInputStream(InputStream inputStream) throws IOException {
-        BufferedReader bufferedReader = null;
-        try {
-            StringBuilder buffer = new StringBuilder();
-            bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                buffer.append(line);
-                buffer.append("\n");
-            }
-
-            return buffer.toString().trim();
-        } finally {
-            if (bufferedReader != null) bufferedReader.close();
-            if (inputStream != null) inputStream.close();
-        }
-    }
-
     public static JSONObject getJsonObjectFromFile(String filePath) throws IOException {
         String content = FileUtils.readFileToString(filePath);
         try {

package/android/src/main/java/com/microsoft/codepush/react/FileUtils.java

@@ -1,59 +1,14 @@
 package com.microsoft.codepush.react;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 public class FileUtils {
 
-    private static final int WRITE_BUFFER_SIZE = 1024 * 8;
-
-    public static void copyDirectoryContents(String sourceDirectoryPath, String destinationDirectoryPath) throws IOException {
-        File sourceDir = new File(sourceDirectoryPath);
-        File destDir = new File(destinationDirectoryPath);
-        if (!destDir.exists()) {
-            destDir.mkdir();
-        }
-
-        for (File sourceFile : sourceDir.listFiles()) {
-            if (sourceFile.isDirectory()) {
-                copyDirectoryContents(
-                        CodePushUtils.appendPathComponent(sourceDirectoryPath, sourceFile.getName()),
-                        CodePushUtils.appendPathComponent(destinationDirectoryPath, sourceFile.getName()));
-            } else {
-                File destFile = new File(destDir, sourceFile.getName());
-                FileInputStream fromFileStream = null;
-                BufferedInputStream fromBufferedStream = null;
-                FileOutputStream destStream = null;
-                byte[] buffer = new byte[WRITE_BUFFER_SIZE];
-                try {
-                    fromFileStream = new FileInputStream(sourceFile);
-                    fromBufferedStream = new BufferedInputStream(fromFileStream);
-                    destStream = new FileOutputStream(destFile);
-                    int bytesRead;
-                    while ((bytesRead = fromBufferedStream.read(buffer)) > 0) {
-                        destStream.write(buffer, 0, bytesRead);
-                    }
-                } finally {
-                    try {
-                        if (fromFileStream != null) fromFileStream.close();
-                        if (fromBufferedStream != null) fromBufferedStream.close();
-                        if (destStream != null) destStream.close();
-                    } catch (IOException e) {
-                        throw new CodePushUnknownException("Error closing IO resources.", e);
-                    }
-                }
-            }
-        }
-    }
-
     public static void deleteDirectoryAtPath(String directoryPath) {
         if (directoryPath == null) {
             CodePushUtils.log("deleteDirectoryAtPath attempted with null directoryPath");
@@ -90,18 +45,6 @@ public class FileUtils {
         return new File(filePath).exists();
     }
 
-    public static void moveFile(File fileToMove, String newFolderPath, String newFileName) {
-        File newFolder = new File(newFolderPath);
-        if (!newFolder.exists()) {
-            newFolder.mkdirs();
-        }
-
-        File newFilePath = new File(newFolderPath, newFileName);
-        if (!fileToMove.renameTo(newFilePath)) {
-            throw new CodePushUnknownException("Unable to move file from " +
-                    fileToMove.getAbsolutePath() + " to " + newFilePath.getAbsolutePath() + ".");
-        }
-    }
 
     public static String readFileToString(String filePath) throws IOException {
         FileInputStream fin = null;
@@ -123,81 +66,9 @@ public class FileUtils {
         }
     }
 
-    private static String validateFileName(String fileName, File destinationFolder) throws IOException {
-        String destinationFolderCanonicalPath = destinationFolder.getCanonicalPath() + File.separator;
-
-        File file = new File(destinationFolderCanonicalPath, fileName);
-        String canonicalPath = file.getCanonicalPath();
-
-        if (!canonicalPath.startsWith(destinationFolderCanonicalPath)) {
-            throw new IllegalStateException("File is outside extraction target directory.");
-        }
-
-        return canonicalPath;
-    }
-
-    public static void unzipFile(File zipFile, String destination) throws IOException {
-        FileInputStream fileStream = null;
-        BufferedInputStream bufferedStream = null;
-        ZipInputStream zipStream = null;
-        try {
-            fileStream = new FileInputStream(zipFile);
-            bufferedStream = new BufferedInputStream(fileStream);
-            zipStream = new ZipInputStream(bufferedStream);
-            ZipEntry entry;
-
-            File destinationFolder = new File(destination);
-            if (destinationFolder.exists()) {
-                deleteFileOrFolderSilently(destinationFolder);
-            }
-
-            destinationFolder.mkdirs();
-
-            byte[] buffer = new byte[WRITE_BUFFER_SIZE];
-            while ((entry = zipStream.getNextEntry()) != null) {
-                String fileName = validateFileName(entry.getName(), destinationFolder);
-                File file = new File(fileName);
-                if (entry.isDirectory()) {
-                    file.mkdirs();
-                } else {
-                    File parent = file.getParentFile();
-                    if (!parent.exists()) {
-                        parent.mkdirs();
-                    }
-
-                    FileOutputStream fout = new FileOutputStream(file);
-                    try {
-                        int numBytesRead;
-                        while ((numBytesRead = zipStream.read(buffer)) != -1) {
-                            fout.write(buffer, 0, numBytesRead);
-                        }
-                    } finally {
-                        fout.close();
-                    }
-                }
-                long time = entry.getTime();
-                if (time > 0) {
-                    file.setLastModified(time);
-                }
-            }
-        } finally {
-            try {
-                if (zipStream != null) zipStream.close();
-                if (bufferedStream != null) bufferedStream.close();
-                if (fileStream != null) fileStream.close();
-            } catch (IOException e) {
-                throw new CodePushUnknownException("Error closing IO resources.", e);
-            }
-        }
-    }
-
     public static void writeStringToFile(String content, String filePath) throws IOException {
-        PrintWriter out = null;
-        try {
-            out = new PrintWriter(filePath);
+        try (PrintWriter out = new PrintWriter(filePath)) {
             out.print(content);
-        } finally {
-            if (out != null) out.close();
         }
     }
 }

package/ios/CodePush/CodePush.h

@@ -108,34 +108,6 @@
 
 @end
 
-@interface CodePushDownloadHandler : NSObject <NSURLConnectionDelegate>
-
-@property (strong) NSOutputStream *outputFileStream;
-@property long long expectedContentLength;
-@property long long receivedContentLength;
-@property dispatch_queue_t operationQueue;
-@property (copy) void (^progressCallback)(long long, long long);
-@property (copy) void (^doneCallback)(BOOL);
-@property (copy) void (^failCallback)(NSError *err);
-@property NSString *downloadUrl;
-
-- (id)init:(NSString *)downloadFilePath
-operationQueue:(dispatch_queue_t)operationQueue
-progressCallback:(void (^)(long long, long long))progressCallback
-doneCallback:(void (^)(BOOL))doneCallback
-failCallback:(void (^)(NSError *err))failCallback;
-
-- (void)download:(NSString*)url;
-
-@end
-
-@interface CodePushErrorUtils : NSObject
-
-+ (NSError *)errorWithMessage:(NSString *)errorMessage;
-+ (BOOL)isCodePushError:(NSError *)error;
-
-@end
-
 @interface CodePushPackage : NSObject
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
@@ -193,6 +165,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 + (NSString *)assetsFolderName;
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error;
++ (NSString *)getHashForBinaryAssets:(NSError **)error;
 
 + (NSString *)manifestFolderPrefix;
 + (NSString *)modifiedDateStringOfFileAtURL:(NSURL *)fileURL;
@@ -219,8 +192,6 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 @end
 
-void CPLog(NSString *formatString, ...);
-
 typedef NS_ENUM(NSInteger, CodePushInstallMode) {
     CodePushInstallModeImmediate,
     CodePushInstallModeOnNextRestart,

package/ios/CodePush/CodePush.m

@@ -15,6 +15,8 @@
 #import "RCTUtils.h"
 #endif
 
+#import <DiffUpdates/DiffUpdates.h>
+
 #import "CodePush.h"
 
 @interface CodePush () <RCTBridgeModule, RCTFrameUpdateObserver>
@@ -32,7 +34,7 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
-    
+
     BOOL _allowed;
     BOOL _restartInProgress;
     NSMutableArray *_restartQueue;
@@ -52,6 +54,7 @@ static NSString *const DeploymentSucceeded = @"DeploymentSucceeded";
 // These keys represent the names we use to store data in NSUserDefaults
 static NSString *const FailedUpdatesKey = @"CODE_PUSH_FAILED_UPDATES";
 static NSString *const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
+static NSString *const DiffFailedUpdatesKey = @"CODE_PUSH_DIFF_FAILED_UPDATES";
 
 // These keys are already "namespaced" by the PendingUpdateKey, so
 // their values don't need to be obfuscated to prevent collision with app data
@@ -377,7 +380,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     _allowed = YES;
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
-    
+
     self = [super init];
     if (self) {
         [self initializeUpdateAfterRestart];
@@ -583,7 +586,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     if ([[self class] isFailedHash:[failedPackage objectForKey:PackageHashKey]]) {
         return;
     }
-    
+
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
     if (failedUpdates == nil) {
@@ -753,12 +756,14 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
             NSDictionary *newPackage = [CodePushPackage getPackage:mutableUpdatePackage[PackageHashKey] error:&err];
 
             if (err) {
+                CPLog(@"CodePushPackage doneCallback: %@", err);
                 return reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
             }
             resolve(newPackage);
         }
         // The download failed
         failCallback:^(NSError *err) {
+            CPLog(@"CodePushPackage failCallback: %@", err);
             if ([CodePushErrorUtils isCodePushError:err]) {
                 [self saveFailedUpdate:mutableUpdatePackage];
             }
@@ -818,15 +823,24 @@ RCT_EXPORT_METHOD(getConfiguration:(RCTPromiseResolveBlock)resolve
         }
 
         if (binaryHash == nil) {
-            // The hash was not generated either due to a previous unknown error or the fact that
-            // the React Native assets were not bundled in the binary (e.g. during dev/simulator)
-            // builds.
             resolve(configuration);
             return;
         }
 
         NSMutableDictionary *mutableConfiguration = [configuration mutableCopy];
         [mutableConfiguration setObject:binaryHash forKey:PackageHashKey];
+
+        CPLog(@"Package binary hash:  %@", binaryHash);
+
+        NSError *assetsError = nil;
+        NSString *assetHash = [CodePushUpdateUtils getHashForBinaryAssets:&assetsError];
+        if (assetsError) {
+            CPLog(@"Error obtaining hash for assets contents: %@", assetsError);
+        } else if (assetHash != nil) {
+            CPLog(@"Asset binary hash:  %@", assetHash);
+            [mutableConfiguration setObject:assetHash forKey:@"assetHash"];
+        }
+
         resolve(mutableConfiguration);
         return;
     }
@@ -844,6 +858,8 @@ RCT_EXPORT_METHOD(getUpdateMetadata:(CodePushUpdateState)updateState
     NSError *error;
     NSMutableDictionary *package = [[CodePushPackage getCurrentPackage:&error] mutableCopy];
 
+    CPLog(@"Current package: %@", package);
+
     if (error) {
         return reject([NSString stringWithFormat: @"%lu", (long)error.code], error.localizedDescription, error);
     } else if (package == nil) {
@@ -914,7 +930,7 @@ RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
                                                          selector:@selector(applicationDidBecomeActive)
                                                              name:UIApplicationDidBecomeActiveNotification
                                                            object:RCTSharedApplication()];
-                                                           
+
                 [[NSNotificationCenter defaultCenter] addObserver:self
                                                          selector:@selector(applicationWillEnterForeground)
                                                              name:UIApplicationWillEnterForegroundNotification