react-native-update 10.44.0 → 10.46.0

package/ios/RCTPushy/RCTPushy.mm

@@ -2,6 +2,7 @@
 #import "RCTPushyDownloader.h"
 #import "ZipArchive.h"
 #include "../../cpp/patch_core/archive_patch_core.h"
+#include "../../cpp/patch_core/error_codes.h"
 #include "../../cpp/patch_core/patch_core.h"
 #include "../../cpp/patch_core/state_core.h"
 
@@ -14,6 +15,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";
@@ -34,9 +38,15 @@ static NSString * const BUNDLE_FILE_NAME = @"index.bundlejs";
 static NSString * const SOURCE_PATCH_NAME = @"__diff.json";
 static NSString * const BUNDLE_PATCH_NAME = @"index.bundlejs.patch";
 
-// error def
+// error def — messages are human-readable; the stable cross-platform codes
+// live in cpp/patch_core/error_codes.h and travel in PushyErrorCodeKey.
 static NSString * const ERROR_OPTIONS = @"options error";
 static NSString * const ERROR_FILE_OPERATION = @"file operation error";
+static NSString * const PushyErrorCodeKey = @"PushyErrorCode";
+
+static NSString *PushyCode(const char *code) {
+    return [NSString stringWithUTF8String:code];
+}
 
 // event def
 static NSString * const EVENT_PROGRESS_DOWNLOAD = @"RCTPushyDownloadProgress";
@@ -52,7 +62,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) {
@@ -64,7 +87,10 @@ static std::string PushyToStdString(NSString *value) {
 static NSError *PushyNSErrorFromStatus(const pushy::patch::Status &status) {
     return [NSError errorWithDomain:PushyErrorDomain
                                code:-1
-                           userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithUTF8String:status.message.c_str()] }];
+                           userInfo:@{
+                               NSLocalizedDescriptionKey: [NSString stringWithUTF8String:status.message.c_str()],
+                               PushyErrorCodeKey: PushyCode(pushy::error_codes::kPatchFailed),
+                           }];
 }
 
 static NSUserDefaults *PushyDefaults(void) {
@@ -102,21 +128,24 @@ static BOOL PushyStringIsBlank(NSString *value) {
 }
 
 static void PushyRejectError(RCTPromiseRejectBlock reject, NSError *error) {
-    reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);
+    // Prefer the stable cross-platform code (error_codes.h); fall back to the
+    // numeric NSError code for system errors that were not classified.
+    NSString *code = error.userInfo[PushyErrorCodeKey];
+    if (code == nil) {
+        code = [NSString stringWithFormat:@"%ld", (long)error.code];
+    }
+    reject(code, error.localizedDescription, error);
 }
 
-static NSError *PushyErrorWithMessage(NSString *message) {
+static NSError *PushyErrorWithCode(const char *code, NSString *message) {
     return [NSError errorWithDomain:PushyErrorDomain
                                code:-1
                            userInfo:@{
                                NSLocalizedDescriptionKey: message ?: @"unknown error",
+                               PushyErrorCodeKey: PushyCode(code),
                            }];
 }
 
-static void PushyRejectMessage(RCTPromiseRejectBlock reject, NSString *message) {
-    PushyRejectError(reject, PushyErrorWithMessage(message));
-}
-
 static pushy::patch::PatchManifest PushyPatchManifestFromJson(NSDictionary *json) {
     pushy::patch::PatchManifest manifest;
 
@@ -221,64 +250,84 @@ 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();
 
-    if (!state.current_version.empty()) {
-        pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
+        NSString *curPackageVersion = [RCTPushy packageVersion];
+        NSString *curBuildTime = [RCTPushy buildTime];
+
+        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()) {
+            std::string const versionBeforeLaunch = state.current_version;
+            pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
+                state,
+                ignoreRollback.load(),
+                true
+            );
+            state = decision.state;
+
+            if (decision.did_rollback) {
+                // The crash-protection rollback: the new version never called
+                // markSuccess. Keep this visible in release logs.
+                RCTLogWarn(@"RCTPushy -- version %@ was not marked as successful, rolled back to %@",
+                    PushyFromStdString(versionBeforeLaunch),
+                    PushyFromStdString(state.current_version));
+            }
+            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];
+            // Guard the rollback chain against cycles: a corrupted state
+            // returning an already-visited version would otherwise spin this
+            // loop forever during startup (Android has the same guard).
+            NSMutableSet<NSString *> *visitedVersions = [NSMutableSet set];
+            while (loadVersion.length && ![visitedVersions containsObject:loadVersion]) {
+                [visitedVersions addObject:loadVersion];
+                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, rolling back", 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 +337,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;
 }
@@ -335,7 +385,7 @@ RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)res
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (PushyStringIsBlank(uuid)) {
-        PushyRejectError(reject, PushyErrorWithMessage(ERROR_OPTIONS));
+        PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
         return;
     }
 
