@revopush/react-native-code-push 2.5.0 → 2.6.0-rc.3

package/README.md

@@ -53,7 +53,8 @@ We try our best to maintain backwards compatibility of our plugin with previous
 | 0.76, 0.77, 0.78, 0.79  | v1.0+ *(Support both New and Old Architectures)*                                                     |
 | v0.80                   | v1.2                                                                                                 |
 | Expo sdk 52             | v1.3                                                                                                 | 
-| v0.81                   | v1.5                                                                                                 |
+| v0.81, v0.82            | v1.5                                                                                                 |
+| v0.83, expo 55          | v1.6                                                                                                 |
 
 
 We work hard to respond to new RN releases, but they do occasionally break us. We will update this chart with each RN release, so that users can check to see what our "official" support is.

package/android/proguard-rules.pro

@@ -18,16 +18,32 @@
 
 # Invoked via reflection, when setting js bundle.
 -keepclassmembers class com.facebook.react.ReactInstanceManager {
-    private final ** mBundleLoader;
+    private ** mBundleLoader;
+    private ** mAttachedReactRoots;
+    private ** mAttachedRootViews;
 }
 
 -keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
-    private final ** reactHostDelegate;
+    private ** mReactHostDelegate;
+    private ** reactHostDelegate;
 }
 
 -keep interface com.facebook.react.runtime.ReactHostDelegate { *; }
 
 -keep class * implements com.facebook.react.runtime.ReactHostDelegate { *; }
 
+-keepclassmembers class * implements com.facebook.react.runtime.ReactHostDelegate {
+    private ** jsBundleLoader;
+    private ** _jsBundleLoader;
+}
+
+-keepclassmembers interface com.facebook.react.ReactRoot {
+    public ** getRootViewGroup();
+}
+
+-keepclassmembers class * implements com.facebook.react.ReactRoot {
+    public ** getRootViewGroup();
+}
+
 # Can't find referenced class org.bouncycastle.**
 -dontwarn com.nimbusds.jose.**

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

