expo-modules-core 0.4.6 → 0.4.7

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 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/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.7'
 
 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.7"
   }
   lintOptions {
     abortOnError false

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.7",
   "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": "42eccf17fce009282234ba2d5d40a37d6fff4e86"
 }