react-native-ota-hot-update 2.2.2 → 2.2.4

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,8 +5,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.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
@@ -39,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 {
@@ -121,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)
   }

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

@@ -28,7 +28,7 @@ object Common {
     val PREVIOUS_PATH = "PREVIOUS_PATH"
     val VERSION = "VERSION"
     val PREVIOUS_VERSION = "PREVIOUS_VERSION"
-    val CURRENT_VERSION_NAME = "CURRENT_VERSION_NAME"
+    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

@@ -133,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"];
     }
 }

package/package.json

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

package/plugin/build/index.js

@@ -3,20 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const withAndroidAction = (config) => {
     return (0, config_plugins_1.withMainApplication)(config, (config) => {
-        config.modResults.contents = config.modResults.contents.replace(/override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED/g, `
+        if (!config.modResults.contents.includes('override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)')) {
+            config.modResults.contents = config.modResults.contents.replace(/override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED/g, `
           override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
 
           override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`);
-        config.modResults.contents = config.modResults.contents.replace(/import expo.modules.ReactNativeHostWrapper/g, `
+        }
+        if (!config.modResults.contents.includes('import com.otahotupdate.OtaHotUpdate')) {
+            config.modResults.contents = config.modResults.contents.replace(/import expo.modules.ReactNativeHostWrapper/g, `
 import expo.modules.ReactNativeHostWrapper
 import com.otahotupdate.OtaHotUpdate`);
+        }
         return config;
     });
 };
 const withIosAction = (config) => {
     return (0, config_plugins_1.withAppDelegate)(config, (config) => {
-        config.modResults.contents = config.modResults.contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
+        if (!config.modResults.contents.includes('#import "OtaHotUpdate.h')) {
+            config.modResults.contents = config.modResults.contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
 #import "OtaHotUpdate.h"`);
+        }
         config.modResults.contents = config.modResults.contents.replace(/\[\[NSBundle mainBundle\] URLForResource:@\"main\" withExtension:@\"jsbundle\"\]/, `[OtaHotUpdate getBundle]`);
         return config;
     });

package/plugin/src/index.ts

@@ -1,30 +1,38 @@
 import { withMainApplication, withAppDelegate } from '@expo/config-plugins';
 const withAndroidAction: any = (config: any) => {
   return withMainApplication(config, (config) => {
-    config.modResults.contents = config.modResults.contents.replace(
-      /override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED/g,
-      `
+    if (!config.modResults.contents.includes('override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)')) {
+      config.modResults.contents = config.modResults.contents.replace(
+        /override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED/g,
+        `
           override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
 
           override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`
-    );
-    config.modResults.contents = config.modResults.contents.replace(
-      /import expo.modules.ReactNativeHostWrapper/g,
-      `
+      );
+    }
+
+    if (!config.modResults.contents.includes('import com.otahotupdate.OtaHotUpdate')) {
+      config.modResults.contents = config.modResults.contents.replace(
+        /import expo.modules.ReactNativeHostWrapper/g,
+        `
 import expo.modules.ReactNativeHostWrapper
 import com.otahotupdate.OtaHotUpdate`
-    );
+      );
+    }
     return config;
   });
 };
 
 const withIosAction: any = (config: any) => {
   return withAppDelegate(config, (config) => {
-    config.modResults.contents = config.modResults.contents.replace(
-      /#import "AppDelegate.h"/g,
-      `#import "AppDelegate.h"
+    if (!config.modResults.contents.includes('#import "OtaHotUpdate.h')) {
+      config.modResults.contents = config.modResults.contents.replace(
+        /#import "AppDelegate.h"/g,
+        `#import "AppDelegate.h"
 #import "OtaHotUpdate.h"`
-    );
+      );
+    }
+
     config.modResults.contents = config.modResults.contents.replace(
       /\[\[NSBundle mainBundle\] URLForResource:@\"main\" withExtension:@\"jsbundle\"\]/,
       `[OtaHotUpdate getBundle]`