@hot-updater/react-native 0.6.7 → 0.8.0

package/android/build.gradle

@@ -65,7 +65,7 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
+    consumerProguardFiles 'proguard-rules.pro'
   }
 
   buildFeatures {

package/android/proguard-rules.pro

@@ -0,0 +1,15 @@
+# Old Architecture
+# Invoked via reflection, when setting js bundle.
+-keepclassmembers class com.facebook.react.ReactInstanceManager {
+    private final ** mBundleLoader;
+}
+
+# New Architecture
+# Keep fields accessed via reflection in ReactHost
+-keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
+    private final ** mReactHostDelegate;
+}
+
+-keepclassmembers class * implements com.facebook.react.runtime.ReactHostDelegate {
+    ** jsBundleLoader;
+}

package/android/src/main/java/com/hotupdater/HotUpdater.kt

@@ -59,6 +59,11 @@ class HotUpdater : ReactPackage {
                 putString("HotUpdaterBundleURL", bundleURL)
                 apply()
             }
+
+            if (bundleURL == null) {
+                return
+            }
+
             val reactIntegrationManager = ReactIntegrationManager(context)
 
             val activity: Activity? = getCurrentActivity(context)
@@ -133,11 +138,11 @@ class HotUpdater : ReactPackage {
         fun updateBundle(
             context: Context,
             bundleId: String,
-            zipUrl: String,
+            zipUrl: String?,
             progressCallback: ((Double) -> Unit),
         ): Boolean {
             Log.d("HotUpdater", "updateBundle bundleId $bundleId zipUrl $zipUrl")
-            if (zipUrl.isEmpty()) {
+            if (zipUrl.isNullOrEmpty()) {
                 setBundleURL(context, null)
                 return true
             }

package/android/src/newarch/HotUpdaterModule.kt

@@ -26,7 +26,7 @@ class HotUpdaterModule internal constructor(
     @ReactMethod
     override fun updateBundle(
         bundleId: String,
-        zipUrl: String,
+        zipUrl: String?,
         promise: Promise,
     ) {
         val isSuccess =

package/android/src/oldarch/HotUpdaterModule.kt

@@ -26,7 +26,7 @@ class HotUpdaterModule internal constructor(
     @ReactMethod
     override fun updateBundle(
         bundleId: String,
-        zipUrl: String,
+        zipUrl: String?,
         promise: Promise,
     ) {
         val isSuccess =

package/android/src/oldarch/HotUpdaterSpec.kt

@@ -9,7 +9,7 @@ abstract class HotUpdaterSpec internal constructor(
 ) : ReactContextBaseJavaModule(context) {
     abstract fun updateBundle(
         bundleId: String,
-        zipUrl: String,
+        zipUrl: String?,
         promise: Promise,
     )
 

package/ios/HotUpdater/HotUpdater.mm

@@ -71,71 +71,66 @@ RCT_EXPORT_MODULE();
     return success;
 }
 
-- (BOOL)updateBundle:(NSString *)bundleId zipUrl:(NSURL *)zipUrl {
+- (void)updateBundle:(NSString *)bundleId zipUrl:(NSURL *)zipUrl completion:(void (^)(BOOL success))completion {
     if (!zipUrl) {
-        [self setBundleURL:nil];
-        return YES;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self setBundleURL:nil];
+            if (completion) completion(YES);
+        });
+        return;
     }
-    
+
     NSString *basePath = [self stripPrefixFromPath:bundleId path:[zipUrl path]];
     NSString *path = [self convertFileSystemPathFromBasePath:basePath];
-    
+
     NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
     NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration];
-    
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-    __block BOOL success = NO;
-    
+
     NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithURL:zipUrl
                                                         completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
         if (error) {
             NSLog(@"Failed to download data from URL: %@, error: %@", zipUrl, error);
-            success = NO;
-            dispatch_semaphore_signal(semaphore);
+            if (completion) completion(NO);
             return;
         }
-        
+
         NSFileManager *fileManager = [NSFileManager defaultManager];
         NSError *folderError;
-        
+
         // Ensure directory exists
         if (![fileManager createDirectoryAtPath:[path stringByDeletingLastPathComponent]
                     withIntermediateDirectories:YES
                                      attributes:nil
                                           error:&folderError]) {
             NSLog(@"Failed to create folder: %@", folderError);
-            success = NO;
-            dispatch_semaphore_signal(semaphore);
+            if (completion) completion(NO);
             return;
         }
-        
+
         // Check if file already exists and remove it
         if ([fileManager fileExistsAtPath:path]) {
             NSError *removeError;
             if (![fileManager removeItemAtPath:path error:&removeError]) {
                 NSLog(@"Failed to remove existing file: %@", removeError);
-                success = NO;
-                dispatch_semaphore_signal(semaphore);
+                if (completion) completion(NO);
                 return;
             }
         }
-        
+
         NSError *moveError;
         if (![fileManager moveItemAtURL:location toURL:[NSURL fileURLWithPath:path] error:&moveError]) {
             NSLog(@"Failed to save data: %@", moveError);
-            success = NO;
-            dispatch_semaphore_signal(semaphore);
+            if (completion) completion(NO);
             return;
         }
-        
+
         NSString *extractedPath = [path stringByDeletingLastPathComponent];
         if (![self extractZipFileAtPath:path toDestination:extractedPath]) {
             NSLog(@"Failed to extract zip file.");
-            success = NO;
-            dispatch_semaphore_signal(semaphore);
+            if (completion) completion(NO);
             return;
         }
-        
+
         NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtPath:extractedPath];
         NSString *filename = nil;
         for (NSString *file in enumerator) {
@@ -144,20 +139,21 @@ RCT_EXPORT_MODULE();
                 break;
             }
         }
-        
+
         if (filename) {
             NSString *bundlePath = [extractedPath stringByAppendingPathComponent:filename];
             NSLog(@"Setting bundle URL: %@", bundlePath);
-            [self setBundleURL:bundlePath];
-            success = YES;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self setBundleURL:bundlePath];
+                if (completion) completion(YES);
+            });
         } else {
             NSLog(@"index.ios.bundle not found.");
-            success = NO;
+            if (completion) completion(NO);
         }
