npm - airborne-react-native - Versions diffs - 0.15.6 → 0.18.0 - Mend

airborne-react-native 0.15.6 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/android/build.gradle CHANGED Viewed

@@ -90,8 +90,11 @@ android {
         }
     }
-    if (findReactNativeVersion().tokenize('.')[1].toInteger() >= 78) {
+    def rnMinorVersion = findReactNativeVersion().tokenize('.')[1].toInteger()
+    if (rnMinorVersion >= 81) {
         sourceSets.main.java.srcDirs += "src/latest/java"
+    } else if (rnMinorVersion >= 78 && rnMinorVersion < 81) {
+        sourceSets.main.java.srcDirs += "src/rn80/java"
     } else {
         sourceSets.main.java.srcDirs += "src/rn77/java"
     }

package/android/src/latest/java/in/juspay/airborneplugin/AirborneReactHostDelegate.kt CHANGED Viewed

@@ -1,8 +1,6 @@
 package `in`.juspay.airborneplugin
 import android.content.Context
-import android.util.Log
-import com.facebook.react.JSEngineResolutionAlgorithm
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate
@@ -10,15 +8,13 @@ import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate
 import com.facebook.react.runtime.BindingsInstaller
-import com.facebook.react.runtime.JSCInstance
 import com.facebook.react.runtime.JSRuntimeFactory
 import com.facebook.react.runtime.ReactHostDelegate
 import com.facebook.react.runtime.hermes.HermesInstance
-import java.lang.ref.WeakReference
 @OptIn(UnstableReactNativeAPI::class)
 class AirborneReactHostDelegate(
-    private val weakContext: WeakReference<Context>,
+    private val context: Context,
     private val reactNativeHostWrapper: ReactNativeHost,
     override val bindingsInstaller: BindingsInstaller? = null,
     override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder =
@@ -27,12 +23,11 @@ class AirborneReactHostDelegate(
     override val jsBundleLoader: JSBundleLoader
         get() {
-            val bundleName =
-                (reactNativeHostWrapper as AirborneReactNativeHost).jsBundleFile
+            val bundleName = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsBundleFile
             bundleName?.let {
                 return if (bundleName.startsWith("assets://")) {
                     JSBundleLoader.createAssetLoader(
-                        weakContext.get(),
+                        context,
                         bundleName,
                         false
                     )
@@ -41,24 +36,20 @@ class AirborneReactHostDelegate(
                 }
             }
             return JSBundleLoader.createAssetLoader(
-                weakContext.get(),
+                context,
                 "assets://index.android.bundle",
                 false
             )
         }
     override val jsMainModulePath: String
-        get() = (reactNativeHostWrapper as AirborneReactNativeHost).jsMainModuleName
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsMainModuleName ?: "index"
     override val jsRuntimeFactory: JSRuntimeFactory
-        get() = if ((reactNativeHostWrapper as AirborneReactNativeHost).jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
-            HermesInstance()
-        } else {
-            JSCInstance()
-        }
+        get() = HermesInstance()
     override val reactPackages: List<ReactPackage>
-        get() = (reactNativeHostWrapper as AirborneReactNativeHost).packages
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.packages ?: emptyList()
     override fun handleInstanceException(error: Exception) {
     }

package/android/src/latest/java/in/juspay/airborneplugin/AirborneReactNativeHost.kt ADDED Viewed

@@ -0,0 +1,5 @@
+package `in`.juspay.airborneplugin
+import android.app.Application
+abstract class AirborneReactNativeHost(application: Application) : AirborneReactNativeHostBase(application)

package/android/src/main/java/in/juspay/airborneplugin/AirborneReactActivityDelegate.kt CHANGED Viewed

@@ -13,8 +13,9 @@ class AirborneReactActivityDelegate(
     fabricEnabled: Boolean
 ) : DefaultReactActivityDelegate(activity, mainComponentName, fabricEnabled) {
-    private var appState = AppState.BEFORE_APPLOAD;
-    override fun loadApp(appKey: String) {
+    private var appState = AppState.BEFORE_APPLOAD
+    private val TAG = "AirborneReactActivityDelegate"
+    override fun loadApp(appKey: String?) {
         if (reactNativeHost is AirborneReactNativeHost) {
             CoroutineScope(Dispatchers.Default).launch {
@@ -30,7 +31,7 @@ class AirborneReactActivityDelegate(
         }
     }
-    private fun callLoadApp(appKey: String) {
+    private fun callLoadApp(appKey: String?) {
         super.loadApp(appKey)
         appState = AppState.APP_LOADED
         onResume()
@@ -41,10 +42,10 @@ class AirborneReactActivityDelegate(
             if (appState == AppState.ONRESUME_CALLED) {
                 super.onPause()
             } else {
-                Log.d(AirborneReactNativeHost.toString(), "skipping onPause as onResume is not yet called")
+                Log.d(TAG, "skipping onPause as onResume is not yet called")
             }
         } catch (e: Exception) {
-            Log.e( AirborneReactNativeHost.toString(), "Exception in onPause: ${e.message}")
+            Log.e( TAG, "Exception in onPause: ${e.message}")
         }
     }
@@ -54,10 +55,10 @@ class AirborneReactActivityDelegate(
                 super.onResume()
                 appState = AppState.ONRESUME_CALLED
             } else {
-                Log.d(AirborneReactNativeHost.toString(), "skipping onResume as app is not yet loaded")
+                Log.d(TAG, "skipping onResume as app is not yet loaded")
             }
         } catch (e: Exception) {
-            Log.e(AirborneReactNativeHost.toString(), "Exception in onResume: ${e.message}")
+            Log.e(TAG, "Exception in onResume: ${e.message}")
         }
     }
@@ -66,10 +67,10 @@ class AirborneReactActivityDelegate(
             if (appState == AppState.ONRESUME_CALLED) {
                 super.onDestroy()
             } else {
-                Log.d(AirborneReactNativeHost.toString(), "skipping onDestroy as onResume is not yet called")
+                Log.d(TAG, "skipping onDestroy as onResume is not yet called")
             }
         } catch (e: Exception) {
-            Log.e(AirborneReactNativeHost.toString(), "Exception in onDestroy: ${e.message}")
+            Log.e(TAG, "Exception in onDestroy: ${e.message}")
         }
     }

package/android/src/main/java/in/juspay/airborneplugin/{AirborneReactNativeHost.kt → AirborneReactNativeHostBase.kt} RENAMED Viewed

@@ -2,12 +2,9 @@ package `in`.juspay.airborneplugin
 import android.app.Application
 import android.content.Context
-import android.util.Log
-import com.facebook.react.JSEngineResolutionAlgorithm
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSExceptionHandler
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultComponentsRegistry
 import com.facebook.react.defaults.DefaultReactNativeHost
@@ -15,7 +12,7 @@ import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.runtime.ReactHostImpl
 import java.lang.ref.WeakReference
-abstract class AirborneReactNativeHost(application: Application) :
+abstract class AirborneReactNativeHostBase(application: Application) :
     DefaultReactNativeHost(application) {
     public override fun getPackages(): List<ReactPackage> {
@@ -26,10 +23,6 @@ abstract class AirborneReactNativeHost(application: Application) :
         return super.getJSBundleFile()
     }
-    public override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? {
-        return super.getJSEngineResolutionAlgorithm()
-    }
     public override fun getJSMainModuleName(): String {
         return super.getJSMainModuleName()
     }
@@ -38,7 +31,7 @@ abstract class AirborneReactNativeHost(application: Application) :
         @OptIn(UnstableReactNativeAPI::class)
         fun getReactHost(context: Context, reactNativeHost: ReactNativeHost): ReactHost {
             val reactHostDelegate =
-                AirborneReactHostDelegate(WeakReference(context), reactNativeHost)
+                AirborneReactHostDelegate(context, reactNativeHost)
             val componentFactory = ComponentFactory()
             DefaultComponentsRegistry.register(componentFactory)
             val reactHostImpl =

package/android/src/rn77/java/in/juspay/airborneplugin/AirborneReactHostDelegate.kt CHANGED Viewed

@@ -19,7 +19,7 @@ import java.lang.ref.WeakReference
 @OptIn(UnstableReactNativeAPI::class)
 class AirborneReactHostDelegate(
-    private val weakContext: WeakReference<Context>,
+    private val context: Context,
     private val reactNativeHostWrapper: ReactNativeHost,
     override val bindingsInstaller: BindingsInstaller? = null,
     private val reactNativeConfig: ReactNativeConfig = ReactNativeConfig.DEFAULT_CONFIG,
@@ -29,12 +29,11 @@ class AirborneReactHostDelegate(
     override val jsBundleLoader: JSBundleLoader
         get() {
-            val bundleName =
-                (reactNativeHostWrapper as AirborneReactNativeHost).jsBundleFile
+            val bundleName = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsBundleFile
             bundleName?.let {
                 return if (bundleName.startsWith("assets://")) {
                     JSBundleLoader.createAssetLoader(
-                        weakContext.get(),
+                        context,
                         bundleName,
                         false
                     )
@@ -43,24 +42,24 @@ class AirborneReactHostDelegate(
                 }
             }
             return JSBundleLoader.createAssetLoader(
-                weakContext.get(),
+                context,
                 "assets://index.android.bundle",
                 false
             )
         }
     override val jsMainModulePath: String
-        get() = (reactNativeHostWrapper as AirborneReactNativeHost).jsMainModuleName
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsMainModuleName ?: "index"
     override val jsRuntimeFactory: JSRuntimeFactory
-        get() = if ((reactNativeHostWrapper as AirborneReactNativeHost).jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
+        get() = if ((reactNativeHostWrapper as? AirborneReactNativeHost)?.jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
             HermesInstance()
         } else {
             JSCInstance()
         }
     override val reactPackages: List<ReactPackage>
-        get() = (reactNativeHostWrapper as AirborneReactNativeHost).packages
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.packages ?: emptyList()
     override fun getReactNativeConfig(): ReactNativeConfig {
         return reactNativeConfig

package/android/src/rn77/java/in/juspay/airborneplugin/AirborneReactNativeHost.kt ADDED Viewed

@@ -0,0 +1,12 @@
+package `in`.juspay.airborneplugin
+import android.app.Application
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.defaults.DefaultReactNativeHost
+abstract class AirborneReactNativeHost(application: Application) :
+    AirborneReactNativeHostBase(application) {
+    override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? {
+        return super.getJSEngineResolutionAlgorithm()
+    }
+}

package/android/src/rn80/java/in/juspay/airborneplugin/AirborneReactHostDelegate.kt ADDED Viewed

@@ -0,0 +1,64 @@
+package `in`.juspay.airborneplugin
+import android.content.Context
+import android.util.Log
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.bridge.JSBundleLoader
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate
+import com.facebook.react.runtime.BindingsInstaller
+import com.facebook.react.runtime.JSCInstance
+import com.facebook.react.runtime.JSRuntimeFactory
+import com.facebook.react.runtime.ReactHostDelegate
+import com.facebook.react.runtime.hermes.HermesInstance
+import java.lang.ref.WeakReference
+@OptIn(UnstableReactNativeAPI::class)
+class AirborneReactHostDelegate(
+    private val context: Context,
+    private val reactNativeHostWrapper: ReactNativeHost,
+    override val bindingsInstaller: BindingsInstaller? = null,
+    override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder =
+        DefaultTurboModuleManagerDelegate.Builder()
+) : ReactHostDelegate {
+    override val jsBundleLoader: JSBundleLoader
+        get() {
+            val bundleName = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsBundleFile
+            bundleName?.let {
+                return if (bundleName.startsWith("assets://")) {
+                    JSBundleLoader.createAssetLoader(
+                        context,
+                        bundleName,
+                        false
+                    )
+                } else {
+                    JSBundleLoader.createFileLoader(bundleName)
+                }
+            }
+            return JSBundleLoader.createAssetLoader(
+                context,
+                "assets://index.android.bundle",
+                false
+            )
+        }
+    override val jsMainModulePath: String
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.jsMainModuleName ?: "index"
+    override val jsRuntimeFactory: JSRuntimeFactory
+        get() = if ((reactNativeHostWrapper as? AirborneReactNativeHost)?.jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
+            HermesInstance()
+        } else {
+            JSCInstance()
+        }
+    override val reactPackages: List<ReactPackage>
+        get() = (reactNativeHostWrapper as? AirborneReactNativeHost)?.packages ?: emptyList()
+    override fun handleInstanceException(error: Exception) {
+    }
+}

package/android/src/rn80/java/in/juspay/airborneplugin/AirborneReactNativeHost.kt ADDED Viewed

@@ -0,0 +1,11 @@
+package `in`.juspay.airborneplugin
+import android.app.Application
+import com.facebook.react.JSEngineResolutionAlgorithm
+abstract class AirborneReactNativeHost(application: Application) :
+    AirborneReactNativeHostBase(application) {
+    public override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? {
+        return super.getJSEngineResolutionAlgorithm()
+    }
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "airborne-react-native",
-  "version": "0.15.6",
+  "version": "0.18.0",
   "description": "Airborne",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",