react-native-ota-hot-update 2.2.71 → 2.3.0

package/README.md

@@ -69,18 +69,13 @@ Open `AppDelegate.m` and add this:
 
 From react native 0.77, AppDelegate changed to swift file, so the configuration will be change a bit.
 
-1. Create a Bridging Header
-   - Right-click on your project in the Xcode navigator and select New File from template.
-   - Select Header File under the iOS section and click Next.
-   - Name it something like `YourProjectName-Bridging-Header.h` and save it in your project directory.
-   - In your project's Build Settings: Search for `Objective-C Bridging Header`.
-   Set its value to the relative path of your bridging header file, e.g., YourProjectName/YourProjectName-Bridging-Header.h, remember need to create header file inside folder `YourProjectName`
-2. Open `YourProjectName-Bridging-Header.h` and add this line:
-
-   `#import "OtaHotUpdate.h"`
-3. Open AppDelegate.swift:
+Open AppDelegate.swift:
 
 ```bash
+
+import react_native_ota_hot_update
+...
+
 override func bundleURL() -> URL? {
         #if DEBUG
             RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
@@ -164,6 +159,13 @@ MainApplication.java:
 
 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:
+
+```aiignore
+return OtaHotUpdate.bundleJS(this@MainApplication, false)
+
+```
+
 Open `AndroidManifest.xml` :
 
 `<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />`

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

@@ -1,14 +1,10 @@
 package com.otahotupdate
 
 import android.content.Context
-import android.os.Handler
-import android.os.Looper
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import com.jakewharton.processphoenix.ProcessPhoenix
 import com.rnhotupdate.Common.PATH
 import com.rnhotupdate.Common.PREVIOUS_PATH
-import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.SharedPrefs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -41,7 +37,8 @@ class CrashHandler(private val context: Context) : Thread.UncaughtExceptionHandl
       } else {
         sharedPrefs.putString(PATH, "")
       }
-      Toast.makeText(context, "Failed to load the update. Please try again.", Toast.LENGTH_LONG).show()
+      val errorMessage = throwable.message ?: "Unknown error occurred"
+      Toast.makeText(context, "Update failed: $errorMessage", Toast.LENGTH_LONG).show()
       GlobalScope.launch(Dispatchers.IO) {
         delay(1500)
         ProcessPhoenix.triggerRebirth(context)

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

@@ -59,8 +59,10 @@ class OtaHotUpdate : TurboReactPackage() {
         }
       }
     }
-    fun bundleJS(context: Context): String {
-      Thread.setDefaultUncaughtExceptionHandler(CrashHandler(context))
+    fun bundleJS(context: Context, isHandleCrash: Boolean = true): String {
+      if (isHandleCrash) {
+        Thread.setDefaultUncaughtExceptionHandler(CrashHandler(context))
+      }
       val sharedPrefs = SharedPrefs(context)
       val pathBundle = sharedPrefs.getString(PATH)
       val version = sharedPrefs.getString(VERSION)

package/ios/OtaHotUpdate.h

@@ -1,13 +1,13 @@
 #import <React/RCTReloadCommand.h>
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "RNOtaHotUpdateSpec.h"
 
+#if defined(RCT_NEW_ARCH_ENABLED) && __has_include("RNOtaHotUpdateSpec.h")
+#import "RNOtaHotUpdateSpec.h"
 @interface OtaHotUpdate : NSObject <NativeOtaHotUpdateSpec>
 #else
 #import <React/RCTBridgeModule.h>
-
 @interface OtaHotUpdate : NSObject <RCTBridgeModule>
 #endif
+
 + (NSURL *)getBundle;
 
 @end

package/package.json

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

package/plugin/build/index.js

@@ -19,11 +19,25 @@ import com.otahotupdate.OtaHotUpdate`);
 };
 const withIosAction = (config) => {
     return (0, config_plugins_1.withAppDelegate)(config, (config) => {
-        if (!config.modResults.contents.includes('#import "OtaHotUpdate.h')) {
-            config.modResults.contents = config.modResults.contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
+        const appDelegatePath = config.modRequest.projectRoot + '/ios/' + config_plugins_1.IOSConfig.Paths.getAppDelegateFilePath(config.modRequest.projectRoot);
+        const isSwift = appDelegatePath.endsWith('.swift');
+        if (isSwift) {
+            // Swift: AppDelegate.swift
+            if (!config.modResults.contents.includes('import react_native_ota_hot_update')) {
+                config.modResults.contents = `import react_native_ota_hot_update\n${config.modResults.contents}`;
+            }
+            if (!config.modResults.contents.includes('OtaHotUpdate.getBundle()')) {
+                config.modResults.contents = config.modResults.contents.replace(/return Bundle.main.url\(forResource: "main", withExtension: "jsbundle"\)/, `return OtaHotUpdate.getBundle()`);
+            }
+        }
+        else {
+            // Objective-C: AppDelegate.mm
+            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]`);
         }
-        config.modResults.contents = config.modResults.contents.replace(/\[\[NSBundle mainBundle\] URLForResource:@\"main\" withExtension:@\"jsbundle\"\]/, `[OtaHotUpdate getBundle]`);
         return config;
     });
 };

package/plugin/src/index.ts

@@ -1,4 +1,9 @@
-import { withMainApplication, withAppDelegate } from '@expo/config-plugins';
+import {
+  withMainApplication,
+  withAppDelegate,
+  IOSConfig,
+} from '@expo/config-plugins';
+
 const withAndroidAction: any = (config: any) => {
   return withMainApplication(config, (config) => {
     if (!config.modResults.contents.includes('override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)')) {
@@ -25,18 +30,37 @@ import com.otahotupdate.OtaHotUpdate`
 
 const withIosAction: any = (config: any) => {
   return withAppDelegate(config, (config) => {
-    if (!config.modResults.contents.includes('#import "OtaHotUpdate.h')) {
-      config.modResults.contents = config.modResults.contents.replace(
-        /#import "AppDelegate.h"/g,
-        `#import "AppDelegate.h"
+    const appDelegatePath = config.modRequest.projectRoot + '/ios/' + IOSConfig.Paths.getAppDelegateFilePath(config.modRequest.projectRoot);
+    const isSwift = appDelegatePath.endsWith('.swift');
+
+    if (isSwift) {
+      // Swift: AppDelegate.swift
+      if (!config.modResults.contents.includes('import react_native_ota_hot_update')) {
+        config.modResults.contents = `import react_native_ota_hot_update\n${config.modResults.contents}`;
+      }
+
+      if (!config.modResults.contents.includes('OtaHotUpdate.getBundle()')) {
+        config.modResults.contents = config.modResults.contents.replace(
+          /return Bundle.main.url\(forResource: "main", withExtension: "jsbundle"\)/,
+          `return OtaHotUpdate.getBundle()`
+        );
+      }
+    } else {
+      // Objective-C: AppDelegate.mm
+      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]`
       );
     }
 
-    config.modResults.contents = config.modResults.contents.replace(
-      /\[\[NSBundle mainBundle\] URLForResource:@\"main\" withExtension:@\"jsbundle\"\]/,
-      `[OtaHotUpdate getBundle]`
-    );
     return config;
   });
 };
@@ -46,4 +70,5 @@ const withAction: any = (config: any) => {
   config = withIosAction(config);
   return config;
 };
+
 module.exports = withAction;

package/react-native-ota-hot-update.podspec

@@ -17,8 +17,7 @@ Pod::Spec.new do |s|
     'SWIFT_VERSION' => '5.0',
     'DEFINES_MODULE' => 'YES'
   }
-
-  s.module_map = 'ios/OtaHotUpdate.modulemap'
+  s.public_header_files = "ios/OtaHotUpdate.h"
   s.source_files = "ios/**/*.{h,m,mm,cpp}"
   s.dependency 'SSZipArchive', '~> 2.4.3'
   if ENV['RCT_NEW_ARCH_ENABLED'] == '0'

package/ios/OtaHotUpdate.modulemap

@@ -1,6 +0,0 @@
-framework module OtaHotUpdate {
-  umbrella header "OtaHotUpdate.h"
-
-  export *
-  module * { export * }
-}