-        
-        dispatch_semaphore_signal(semaphore);
     }];
-    
+
+
     // Add observer for progress updates
     [downloadTask addObserver:self
                    forKeyPath:@"countOfBytesReceived"
@@ -167,11 +163,8 @@ RCT_EXPORT_MODULE();
                    forKeyPath:@"countOfBytesExpectedToReceive"
                       options:NSKeyValueObservingOptionNew
                       context:nil];
-    
+
     [downloadTask resume];
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-    
-    return success;
 }
 
 #pragma mark - Progress Updates
@@ -234,9 +227,12 @@ RCT_EXPORT_METHOD(updateBundle:(NSString *)bundleId zipUrl:(NSString *)zipUrlStr
     if (![zipUrlString isEqualToString:@""]) {
         zipUrl = [NSURL URLWithString:zipUrlString];
     }
-    
-    BOOL result = [self updateBundle:bundleId zipUrl:zipUrl];
-    resolve(@[@(result)]);
+
+    [self updateBundle:bundleId zipUrl:zipUrl completion:^(BOOL success) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            resolve(@[@(success)]);
+        });
+    }];
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.6.7",
+  "version": "0.8.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -78,8 +78,8 @@
     "react-native-builder-bob": "^0.33.1"
   },
   "dependencies": {
-    "@hot-updater/js": "0.6.7",
-    "@hot-updater/core": "0.6.7"
+    "@hot-updater/js": "0.8.0",
+    "@hot-updater/core": "0.8.0"
   },
   "scripts": {
     "build": "rslib build",