expo-modules-core 0.4.6 → 0.4.10

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 0.4.10 — 2022-01-05
+
+### 🐛 Bug fixes
+
+- Fix `ReactInstanceManager.onHostPause` exception from moving Android apps to background. ([#15748](https://github.com/expo/expo/pull/15748) by [@kudo](https://github.com/kudo))
+
+## 0.4.9 — 2021-12-08
+
+### 🎉 New features
+
+- Improve external Android handlers or listeners backward compatibility by Java 8 interface default method. ([#15421](https://github.com/expo/expo/pull/15421) by [@kudo](https://github.com/kudo))
+
+## 0.4.8 — 2021-11-11
+
+### 🐛 Bug fixes
+
+- Fix Gradle error when running Gradle from outside of the project directory. ([#15109](https://github.com/expo/expo/pull/15109) by [@kudo](https://github.com/kudo))
+
+## 0.4.7 — 2021-10-28
+
+### 🐛 Bug fixes
+
+- Fix iOS app freezing in remote debugging mode. ([#14922](https://github.com/expo/expo/pull/14922) by [@kudo](https://github.com/kudo))
+
 ## 0.4.6 — 2021-10-27
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -55,23 +55,23 @@ end
 ```groovy
 // app/build.gradle
 
-apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute().text.trim(), "../gradle.groovy")
-apply from: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute().text.trim(), "../react.gradle")
-apply from: new File(["node", "--print", "require.resolve('expo-updates/package.json')"].execute().text.trim(), "../scripts/create-manifest-android.gradle")
+apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy")
+apply from: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../react.gradle")
+apply from: new File(["node", "--print", "require.resolve('expo-updates/package.json')"].execute(null, rootDir).text.trim(), "../scripts/create-manifest-android.gradle")
 
 // ...
 
-apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute().text.trim(), "../native_modules.gradle");
+apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
 applyNativeModulesAppBuildGradle(project)
 ```
 
 ```groovy
 // settings.gradle
 
-apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute().text.trim(), "../gradle.groovy");
+apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy");
 includeUnimodulesProjects()
 
-apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute().text.trim(), "../native_modules.gradle");
+apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
 applyNativeModulesSettingsGradle(settings)
 ```
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.4.6'
+version = '0.4.10'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -58,7 +58,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.4.6"
+    versionName "0.4.10"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/adapters/react/apploader/RNHeadlessAppLoader.kt

@@ -3,6 +3,7 @@ package expo.modules.adapters.react.apploader
 import android.content.Context
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceManager
+import com.facebook.react.common.LifecycleState
 import expo.modules.apploader.HeadlessAppLoader
 import expo.modules.core.interfaces.Consumer
 import expo.modules.core.interfaces.DoNotStrip
@@ -43,7 +44,12 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     return if (appRecords.containsKey(appScopeKey) && appRecords[appScopeKey] != null) {
       val appRecord: ReactInstanceManager = appRecords[appScopeKey]!!
       android.os.Handler(context.mainLooper).post {
-        appRecord.destroy()
+        // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
+        // And The Activity would take over the ownership of `ReactInstanceManager`.
+        // This case happens when a user clicks a background task triggered notification immediately.
+        if (appRecord.lifecycleState == LifecycleState.BEFORE_CREATE) {
+          appRecord.destroy()
+        }
         HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
         appRecords.remove(appScopeKey)
       }

package/android/src/main/java/expo/modules/core/interfaces/ApplicationLifecycleListener.java

@@ -0,0 +1,10 @@
+package expo.modules.core.interfaces;
+
+import android.app.Application;
+import android.content.res.Configuration;
+
+public interface ApplicationLifecycleListener {
+  default void onCreate(Application application) {}
+
+  default void onConfigurationChanged(Configuration newConfig) {}
+}

package/android/src/main/java/expo/modules/core/interfaces/ReactActivityLifecycleListener.java

@@ -0,0 +1,14 @@
+package expo.modules.core.interfaces;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public interface ReactActivityLifecycleListener {
+  default void onCreate(Activity activity, Bundle savedInstanceState) {}
+
+  default void onResume(Activity activity) {}
+
+  default void onPause(Activity activity) {}
+
+  default void onDestroy(Activity activity) {}
+}

package/android/src/main/java/expo/modules/core/interfaces/{ReactNativeHostHandler.kt → ReactNativeHostHandler.java}

@@ -1,18 +1,21 @@
-package expo.modules.core.interfaces
+package expo.modules.core.interfaces;
 
-import com.facebook.react.ReactInstanceManager
-import com.facebook.react.bridge.JavaScriptContextHolder
-import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
 
-interface ReactNativeHostHandler {
+import androidx.annotation.Nullable;
+
+public interface ReactNativeHostHandler {
   /**
    * Given chance for modules to customize {@link ReactInstanceManager}
    *
    * @param useDeveloperSupport true if {@link ReactNativeHost} enabled developer support
    * @return instance of {@link ReactInstanceManager}, or null if not to override
    */
-  fun createReactInstanceManager(useDeveloperSupport: Boolean): ReactInstanceManager? {
-    return null
+  @Nullable
+  default ReactInstanceManager createReactInstanceManager(boolean useDeveloperSupport) {
+    return null;
   }
 
   /**
@@ -22,8 +25,9 @@ interface ReactNativeHostHandler {
    * @param useDeveloperSupport true if {@link ReactNativeHost} enabled developer support
    * @return custom path to bundle file, or null if not to override
    */
-  fun getJSBundleFile(useDeveloperSupport: Boolean): String? {
-    return null
+  @Nullable
+  default String getJSBundleFile(boolean useDeveloperSupport) {
+    return null;
   }
 
   /**
@@ -33,8 +37,9 @@ interface ReactNativeHostHandler {
    * @param useDeveloperSupport true if {@link ReactNativeHost} enabled developer support
    * @return custom bundle asset name, or null if not to override
    */
-  fun getBundleAssetName(useDeveloperSupport: Boolean): String? {
-    return null
+  @Nullable
+  default String getBundleAssetName(boolean useDeveloperSupport) {
+    return null;
   }
 
   /**
@@ -42,10 +47,10 @@ interface ReactNativeHostHandler {
    *
    * @param useDeveloperSupport true if {@link ReactNativeHost} enabled developer support
    */
-  fun onRegisterJSIModules(
-    reactApplicationContext: ReactApplicationContext,
-    jsContext: JavaScriptContextHolder,
-    useDeveloperSupport: Boolean
+  default void onRegisterJSIModules(
+    ReactApplicationContext reactApplicationContext,
+    JavaScriptContextHolder jsContext,
+    boolean useDeveloperSupport
   ) {
   }
 }

package/ios/NativeModulesProxy/EXNativeModulesProxy.m

@@ -32,6 +32,7 @@ static const NSString *methodInfoArgumentsCountKey = @"argumentsCount";
 
 @interface RCTBridge (RegisterAdditionalModuleClasses)
 
+- (NSArray<RCTModuleData *> *)registerModulesForClasses:(NSArray<Class> *)moduleClasses;
 - (void)registerAdditionalModuleClasses:(NSArray<Class> *)modules;
 
 @end
@@ -248,7 +249,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   [bridge uiManager];
 
   // Register the view managers as additional modules.
-  [bridge registerAdditionalModuleClasses:additionalModuleClasses];
+  [self registerAdditionalModuleClasses:additionalModuleClasses inBridge:bridge];
 
   // Bridge's `registerAdditionalModuleClasses:` method doesn't register
   // components in UIManager — we need to register them on our own.
@@ -263,6 +264,32 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   [_exModuleRegistry initialize];
 }
 
+- (void)registerAdditionalModuleClasses:(NSArray<Class> *)moduleClasses inBridge:(RCTBridge *)bridge
+{
+  // In remote debugging mode, i.e. executorClass is `RCTWebSocketExecutor`,
+  // there is a deadlock issue in `registerAdditionalModuleClasses:` and causes app freezed.
+  //   - The JS thread acquired the `RCTCxxBridge._moduleRegistryLock` lock in `RCTCxxBridge._initializeBridgeLocked`
+  //      = it further goes into RCTObjcExecutor and tries to get module config from main thread
+  //   - The main thread is pending in `RCTCxxBridge.registerAdditionalModuleClasses` where trying to acquire the same lock.
+  // To workaround the deadlock, we tend to use the non-locked registration and mutate the bridge internal module data.
+  // Since JS thread in this situation is waiting for main thread, it's safe to mutate module data without lock.
+  // The only risk should be the internal `_moduleRegistryCreated` flag without lock protection.
+  // As we just workaround in `RCTWebSocketExecutor` case, the risk of `_moduleRegistryCreated` race condition should be lower.
+  //
+  // Learn more about the non-locked initialization:
+  // https://github.com/facebook/react-native/blob/757bb75fbf837714725d7b2af62149e8e2a7ee51/React/CxxBridge/RCTCxxBridge.mm#L922-L935
+  // See the `_moduleRegistryCreated` false case
+  if ([NSStringFromClass([bridge executorClass]) isEqualToString:@"RCTWebSocketExecutor"]) {
+    NSNumber *moduleRegistryCreated = [bridge valueForKey:@"_moduleRegistryCreated"];
+    if (![moduleRegistryCreated boolValue]) {
+      [bridge registerModulesForClasses:moduleClasses];
+      return;
+    }
+  }
+
+  [bridge registerAdditionalModuleClasses:moduleClasses];
+}
+
 - (void)registerComponentDataForModuleClasses:(NSArray<Class> *)moduleClasses inBridge:(RCTBridge *)bridge
 {
   // Hacky way to get a dictionary with `RCTComponentData` from UIManager.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.4.6",
+  "version": "0.4.10",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "59adc892501ce855c3c758fc984e06a766d00f76"
+  "gitHead": "94920c7dca7af1747e268c783780d1d2dd3e7a54"
 }

package/android/src/main/java/expo/modules/core/interfaces/ApplicationLifecycleListener.kt

@@ -1,9 +0,0 @@
-package expo.modules.core.interfaces
-
-import android.app.Application
-import android.content.res.Configuration
-
-interface ApplicationLifecycleListener {
-  fun onCreate(application: Application) {}
-  fun onConfigurationChanged(newConfig: Configuration) {}
-}

package/android/src/main/java/expo/modules/core/interfaces/ReactActivityLifecycleListener.kt

@@ -1,11 +0,0 @@
-package expo.modules.core.interfaces
-
-import android.app.Activity
-import android.os.Bundle
-
-interface ReactActivityLifecycleListener {
-  fun onCreate(activity: Activity, savedInstanceState: Bundle?) {}
-  fun onResume(activity: Activity) {}
-  fun onPause(activity: Activity) {}
-  fun onDestroy(activity: Activity) {}
-}