@hot-updater/react-native 0.10.1 → 0.11.0

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

@@ -26,26 +26,6 @@ class HotUpdater : ReactPackage {
         listOf(HotUpdaterModule(context)).toMutableList()
 
     companion object {
-        private fun convertFileSystemPathFromBasePath(
-            context: Context,
-            basePath: String,
-        ): String {
-            val documentsDir =
-                context.getExternalFilesDir(null)?.absolutePath ?: context.filesDir.absolutePath
-            val separator = if (basePath.startsWith("/")) "" else "/"
-            return "$documentsDir$separator$basePath"
-        }
-
-        private fun stripPrefixFromPath(
-            prefix: String,
-            path: String,
-        ): String =
-            if (path.startsWith("/$prefix/")) {
-                path.replaceFirst("/$prefix/", "")
-            } else {
-                path
-            }
-
         fun getAppVersion(context: Context): String? {
             val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
             return packageInfo.versionName
@@ -146,12 +126,19 @@ class HotUpdater : ReactPackage {
                 return true
             }
 
-            val downloadUrl = URL(zipUrl)
-            val basePath = stripPrefixFromPath(bundleId, downloadUrl.path)
-            val path = convertFileSystemPathFromBasePath(context, basePath)
+            val baseDir = context.getExternalFilesDir(null)
+            val bundleStoreDir = File(baseDir, "bundle-store")
+            val zipFilePath = File(bundleStoreDir, "build.zip")
+
+            // Delete existing folder logic
+            if (bundleStoreDir.exists()) {
+                bundleStoreDir.deleteRecursively()
+            }
+            bundleStoreDir.mkdirs()
 
             val isSuccess =
                 withContext(Dispatchers.IO) {
+                    val downloadUrl = URL(zipUrl)
                     val conn =
                         try {
                             downloadUrl.openConnection() as HttpURLConnection
@@ -168,11 +155,9 @@ class HotUpdater : ReactPackage {
                             return@withContext false
                         }
 
-                        val file = File(path)
-                        file.parentFile?.mkdirs()
-
+                        // File download
                         conn.inputStream.use { input ->
-                            file.outputStream().use { output ->
+                            zipFilePath.outputStream().use { output ->
                                 val buffer = ByteArray(8 * 1024)
                                 var bytesRead: Int
                                 var totalRead = 0L
@@ -182,13 +167,12 @@ class HotUpdater : ReactPackage {
                                     output.write(buffer, 0, bytesRead)
                                     totalRead += bytesRead
                                     val currentTime = System.currentTimeMillis()
-                                    if (currentTime - lastProgressTime >= 100) { // Check every 100ms
+                                    if (currentTime - lastProgressTime >= 100) {
                                         val progress = totalRead.toDouble() / totalSize
                                         progressCallback.invoke(progress)
                                         lastProgressTime = currentTime
                                     }
                                 }
-                                // Send final progress (100%) after download completes
                                 progressCallback.invoke(1.0)
                             }
                         }
@@ -199,18 +183,17 @@ class HotUpdater : ReactPackage {
                         conn.disconnect()
                     }
 
-                    val extractedPath = File(path).parentFile?.path ?: return@withContext false
-
-                    if (!extractZipFileAtPath(path, extractedPath)) {
+                    // Extract zip
+                    if (!extractZipFileAtPath(zipFilePath.absolutePath, bundleStoreDir.absolutePath)) {
                         Log.d("HotUpdater", "Failed to extract zip file.")
                         return@withContext false
                     }
 
-                    val extractedDirectory = File(extractedPath)
-                    val indexFile = extractedDirectory.walk().find { it.name == "index.android.bundle" }
+                    // Find index.android.bundle
+                    val indexFile = bundleStoreDir.walk().find { it.name == "index.android.bundle" }
 
                     if (indexFile != null) {
-                        val bundlePath = indexFile.path
+                        val bundlePath = indexFile.absolutePath
                         Log.d("HotUpdater", "Setting bundle URL: $bundlePath")
                         setBundleURL(context, bundlePath)
                     } else {
@@ -221,6 +204,7 @@ class HotUpdater : ReactPackage {
                     Log.d("HotUpdater", "Downloaded and extracted file successfully.")
                     true
                 }
+
             return isSuccess
         }
     }

package/dist/index.js

@@ -1689,14 +1689,13 @@ var __webpack_exports__ = {};
     const updateBundle = (bundleId, zipUrl)=>HotUpdaterNative.updateBundle(bundleId, zipUrl);
     const getAppVersion = ()=>HotUpdaterNative.getAppVersion();
     const reload = ()=>{
-        HotUpdaterNative.reload();
+        requestAnimationFrame(()=>{
+            HotUpdaterNative.reload();
+        });
     };
     const getBundleId = ()=>HotUpdater.HOT_UPDATER_BUNDLE_ID;
     async function checkForUpdate(config) {
-        if (__DEV__) {
-            console.warn("[HotUpdater] __DEV__ is true, HotUpdater is only supported in production");
-            return null;
-        }
+        if (__DEV__) return null;
         if (![
             "ios",
             "android"

package/dist/index.mjs

@@ -1658,14 +1658,13 @@ const addListener = (eventName, listener)=>{
 const updateBundle = (bundleId, zipUrl)=>HotUpdaterNative.updateBundle(bundleId, zipUrl);
 const getAppVersion = ()=>HotUpdaterNative.getAppVersion();
 const reload = ()=>{
-    HotUpdaterNative.reload();
+    requestAnimationFrame(()=>{
+        HotUpdaterNative.reload();
+    });
 };
 const getBundleId = ()=>HotUpdater.HOT_UPDATER_BUNDLE_ID;
 async function checkForUpdate(config) {
-    if (__DEV__) {
-        console.warn("[HotUpdater] __DEV__ is true, HotUpdater is only supported in production");
-        return null;
-    }
+    if (__DEV__) return null;
     if (![
         "ios",
         "android"

package/ios/HotUpdater/HotUpdater.mm

@@ -7,6 +7,9 @@
     bool hasListeners;
 }
 
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
 
 - (instancetype)init {
     self = [super init];
@@ -20,7 +23,6 @@ RCT_EXPORT_MODULE();
 
 #pragma mark - Bundle URL Management
 
-
 - (NSString *)getAppVersion {
     NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     return appVersion;
@@ -47,7 +49,7 @@ RCT_EXPORT_MODULE();
 }
 
 + (NSURL *)fallbackURL {
-    // This Support React Native 0.72.6
+    // This supports React Native 0.72.6
 #if DEBUG
     return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
@@ -61,17 +63,6 @@ RCT_EXPORT_MODULE();
 
 #pragma mark - Utility Methods
 
-- (NSString *)convertFileSystemPathFromBasePath:(NSString *)basePath {
-    return [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:basePath];
-}
-
-- (NSString *)stripPrefixFromPath:(NSString *)prefix path:(NSString *)path {
-    if ([path hasPrefix:[NSString stringWithFormat:@"/%@/", prefix]]) {
-        return [path stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"/%@/", prefix] withString:@""];
-    }
-    return path;
-}
-
 - (BOOL)extractZipFileAtPath:(NSString *)filePath toDestination:(NSString *)destinationPath {
     NSError *error = nil;
     BOOL success = [SSZipArchive unzipFileAtPath:filePath toDestination:destinationPath overwrite:YES password:nil error:&error];
@@ -81,6 +72,8 @@ RCT_EXPORT_MODULE();
     return success;
 }
 
+#pragma mark - Update Bundle Method
+
 - (void)updateBundle:(NSString *)bundleId zipUrl:(NSURL *)zipUrl completion:(void (^)(BOOL success))completion {
     if (!zipUrl) {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -89,13 +82,20 @@ RCT_EXPORT_MODULE();
         });
         return;
     }
-
-    NSString *basePath = [self stripPrefixFromPath:bundleId path:[zipUrl path]];
-    NSString *path = [self convertFileSystemPathFromBasePath:basePath];
-
+    
+    // Set app-specific path (dynamically using NSSearchPathForDirectoriesInDomains)
+    NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+    NSString *bundleStoreDir = [documentsPath stringByAppendingPathComponent:@"bundle-store"];
+    NSString *zipFilePath = [bundleStoreDir stringByAppendingPathComponent:@"build.zip"];
+    
+    // Delete existing folder
+    [self deleteFolderIfExists:bundleStoreDir];
+    // Create download folder
+    [[NSFileManager defaultManager] createDirectoryAtPath:bundleStoreDir withIntermediateDirectories:YES attributes:nil error:nil];
+    
     NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
     NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration];
-
+    
     NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithURL:zipUrl
                                                         completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
         if (error) {
@@ -103,45 +103,31 @@ RCT_EXPORT_MODULE();
             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);
-            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);
-                if (completion) completion(NO);
-                return;
-            }
+        
+        // Remove existing file
+        if ([fileManager fileExistsAtPath:zipFilePath]) {
+            [fileManager removeItemAtPath:zipFilePath error:nil];
         }
-
+        
+        // Move downloaded file
         NSError *moveError;
-        if (![fileManager moveItemAtURL:location toURL:[NSURL fileURLWithPath:path] error:&moveError]) {
+        if (![fileManager moveItemAtURL:location toURL:[NSURL fileURLWithPath:zipFilePath] error:&moveError]) {
             NSLog(@"Failed to save data: %@", moveError);
             if (completion) completion(NO);
             return;
         }
-
-        NSString *extractedPath = [path stringByDeletingLastPathComponent];
-        if (![self extractZipFileAtPath:path toDestination:extractedPath]) {
+        
+        // Extract zip
+        if (![self extractZipFileAtPath:zipFilePath toDestination:bundleStoreDir]) {
             NSLog(@"Failed to extract zip file.");
             if (completion) completion(NO);
             return;
         }
-
-        NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtPath:extractedPath];
+        
+        // Search for bundle file (index.ios.bundle)
+        NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtPath:bundleStoreDir];
         NSString *filename = nil;
         for (NSString *file in enumerator) {
             if ([file isEqualToString:@"index.ios.bundle"]) {
@@ -149,9 +135,9 @@ RCT_EXPORT_MODULE();
                 break;
             }
         }
-
+        
         if (filename) {
-            NSString *bundlePath = [extractedPath stringByAppendingPathComponent:filename];
+            NSString *bundlePath = [bundleStoreDir stringByAppendingPathComponent:filename];
             NSLog(@"Setting bundle URL: %@", bundlePath);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self setBundleURL:bundlePath];
@@ -163,7 +149,7 @@ RCT_EXPORT_MODULE();
         }
     }];
 
-    
+
     // Add observer for progress updates
     [downloadTask addObserver:self
                 forKeyPath:@"countOfBytesReceived"
@@ -181,13 +167,27 @@ RCT_EXPORT_MODULE();
     usingBlock:^(NSNotification * _Nonnull note) {
         [weakSelf removeObserversForTask:downloadTask];
     }];
+    
     [downloadTask resume];
+}
 
+#pragma mark - Folder Deletion Utility
+
+- (void)deleteFolderIfExists:(NSString *)path {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if ([fileManager fileExistsAtPath:path]) {
+        NSError *error;
+        [fileManager removeItemAtPath:path error:&error];
+        if (error) {
+            NSLog(@"Failed to delete existing folder: %@", error);
+        } else {
+            NSLog(@"Successfully deleted existing folder: %@", path);
+        }
+    }
 }
 
 #pragma mark - Progress Updates
 
-
 - (void)removeObserversForTask:(NSURLSessionDownloadTask *)task {
     @try {
         if ([task observationInfo]) {
@@ -200,53 +200,41 @@ RCT_EXPORT_MODULE();
     }
 }
 
-
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary<NSKeyValueChangeKey, id> *)change
                        context:(void *)context {
     if ([keyPath isEqualToString:@"countOfBytesReceived"] || [keyPath isEqualToString:@"countOfBytesExpectedToReceive"]) {
         NSURLSessionDownloadTask *task = (NSURLSessionDownloadTask *)object;
-        
         if (task.countOfBytesExpectedToReceive > 0) {
             double progress = (double)task.countOfBytesReceived / (double)task.countOfBytesExpectedToReceive;
-            
-            // Get current timestamp
-            NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970] * 1000; // Convert to milliseconds
-            
-            // Send event only if 100ms has passed OR progress is 100%
+            NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970] * 1000; // In milliseconds
             if ((currentTime - self.lastUpdateTime) >= 100 || progress >= 1.0) {
-                self.lastUpdateTime = currentTime; // Update last event timestamp
-
-                // Send progress to React Native
+                self.lastUpdateTime = currentTime;
                 [self sendEventWithName:@"onProgress" body:@{@"progress": @(progress)}];
             }
         }
     }
 }
 
-
 #pragma mark - React Native Events
+
 - (NSArray<NSString *> *)supportedEvents {
     return @[@"onProgress"];
 }
 
-- (void)startObserving
-{
+- (void)startObserving {
     hasListeners = YES;
 }
 
-- (void)stopObserving
-{
+- (void)stopObserving {
     hasListeners = NO;
 }
 
-
 - (void)sendEventWithName:(NSString * _Nonnull)name result:(NSDictionary *)result {
     [self sendEventWithName:name body:result];
 }
 
-
 #pragma mark - React Native Exports
 
 RCT_EXPORT_METHOD(reload) {
@@ -257,8 +245,7 @@ RCT_EXPORT_METHOD(reload) {
     });
 }
 
-RCT_EXPORT_METHOD(getAppVersion:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getAppVersion:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     NSString *version = [self getAppVersion];
     resolve(version ?: [NSNull null]);
 }
@@ -268,7 +255,6 @@ RCT_EXPORT_METHOD(updateBundle:(NSString *)bundleId zipUrl:(NSString *)zipUrlStr
     if (![zipUrlString isEqualToString:@""]) {
         zipUrl = [NSURL URLWithString:zipUrlString];
     }
-
     [self updateBundle:bundleId zipUrl:zipUrl completion:^(BOOL success) {
         dispatch_async(dispatch_get_main_queue(), ^{
             resolve(@[@(success)]);
@@ -276,14 +262,10 @@ RCT_EXPORT_METHOD(updateBundle:(NSString *)bundleId zipUrl:(NSString *)zipUrlStr
     }];
 }
 
-
-// Don't compile this code when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-(const facebook::react::ObjCTurboModule::InitParams &)params
-{
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
     return std::make_shared<facebook::react::NativeHotUpdaterSpecJSI>(params);
 }
 #endif
 
-@end
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.10.1",
+  "version": "0.11.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.10.1",
-    "@hot-updater/core": "0.10.1"
+    "@hot-updater/js": "0.11.0",
+    "@hot-updater/core": "0.11.0"
   },
   "scripts": {
     "build": "rslib build",

package/src/checkUpdate.ts

@@ -12,9 +12,6 @@ export interface CheckForUpdateConfig {
 
 export async function checkForUpdate(config: CheckForUpdateConfig) {
   if (__DEV__) {
-    console.warn(
-      "[HotUpdater] __DEV__ is true, HotUpdater is only supported in production",
-    );
     return null;
   }
 

package/src/native.ts

@@ -74,7 +74,9 @@ export const getAppVersion = (): Promise<string | null> => {
  * Reloads the app.
  */
 export const reload = () => {
-  HotUpdaterNative.reload();
+  requestAnimationFrame(() => {
+    HotUpdaterNative.reload();
+  });
 };
 
 /**