react-native-update 10.37.20 → 10.38.0-beta.0

package/ios/RCTPushy/RCTPushy.mm

@@ -1,6 +1,9 @@
 #import "RCTPushy.h"
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
+#include "../../cpp/patch_core/archive_patch_core.h"
+#include "../../cpp/patch_core/patch_core.h"
+#include "../../cpp/patch_core/state_core.h"
 
 #if __has_include("RCTReloadCommand.h")
 #import "RCTReloadCommand.h"
@@ -58,6 +61,112 @@ typedef NS_ENUM(NSInteger, PushyType) {
 
 static BOOL ignoreRollback = false;
 
+static std::string PushyToStdString(NSString *value) {
+    if (value == nil) {
+        return std::string();
+    }
+    return std::string([value UTF8String]);
+}
+
+static NSError *PushyNSErrorFromStatus(const pushy::patch::Status &status) {
+    return [NSError errorWithDomain:@"cn.reactnative.pushy"
+                               code:-1
+                           userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithUTF8String:status.message.c_str()] }];
+}
+
+static NSString *PushyFromStdString(const std::string &value) {
+    if (value.empty()) {
+        return nil;
+    }
+    return [NSString stringWithUTF8String:value.c_str()];
+}
+
+static void PushySetNullableString(NSUserDefaults *defaults, NSString *key, NSString *value) {
+    if (value != nil) {
+        [defaults setObject:value forKey:key];
+    } else {
+        [defaults removeObjectForKey:key];
+    }
+}
+
+static pushy::patch::PatchManifest PushyPatchManifestFromJson(NSDictionary *json) {
+    pushy::patch::PatchManifest manifest;
+
+    NSDictionary *copies = json[@"copies"];
+    for (NSString *to in copies) {
+        NSString *from = copies[to];
+        if (from.length <= 0) {
+            from = to;
+        }
+        manifest.copies.push_back(pushy::patch::CopyOperation{
+            PushyToStdString(from),
+            PushyToStdString(to),
+        });
+    }
+
+    NSDictionary *deletes = json[@"deletes"];
+    for (NSString *path in deletes) {
+        manifest.deletes.push_back(PushyToStdString(path));
+    }
+
+    return manifest;
+}
+
+static pushy::state::State PushyStateFromDefaults(NSUserDefaults *defaults) {
+    pushy::state::State state;
+    state.package_version = PushyToStdString([defaults stringForKey:paramPackageVersion]);
+    state.build_time = PushyToStdString([defaults stringForKey:paramBuildTime]);
+    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
+    if (pushyInfo != nil) {
+        state.current_version = PushyToStdString(pushyInfo[paramCurrentVersion]);
+        state.last_version = PushyToStdString(pushyInfo[paramLastVersion]);
+        state.first_time = [pushyInfo[paramIsFirstTime] boolValue];
+        id firstLoadOk = pushyInfo[paramIsFirstLoadOk];
+        state.first_time_ok = firstLoadOk == nil ? true : [firstLoadOk boolValue];
+    }
+    state.rolled_back_version = PushyToStdString([defaults stringForKey:keyRolledBackMarked]);
+    return state;
+}
+
+static void PushyApplyStateToDefaults(NSUserDefaults *defaults, const pushy::state::State &state) {
+    PushySetNullableString(defaults, paramPackageVersion, PushyFromStdString(state.package_version));
+    PushySetNullableString(defaults, paramBuildTime, PushyFromStdString(state.build_time));
+
+    BOOL hasPushyInfo = !state.current_version.empty() || !state.last_version.empty() || state.first_time || !state.first_time_ok;
+    if (hasPushyInfo) {
+        NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] init];
+        if (!state.current_version.empty()) {
+            newInfo[paramCurrentVersion] = PushyFromStdString(state.current_version);
+        }
+        if (!state.last_version.empty()) {
+            newInfo[paramLastVersion] = PushyFromStdString(state.last_version);
+        }
+        newInfo[paramIsFirstTime] = @(state.first_time);
+        newInfo[paramIsFirstLoadOk] = @(state.first_time_ok);
+        [defaults setObject:newInfo forKey:keyPushyInfo];
+    } else {
+        [defaults removeObjectForKey:keyPushyInfo];
+    }
+
+    PushySetNullableString(
+        defaults,
+        keyRolledBackMarked,
+        PushyFromStdString(state.rolled_back_version));
+}
+
+@interface RCTPushy ()
+- (void)_dopatch:(NSString *)hash
+            type:(PushyType)type
+      fromBundle:(NSString *)bundleOrigin
+          source:(NSString *)sourceOrigin
+        callback:(void (^)(NSError *error))callback;
+- (void)patch:(NSString *)hash
+         type:(PushyType)type
+   fromBundle:(NSString *)bundleOrigin
+       source:(NSString *)sourceOrigin
+     callback:(void (^)(NSError *error))callback;
+@end
+
 @implementation RCTPushy {
     RCTPushyManager *_fileManager;
     bool hasListeners;
@@ -77,51 +186,49 @@ RCT_EXPORT_MODULE(RCTPushy);
     NSString *storedPackageVersion = [defaults stringForKey:paramPackageVersion];
     NSString *storedBuildTime = [defaults stringForKey:paramBuildTime];
     
-    BOOL packageVersionChanged = !storedPackageVersion || ![curPackageVersion isEqualToString:storedPackageVersion];
-    BOOL buildTimeChanged = !storedBuildTime || ![curBuildTime isEqualToString:storedBuildTime];
-    
-    if (packageVersionChanged || buildTimeChanged) {
-        // Clear all update data and store new versions
-        [defaults setObject:nil forKey:keyPushyInfo];
-        [defaults setObject:nil forKey:keyHashInfo];
+    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];
-        [defaults setObject:curPackageVersion forKey:paramPackageVersion];
-        [defaults setObject:curBuildTime forKey:paramBuildTime];
+        state = sync.state;
+        PushyApplyStateToDefaults(defaults, state);
     }
