react-native-ota-hot-update 2.3.3 → 2.3.5

package/README.md

@@ -118,22 +118,26 @@ var taskIdentifier: UIBackgroundTaskIdentifier = .invalid
 ...
 ```
 ```bash
-override func applicationWillResignActive(_ application: UIApplication) {
-          // End any existing background task
-          if taskIdentifier != .invalid {
-              application.endBackgroundTask(taskIdentifier)
-              taskIdentifier = .invalid
-          }
-
-          // Start a new background task
-          taskIdentifier = application.beginBackgroundTask(withName: nil) { [weak self] in
-              if let strongSelf = self {
-                  application.endBackgroundTask(strongSelf.taskIdentifier)
-                  strongSelf.taskIdentifier = .invalid
-              }
-          }
+  public override func applicationDidEnterBackground(_ application: UIApplication) {
+    if taskIdentifier != .invalid {
+      application.endBackgroundTask(taskIdentifier)
+      taskIdentifier = .invalid
+    }
+
+    taskIdentifier = application.beginBackgroundTask(withName: "OTAUpdate") { [weak self] in
+      if let strongSelf = self {
+        application.endBackgroundTask(strongSelf.taskIdentifier)
+        strongSelf.taskIdentifier = .invalid
       }
-
+    }
+  }
+
+  public override func applicationWillEnterForeground(_ application: UIApplication) {
+    if taskIdentifier != .invalid {
+      application.endBackgroundTask(taskIdentifier)
+      taskIdentifier = .invalid
+    }
+  }
 ```
 
 
@@ -142,9 +146,14 @@ Open `MainApplication.kt` and add these codes bellow:
 ```bash
 import com.otahotupdate.OtaHotUpdate
 ...
-override fun getJSBundleFile(): String? {
-    return OtaHotUpdate.bundleJS(this@MainApplication)
-}
+override val reactNativeHost: ReactNativeHost =
+  object : DefaultReactNativeHost(this) {
+    ...
+    override fun getJSBundleFile(): String? {
+      return OtaHotUpdate.bundleJS(this@MainApplication)
+    }
+    ...
+  }
 
 ```
 
@@ -157,6 +166,22 @@ MainApplication.java:
 		}
 ```
 
+### Android in react native 0.82 or above:
+
+```bash
+  override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+        },
+      jsBundleFilePath = OtaHotUpdate.bundleJS(applicationContext)
+    )
+  }
+```
+
 For java it maybe can be like: `OtaHotUpdate.Companion.getBundleJS(this)` depend on kotlin / jdk version on your project, you can use android studio to get the correct format coding.
 
 If want to remove bundle wrong handler, pass false param in getBundleJS like this:

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

@@ -3,7 +3,7 @@ package com.otahotupdate
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import com.facebook.react.TurboReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
@@ -15,7 +15,7 @@ import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.SharedPrefs
 
 
-class OtaHotUpdate : TurboReactPackage() {
+class OtaHotUpdate : BaseReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
     return if (name == OtaHotUpdateModule.NAME) {
       OtaHotUpdateModule(reactContext)
@@ -33,7 +33,6 @@ class OtaHotUpdate : TurboReactPackage() {
         OtaHotUpdateModule.NAME,
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
-        true,  // hasConstants
         false,  // isCxxModule
         isTurboModule // isTurboModule
       )
@@ -68,6 +67,9 @@ class OtaHotUpdate : TurboReactPackage() {
       val version = sharedPrefs.getString(VERSION)
       val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_CODE)
       if (pathBundle == "" || (currentVersionName != context.getVersionCode())) {
+        if (pathBundle != "") {
+          sharedPrefs.putString(PATH, "")
+        }
         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

@@ -141,13 +141,18 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
 
   @ReactMethod
   override fun setExactBundlePath(path: String?, promise: Promise) {
-    val sharedPrefs = SharedPrefs(reactApplicationContext)
-    sharedPrefs.putString(PATH, path)
-    sharedPrefs.putString(
-      CURRENT_VERSION_CODE,
-      reactApplicationContext.getVersionCode()
-    )
-    promise.resolve(true)
+    val file = File(path)
+    if (file.exists() && file.isFile) {
+      val sharedPrefs = SharedPrefs(reactApplicationContext)
+      sharedPrefs.putString(PATH, path)
+      sharedPrefs.putString(
+        CURRENT_VERSION_CODE,
+        reactApplicationContext.getVersionCode()
+      )
+      promise.resolve(true)
+    } else {
+      promise.resolve(false)
+    }
   }
 
   @ReactMethod

package/ios/OtaHotUpdate.mm

@@ -162,6 +162,7 @@ void OTAExceptionHandler(NSException *exception) {
     } else {
          // reset version number because bundle is wrong version, need download from new version
         [defaults removeObjectForKey:@"VERSION"];
+        [defaults removeObjectForKey:@"PATH"];
         [defaults synchronize];
         return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
     }
@@ -394,7 +395,7 @@ RCT_EXPORT_METHOD(getUpdateMetadata:(double)a
 RCT_EXPORT_METHOD(setExactBundlePath:(NSString *)path
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-    if (path) {
+  if ([OtaHotUpdate isFilePathValid:path]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         [defaults setObject:path forKey:@"PATH"];
         [defaults setObject:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] forKey:@"VERSION_NAME"];

package/package.json

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

package/plugin/build/index.js

@@ -3,17 +3,29 @@ 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) => {
-        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
+        let content = config.modResults.contents;
+        const isNewReactHost = content.includes('context = applicationContext');
+        if (!content.includes('import com.otahotupdate.OtaHotUpdate')) {
+            content = content.replace(/import android.app.Application/g, `
+import android.app.Application
+import com.otahotupdate.OtaHotUpdate`);
+        }
+        if (isNewReactHost) {
+            if (!content.includes('OtaHotUpdate.bundleJS')) {
+                content = content.replace(/context = applicationContext,/, `context = applicationContext,
+      jsBundleFilePath = OtaHotUpdate.bundleJS(applicationContext),
+      `);
+            }
+            config.modResults.contents = content;
+            return config;
+        }
+        if (!content.includes('OtaHotUpdate.bundleJS(this@MainApplication)')) {
+            content = content.replace(/DefaultReactNativeHost\s*\(this\)\s*\{/, `
+          DefaultReactNativeHost(this) {
 
           override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`);
         }
-        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`);
-        }
+        config.modResults.contents = content;
         return config;
     });
 };

package/plugin/src/index.ts

@@ -6,24 +6,42 @@ import {
 
 const withAndroidAction: any = (config: any) => {
   return withMainApplication(config, (config) => {
-    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
+    let content = config.modResults.contents;
 
-          override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`
+    const isNewReactHost = content.includes('context = applicationContext');
+
+    if (!content.includes('import com.otahotupdate.OtaHotUpdate')) {
+      content = content.replace(
+        /import android.app.Application/g,
+        `
+import android.app.Application
+import com.otahotupdate.OtaHotUpdate`
       );
     }
+    if (isNewReactHost) {
+      if (!content.includes('OtaHotUpdate.bundleJS')) {
+        content = content.replace(
+          /context = applicationContext,/,
+          `context = applicationContext,
+      jsBundleFilePath = OtaHotUpdate.bundleJS(applicationContext),`
+        );
+      }
 
-    if (!config.modResults.contents.includes('import com.otahotupdate.OtaHotUpdate')) {
-      config.modResults.contents = config.modResults.contents.replace(
-        /import expo.modules.ReactNativeHostWrapper/g,
+      config.modResults.contents = content;
+      return config;
+    }
+
+    if (!content.includes('OtaHotUpdate.bundleJS(this@MainApplication)')) {
+      content = content.replace(
+        /DefaultReactNativeHost\s*\(this\)\s*\{/,
         `
-import expo.modules.ReactNativeHostWrapper
-import com.otahotupdate.OtaHotUpdate`
+          DefaultReactNativeHost(this) {
+
+          override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`
       );
     }
+
+    config.modResults.contents = content;
     return config;
   });
 };