@@ -349,7 +399,7 @@ RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (PushyStringIsBlank(hash) || PushyStringIsBlank(value)) {
-        PushyRejectMessage(reject, ERROR_OPTIONS);
+        PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
         return;
     }
 
@@ -362,7 +412,9 @@ RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
         
         resolve(@true);
     } else {
-        PushyRejectError(reject, error ?: PushyErrorWithMessage(@"json格式校验报错"));
+        PushyRejectError(reject, PushyErrorWithCode(
+            pushy::error_codes::kInvalidHashInfo,
+            error != nil ? error.localizedDescription : @"invalid json string"));
     }
 }
 
@@ -397,6 +449,15 @@ RCT_EXPORT_METHOD(downloadPatchFromPpk:(NSDictionary *)options
     [self downloadUpdate:PushyTypePatchFromPpk options:options resolver:resolve rejecter:reject];
 }
 
+RCT_EXPORT_METHOD(downloadAndInstallApk:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    PushyRejectError(reject, PushyErrorWithCode(
+        pushy::error_codes::kUnsupportedPlatform,
+        @"downloadAndInstallApk is only supported on Android"));
+}
+
 RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -438,13 +499,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);
@@ -476,6 +539,12 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
 {
     [self performUpdate:type options:options callback:^(NSError *error) {
         if (error != nil) {
+            if (error.userInfo[PushyErrorCodeKey] == nil) {
+                // Unclassified (system/network) errors from the download
+                // pipeline; keep the original message.
+                error = PushyErrorWithCode(pushy::error_codes::kDownloadFailed,
+                                           error.localizedDescription);
+            }
             PushyRejectError(reject, error);
             return;
         }
@@ -501,24 +570,38 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     NSString *hash = PushyOptionString(options, @"hash");
 
     if (PushyStringIsBlank(updateUrl) || PushyStringIsBlank(hash)) {
-        callback(PushyErrorWithMessage(ERROR_OPTIONS));
+        callback(PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
         return;
     }
     NSString *originHash = PushyOptionString(options, @"originHash");
     if (type == PushyTypePatchFromPpk && PushyStringIsBlank(originHash)) {
-        callback(PushyErrorWithMessage(ERROR_OPTIONS));
+        callback(PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
         return;
     }
     
     NSString *dir = [RCTPushy downloadDir];
     BOOL success = [self ensureDirectoryExistsAtPath:dir];
     if (!success) {
-        callback(PushyErrorWithMessage(ERROR_FILE_OPERATION));
+        callback(PushyErrorWithCode(pushy::error_codes::kFileOperationFailed, ERROR_FILE_OPERATION));
         return;
     }
 
     NSString *zipFilePath = [dir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@%@",hash, [self zipExtension:type]]];
 
+    // On failure, remove the partial version directory like Android/Harmony
+    // do: a half-unzipped/half-patched dir leaks disk and could later be
+    // mistaken for a complete version. hash is validated non-blank above, so
+    // this can never resolve to the download root itself.
+    NSString *unzipDir = [dir stringByAppendingPathComponent:hash];
+    void (^completion)(NSError *) = ^(NSError *error) {
+        if (error != nil) {
+            dispatch_async(self->_fileQueue, ^{
+                [[NSFileManager defaultManager] removeItemAtPath:unzipDir error:nil];
+            });
+        }
+        callback(error);
+    };
+
     RCTLogInfo(@"RCTPushy -- download file %@", updateUrl);
     [RCTPushyDownloader download:updateUrl savePath:zipFilePath progressHandler:^(long long receivedBytes, long long totalBytes) {
         if (self->hasListeners) {
@@ -530,14 +613,14 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
         }
     } completionHandler:^(NSString *path, NSError *error) {
         if (error != nil) {
-            callback(error);
+            completion(error);
             return;
         }
         [self unzipDownloadedPackage:zipFilePath
                                 hash:hash
                                 type:type
                           originHash:originHash
-                            callback:callback];
+                            callback:completion];
     }];
 }
 
@@ -603,18 +686,21 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     NSString *destination = [unzipDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
     NSData *data = [NSData dataWithContentsOfFile:sourcePatch];
     if (data == nil) {
-        callback(PushyErrorWithMessage(@"missing patch manifest"));
+        callback(PushyErrorWithCode(pushy::error_codes::kPatchFailed, @"missing patch manifest"));
         return;
     }
 
     NSError *error = nil;
     id jsonObject = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&error];
     if (error != nil) {
-        callback(error);
+        // Classify as a patch failure like the sibling manifest branches;
+        // unclassified errors would otherwise be tagged DOWNLOAD_FAILED by the
+        // downloadUpdate fallback even though the download itself succeeded.
+        callback(PushyErrorWithCode(pushy::error_codes::kPatchFailed, error.localizedDescription));
         return;
     }
     if (![jsonObject isKindOfClass:[NSDictionary class]]) {
-        callback(PushyErrorWithMessage(@"invalid patch manifest"));
+        callback(PushyErrorWithCode(pushy::error_codes::kPatchFailed, @"invalid patch manifest"));
         return;
     }
     NSDictionary *json = (NSDictionary *)jsonObject;
@@ -669,43 +755,44 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
 {
     if (PushyStringIsBlank(hash)) {
         if (error != NULL) {
-            *error = PushyErrorWithMessage(ERROR_OPTIONS);
+            *error = PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS);
         }
         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;
 }
@@ -731,7 +818,7 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
 
             NSError *unzipError = error;
             if (!succeeded && unzipError == nil) {
-                unzipError = PushyErrorWithMessage(@"unzip failed");
+                unzipError = PushyErrorWithCode(pushy::error_codes::kPatchFailed, @"unzip failed");
             }
             completionHandler(unzipError);
         }];
@@ -741,8 +828,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

@@ -113,7 +113,8 @@ didFinishDownloadingToURL:(NSURL *)location
     // 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;
+        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+        NSInteger statusCode = httpResponse.statusCode;
         if (statusCode < 200 || statusCode >= 300) {
             self.fileError = [NSError errorWithDomain:RCTPushyDownloaderErrorDomain
                                                  code:statusCode
@@ -122,6 +123,26 @@ didFinishDownloadingToURL:(NSURL *)location
             }];
             return;
         }
+
+        // Reject truncated transfers like Android/Harmony do. Skip the check
+        // for encoded responses (e.g. gzip): NSURLSession decompresses them
+        // transparently, so the on-disk size legitimately differs from the
+        // Content-Length of the encoded body.
+        NSString *contentEncoding = [httpResponse.allHeaderFields[@"Content-Encoding"] lowercaseString];
+        BOOL isEncodedBody = contentEncoding.length > 0 && ![contentEncoding isEqualToString:@"identity"];
+        long long expectedLength = httpResponse.expectedContentLength;
+        if (!isEncodedBody && expectedLength > 0) {
+            NSNumber *fileSize = [[NSFileManager defaultManager] attributesOfItemAtPath:location.path
+                                                                                  error:nil][NSFileSize];
+            if (fileSize != nil && fileSize.longLongValue != expectedLength) {
+                self.fileError = [NSError errorWithDomain:RCTPushyDownloaderErrorDomain
+                                                     code:-1
+                                                 userInfo:@{
+                    NSLocalizedDescriptionKey: [NSString stringWithFormat:@"download incomplete: expected %lld bytes, got %lld", expectedLength, fileSize.longLongValue],
+                }];
+                return;
+            }
+        }
     }
 
     NSFileManager *fileManager = [NSFileManager defaultManager];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.44.0",
+  "version": "10.46.0",
   "description": "react-native hot update",
   "main": "src/index",
   "types": "src/index.ts",
@@ -9,12 +9,14 @@
     "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:harmony-e2e": "bash Example/e2etest/scripts/build-harmony-e2e.sh",
+    "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",
@@ -68,6 +70,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",
@@ -76,6 +79,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"
   }