-    
-    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    if (pushyInfo) {
-            NSString *curVersion = pushyInfo[paramCurrentVersion];
-            
-            BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue];
-            BOOL isFirstLoadOK = [pushyInfo[paramIsFirstLoadOk] boolValue];
-            
-            NSString *loadVersion = curVersion;
-            BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
-            if (needRollback) {
-                loadVersion = [self rollback];
-            } else if (isFirstTime && !ignoreRollback){
-                // bundleURL may be called many times, ignore rollbacks before process restarted again.
-                ignoreRollback = true;
-
-                NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] initWithDictionary:pushyInfo];
-                newInfo[paramIsFirstTime] = @(NO);
-                [defaults setObject:newInfo forKey:keyPushyInfo];
-                [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
-                
-            }
-            
-            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);
-                    loadVersion = [self rollback];
-                }
+
+    if (!state.current_version.empty()) {
+        pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
+            state,
+            ignoreRollback,
+            true
+        );
+        state = decision.state;
+
+        if (decision.did_rollback || decision.consumed_first_time) {
+            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);
+                PushyApplyStateToDefaults(defaults, state);
+                loadVersion = PushyFromStdString(state.current_version);
             }
+        }
     }
     
     return [RCTPushy binaryBundleURL];
@@ -129,24 +236,9 @@ RCT_EXPORT_MODULE(RCTPushy);
 
 + (NSString *) rollback {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    
-    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    NSString *lastVersion = pushyInfo[paramLastVersion];
-    NSString *curVersion = pushyInfo[paramCurrentVersion]; 
-    if (lastVersion.length) {
-        // roll back to last version
-        [defaults setObject:@{paramCurrentVersion:lastVersion,
-                              paramIsFirstTime:@(NO),
-                              paramIsFirstLoadOk:@(YES)}
-                     forKey:keyPushyInfo];
-    }
-    else {
-        // roll back to bundle
-        [defaults setObject:nil forKey:keyPushyInfo];
-    }
-    [defaults setObject:curVersion forKey:keyRolledBackMarked];
-    
-    return lastVersion;
+    pushy::state::State state = pushy::state::Rollback(PushyStateFromDefaults(defaults));
+    PushyApplyStateToDefaults(defaults, state);
+    return PushyFromStdString(state.current_version);
 }
 
 + (BOOL)requiresMainQueueSetup {
@@ -293,20 +385,11 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
     
     if (hash.length) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSString *lastVersion = nil;
-        NSDictionary *pushyInfo = [defaults objectForKey:keyPushyInfo];
-        if (pushyInfo) {
-            lastVersion = pushyInfo[paramCurrentVersion];
-        }
-        
-        NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] init];
-        newInfo[paramCurrentVersion] = hash;
-        newInfo[paramLastVersion] = lastVersion;
-        newInfo[paramIsFirstTime] = @(YES);
-        newInfo[paramIsFirstLoadOk] = @(NO);
-        [defaults setObject:newInfo forKey:keyPushyInfo];
-        
-        
+        pushy::state::State next = pushy::state::SwitchVersion(
+            PushyStateFromDefaults(defaults),
+            PushyToStdString(hash)
+        );
+        PushyApplyStateToDefaults(defaults, next);
         resolve(@true);
     } else {
         reject(@"执行报错", nil, nil);
@@ -373,19 +456,13 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     #else
     
     @try {
-        // up package info
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSMutableDictionary *pushyInfo = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:keyPushyInfo]];
-        [pushyInfo setObject:@(NO) forKey:paramIsFirstTime];
-        [pushyInfo setObject:@(YES) forKey:paramIsFirstLoadOk];
-        
-        NSString *lastVersion = pushyInfo[paramLastVersion];
-        NSString *curVersion = pushyInfo[paramCurrentVersion];
-        if (lastVersion != nil && ![lastVersion isEqualToString:curVersion]) {
-            [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
+        pushy::state::MarkSuccessResult result =
+            pushy::state::MarkSuccess(PushyStateFromDefaults(defaults));
+        if (!result.stale_version_to_delete.empty()) {
+            [defaults removeObjectForKey:[keyHashInfo stringByAppendingString:PushyFromStdString(result.stale_version_to_delete)]];
         }
-        [defaults setObject:pushyInfo forKey:keyPushyInfo];
-        
+        PushyApplyStateToDefaults(defaults, result.state);
         
         // clear other package dir
         [self clearInvalidFiles];
@@ -496,7 +573,7 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                             {
                                 NSString *sourceOrigin = [[NSBundle mainBundle] resourcePath];
                                 NSString *bundleOrigin = [[RCTPushy binaryBundleURL] path];
-                                [self patch:hash fromBundle:bundleOrigin source:sourceOrigin callback:callback];
+                                [self patch:hash type:type fromBundle:bundleOrigin source:sourceOrigin callback:callback];
                             }
                                 break;
                             case PushyTypePatchFromPpk:
@@ -505,7 +582,7 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                 
                                 NSString *sourceOrigin = lastVersionDir;
                                 NSString *bundleOrigin = [lastVersionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-                                [self patch:hash fromBundle:bundleOrigin source:sourceOrigin callback:callback];
+                                [self patch:hash type:type fromBundle:bundleOrigin source:sourceOrigin callback:callback];
                             }
                                 break;
                             default:
@@ -519,7 +596,10 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     }];
 }
 
