@bravemobile/react-native-code-push 12.2.0 → 12.3.1

package/README.md

@@ -8,7 +8,7 @@
 
 ### 🚀 New Architecture support
 
-Supports React Native 0.74 ~ 0.82.
+Supports React Native 0.74 ~ 0.83.
 
 > [!NOTE]
 > If you are using React Native 0.76 or lower, please use version `12.0.2` of this library.

package/cli/dist/functions/runHermesEmitBinaryCommand.js

@@ -96,10 +96,9 @@ function getHermesCommand() {
             return false;
         }
     };
-    // Hermes is bundled with react-native since 0.69
-    const bundledHermesEngine = path.join(getReactNativePackagePath(), 'sdks', 'hermesc', getHermesOSBin(), getHermesOSExe());
-    if (fileExists(bundledHermesEngine)) {
-        return bundledHermesEngine;
+    const hermescExecutable = path.join(getHermesCompilerPath(), getHermesOSBin(), getHermesOSExe());
+    if (fileExists(hermescExecutable)) {
+        return hermescExecutable;
     }
     throw new Error('Hermes engine binary not found. Please upgrade to react-native 0.69 or later');
 }
@@ -144,6 +143,28 @@ function getReactNativePackagePath() {
     }
     return path.join('node_modules', 'react-native');
 }
+function getHermescDirPathInHermesCompilerPackage() {
+    const result = childProcess.spawnSync('node', [
+        '--print',
+        "require.resolve('hermes-compiler/package.json')",
+    ]);
+    const packagePath = path.dirname(result.stdout.toString());
+    const hermescDirPath = path.join(packagePath, 'hermesc');
+    if (result.status === 0 && directoryExistsSync(hermescDirPath)) {
+        return hermescDirPath;
+    }
+    return null;
+}
+function getHermesCompilerPath() {
+    const hermescDirPath = getHermescDirPathInHermesCompilerPackage();
+    if (hermescDirPath) {
+        // Since react-native 0.83, Hermes compiler executables are in 'hermes-compiler' package
+        return hermescDirPath;
+    }
+    else {
+        return path.join(getReactNativePackagePath(), 'sdks', 'hermesc');
+    }
+}
 function directoryExistsSync(dirname) {
     try {
         return fs.statSync(dirname).isDirectory();

package/cli/functions/runHermesEmitBinaryCommand.ts

@@ -114,16 +114,10 @@ function getHermesCommand(): string {
             return false;
         }
     };
-    // Hermes is bundled with react-native since 0.69
-    const bundledHermesEngine = path.join(
-        getReactNativePackagePath(),
-        'sdks',
-        'hermesc',
-        getHermesOSBin(),
-        getHermesOSExe(),
-    );
-    if (fileExists(bundledHermesEngine)) {
-        return bundledHermesEngine;
+
+    const hermescExecutable = path.join(getHermesCompilerPath(), getHermesOSBin(), getHermesOSExe());
+    if (fileExists(hermescExecutable)) {
+        return hermescExecutable;
     }
     throw new Error('Hermes engine binary not found. Please upgrade to react-native 0.69 or later');
 }
@@ -174,6 +168,29 @@ function getReactNativePackagePath(): string {
     return path.join('node_modules', 'react-native');
 }
 
+function getHermescDirPathInHermesCompilerPackage() {
+    const result = childProcess.spawnSync('node', [
+        '--print',
+        "require.resolve('hermes-compiler/package.json')",
+    ]);
+    const packagePath = path.dirname(result.stdout.toString());
+    const hermescDirPath = path.join(packagePath, 'hermesc');
+    if (result.status === 0 && directoryExistsSync(hermescDirPath)) {
+        return hermescDirPath;
+    }
+    return null;
+}
+
+function getHermesCompilerPath() {
+    const hermescDirPath = getHermescDirPathInHermesCompilerPackage();
+    if (hermescDirPath) {
+        // Since react-native 0.83, Hermes compiler executables are in 'hermes-compiler' package
+        return hermescDirPath
+    } else {
+        return path.join(getReactNativePackagePath(), 'sdks', 'hermesc');
+    }
+}
+
 function directoryExistsSync(dirname: string): boolean {
     try {
         return fs.statSync(dirname).isDirectory();

package/ios/CodePush/CodePush.m

@@ -32,6 +32,7 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
+    NSTimeInterval _lastProgressEventTime;
 
     BOOL _allowed;
     BOOL _restartInProgress;
@@ -336,6 +337,18 @@ static NSString *const LatestRollbackCountKey = @"count";
                      }];
 }
 
+- (void)dispatchThrottledDownloadProgressEventWithForce:(BOOL)force
+{
+    static const NSTimeInterval interval = 0.05; // 50 ms throttle
+    NSTimeInterval now = CFAbsoluteTimeGetCurrent();
+    if (!force && _lastProgressEventTime > 0 && (now - _lastProgressEventTime) < interval) {
+        return;
+    }
+
+    _lastProgressEventTime = now;
+    [self dispatchDownloadProgressEvent];
+}
+
 /*
  * This method ensures that the app was packaged with a JS bundle
  * file, and if not, it throws the appropriate exception.
@@ -377,6 +390,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     _allowed = YES;
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
+    _lastProgressEventTime = 0;
 
     self = [super init];
     if (self) {
@@ -723,6 +737,7 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
         // progress events every frame if the progress is updated.
         _didUpdateProgress = NO;
         self.paused = NO;
+        _lastProgressEventTime = 0;
     }
 
     NSString * publicKey = [[CodePushConfig current] publicKey];
@@ -738,13 +753,19 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
             _latestExpectedContentLength = expectedContentLength;
             _latestReceivedConentLength = receivedContentLength;
             _didUpdateProgress = YES;
+            // Fabric/TurboModules don't hook RCTFrameUpdateObserver, so _pauseCallback
+            // stays nil there and we must emit progress events directly.
+            // On the legacy bridge _pauseCallback is set, and didUpdateFrame handles dispatch.
+            if (!_pauseCallback) {
+                [self dispatchThrottledDownloadProgressEventWithForce:NO];
+            }
 
             // 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];
+                [self dispatchThrottledDownloadProgressEventWithForce:YES];
             }
         }
         // The download completed
@@ -1115,7 +1136,7 @@ RCT_EXPORT_METHOD(saveStatusReportForRetry:(NSDictionary *)statusReport)
         return;
     }
 
-    [self dispatchDownloadProgressEvent];
+    [self dispatchThrottledDownloadProgressEventWithForce:YES];
     _didUpdateProgress = NO;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.2.0",
+  "version": "12.3.1",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",