expo-modules-core 0.11.7 → 0.11.8

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.11.8 — 2022-10-13
+
+### 🐛 Bug fixes
+
+- Fixed `Updates.reloadAsync` from `expo-updates` occasionally crashes the app. ([#19539](https://github.com/expo/expo/pull/19539) by [@kudo](https://github.com/kudo), [@kudo](https://github.com/kudo))
+- Fixed `JSCRuntime destroyed with a dangling API object` on Android. ([#19487](https://github.com/expo/expo/pull/19487) by [@lukmccall](https://github.com/lukmccall))
+
 ## 0.11.7 — 2022-10-06
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '0.11.7'
+version = '0.11.8'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -161,7 +161,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.11.7"
+    versionName "0.11.8"
 
     testInstrumentationRunner "expo.modules.TestRunner"
 

package/android/src/main/cpp/ExpoModulesHostObject.cpp

@@ -12,6 +12,13 @@ namespace expo {
 ExpoModulesHostObject::ExpoModulesHostObject(JSIInteropModuleRegistry *installer)
   : installer(installer) {}
 
+/**
+ * Clears jsi references held by JSRegistry and JavaScriptRuntime.
+ */
+ExpoModulesHostObject::~ExpoModulesHostObject() {
+  installer->runtimeHolder.reset();
+}
+
 jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropNameID &name) {
   auto cName = name.utf8(runtime);
   auto module = installer->getModule(cName);

package/android/src/main/cpp/ExpoModulesHostObject.h

@@ -20,6 +20,8 @@ class ExpoModulesHostObject : public jsi::HostObject {
 public:
   ExpoModulesHostObject(JSIInteropModuleRegistry *installer);
 
+  ~ExpoModulesHostObject() override;
+
   jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
 
   void set(jsi::Runtime &, const jsi::PropNameID &name, const jsi::Value &value) override;

package/android/src/main/cpp/JavaScriptModuleObject.cpp

@@ -137,6 +137,18 @@ void JavaScriptModuleObject::registerProperty(
 JavaScriptModuleObject::HostObject::HostObject(
   JavaScriptModuleObject *jsModule) : jsModule(jsModule) {}
 
+/**
+ * Clears all the JSI references held by the `JavaScriptModuleObject`.
+ */
+JavaScriptModuleObject::HostObject::~HostObject() {
+  if (jsModule->jsiObject != nullptr) {
+    jsModule->jsiObject.reset();
+  }
+  jsModule->methodsMetadata.clear();
+  jsModule->constants.clear();
+  jsModule->properties.clear();
+}
+
 jsi::Value JavaScriptModuleObject::HostObject::get(jsi::Runtime &runtime,
                                                    const jsi::PropNameID &name) {
   auto cName = name.utf8(runtime);

package/android/src/main/cpp/JavaScriptModuleObject.h

@@ -103,6 +103,8 @@ public:
   public:
     HostObject(JavaScriptModuleObject *);
 
+    ~HostObject() override;
+
     jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
 
     void set(jsi::Runtime &, const jsi::PropNameID &name, const jsi::Value &value) override;

package/android/src/main/java/expo/modules/adapters/react/ModuleRegistryAdapter.java

@@ -111,8 +111,9 @@ public class ModuleRegistryAdapter implements ReactPackage {
     ReactApplicationContext reactContext,
     @Nullable ModuleRegistry moduleRegistry
   ) {
-    if (mModulesProxy != null && mModulesProxy.getKotlinInteropModuleRegistry().getWasDestroyed()) {
+    if (mModulesProxy != null && mModulesProxy.getReactContext() != reactContext) {
       mModulesProxy = null;
+      mWrapperDelegateHolders = null;
     }
     if (mModulesProxy == null) {
       ModuleRegistry registry = moduleRegistry != null ? moduleRegistry : mModuleRegistryProvider.get(reactContext);

package/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java

@@ -255,4 +255,8 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
   ModuleRegistry getModuleRegistry() {
     return mModuleRegistry;
   }
+
+  /* package */ ReactApplicationContext getReactContext() {
+    return getReactApplicationContext();
+  }
 }

package/android/src/main/java/expo/modules/kotlin/KotlinInteropModuleRegistry.kt

@@ -25,9 +25,6 @@ class KotlinInteropModuleRegistry(
   private val registry: ModuleRegistry
     get() = appContext.registry
 
-  var wasDestroyed = false
-    private set
-
   fun hasModule(name: String): Boolean = registry.hasModule(name)
 
   fun callMethod(moduleName: String, method: String, arguments: ReadableArray, promise: Promise) {
@@ -111,7 +108,6 @@ class KotlinInteropModuleRegistry(
 
   fun onDestroy() {
     appContext.onDestroy()
-    wasDestroyed = true
   }
 
   fun installJSIInterop() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "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": "d94331a2fd0db76d4a8438ae7216b43082999bf1"
+  "gitHead": "da2b9d2bb73100781b31906967669fe521d55e8a"
 }