react-native-ota-hot-update 2.0.4 → 2.0.6

package/README.md

@@ -1,7 +1,7 @@
 # react-native-ota-hot-update
 
 
-This React Native module allows you to manage hot updates 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.
+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.
 
 
 1. **Demo via server**

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

@@ -1,11 +1,15 @@
 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.TurboReactPackage
 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.DEFAULT_BUNDLE
 import com.rnhotupdate.Common.PATH
 import com.rnhotupdate.SharedPrefs
@@ -40,6 +44,14 @@ class OtaHotUpdate(context: Context?) : TurboReactPackage() {
     }
   }
   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)
+      }
+    }
     private var mContext: Context? = null
     val bundleJS: String
       get() {
@@ -48,7 +60,8 @@ class OtaHotUpdate(context: Context?) : TurboReactPackage() {
         }
         val sharedPrefs = SharedPrefs(mContext!!)
         val pathBundle = sharedPrefs.getString(PATH)
-        if (pathBundle == "") {
+        val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_NAME)
+        if (pathBundle == "" || (!currentVersionName.isNullOrEmpty() && currentVersionName != mContext?.getPackageInfo()?.versionName)) {
           return DEFAULT_BUNDLE
         }
         return pathBundle!!

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

@@ -6,6 +6,8 @@ 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.rnhotupdate.Common.PATH
 import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.SharedPrefs
@@ -93,6 +95,7 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
           file.delete()
           val sharedPrefs = SharedPrefs(reactApplicationContext)
           sharedPrefs.putString(PATH, fileUnzip)
+          sharedPrefs.putString(CURRENT_VERSION_NAME, reactApplicationContext?.getPackageInfo()?.versionName)
           promise.resolve(true)
         } else {
           file.delete()
@@ -145,6 +148,7 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
   override fun setExactBundlePath(path: String?, promise: Promise) {
     val sharedPrefs = SharedPrefs(reactApplicationContext)
     sharedPrefs.putString(PATH, path)
+    sharedPrefs.putString(CURRENT_VERSION_NAME, reactApplicationContext?.getPackageInfo()?.versionName)
     promise.resolve(true)
   }
   companion object {

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

@@ -26,6 +26,7 @@ class SharedPrefs internal constructor(context: Context) {
 object Common {
     val PATH = "PATH"
     val VERSION = "VERSION"
+    val CURRENT_VERSION_NAME = "CURRENT_VERSION_NAME"
     val SHARED_PREFERENCE_NAME = "HOT-UPDATE-REACT_NATIVE"
     val DEFAULT_BUNDLE = "assets://index.android.bundle"
 }

package/ios/OtaHotUpdate.mm

@@ -88,7 +88,10 @@ RCT_EXPORT_MODULE()
 + (NSURL *)getBundle {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *retrievedString = [defaults stringForKey:@"PATH"];
-    if (retrievedString && [self isFilePathExist:retrievedString]) {
+    NSString *currentVersionName = [defaults stringForKey:@"VERSION_NAME"];
+    NSString *versionName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
+
+  if (retrievedString && [self isFilePathExist:retrievedString] && [currentVersionName isEqualToString:versionName]) {
        NSURL *fileURL = [NSURL fileURLWithPath:retrievedString];
        return fileURL;
     } else {
@@ -175,6 +178,7 @@ RCT_EXPORT_METHOD(setupBundlePath:(NSString *)path extension:(NSString *)extensi
             NSLog(@"file extraction----- %@", extractedFilePath);
             NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
             [defaults setObject:extractedFilePath forKey:@"PATH"];
+            [defaults setObject:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] forKey:@"VERSION_NAME"];
             [defaults synchronize];
             resolve(@(YES));
         } else {
@@ -224,6 +228,7 @@ RCT_EXPORT_METHOD(setExactBundlePath:(NSString *)path
     if (path) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         [defaults setObject:path forKey:@"PATH"];
+        [defaults setObject:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] forKey:@"VERSION_NAME"];
         [defaults synchronize];
         resolve(@(YES));
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Hot update for react native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "buffer": "^6.0.3",
-    "isomorphic-git": "git+https://github.com/vantuan88291/isomorphic-git.git"
+    "isomorphic-git": "1.27.3"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",