-- (void)_dopatch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin
+- (void)_dopatch:(NSString *)hash
+            type:(PushyType)type
+      fromBundle:(NSString *)bundleOrigin
+          source:(NSString *)sourceOrigin
         callback:(void (^)(NSError *error))callback
 {
     NSString *unzipDir = [[RCTPushy downloadDir] stringByAppendingPathComponent:hash];
@@ -527,73 +607,83 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     NSString *bundlePatch = [unzipDir stringByAppendingPathComponent:BUNDLE_PATCH_NAME];
     
     NSString *destination = [unzipDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-    void (^completionHandler)(BOOL success) = ^(BOOL success) {
-        if (success) {
-            NSData *data = [NSData dataWithContentsOfFile:sourcePatch];
-            NSError *error = nil;
-            NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&error];
-            if (error) {
-                callback(error);
-                return;
-            }
-            
-            NSDictionary *copies = json[@"copies"];
-            NSDictionary *deletes = json[@"deletes"];
-
-            [self->_fileManager copyFiles:copies fromDir:sourceOrigin toDir:unzipDir deletes:deletes completionHandler:^(NSError *error) {
-                if (error) {
-                    callback(error);
-                }
-                else {
-                    callback(nil);
-                }
-            }];
-        }
-        else {
-            callback([self errorWithMessage:ERROR_HDIFFPATCH]);
-        }
-    };
-    
-    @try {
-        [_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
+    NSData *data = [NSData dataWithContentsOfFile:sourcePatch];
+    NSError *error = nil;
+    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&error];
+    if (error) {
+        callback(error);
+        return;
     }
-    @catch (NSException *exception) {
-        NSLog(@"Pushy _dopatch error: exception occurred during hdiffFileAtPath: %@, reason: %@", 
-              exception.name, exception.reason);
-        callback([self errorWithMessage:ERROR_HDIFFPATCH]);
+
+    std::vector<std::string> entryNames;
+    if ([[NSFileManager defaultManager] fileExistsAtPath:sourcePatch isDirectory:NULL]) {
+        entryNames.push_back(PushyToStdString(SOURCE_PATCH_NAME));
+    }
+    if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePatch isDirectory:NULL]) {
+        entryNames.push_back(PushyToStdString(BUNDLE_PATCH_NAME));
+    }
+
+    pushy::archive_patch::ArchivePatchPlan plan;
+    pushy::patch::Status planStatus = pushy::archive_patch::BuildArchivePatchPlan(
+        type == PushyTypePatchFromPackage
+            ? pushy::archive_patch::ArchivePatchType::kPatchFromPackage
+            : pushy::archive_patch::ArchivePatchType::kPatchFromPpk,
+        PushyPatchManifestFromJson(json),
+        entryNames,
+        &plan
+    );
+    if (!planStatus.ok) {
+        callback(PushyNSErrorFromStatus(planStatus));
+        return;
+    }
+
+    pushy::patch::FileSourcePatchOptions options;
+    pushy::patch::Status optionStatus = pushy::archive_patch::BuildFileSourcePatchOptions(
+        plan,
+        PushyToStdString(sourceOrigin),
+        PushyToStdString(unzipDir),
+        PushyToStdString(bundleOrigin),
+        PushyToStdString(bundlePatch),
+        PushyToStdString(destination),
+        &options
+    );
+    if (!optionStatus.ok) {
+        callback(PushyNSErrorFromStatus(optionStatus));
+        return;
     }
+
+    pushy::patch::Status status = pushy::patch::ApplyPatchFromFileSource(options);
+    if (!status.ok) {
+        callback(PushyNSErrorFromStatus(status));
+        return;
+    }
+
+    callback(nil);
 }
 
