react-native-ota-hot-update 2.4.1 → 2.4.3

package/android/src/main/java/com/otahotupdate/CrashHandler.kt

@@ -4,12 +4,15 @@ import android.content.Context
 import android.widget.Toast
 import com.jakewharton.processphoenix.ProcessPhoenix
 import com.rnhotupdate.Common.PATH
-import com.rnhotupdate.Common.PREVIOUS_PATH
+import com.rnhotupdate.Common.VERSION
+import com.rnhotupdate.Common.BUNDLE_HISTORY
 import com.rnhotupdate.SharedPrefs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.json.JSONArray
+import java.io.File
 
 class CrashHandler(private val context: Context) : Thread.UncaughtExceptionHandler {
   private val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
@@ -23,20 +26,45 @@ class CrashHandler(private val context: Context) : Thread.UncaughtExceptionHandl
   }
   override fun uncaughtException(thread: Thread, throwable: Throwable) {
     if (beginning) {
-      //begin remove and using previous bundle
       val sharedPrefs = SharedPrefs(context)
-      val oldPath = sharedPrefs.getString(PREVIOUS_PATH)
-      if (oldPath != "") {
-        val isDeleted = utils.deleteOldBundleIfneeded(PATH)
-        if (isDeleted) {
-          sharedPrefs.putString(PATH, oldPath)
-          sharedPrefs.putString(PREVIOUS_PATH, "")
-        } else {
-          sharedPrefs.putString(PATH, "")
+      val currentPath = sharedPrefs.getString(PATH)
+
+      // Try to rollback using history system
+      val historyJson = sharedPrefs.getString(BUNDLE_HISTORY)
+      var rolledBack = false
+
+      if (!historyJson.isNullOrEmpty() && !currentPath.isNullOrEmpty()) {
+        try {
+          val jsonArray = JSONArray(historyJson)
+          val history = (0 until jsonArray.length()).map { i ->
+            val obj = jsonArray.getJSONObject(i)
+            Pair(obj.getInt("version"), obj.getString("path"))
+          }.sortedByDescending { it.first }
+
+          val currentBundle = history.find { it.second == currentPath }
+          if (currentBundle != null) {
+            val previousBundle = history
+              .filter { it.first < currentBundle.first }
+              .maxByOrNull { it.first }
+
+            if (previousBundle != null && File(previousBundle.second).exists()) {
+              val isDeleted = utils.deleteOldBundleIfneeded(PATH)
+              if (isDeleted) {
+                sharedPrefs.putString(PATH, previousBundle.second)
+                sharedPrefs.putString(VERSION, previousBundle.first.toString())
+                rolledBack = true
+              }
+            }
+          }
+        } catch (e: Exception) {
+          // ignore, fall through to clear path
         }
-      } else {
+      }
+
+      if (!rolledBack) {
         sharedPrefs.putString(PATH, "")
       }
+
       val errorMessage = throwable.message ?: "Unknown error occurred"
       Toast.makeText(context, "Update failed: $errorMessage", Toast.LENGTH_LONG).show()
       GlobalScope.launch(Dispatchers.IO) {
@@ -48,4 +76,3 @@ class CrashHandler(private val context: Context) : Thread.UncaughtExceptionHandl
     }
   }
 }
-

package/android/src/main/java/com/otahotupdate/OtaHotUpdateModule.kt

@@ -14,7 +14,6 @@ import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.Common.PREVIOUS_VERSION
 import com.rnhotupdate.Common.METADATA
 import com.rnhotupdate.Common.BUNDLE_HISTORY
-import com.rnhotupdate.Common.DEFAULT_MAX_BUNDLE_VERSIONS
 import com.rnhotupdate.SharedPrefs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -189,7 +188,11 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
     val versionsToKeep = finalHistory.map { it.version }.toSet()
     updatedHistory.forEach { bundle ->
       if (bundle.version !in versionsToKeep) {
-        utils.deleteOldBundleIfneeded(bundle.path)
+        val bundleFile = File(bundle.path)
+        val parentDir = bundleFile.parentFile
+        if (parentDir != null && parentDir.exists() && parentDir.isDirectory) {
+          utils.deleteDirectory(parentDir)
+        }
       }
     }
 
@@ -201,7 +204,13 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
     sharedPrefs.putString(VERSION, version.toString())
   }
 
-  private fun processBundleFile(path: String?, extension: String?, version: Int?, maxVersions: Int?, metadata: String?): Boolean {
+  private fun processBundleFile(
+    path: String?,
+    extension: String?,
+    version: Int?,
+    maxVersions: Int?,
+    metadata: String?
+  ): Boolean {
     if (path != null) {
       val file = File(path)
       if (file.exists() && file.isFile) {
@@ -237,8 +246,16 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
       throw Exception("Invalid path: $path")
     }
   }
+
   @ReactMethod
-  override fun setupBundlePath(path: String?, extension: String?, version: Double?, maxVersions: Double?, metadata: String?, promise: Promise) {
+  override fun setupBundlePath(
+    path: String?,
+    extension: String?,
+    version: Double?,
+    maxVersions: Double?,
+    metadata: String?,
+    promise: Promise
+  ) {
     scope.launch {
       try {
         val versionInt = version?.toInt()
@@ -289,8 +306,11 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
 
   @ReactMethod
   override fun restart() {
-    val context: Context? = reactApplicationContext.currentActivity
-    ProcessPhoenix.triggerRebirth(context)
+    val activity = reactApplicationContext.currentActivity
+    val context: Context = activity ?: reactApplicationContext
+    UiThreadUtil.runOnUiThread {
+      ProcessPhoenix.triggerRebirth(context)
+    }
   }
 
   @ReactMethod
@@ -516,49 +536,52 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
         }
       }
     }
-     /**
-       * Write file with base64 content on native thread
-       * This runs on a background thread, not blocking JS thread
-       */
-      @ReactMethod
-      override fun writeFile(path: String?, base64Content: String?, encoding: String?, promise: Promise) {
-        if (path == null || base64Content == null) {
-          promise.reject("INVALID_ARG", "Path and base64Content are required", null)
-          return
-        }
 
-        fileWriterExecutor.execute {
-          try {
-            // Decode base64 to bytes
-            val bytes = Base64.decode(base64Content, Base64.DEFAULT)
+  }
 
-            // Ensure parent directory exists
-            val file = File(path)
-            val parentDir = file.parentFile
-            if (parentDir != null && !parentDir.exists()) {
-              parentDir.mkdirs()
-            }
+  override fun writeFile(
+    path: String?,
+    base64Content: String?,
+    encoding: String?,
+    promise: Promise
+  ) {
+    if (path == null || base64Content == null) {
+      promise.reject("INVALID_ARG", "Path and base64Content are required", null)
+      return
+    }
 
-            // Write file on background thread
-            FileOutputStream(file).use { fos ->
-              fos.write(bytes)
-              fos.flush()
-            }
+    fileWriterExecutor.execute {
+      try {
+        // Decode base64 to bytes
+        val bytes = Base64.decode(base64Content, Base64.DEFAULT)
+
+        // Ensure parent directory exists
+        val file = File(path)
+        val parentDir = file.parentFile
+        if (parentDir != null && !parentDir.exists()) {
+          parentDir.mkdirs()
+        }
 
-            // Resolve on UI thread (React Native requirement)
-            UiThreadUtil.runOnUiThread {
-              promise.resolve(true)
-            }
-          } catch (e: IOException) {
-            UiThreadUtil.runOnUiThread {
-              promise.reject("WRITE_ERROR", "Failed to write file: ${e.message}", e)
-            }
-          } catch (e: Exception) {
-            UiThreadUtil.runOnUiThread {
-              promise.reject("WRITE_ERROR", "Unexpected error: ${e.message}", e)
-            }
-          }
+        // Write file on background thread
+        FileOutputStream(file).use { fos ->
+          fos.write(bytes)
+          fos.flush()
+        }
+
+        // Resolve on UI thread (React Native requirement)
+        UiThreadUtil.runOnUiThread {
+          promise.resolve(true)
+        }
+      } catch (e: IOException) {
+        UiThreadUtil.runOnUiThread {
+          promise.reject("WRITE_ERROR", "Failed to write file: ${e.message}", e)
+        }
+      } catch (e: Exception) {
+        UiThreadUtil.runOnUiThread {
+          promise.reject("WRITE_ERROR", "Unexpected error: ${e.message}", e)
         }
+      }
+    }
   }
 
   companion object {

package/ios/OtaHotUpdate.mm

@@ -39,16 +39,24 @@ RCT_EXPORT_MODULE()
 void OTASignalHandler(int sig) {
     if (isBeginning) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSString *oldPath = [defaults stringForKey:@"OLD_PATH"];
-        if (oldPath) {
+        // Use PREVIOUS_BUNDLE_PATH (simple key, written by saveBundleVersion before each update)
+        NSString *previousPath = [defaults stringForKey:@"PREVIOUS_BUNDLE_PATH"];
+        if (previousPath && previousPath.length > 0) {
             BOOL isDeleted = [OtaHotUpdate removeBundleIfNeeded:@"PATH"];
             if (isDeleted) {
-                [defaults setObject:oldPath forKey:@"PATH"];
+                [defaults setObject:previousPath forKey:@"PATH"];
+                NSString *previousVersion = [defaults stringForKey:@"PREVIOUS_BUNDLE_VERSION"];
+                if (previousVersion) {
+                    [defaults setObject:previousVersion forKey:@"VERSION"];
+                }
+            } else {
+                [defaults removeObjectForKey:@"PATH"];
             }
-            [defaults removeObjectForKey:@"OLD_PATH"];
         } else {
             [defaults removeObjectForKey:@"PATH"];
         }
+        [defaults removeObjectForKey:@"PREVIOUS_BUNDLE_PATH"];
+        [defaults removeObjectForKey:@"PREVIOUS_BUNDLE_VERSION"];
         [defaults synchronize];
     }
 
@@ -58,20 +66,24 @@ void OTASignalHandler(int sig) {
 void OTAExceptionHandler(NSException *exception) {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     if (isBeginning) {
-      NSString *oldPath = [defaults stringForKey:@"OLD_PATH"];
-        if (oldPath) {
-          BOOL isDeleted = [OtaHotUpdate removeBundleIfNeeded:@"PATH"];
-          if (isDeleted) {
-            [defaults setObject:oldPath forKey:@"PATH"];
-            [defaults removeObjectForKey:@"OLD_PATH"];
-          } else {
-            [defaults removeObjectForKey:@"OLD_PATH"];
-            [defaults removeObjectForKey:@"PATH"];
-          }
+        NSString *previousPath = [defaults stringForKey:@"PREVIOUS_BUNDLE_PATH"];
+        if (previousPath && previousPath.length > 0) {
+            BOOL isDeleted = [OtaHotUpdate removeBundleIfNeeded:@"PATH"];
+            if (isDeleted) {
+                [defaults setObject:previousPath forKey:@"PATH"];
+                NSString *previousVersion = [defaults stringForKey:@"PREVIOUS_BUNDLE_VERSION"];
+                if (previousVersion) {
+                    [defaults setObject:previousVersion forKey:@"VERSION"];
+                }
+            } else {
+                [defaults removeObjectForKey:@"PATH"];
+            }
         } else {
-          [defaults removeObjectForKey:@"PATH"];
+            [defaults removeObjectForKey:@"PATH"];
         }
-      [defaults synchronize];
+        [defaults removeObjectForKey:@"PREVIOUS_BUNDLE_PATH"];
+        [defaults removeObjectForKey:@"PREVIOUS_BUNDLE_VERSION"];
+        [defaults synchronize];
     } else if (previousHandler) {
         previousHandler(exception);
     }
@@ -300,12 +312,10 @@ RCT_EXPORT_METHOD(setupBundlePath:(NSString *)path extension:(NSString *)extensi
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
     if ([OtaHotUpdate isFilePathValid:path]) {
-        [OtaHotUpdate removeBundleIfNeeded:nil];
         //Unzip file
         NSString *extractedFilePath = [self unzipFileAtPath:path extension:(extension != nil) ? extension : @".jsbundle" version:version];
         if (extractedFilePath) {
             NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-            NSString *oldPath = [defaults stringForKey:@"PATH"];
 
             // If version is provided, save to history system
             if (version != nil) {
@@ -628,6 +638,16 @@ RCT_EXPORT_METHOD(setExactBundlePath:(NSString *)path
     // Save updated history
     [self saveBundleHistory:finalHistory];
 
+    // Before updating current path, save it as fallback for crash handler
+    NSString *currentPath = [defaults stringForKey:@"PATH"];
+    NSString *currentVersion = [defaults stringForKey:@"VERSION"];
+    if (currentPath && currentPath.length > 0) {
+        [defaults setObject:currentPath forKey:@"PREVIOUS_BUNDLE_PATH"];
+        if (currentVersion) {
+            [defaults setObject:currentVersion forKey:@"PREVIOUS_BUNDLE_VERSION"];
+        }
+    }
+
     // Set current path and version
     [defaults setObject:path forKey:@"PATH"];
     [defaults setObject:[NSString stringWithFormat:@"%ld", (long)version] forKey:@"VERSION"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Hot update for react native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",