react-native-update 10.43.3 → 10.45.0

package/harmony/pushy/src/main/ets/UpdateContext.ts

@@ -68,7 +68,7 @@ export class UpdateContext {
    */
   private trace(point: string): void {
     const snap = this.getStateSnapshot();
-    logger.info(
+    logger.debug(
       'UpdateContext',
       `trace id=${this.instanceId} ${point}` +
         ` pkg=${snap.packageVersion} bt=${snap.buildTime}` +
@@ -91,7 +91,12 @@ export class UpdateContext {
         name: 'update',
       });
     } catch (e) {
+      // Fail fast: a missing preferences store means no state can be persisted,
+      // which disables rollback protection. Rethrow so the failure surfaces at
+      // construction time instead of later as an unrelated TypeError on the
+      // undefined `preferences` handle.
       console.error('Failed to init preferences:', e);
+      throw e;
     }
   }
 
@@ -179,17 +184,23 @@ export class UpdateContext {
   }
 
   private flushPreferences(reason: string): void {
-    try {
-      const flushablePreferences = this.preferences as FlushablePreferences;
-      if (typeof flushablePreferences.flushSync === 'function') {
+    const flushablePreferences = this.preferences as FlushablePreferences;
+    if (typeof flushablePreferences.flushSync === 'function') {
+      try {
         flushablePreferences.flushSync();
         return;
+      } catch (error) {
+        console.error(`Failed to flushSync preferences for ${reason}:`, error);
+        // fall through to async flush rather than failing the whole operation
       }
-      throw Error('preferences.flushSync is not available');
-    } catch (error) {
-      console.error(`Failed to flush preferences for ${reason}:`, error);
-      throw error;
     }
+    // flushSync unavailable or failed: writes are already applied in memory via
+    // putSync/deleteSync; persist asynchronously as a best-effort so the state
+    // operation still succeeds instead of throwing (which is worse than a
+    // slightly delayed persist).
+    this.preferences.flush().catch((error: Object) => {
+      console.error(`Failed to flush preferences for ${reason}:`, error);
+    });
   }
 
   private putNullableString(key: string, value?: string): void {
@@ -509,12 +520,18 @@ export class UpdateContext {
 
   public cleanUp(): void {
     const state = this.getStateSnapshot();
+    // cleanupOldEntries now runs on a native worker thread (returns a Promise).
+    // Cleanup is best-effort background maintenance and no caller depends on its
+    // completion, so fire-and-forget it off the UI thread and just log failures
+    // instead of blocking the state operation (or cold start) on disk I/O.
     NativePatchCore.cleanupOldEntries(
       this.rootDir,
       state.currentVersion || '',
       state.lastVersion || '',
       3,
-    );
+    ).catch((error: Object) => {
+      console.error('cleanupOldEntries failed:', error);
+    });
   }
 
   public getIsUsingBundleUrl(): boolean {

package/ios/RCTPushy/RCTPushy.mm

@@ -14,6 +14,9 @@
 
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
+#import <os/lock.h>
+
+#include <atomic>
 
 static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY";
 static NSString *const paramPackageVersion = @"packageVersion";
@@ -52,7 +55,20 @@ typedef NS_ENUM(NSInteger, PushyType) {
     //TASK_TYPE_PLAIN_DOWNLOAD=4?
 };
 
-static BOOL ignoreRollback = false;
+static std::atomic<bool> ignoreRollback{false};
+
+// Serializes every read-modify-write of the persisted update state. The state
+// machine itself is a pure function (state_core), but callers run on different
+// threads (main thread bundleURL, module method queue, _fileQueue), so the
+// read→transform→write sequence must be atomic to avoid e.g. markSuccess being
+// overwritten by a concurrent bundleURL and the version being rolled back.
+static os_unfair_lock pushyStateLock = OS_UNFAIR_LOCK_INIT;
+
+static void PushyWithStateLock(void (NS_NOESCAPE ^block)(void)) {
+    os_unfair_lock_lock(&pushyStateLock);
+    block();
+    os_unfair_lock_unlock(&pushyStateLock);
+}
 
 static std::string PushyToStdString(NSString *value) {
     if (value == nil) {
@@ -221,64 +237,71 @@ RCT_EXPORT_MODULE(RCTPushy);
 
 + (NSURL *)bundleURL
 {
-    NSUserDefaults *defaults = PushyDefaults();
-    
-    NSString *curPackageVersion = [RCTPushy packageVersion];
-    NSString *curBuildTime = [RCTPushy buildTime];
-    
-    pushy::state::State state = PushyStateFromDefaults(defaults);
-    pushy::state::BinaryVersionSyncResult sync = pushy::state::SyncBinaryVersion(
-        state,
-        PushyToStdString(curPackageVersion),
-        PushyToStdString(curBuildTime)
-    );
-    if (sync.changed) {
-        [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
-        state = sync.state;
-        PushyApplyStateToDefaults(defaults, state);
-    }
+    __block NSURL *resolvedURL = nil;
+    PushyWithStateLock(^{
+        NSUserDefaults *defaults = PushyDefaults();
+
+        NSString *curPackageVersion = [RCTPushy packageVersion];
+        NSString *curBuildTime = [RCTPushy buildTime];
 
-    if (!state.current_version.empty()) {
-        pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
+        pushy::state::State state = PushyStateFromDefaults(defaults);
+        pushy::state::BinaryVersionSyncResult sync = pushy::state::SyncBinaryVersion(
             state,
-            ignoreRollback,
-            true
+            PushyToStdString(curPackageVersion),
+            PushyToStdString(curBuildTime)
         );
-        state = decision.state;
-
-        if (decision.did_rollback || decision.consumed_first_time) {
+        if (sync.changed) {
+            [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
+            state = sync.state;
             PushyApplyStateToDefaults(defaults, state);
         }
-        if (decision.consumed_first_time) {
-            // bundleURL may be called many times, ignore rollbacks before process restarted again.
-            ignoreRollback = true;
-            [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
-        }
 
-        NSString *loadVersion = PushyFromStdString(decision.load_version);
-        NSString *downloadDir = [RCTPushy downloadDir];
-        while (loadVersion.length) {
-            NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-            if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
-                NSURL *bundleURL = [NSURL fileURLWithPath:bundlePath];
-                return bundleURL;
-            } else {
-                RCTLogError(@"RCTPushy -- bundle version %@ not found", loadVersion);
-                state = pushy::state::Rollback(state);
+        if (!state.current_version.empty()) {
+            pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
+                state,
+                ignoreRollback.load(),
+                true
+            );
+            state = decision.state;
+
+            if (decision.did_rollback || decision.consumed_first_time) {
                 PushyApplyStateToDefaults(defaults, state);
-                loadVersion = PushyFromStdString(state.current_version);
+            }
+            if (decision.consumed_first_time) {
+                // bundleURL may be called many times, ignore rollbacks before process restarted again.
+                ignoreRollback = true;
+                [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
+            }
+
+            NSString *loadVersion = PushyFromStdString(decision.load_version);
+            NSString *downloadDir = [RCTPushy downloadDir];
+            while (loadVersion.length) {
+                NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
+                if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
+                    resolvedURL = [NSURL fileURLWithPath:bundlePath];
+                    return;
+                } else {
+                    RCTLogError(@"RCTPushy -- bundle version %@ not found", loadVersion);
+                    state = pushy::state::Rollback(state);
+                    PushyApplyStateToDefaults(defaults, state);
+                    loadVersion = PushyFromStdString(state.current_version);
+                }
             }
         }
-    }
-    
-    return [RCTPushy binaryBundleURL];
+    });
+
+    return resolvedURL ?: [RCTPushy binaryBundleURL];
 }
 
 + (NSString *) rollback {
-    NSUserDefaults *defaults = PushyDefaults();
-    pushy::state::State state = pushy::state::Rollback(PushyStateFromDefaults(defaults));
-    PushyApplyStateToDefaults(defaults, state);
-    return PushyFromStdString(state.current_version);
+    __block NSString *currentVersion = nil;
+    PushyWithStateLock(^{
+        NSUserDefaults *defaults = PushyDefaults();
+        pushy::state::State state = pushy::state::Rollback(PushyStateFromDefaults(defaults));
+        PushyApplyStateToDefaults(defaults, state);
+        currentVersion = PushyFromStdString(state.current_version);
+    });
+    return currentVersion;
 }
 
 + (BOOL)requiresMainQueueSetup
@@ -288,36 +311,37 @@ RCT_EXPORT_MODULE(RCTPushy);
 
 - (NSDictionary *)constantsToExport
 {
-    NSUserDefaults *defaults = PushyDefaults();
-    
     NSMutableDictionary *ret = [NSMutableDictionary new];
-    ret[@"downloadRootDir"] = [RCTPushy downloadDir];
-    ret[@"packageVersion"] = [RCTPushy packageVersion];
-    ret[@"buildTime"] = [RCTPushy buildTime];
-    ret[@"rolledBackVersion"] = [defaults objectForKey:keyRolledBackMarked];
-    ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
-    ret[@"uuid"] = [defaults objectForKey:keyUuid];
-    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
-    ret[@"currentVersion"] = currentVersion;
-    if (currentVersion != nil) {
-        ret[@"currentVersionInfo"] = [defaults objectForKey:PushyHashInfoKey(currentVersion)];
-    }
-    
-    if (ret[@"isFirstTime"]) {
-        [defaults removeObjectForKey:keyFirstLoadMarked];
-    }
-    
-    if (ret[@"rolledBackVersion"] != nil) {
-        [defaults removeObjectForKey:keyRolledBackMarked];
-        [self clearInvalidFiles];
-    }
-    
-    if ([[defaults objectForKey:KeyPackageUpdatedMarked] boolValue]) {
-        [defaults removeObjectForKey:KeyPackageUpdatedMarked];
-        [self clearInvalidFiles];
-    }
-    
+    PushyWithStateLock(^{
+        NSUserDefaults *defaults = PushyDefaults();
+
+        ret[@"downloadRootDir"] = [RCTPushy downloadDir];
+        ret[@"packageVersion"] = [RCTPushy packageVersion];
+        ret[@"buildTime"] = [RCTPushy buildTime];
+        ret[@"rolledBackVersion"] = [defaults objectForKey:keyRolledBackMarked];
+        ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
+        ret[@"uuid"] = [defaults objectForKey:keyUuid];
+        NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
+        NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
+        ret[@"currentVersion"] = currentVersion;
+        if (currentVersion != nil) {
+            ret[@"currentVersionInfo"] = [defaults objectForKey:PushyHashInfoKey(currentVersion)];
+        }
+
+        if (ret[@"isFirstTime"]) {
+            [defaults removeObjectForKey:keyFirstLoadMarked];
+        }
+
+        if (ret[@"rolledBackVersion"] != nil) {
+            [defaults removeObjectForKey:keyRolledBackMarked];
+            [self clearInvalidFiles];
+        }
+
+        if ([[defaults objectForKey:KeyPackageUpdatedMarked] boolValue]) {
+            [defaults removeObjectForKey:KeyPackageUpdatedMarked];
+            [self clearInvalidFiles];
+        }
+    });
 
     return ret;
 }
@@ -438,13 +462,15 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     resolve(@true);
     #else
 
-    NSUserDefaults *defaults = PushyDefaults();
-    pushy::state::MarkSuccessResult result =
-        pushy::state::MarkSuccess(PushyStateFromDefaults(defaults));
-    if (!result.stale_version_to_delete.empty()) {
-        [defaults removeObjectForKey:PushyHashInfoKey(PushyFromStdString(result.stale_version_to_delete))];
-    }
-    PushyApplyStateToDefaults(defaults, result.state);
+    PushyWithStateLock(^{
+        NSUserDefaults *defaults = PushyDefaults();
+        pushy::state::MarkSuccessResult result =
+            pushy::state::MarkSuccess(PushyStateFromDefaults(defaults));
+        if (!result.stale_version_to_delete.empty()) {
+            [defaults removeObjectForKey:PushyHashInfoKey(PushyFromStdString(result.stale_version_to_delete))];
+        }
+        PushyApplyStateToDefaults(defaults, result.state);
+    });
 
     [self clearInvalidFiles];
     resolve(@true);
@@ -674,38 +700,39 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
         return NO;
     }
 
-    NSUserDefaults *defaults = PushyDefaults();
-    pushy::state::State next = pushy::state::SwitchVersion(
-        PushyStateFromDefaults(defaults),
-        PushyToStdString(hash)
-    );
-    PushyApplyStateToDefaults(defaults, next);
-    // Re-enable first-load consumption and rollback checks for the newly selected bundle.
-    ignoreRollback = false;
+    PushyWithStateLock(^{
+        NSUserDefaults *defaults = PushyDefaults();
+        pushy::state::State next = pushy::state::SwitchVersion(
+            PushyStateFromDefaults(defaults),
+            PushyToStdString(hash)
+        );
+        PushyApplyStateToDefaults(defaults, next);
+        // Re-enable first-load consumption and rollback checks for the newly selected bundle.
+        ignoreRollback = false;
+    });
     return YES;
 }
 
 - (BOOL)ensureDirectoryExistsAtPath:(NSString *)path
 {
-    __block BOOL success = NO;
-
-    dispatch_sync(_fileQueue, ^{
-        NSFileManager *fileManager = [NSFileManager defaultManager];
-        BOOL isDirectory = NO;
-        if ([fileManager fileExistsAtPath:path isDirectory:&isDirectory]) {
-            success = isDirectory;
-            return;
-        }
+    // No _fileQueue hop here: that queue also runs multi-second unzip/patch
+    // work, and a dispatch_sync onto it would block the whole module method
+    // queue for the duration. createDirectoryAtPath is idempotent and
+    // thread-safe, so checking inline is fine.
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    BOOL isDirectory = NO;
+    if ([fileManager fileExistsAtPath:path isDirectory:&isDirectory]) {
+        return isDirectory;
+    }
 
-        NSError *error = nil;
-        success = [fileManager createDirectoryAtPath:path
-                         withIntermediateDirectories:YES
-                                          attributes:nil
-                                               error:&error];
-        if (!success && error != nil) {
-            RCTLogWarn(@"Pushy create directory error: %@", error.localizedDescription);
-        }
-    });
+    NSError *error = nil;
+    BOOL success = [fileManager createDirectoryAtPath:path
+                          withIntermediateDirectories:YES
+                                           attributes:nil
+                                                error:&error];
+    if (!success && error != nil) {
+        RCTLogWarn(@"Pushy create directory error: %@", error.localizedDescription);
+    }
 
     return success;
 }
@@ -741,8 +768,12 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
 - (void)clearInvalidFiles
 {
     dispatch_async(_fileQueue, ^{
-        NSUserDefaults *defaults = PushyDefaults();
-        pushy::state::State state = PushyStateFromDefaults(defaults);
+        // Snapshot the state under the lock, but run the (slow) filesystem
+        // cleanup outside of it so state operations are not blocked.
+        __block pushy::state::State state;
+        PushyWithStateLock(^{
+            state = PushyStateFromDefaults(PushyDefaults());
+        });
         NSString *downloadDir = [RCTPushy downloadDir];
         pushy::patch::Status status = pushy::patch::CleanupOldEntries(
             PushyToStdString(downloadDir),

package/ios/RCTPushy/RCTPushyDownloader.mm

@@ -10,6 +10,8 @@ static NSString *const RCTPushyDownloaderErrorDomain = @"cn.reactnative.pushy";
 @property (copy) NSString *savePath;
 @property (nonatomic, strong) NSError *fileError;
 @property (nonatomic, assign) BOOL finished;
+@property (nonatomic, assign) int lastReportedPercentage;
+@property (nonatomic, assign) long long lastReportedBytes;
 @end
 
 @implementation RCTPushyDownloader
@@ -42,6 +44,10 @@ completionHandler:(void (^)(NSString *path, NSError *error))completionHandler
     }
 
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
+    // Avoid hanging forever on a stalled connection (default resource timeout
+    // is 7 days). These are generous enough for large bundles on slow networks.
+    sessionConfig.timeoutIntervalForRequest = 30;
+    sessionConfig.timeoutIntervalForResource = 300;
     self.session = [NSURLSession sessionWithConfiguration:sessionConfig
                                                  delegate:self
                                             delegateQueue:nil];
@@ -77,14 +83,47 @@ completionHandler:(void (^)(NSString *path, NSError *error))completionHandler
  totalBytesWritten:(int64_t)totalBytesWritten
 totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
 {
-    if (self.progressHandler) {
-        self.progressHandler(totalBytesWritten ,totalBytesExpectedToWrite);
+    if (!self.progressHandler) {
+        return;
+    }
+    // Normalize an unknown total (NSURLSessionTransferSizeUnknown == -1) to 0 so
+    // the JS side does not compute a negative/NaN percentage.
+    long long total = totalBytesExpectedToWrite > 0 ? totalBytesExpectedToWrite : 0;
+    if (total > 0) {
+        int percentage = (int)((totalBytesWritten * 100.0 / total) + 0.5);
+        if (percentage <= self.lastReportedPercentage) {
+            return;
+        }
+        self.lastReportedPercentage = percentage;
+    } else {
+        // Total unknown: throttle by bytes to avoid flooding the bridge.
+        if (totalBytesWritten - self.lastReportedBytes < 256 * 1024) {
+            return;
+        }
+        self.lastReportedBytes = totalBytesWritten;
     }
+    self.progressHandler(totalBytesWritten, total);
 }
 
 - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask
 didFinishDownloadingToURL:(NSURL *)location
 {
+    // A completed transfer does not imply success: 404/500 pages, CDN error
+    // bodies and captive-portal HTML all arrive here. Reject non-2xx responses
+    // before touching savePath so an existing valid package is not destroyed.
+    NSURLResponse *response = downloadTask.response;
+    if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+        NSInteger statusCode = ((NSHTTPURLResponse *)response).statusCode;
+        if (statusCode < 200 || statusCode >= 300) {
+            self.fileError = [NSError errorWithDomain:RCTPushyDownloaderErrorDomain
+                                                 code:statusCode
+                                             userInfo:@{
+                NSLocalizedDescriptionKey: [NSString stringWithFormat:@"unexpected http status code %ld", (long)statusCode],
+            }];
+            return;
+        }
+    }
+
     NSFileManager *fileManager = [NSFileManager defaultManager];
     [fileManager removeItemAtPath:self.savePath error:nil];
 

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "react-native-update",
-  "version": "10.43.3",
+  "version": "10.45.0",
   "description": "react-native hot update",
   "main": "src/index",
+  "types": "src/index.ts",
   "scripts": {
     "prepublishOnly": "NODE_ENV=production bun scripts/prepublish.ts",
     "publish:local": "SKIP_NATIVE_BUILD=1 npm publish",
     "postinstall": "node scripts/check-expo-version.js",
     "prepack": "bun submodule && bun lint",
-    "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
+    "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit && node scripts/check-harmony-types.js",
+    "lint:harmony": "node scripts/check-harmony-types.js",
     "submodule": "git submodule update --init --recursive",
     "test": "bun test src/__tests__",
     "test:patch-core": "./scripts/test-patch-core.sh",
     "build:harmony-har": "node scripts/build-harmony-har.js",
-    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
+    "build:so": "bun submodule && bash scripts/build-android-so.sh",
     "build:ios-debug": "cd Example/e2etest && bun && detox build --configuration ios.sim.debug",
     "build:ios-release": "cd Example/e2etest && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/e2etest && E2E_PLATFORM=ios detox test --configuration ios.sim.debug",
@@ -67,6 +69,7 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^25.5.0",
     "@types/react": "^19.2.14",
+    "@types/react-test-renderer": "18.0.7",
     "detox": "^20.50.1",
     "eslint": "^8.57.0",
     "firebase-tools": "^15.11.0",
@@ -75,6 +78,7 @@
     "prettier": "^2",
     "react": "18.2.0",
     "react-native": "0.73",
+    "react-test-renderer": "18.2.0",
     "ts-jest": "^29.4.6",
     "typescript": "^5.6.3"
   }