-- (void)patch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin callback:(void (^)(NSError *error))callback
+- (void)patch:(NSString *)hash
+         type:(PushyType)type
+   fromBundle:(NSString *)bundleOrigin
+       source:(NSString *)sourceOrigin
+     callback:(void (^)(NSError *error))callback
 {
-    [self _dopatch:hash fromBundle:bundleOrigin source:sourceOrigin callback:callback];
+    [self _dopatch:hash type:type fromBundle:bundleOrigin source:sourceOrigin callback:callback];
 }
 
 - (void)clearInvalidFiles
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSDictionary *pushyInfo = [defaults objectForKey:keyPushyInfo];
-    NSString *curVersion = [pushyInfo objectForKey:paramCurrentVersion];
+    pushy::state::State state = PushyStateFromDefaults(defaults);
     
     NSString *downloadDir = [RCTPushy downloadDir];
-    NSError *error = nil;
-    NSArray *list = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:downloadDir error:&error];
-    if (error) {
-        return;
-    }
-    
-    for(NSString *fileName in list) {
-        if (![fileName isEqualToString:curVersion]) {
-            NSString *filePath = [downloadDir stringByAppendingPathComponent:fileName];
-            NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error];
-            if (error) {
-                continue;
-            }
-            NSDate *modificationDate = [attributes fileModificationDate];
-            if ([[NSDate date] timeIntervalSinceDate:modificationDate] > 7 * 24 * 60 * 60) {
-                [_fileManager removeFile:filePath completionHandler:nil];
-            }
-        }
+    pushy::patch::Status status = pushy::patch::CleanupOldEntries(
+        PushyToStdString(downloadDir),
+        state.current_version,
+        state.last_version,
+        7
+    );
+    if (!status.ok) {
+        NSLog(@"Pushy cleanup error: %s", status.message.c_str());
     }
 }
 

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "react-native-update",
-  "version": "10.37.20",
+  "version": "10.38.0-beta.0",
   "description": "react-native hot update",
   "main": "src/index",
   "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",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