@@ -44,7 +44,7 @@ public class CodePush implements ReactPackage {
 
     private boolean mDidUpdate = false;
 
-    private String mAssetsBundleFileName;
+    private String mAssetsBundleFileName = CodePushConstants.DEFAULT_JS_BUNDLE_NAME;
 
     // Helper classes.
     private CodePushUpdateManager mUpdateManager;

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

@@ -5,15 +5,15 @@ import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.View;
 import android.view.Choreographer;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.OptIn;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -43,7 +43,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -58,6 +57,7 @@ public class CodePushNativeModule extends BaseJavaModule {
     private SettingsManager mSettingsManager;
     private CodePushTelemetryManager mTelemetryManager;
     private CodePushUpdateManager mUpdateManager;
+    private boolean mIsExpoApp = false;
 
     private boolean _allowed = true;
     private boolean _restartInProgress = false;
@@ -70,6 +70,8 @@ public class CodePushNativeModule extends BaseJavaModule {
         mSettingsManager = settingsManager;
         mTelemetryManager = codePushTelemetryManager;
         mUpdateManager = codePushUpdateManager;
+        mIsExpoApp = detectExpoEnvironment();
+
         // Initialize module state while we have a reference to the current context.
 
         mNativeBundleHash = bundleMetadataManager.getNativeBundleHash();
@@ -119,6 +121,31 @@ public class CodePushNativeModule extends BaseJavaModule {
         });
     }
 
+    private boolean detectExpoEnvironment() {
+        try {
+            Class.forName("expo.modules.ReactNativeHostWrapper");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    private Field findField(Class<?> clazz, String... fieldNames) throws NoSuchFieldException {
+        Class<?> currentClass = clazz;
+        while (currentClass != null) {
+            for (String fieldName : fieldNames) {
+                try {
+                    return currentClass.getDeclaredField(fieldName);
+                } catch (NoSuchFieldException ignored) {
+                }
+            }
+
+            currentClass = currentClass.getSuperclass();
+        }
+
+        throw new NoSuchFieldException(fieldNames.length > 0 ? fieldNames[0] : "");
+    }
+
     // Use reflection to find and set the appropriate fields on ReactInstanceManager. See #556 for a proposal for a less brittle way
     // to approach this.
     private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBundleFile) throws IllegalAccessException {
@@ -130,7 +157,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                 latestJSBundleLoader = JSBundleLoader.createFileLoader(latestJSBundleFile);
             }
 
-            Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
+            Field bundleLoaderField = findField(instanceManager.getClass(), "mBundleLoader");
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(instanceManager, latestJSBundleLoader);
         } catch (Exception e) {
@@ -150,12 +177,10 @@ public class CodePushNativeModule extends BaseJavaModule {
                 latestJSBundleLoader = JSBundleLoader.createFileLoader(latestJSBundleFile);
             }
 
-            Field bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+            Field bundleLoaderField = findField(reactHostDelegate.getClass(), "jsBundleLoader", "_jsBundleLoader");
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
-        } catch (NoSuchFieldException noSuchFileFound) {
-            // Ignore this error for Expo
-        } catch (Exception e) {
+        }  catch (Exception e) {
             CodePushUtils.log("Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
             throw new IllegalAccessException("Could not setJSBundle");
         }
@@ -192,7 +217,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                 String latestJSBundleFile = mCodePush.getJSBundleFileInternal(mCodePush.getAssetsBundleFileName());
 
                 try {
-                    if (reactHost instanceof ReactHostImpl) {
+                    if (!mIsExpoApp && reactHost instanceof ReactHostImpl) {
                         ReactHostDelegate delegate = getReactHostDelegate((ReactHostImpl) reactHost);
                         if (delegate != null) {
                             // #2) Update the locally stored JS bundle file path
@@ -200,7 +225,9 @@ public class CodePushNativeModule extends BaseJavaModule {
                         }
                     }
                 } catch (Exception e) {
-                    CodePushUtils.log("Exception setJSBundle: " + e.getMessage());
+                    if (!mIsExpoApp) {
+                        CodePushUtils.log("Exception setJSBundle: " + e.getMessage());
+                    }
                 }
 
                 // #3) Get the context creation method
@@ -301,14 +328,38 @@ public class CodePushNativeModule extends BaseJavaModule {
     // resetReactRootViews allows to call recreateReactContextInBackground without any exceptions
     // This fix also relates to https://github.com/microsoft/react-native-code-push/issues/878
     private void resetReactRootViews(ReactInstanceManager instanceManager) throws NoSuchFieldException, IllegalAccessException {
-        Field mAttachedRootViewsField = instanceManager.getClass().getDeclaredField("mAttachedRootViews");
-        mAttachedRootViewsField.setAccessible(true);
-        List<ReactRootView> mAttachedRootViews = (List<ReactRootView>) mAttachedRootViewsField.get(instanceManager);
-        for (ReactRootView reactRootView : mAttachedRootViews) {
-            reactRootView.removeAllViews();
-            reactRootView.setId(View.NO_ID);
+        Field attachedRootsField = findField(instanceManager.getClass(), "mAttachedReactRoots", "mAttachedRootViews");
+        attachedRootsField.setAccessible(true);
+        Object attachedRoots = attachedRootsField.get(instanceManager);
+        if (attachedRoots instanceof Iterable) {
+            for (Object reactRoot : (Iterable<?>) attachedRoots) {
+                resetReactRootView(reactRoot);
+            }
+        }
+    }
+
+    private void resetReactRootView(Object reactRoot) {
+        try {
+            View rootView = null;
+            if (reactRoot instanceof View) {
+                rootView = (View) reactRoot;
+            } else {
+                Method getRootViewGroupMethod = reactRoot.getClass().getMethod("getRootViewGroup");
+                Object rootViewGroup = getRootViewGroupMethod.invoke(reactRoot);
+                if (rootViewGroup instanceof View) {
+                    rootView = (View) rootViewGroup;
+                }
+            }
+
+            if (rootView instanceof ViewGroup) {
+                ((ViewGroup) rootView).removeAllViews();
+            }
+            if (rootView != null) {
+                rootView.setId(View.NO_ID);
+            }
+        } catch (Exception e) {
+            CodePushUtils.log("Failed to reset root view: " + e.getMessage());
         }
-        mAttachedRootViewsField.set(instanceManager, mAttachedRootViews);
     }
 
     private void clearLifecycleEventListener() {
@@ -690,7 +741,12 @@ public class CodePushNativeModule extends BaseJavaModule {
                                         if (installMode == CodePushInstallMode.IMMEDIATE.getValue()
                                                 || durationInBackground >= CodePushNativeModule.this.mMinimumBackgroundDuration) {
                                             CodePushUtils.log("Loading bundle on resume");
-                                            restartAppInternal(false);
+                                            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    restartAppInternal(false);
+                                                }
+                                            });
                                         }
                                     }
                                 }
@@ -849,14 +905,13 @@ public class CodePushNativeModule extends BaseJavaModule {
 
     public ReactHostDelegate getReactHostDelegate(ReactHostImpl reactHostImpl) {
         try {
-            Class<?> clazz = reactHostImpl.getClass();
             Field field;
             try {
                 // RN < 0.81
                 field = clazz.getDeclaredField("mReactHostDelegate");
             } catch (NoSuchFieldException e) {
                 // RN >= 0.81
-                field = clazz.getDeclaredField("reactHostDelegate");
+                field = findField(reactHostImpl.getClass(), "mReactHostDelegate", "reactHostDelegate");
             }
             field.setAccessible(true);
 

package/docs/setup-android.md

@@ -18,7 +18,7 @@ In order to integrate CodePush into your Android project, please perform the fol
 
 2. Update the `MainApplication` file to use CodePush via the following changes:
 
-   For React Native 0.76 and above: update the `MainApplication.kt`
+   For React Native 0.76 - 0.82: update the `MainApplication.kt`
 
    **Important! : PackageList must be instantiated only one in application lifetime.**
 
@@ -45,6 +45,32 @@ In order to integrate CodePush into your Android project, please perform the fol
     }
     ```
 
+    For React Native 0.83 and above: update the `MainApplication.kt`
+
+    ```kotlin
+    ...
+    // 1. Import the plugin class.
+    import com.microsoft.codepush.react.CodePush
+
+    class MainApplication : Application(), ReactApplication {
+
+        override val reactHost: ReactHost by lazy {
+            getDefaultReactHost(
+            context = applicationContext,
+            packageList =
+                PackageList(this).packages.apply {
+                // Packages that cannot be autolinked yet can be added manually here, for example:
+                // add(MyReactNativePackage())
+                },
+            // 2. Override the jsBundleFilePath in order to let
+            // the CodePush runtime determine where to get the JS
+            // bundle location from on each app start
+            jsBundleFilePath = CodePush.getJSBundleFile(),
+            )
+        }
+    }
+    ```
+
 
 3. Add the Deployment key to `strings.xml`:
 

package/ios/CodePush/CodePush.m

@@ -19,7 +19,7 @@
 
 #import "CodePush.h"
 
-@interface CodePush () <RCTBridgeModule, RCTFrameUpdateObserver>
+@interface CodePush () <RCTBridgeModule>
 @end
 
 @implementation CodePush {
@@ -32,8 +32,8 @@
 
     // Used to coordinate the dispatching of download progress events to JS.
     long long _latestExpectedContentLength;
-    long long _latestReceivedConentLength;
-    BOOL _didUpdateProgress;
+    long long _latestReceivedContentLength;
+    NSTimeInterval _lastProgressEmitTimestamp;
 
     BOOL _allowed;
     BOOL _restartInProgress;
@@ -263,18 +263,6 @@ static NSString *const LatestRollbackCountKey = @"count";
 #pragma mark - Private API methods
 
 @synthesize methodQueue = _methodQueue;
-@synthesize pauseCallback = _pauseCallback;
-@synthesize paused = _paused;
-
-- (void)setPaused:(BOOL)paused
-{
-    if (_paused != paused) {
-        _paused = paused;
-        if (_pauseCallback) {
-            _pauseCallback();
-        }
-    }
-}
 
 /*
  * This method is used to clear updates that are installed
@@ -340,7 +328,7 @@ static NSString *const LatestRollbackCountKey = @"count";
                        @"totalBytes" : [NSNumber
                            numberWithLongLong:_latestExpectedContentLength],
                        @"receivedBytes" : [NSNumber
-                           numberWithLongLong:_latestReceivedConentLength]
+                           numberWithLongLong:_latestReceivedContentLength]
                      }];
 }
 
@@ -404,7 +392,6 @@ static NSString *const LatestRollbackCountKey = @"count";
 #ifdef DEBUG
     [self clearDebugUpdates];
 #endif
-    self.paused = YES;
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
     if (pendingUpdate) {
@@ -546,7 +533,7 @@ static NSString *const LatestRollbackCountKey = @"count";
         // file (since Chrome wouldn't support it). Otherwise, update
         // the current bundle URL to point at the latest update
         if ([CodePush isUsingTestConfiguration] || ![super.bridge.bundleURL.scheme hasPrefix:@"http"]) {
-            [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
+            RCTReloadCommandSetBundleURL([CodePush bundleURL]);
         }
 
         RCTTriggerReloadCommandListeners(@"react-native-code-push: Restart");
@@ -727,10 +714,7 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
     }
 
     if (notifyProgress) {
-        // Set up and unpause the frame observer so that it can emit
-        // progress events every frame if the progress is updated.
-        _didUpdateProgress = NO;
-        self.paused = NO;
+        _lastProgressEmitTimestamp = 0;
     }
 
     NSString * publicKey = [[CodePushConfig current] publicKey];
@@ -742,17 +726,21 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
         operationQueue:_methodQueue
         // The download is progressing forward
         progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
-            // Update the download progress so that the frame observer can notify the JS side
+            if (!notifyProgress) {
+                return;
+            }
+
             _latestExpectedContentLength = expectedContentLength;
-            _latestReceivedConentLength = receivedContentLength;
-            _didUpdateProgress = YES;
+            _latestReceivedContentLength = receivedContentLength;
 
-            // If the download is completed, stop observing frame
-            // updates and synchronously send the last event.
             if (expectedContentLength == receivedContentLength) {
-                _didUpdateProgress = NO;
-                self.paused = YES;
                 [self dispatchDownloadProgressEvent];
+            } else {
+                NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
+                if (timestamp - _lastProgressEmitTimestamp > 0.3) {
+                    _lastProgressEmitTimestamp = timestamp;
+                    [self dispatchDownloadProgressEvent];
+                }
             }
         }
         // The download completed
@@ -773,9 +761,6 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
                 [self saveFailedUpdate:mutableUpdatePackage];
             }
 
-            // Stop observing frame updates if the download fails.
-            _didUpdateProgress = NO;
-            self.paused = YES;
             reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
         }];
 }
@@ -1128,16 +1113,4 @@ RCT_EXPORT_METHOD(saveStatusReportForRetry:(NSDictionary *)statusReport)
     [CodePushTelemetryManager saveStatusReportForRetry:statusReport];
 }
 
-#pragma mark - RCTFrameUpdateObserver Methods
-
-- (void)didUpdateFrame:(RCTFrameUpdate *)update
-{
-    if (!_didUpdateProgress) {
-        return;
-    }
-
-    [self dispatchDownloadProgressEvent];
-    _didUpdateProgress = NO;
-}
-
 @end

package/ios/CodePush/CodePushUpdateUtils.m

@@ -197,16 +197,24 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     return AssetsFolderName;
 }
 
++ (NSString *)cacheKeyForBinaryAtURL:(NSURL *)binaryBundleUrl
+{
+    NSString *bundleModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    return [NSString stringWithFormat:@"%@:%@",
+            [[NSBundle mainBundle] bundlePath],
+            bundleModifiedDate ?: @"unknown"];
+}
+
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error
 {
     // Get the cached hash from user preferences if it exists.
-    NSString *binaryModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    NSString *binaryCacheKey = [self cacheKeyForBinaryAtURL:binaryBundleUrl];
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *binaryHashDictionary = [preferences objectForKey:BinaryHashKey];
     NSString *binaryHash = nil;
     if (binaryHashDictionary != nil) {
-        binaryHash = [binaryHashDictionary objectForKey:binaryModifiedDate];
+        binaryHash = [binaryHashDictionary objectForKey:binaryCacheKey];
         if (binaryHash == nil) {
             [preferences removeObjectForKey:BinaryHashKey];
             [preferences synchronize];
@@ -237,9 +245,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
 
     binaryHash = [self computeFinalHashFromManifest:manifest error:error];
 
-    // Cache the hash in user preferences. This assumes that the modified date for the
-    // JS bundle changes every time a new bundle is generated by the packager.
-    [binaryHashDictionary setObject:binaryHash forKey:binaryModifiedDate];
+    [binaryHashDictionary setObject:binaryHash forKey:binaryCacheKey];
     [preferences setObject:binaryHashDictionary forKey:BinaryHashKey];
     [preferences synchronize];
     return binaryHash;
@@ -255,11 +261,10 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *assetsHashDictionary = [preferences objectForKey:BinaryAssetsHashKey];
 
-    NSString *assetsModifiedDate = [self modifiedDateStringOfFileAtURL:
-                                    [NSURL fileURLWithPath:assetsPath isDirectory:YES]];
+    NSString *assetsCacheKey = [self cacheKeyForBinaryAtURL:[CodePush binaryBundleURL]];
 
     if (assetsHashDictionary != nil) {
-        NSString *cached = [assetsHashDictionary objectForKey:assetsModifiedDate];
+        NSString *cached = [assetsHashDictionary objectForKey:assetsCacheKey];
         if (cached != nil) {
             return cached;
         } else {
@@ -285,7 +290,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
         return nil;
     }
 
-    [assetsHashDictionary setObject:assetsHash forKey:assetsModifiedDate];
+    [assetsHashDictionary setObject:assetsHash forKey:assetsCacheKey];
     [preferences setObject:assetsHashDictionary forKey:BinaryAssetsHashKey];
     [preferences synchronize];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "2.5.0",
+  "version": "2.6.0-rc.3",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -65,6 +65,9 @@
     "tslint": "^6.1.3",
     "typescript": "^4.4.3"
   },
+  "peerDependencies": {
+    "react-native": ">=0.83.0"
+  },
   "rnpm": {
     "android": {
       "packageInstance": "new CodePush(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)"