Merge pull request #243 from Microsoft/ios_debug

Simplify JS bundle discovery strategy

Author: lostintangent

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

@@ -365,7 +365,7 @@ protected Void doInBackground(Object... params) {
                     try {
                         WritableMap mutableUpdatePackage = CodePushUtils.convertReadableMapToWritableMap(updatePackage);
                         mutableUpdatePackage.putString(BINARY_MODIFIED_TIME_KEY, "" + getBinaryResourcesModifiedTime());
-                        codePushPackage.downloadPackage(applicationContext, mutableUpdatePackage, new DownloadProgressCallback() {
+                        codePushPackage.downloadPackage(applicationContext, mutableUpdatePackage, CodePush.this.assetsBundleFileName, new DownloadProgressCallback() {
                             @Override
                             public void call(DownloadProgress downloadProgress) {
                                 getReactApplicationContext()

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

@@ -151,7 +151,7 @@ public WritableMap getPackage(String packageHash) {
         }
     }
 
-    public void downloadPackage(Context applicationContext, ReadableMap updatePackage,
+    public void downloadPackage(Context applicationContext, ReadableMap updatePackage, String expectedBundleFileName,
                                 DownloadProgressCallback progressCallback) throws IOException {
         String newUpdateHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
         String newUpdateFolderPath = getPackageFolderPath(newUpdateHash);
@@ -243,7 +243,7 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
 
             // 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(newUpdateFolderPath);
+            String relativeBundlePath = CodePushUpdateUtils.findJSBundleInUpdateContents(newUpdateFolderPath, expectedBundleFileName);
 
             if (relativeBundlePath == null) {
                 throw new CodePushInvalidUpdateException("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/CodePushUpdateUtils.java

@@ -79,24 +79,20 @@ public static void copyNecessaryFilesFromCurrentPackage(String diffManifestFileP
         }
     }
 
-    public static String findJSBundleInUpdateContents(String folderPath) {
+    public static String findJSBundleInUpdateContents(String folderPath, String expectedFileName) {
         File folder = new File(folderPath);
         File[] folderFiles = folder.listFiles();
         for (File file : folderFiles) {
             String fullFilePath = CodePushUtils.appendPathComponent(folderPath, file.getName());
             if (file.isDirectory()) {
-                String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath);
+                String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath, expectedFileName);
                 if (mainBundlePathInSubFolder != null) {
                     return CodePushUtils.appendPathComponent(file.getName(), mainBundlePathInSubFolder);
                 }
             } else {
                 String fileName = file.getName();
-                int dotIndex = fileName.lastIndexOf(".");
-                if (dotIndex >= 0) {
-                    String fileExtension = fileName.substring(dotIndex + 1);
-                    if (fileExtension.equals("bundle") || fileExtension.equals("js") || fileExtension.equals("jsbundle")) {
-                        return fileName;
-                    }
+                if (fileName.equals(expectedFileName)) {
+                    return fileName;
                 }
             }
         }

ios/CodePush/CodePush.h

@@ -70,6 +70,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 @interface CodePushPackage : NSObject
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
+ expectedBundleFileName:(NSString *)expectedBundleFileName
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback;
@@ -113,6 +114,7 @@ failCallback:(void (^)(NSError *err))failCallback;
                       error:(NSError **)error;
 
 + (NSString *)findMainBundleInFolder:(NSString *)folderPath
+                    expectedFileName:(NSString *)expectedFileName
                                error:(NSError **)error;
 
 + (NSString *)assetsFolderName;

ios/CodePush/CodePush.m

@@ -419,7 +419,9 @@ - (void)applicationWillResignActive
                                 forKey:BinaryBundleDateKey];
     }
 
-    [CodePushPackage downloadPackage:mutableUpdatePackage
+    [CodePushPackage
+        downloadPackage:mutableUpdatePackage
+        expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
         // The download is progressing forward
         progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
             dispatch_async(_methodQueue, ^{

ios/CodePush/CodePushPackage.m

@@ -205,6 +205,7 @@ + (BOOL)isCodePushError:(NSError *)err
 }
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
+ expectedBundleFileName:(NSString *)expectedBundleFileName
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback
@@ -360,7 +361,9 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                 }
 
                 NSString *relativeBundlePath = [CodePushUpdateUtils findMainBundleInFolder:newUpdateFolderPath
+                                                                          expectedFileName:expectedBundleFileName
                                                                                      error:&error];
+                
                 if (error) {
                     failCallback(error);
                     return;

ios/CodePush/CodePushUpdateUtils.m

@@ -118,6 +118,7 @@ + (void)copyEntriesInFolder:(NSString *)sourceFolder
 }
 
 + (NSString *)findMainBundleInFolder:(NSString *)folderPath
+                    expectedFileName:(NSString *)expectedFileName
                                error:(NSError **)error
 {
     NSArray* folderFiles = [[NSFileManager defaultManager]
@@ -132,17 +133,17 @@ + (NSString *)findMainBundleInFolder:(NSString *)folderPath
         BOOL isDir = NO;
         if ([[NSFileManager defaultManager] fileExistsAtPath:fullFilePath
                                                  isDirectory:&isDir] && isDir) {
-            NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath error:error];
+            NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath
+                                                           expectedFileName:expectedFileName
+                                                                      error:error];
             if (*error) {
                 return nil;
             }
 
             if (mainBundlePathInFolder) {
                 return [fileName stringByAppendingPathComponent:mainBundlePathInFolder];
             }
-        } else if ([[fileName pathExtension] isEqualToString:@"bundle"] ||
-                   [[fileName pathExtension] isEqualToString:@"jsbundle"] ||
-                   [[fileName pathExtension] isEqualToString:@"js"]) {
+        } else if ([fileName isEqualToString:expectedFileName]) {
             return fileName;
         }
     }