+    "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 && $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 && ./scripts/prune-host-stl.sh android/lib",
     "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
     "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && E2E_PLATFORM=ios detox test --configuration ios.sim.debug",
@@ -49,7 +51,7 @@
   "homepage": "https://github.com/reactnativecn/react-native-update#readme",
   "dependencies": {
     "nanoid": "^3.3.3",
-    "react-native-url-polyfill": "^2.0.0"
+    "react-native-url-polyfill": "^3.0.0"
   },
   "codegenConfig": {
     "name": "RCTPushySpec",
@@ -59,21 +61,21 @@
   "devDependencies": {
     "@babel/core": "^7.25.8",
     "@react-native/babel-preset": "^0.73.21",
-    "@react-native/eslint-config": "0.79.1",
-    "@react-native/typescript-config": "0.79.1",
-    "@types/bun": "^1.3.7",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.15.2",
-    "@types/react": "^18.3.11",
-    "detox": "^20.37.0",
+    "@react-native/eslint-config": "0.84.1",
+    "@react-native/typescript-config": "0.84.1",
+    "@types/bun": "^1.3.11",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^25.5.0",
+    "@types/react": "^19.2.14",
+    "detox": "^20.50.1",
     "eslint": "^8.57.0",
-    "firebase-tools": "^13.22.1",
-    "jest": "^29.7.0",
-    "pod-install": "^0.3.7",
+    "firebase-tools": "^15.11.0",
+    "jest": "^30.3.0",
+    "pod-install": "^1.0.14",
     "prettier": "^2",
     "react": "18.2.0",
     "react-native": "0.73",
-    "ts-jest": "^29.3.2",
+    "ts-jest": "^29.4.6",
     "typescript": "^5.6.3"
   }
-}
+}

package/react-native-update.podspec

