react-native-ota-hot-update 2.2.0 → 2.2.3

package/README.md

@@ -3,6 +3,11 @@
 
 This React Native module allows you to manage hot updates (in-app update) with minimal configuration, similar to Code Push. You can control versioning and host the JS bundle yourself. The library handles the installation of updates after the bundle is downloaded from your server or Git repository. With Code Push retiring soon, this library gives you full control over your update process, whether hosting the bundle on your own server or in a Git repository.
 
+### Key features:
+
+- Host the bundle on your own server or in a Git repository.
+- Rollback function
+- Crash Handling: Handles crash exceptions when an incorrect bundle is updated and will automatically roll back to the previous bundle version.
 
 1. **Demo via server**
 

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

@@ -41,7 +41,6 @@ class CrashHandler(private val context: Context) : Thread.UncaughtExceptionHandl
       } else {
         sharedPrefs.putString(PATH, "")
       }
-      sharedPrefs.putString(VERSION, "0")
       Toast.makeText(context, "Failed to load the update. Please try again.", Toast.LENGTH_LONG).show()
       GlobalScope.launch(Dispatchers.IO) {
         delay(1500)

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

@@ -1,7 +1,6 @@
 package com.otahotupdate
 
 import android.content.Context
-import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import com.facebook.react.BaseReactPackage
@@ -9,7 +8,7 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
-import com.rnhotupdate.Common.CURRENT_VERSION_NAME
+import com.rnhotupdate.Common.CURRENT_VERSION_CODE
 import com.rnhotupdate.Common.DEFAULT_BUNDLE
 import com.rnhotupdate.Common.PATH
 import com.rnhotupdate.Common.VERSION
@@ -41,12 +40,22 @@ class OtaHotUpdate : BaseReactPackage() {
     }
   }
   companion object {
-    @Suppress("DEPRECATION")
-    fun Context.getPackageInfo(): PackageInfo {
-      return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0))
-      } else {
-        packageManager.getPackageInfo(packageName, 0)
+    fun Context.getVersionCode(): String {
+      return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
+          packageManager.getPackageInfo(
+            packageName,
+            PackageManager.PackageInfoFlags.of(0)
+          ).longVersionCode.toString()
+        }
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> {
+          @Suppress("DEPRECATION")
+          packageManager.getPackageInfo(packageName, 0).longVersionCode.toString()
+        }
+        else -> {
+          @Suppress("DEPRECATION")
+          packageManager.getPackageInfo(packageName, 0).versionCode.toString()
+        }
       }
     }
     fun bundleJS(context: Context): String {
@@ -54,8 +63,8 @@ class OtaHotUpdate : BaseReactPackage() {
       val sharedPrefs = SharedPrefs(context)
       val pathBundle = sharedPrefs.getString(PATH)
       val version = sharedPrefs.getString(VERSION)
-      val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_NAME)
-      if (pathBundle == "" || (currentVersionName != context.getPackageInfo().versionName)) {
+      val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_CODE)
+      if (pathBundle == "" || (currentVersionName != context.getVersionCode())) {
         if (version != "") {
           // reset version number because bundle is wrong version, need download from new version
           sharedPrefs.putString(VERSION, "")

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

@@ -5,11 +5,12 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.jakewharton.processphoenix.ProcessPhoenix
-import com.otahotupdate.OtaHotUpdate.Companion.getPackageInfo
-import com.rnhotupdate.Common.CURRENT_VERSION_NAME
+import com.otahotupdate.OtaHotUpdate.Companion.getVersionCode
+import com.rnhotupdate.Common.CURRENT_VERSION_CODE
 import com.rnhotupdate.Common.PATH
 import com.rnhotupdate.Common.PREVIOUS_PATH
 import com.rnhotupdate.Common.VERSION
+import com.rnhotupdate.Common.PREVIOUS_VERSION
 import com.rnhotupdate.Common.METADATA
 import com.rnhotupdate.SharedPrefs
 import java.io.File
@@ -38,8 +39,8 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
           }
           sharedPrefs.putString(PATH, fileUnzip)
           sharedPrefs.putString(
-            CURRENT_VERSION_NAME,
-            reactApplicationContext?.getPackageInfo()?.versionName
+            CURRENT_VERSION_CODE,
+            reactApplicationContext.getVersionCode()
           )
           promise.resolve(true)
         } else {
@@ -86,6 +87,12 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
   @ReactMethod
   override fun setCurrentVersion(version: String?, promise: Promise) {
     val sharedPrefs = SharedPrefs(reactApplicationContext)
+
+    val currentVersion = sharedPrefs.getString(VERSION)
+    if (currentVersion != "" && currentVersion != version) {
+        sharedPrefs.putString(PREVIOUS_VERSION, currentVersion)
+    }
+
     sharedPrefs.putString(VERSION, version)
     promise.resolve(true)
   }
@@ -114,8 +121,8 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
     val sharedPrefs = SharedPrefs(reactApplicationContext)
     sharedPrefs.putString(PATH, path)
     sharedPrefs.putString(
-      CURRENT_VERSION_NAME,
-      reactApplicationContext?.getPackageInfo()?.versionName
+      CURRENT_VERSION_CODE,
+      reactApplicationContext.getVersionCode()
     )
     promise.resolve(true)
   }
@@ -124,11 +131,21 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
   override fun rollbackToPreviousBundle(a: Double, promise: Promise) {
     val sharedPrefs = SharedPrefs(reactApplicationContext)
     val oldPath = sharedPrefs.getString(PREVIOUS_PATH)
+    val previousVersion = sharedPrefs.getString(PREVIOUS_VERSION)
+
     if (oldPath != "") {
       val isDeleted = utils.deleteOldBundleIfneeded(PATH)
       if (isDeleted) {
         sharedPrefs.putString(PATH, oldPath)
         sharedPrefs.putString(PREVIOUS_PATH, "")
+
+        if (previousVersion != "") {
+            sharedPrefs.putString(VERSION, previousVersion)
+            sharedPrefs.putString(PREVIOUS_VERSION, "")
+        } else {
+            sharedPrefs.putString(VERSION, "")
+        }
+
         promise.resolve(true)
       } else {
         promise.resolve(false)

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

@@ -27,7 +27,8 @@ object Common {
     val PATH = "PATH"
     val PREVIOUS_PATH = "PREVIOUS_PATH"
     val VERSION = "VERSION"
-    val CURRENT_VERSION_NAME = "CURRENT_VERSION_NAME"
+    val PREVIOUS_VERSION = "PREVIOUS_VERSION"
+    val CURRENT_VERSION_CODE = "CURRENT_VERSION_CODE"
     val SHARED_PREFERENCE_NAME = "HOT-UPDATE-REACT_NATIVE"
     val DEFAULT_BUNDLE = "assets://index.android.bundle"
     val METADATA = "METADATA"

package/ios/OtaHotUpdate.mm

@@ -34,7 +34,6 @@ void OTAExceptionHandler(NSException *exception) {
         } else {
           [defaults removeObjectForKey:@"PATH"];
         }
-      [defaults removeObjectForKey:@"VERSION"];
       [defaults synchronize];
     } else if (previousHandler) {
         previousHandler(exception);
@@ -134,6 +133,9 @@ void OTAExceptionHandler(NSException *exception) {
        NSURL *fileURL = [NSURL fileURLWithPath:retrievedString];
        return fileURL;
     } else {
+         // reset version number because bundle is wrong version, need download from new version
+        [defaults removeObjectForKey:@"VERSION"];
+        [defaults synchronize];
         return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
     }
 }
@@ -283,6 +285,14 @@ RCT_EXPORT_METHOD(rollbackToPreviousBundle:(double)i
     if (oldPath && [OtaHotUpdate isFilePathValid:oldPath]) {
       BOOL isDeleted = [OtaHotUpdate removeBundleIfNeeded:@"PATH"];
       if (isDeleted) {
+        NSString *previousVersion = [defaults stringForKey:@"PREVIOUS_VERSION"];
+        if (previousVersion) {
+          [defaults setObject:previousVersion forKey:@"VERSION"];
+          [defaults removeObjectForKey:@"PREVIOUS_VERSION"];
+        } else {
+          [defaults removeObjectForKey:@"VERSION"];
+        }
+
         [defaults setObject:oldPath forKey:@"PATH"];
         [defaults removeObjectForKey:@"OLD_PATH"];
         [defaults synchronize];
@@ -311,8 +321,14 @@ RCT_EXPORT_METHOD(getCurrentVersion:(double)a
 RCT_EXPORT_METHOD(setCurrentVersion:(NSString *)version
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSString *currentVersion = [defaults stringForKey:@"VERSION"];
+
     if (version) {
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        if (currentVersion && currentVersion != version) {
+            [defaults setObject:currentVersion forKey:@"PREVIOUS_VERSION"];
+        }
+
         [defaults setObject:version forKey:@"VERSION"];
         [defaults synchronize];
         resolve(@(YES));

package/package.json

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