@@ -110,6 +110,9 @@ Pod::Spec.new do |s|
 
   s.subspec 'RCTPushy' do |ss|
     ss.source_files = ['ios/**/*.{h,m,mm,c}',
+                       'cpp/patch_core/archive_patch_core.{h,cpp}',
+                       'cpp/patch_core/patch_core.{h,cpp}',
+                       'cpp/patch_core/state_core.{h,cpp}',
                        'android/jni/hpatch.{h,c}',
                        'android/jni/HDiffPatch/libHDiffPatch/HPatch/*.{h,c}',
                        'android/jni/HDiffPatch/file_for_patch.{h,c}',

package/scripts/build-harmony-har.js

@@ -6,6 +6,7 @@ const { spawnSync } = require('child_process');
 
 const projectRoot = path.resolve(__dirname, '..');
 const androidJniDir = path.join(projectRoot, 'android', 'jni');
+const patchCoreDir = path.join(projectRoot, 'cpp', 'patch_core');
 const harmonyModuleDir = path.join(projectRoot, 'harmony', 'pushy');
 const harmonyBuildDir = path.join(harmonyModuleDir, 'build');
 const harmonyNativeStageDir = path.join(
@@ -16,6 +17,10 @@ const harmonyNativeStageDir = path.join(
   'android-generated',
 );
 const harmonyNativeStageJniDir = path.join(harmonyNativeStageDir, 'jni');
+const harmonyNativeStagePatchCoreDir = path.join(
+  harmonyNativeStageDir,
+  'patch_core',
+);
 const wrapperProjectDir = path.join(projectRoot, 'harmony', 'har-wrapper');
 const defaultOutputPath = path.join(projectRoot, 'harmony', 'pushy.har');
 const wrapperProjectFiles = [
@@ -197,6 +202,12 @@ function syncHarmonyNativeSources() {
       path.join(androidJniDir, 'lzma', 'C'),
     )}`,
   );
+  ensureFileExists(
+    path.join(patchCoreDir, 'patch_core.cpp'),
+    `Missing shared patch core source: ${relativeToProject(
+      path.join(patchCoreDir, 'patch_core.cpp'),
+    )}`,
+  );
 
   fs.rmSync(harmonyNativeStageDir, { recursive: true, force: true });
   fs.mkdirSync(path.join(harmonyNativeStageJniDir, 'lzma'), {
@@ -219,6 +230,7 @@ function syncHarmonyNativeSources() {
     path.join(androidJniDir, 'lzma', 'C'),
     path.join(harmonyNativeStageJniDir, 'lzma', 'C'),
   );
+  copyPath(patchCoreDir, harmonyNativeStagePatchCoreDir);
 }
 
 function cleanupHarmonyNativeSources() {

package/scripts/prepublish.ts

@@ -98,11 +98,57 @@ async function modifyPackageJson({
   console.log('package.json has been modified for publishing');
 }
 
+function isGitHubCI(): boolean {
+  return process.env.GITHUB_ACTIONS === 'true';
+}
+
+function shouldSkipNativeBuild(): boolean {
+  return process.argv.includes('--skip') || process.env.SKIP_NATIVE_BUILD === '1';
+}
+
+async function buildNativeArtifacts(): Promise<void> {
+  console.log('Building Harmony HAR...');
+  const harResult = Bun.spawnSync(['npm', 'run', 'build:harmony-har'], {
+    cwd: path.join(__dirname, '..'),
+    stdio: ['inherit', 'inherit', 'inherit'],
+  });
+  if (harResult.exitCode !== 0) {
+    throw new Error(
+      `Harmony HAR build failed with exit code ${harResult.exitCode}`,
+    );
+  }
+
+  console.log('Building Android SO...');
+  const soResult = Bun.spawnSync(['npm', 'run', 'build:so'], {
+    cwd: path.join(__dirname, '..'),
+    stdio: ['inherit', 'inherit', 'inherit'],
+  });
+  if (soResult.exitCode !== 0) {
+    throw new Error(
+      `Android SO build failed with exit code ${soResult.exitCode}`,
+    );
+  }
+}
+
 async function main(): Promise<void> {
   try {
-    const version = await resolveVersion();
-    console.log(`Using publish version ${version}`);
-    await modifyPackageJson({ version });
+    if (isGitHubCI()) {
+      const version = await resolveVersion();
+      console.log(`Using publish version ${version}`);
+      await modifyPackageJson({ version });
+    } else {
+      console.log(
+        'ℹ️  Not in GitHub CI, skipping version resolution and package.json modification',
+      );
+      if (shouldSkipNativeBuild()) {
+        console.log(
+          'ℹ️  --skip flag detected, skipping native artifacts build',
+        );
+      } else {
+        await buildNativeArtifacts();
+      }
+    }
+
     console.log('✅ Prepublish script completed successfully');
   } catch (error) {
     console.error('❌ Prepublish script failed:', error);

package/scripts/prune-host-stl.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+
+TARGET_DIR="${1:-android/lib}"
+
+find "$TARGET_DIR" -type f -name 'libc++_shared.so' -delete